/*
 * Licensed to CRATE Technology GmbH ("Crate") under one or more contributor
 * license agreements.  See the NOTICE file distributed with this work for
 * additional information regarding copyright ownership.  Crate licenses
 * this file to you under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.  You may
 * obtain a copy of the License at
 *
 *   http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
 * License for the specific language governing permissions and limitations
 * under the License.
 *
 * However, if you have executed another commercial license agreement
 * with Crate these terms will supersede the license and you may use the
 * software solely pursuant to the terms of the relevant commercial agreement.
 */

package io.crate.operation.reference.file;

import io.crate.metadata.ColumnIdent;
import io.crate.metadata.doc.DocSysColumns;
import io.crate.operation.collect.files.CollectorContext;
import io.crate.operation.collect.files.LineCollectorExpression;
import org.apache.lucene.util.BytesRef;

public class ColumnExtractingLineExpression extends LineCollectorExpression<Object> {

    private final ColumnIdent columnIdent;
    private LineContext context;

    public ColumnExtractingLineExpression(ColumnIdent columnIdent) {
        this.columnIdent = columnIdent;
    }

    @Override
    public Object value() {
        Object value = context.get(columnIdent);
        if (!columnIdent.equals(DocSysColumns.RAW) && value != null && value instanceof String)  {
            return new BytesRef((String) value);
        }
        return value;
    }

    @Override
    public void startCollect(CollectorContext context) {
        this.context = context.lineContext();
    }
}

@@ -1732,25 +1732,8 @@
 ) &&
- value != null &&
  val

remove unnecessary npe check