This is an automated email from the ASF dual-hosted git repository. arina pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/drill.git
commit 71c1a4c691c50c660fea0b046ae71a83ae358e15 Author: Arina Ielchiieva <arina.yelchiy...@gmail.com> AuthorDate: Fri Mar 15 18:00:23 2019 +0200 DRILL-7106: Fix Intellij warning for FieldSchemaNegotiator closes #1698 --- .../impl/scan/columns/ColumnsScanFramework.java | 13 +-------- .../impl/scan/columns/ColumnsSchemaNegotiator.java | 31 ++++++++++++++++++++++ .../exec/store/easy/text/TextFormatPlugin.java | 2 +- .../compliant/v3/CompliantTextBatchReader.java | 2 +- .../impl/scan/TestColumnsArrayFramework.java | 2 +- 5 files changed, 35 insertions(+), 15 deletions(-) diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/columns/ColumnsScanFramework.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/columns/ColumnsScanFramework.java index 231e967..17265c8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/columns/ColumnsScanFramework.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/columns/ColumnsScanFramework.java @@ -22,7 +22,6 @@ import java.util.List; import org.apache.drill.common.exceptions.ExecutionSetupException; import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.exec.physical.impl.scan.file.BaseFileScanFramework; -import org.apache.drill.exec.physical.impl.scan.file.BaseFileScanFramework.FileSchemaNegotiator; import org.apache.drill.exec.physical.impl.scan.file.FileScanFramework.FileSchemaNegotiatorImpl; import org.apache.drill.exec.physical.impl.scan.framework.ManagedReader; import org.apache.drill.exec.physical.impl.scan.framework.ShimBatchReader; @@ -44,7 +43,7 @@ import org.apache.hadoop.mapred.FileSplit; * identifier, the use of the columns identifier when it is not allowed, etc. */ -public class ColumnsScanFramework extends BaseFileScanFramework<ColumnsScanFramework.ColumnsSchemaNegotiator> { +public class ColumnsScanFramework extends BaseFileScanFramework<ColumnsSchemaNegotiator> { public interface FileReaderCreator { ManagedReader<ColumnsSchemaNegotiator> makeBatchReader( @@ -53,16 +52,6 @@ public class ColumnsScanFramework extends BaseFileScanFramework<ColumnsScanFrame } /** - * Schema negotiator that supports the file scan options plus access - * to the specific selected columns indexes. - */ - - public interface ColumnsSchemaNegotiator extends FileSchemaNegotiator { - boolean columnsArrayProjected(); - boolean[] projectedIndexes(); - } - - /** * Implementation of the columns array schema negotiator. */ diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/columns/ColumnsSchemaNegotiator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/columns/ColumnsSchemaNegotiator.java new file mode 100644 index 0000000..3bffd8a --- /dev/null +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/scan/columns/ColumnsSchemaNegotiator.java @@ -0,0 +1,31 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF 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. + */ +package org.apache.drill.exec.physical.impl.scan.columns; + +import org.apache.drill.exec.physical.impl.scan.file.BaseFileScanFramework; + +/** + * Schema negotiator that supports the file scan options plus access + * to the specific selected columns indexes. + */ +public interface ColumnsSchemaNegotiator extends BaseFileScanFramework.FileSchemaNegotiator { + + boolean columnsArrayProjected(); + boolean[] projectedIndexes(); + +} diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/TextFormatPlugin.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/TextFormatPlugin.java index c57576a..e162d2a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/TextFormatPlugin.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/TextFormatPlugin.java @@ -35,7 +35,7 @@ import org.apache.drill.exec.physical.base.ScanStats; import org.apache.drill.exec.physical.base.ScanStats.GroupScanProperty; import org.apache.drill.exec.planner.common.DrillStatsTable.TableStatistics; import org.apache.drill.exec.physical.impl.scan.columns.ColumnsScanFramework; -import org.apache.drill.exec.physical.impl.scan.columns.ColumnsScanFramework.ColumnsSchemaNegotiator; +import org.apache.drill.exec.physical.impl.scan.columns.ColumnsSchemaNegotiator; import org.apache.drill.exec.physical.impl.scan.columns.ColumnsScanFramework.FileReaderCreator; import org.apache.drill.exec.physical.impl.scan.framework.ManagedReader; import org.apache.drill.exec.planner.physical.PlannerSettings; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/v3/CompliantTextBatchReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/v3/CompliantTextBatchReader.java index e489003..323f793 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/v3/CompliantTextBatchReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/v3/CompliantTextBatchReader.java @@ -25,7 +25,7 @@ import org.apache.drill.common.types.TypeProtos.DataMode; import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.exec.ops.OperatorContext; import org.apache.drill.exec.physical.impl.scan.columns.ColumnsArrayManager; -import org.apache.drill.exec.physical.impl.scan.columns.ColumnsScanFramework.ColumnsSchemaNegotiator; +import org.apache.drill.exec.physical.impl.scan.columns.ColumnsSchemaNegotiator; import org.apache.drill.exec.physical.impl.scan.framework.ManagedReader; import org.apache.drill.exec.physical.rowSet.RowSetLoader; import org.apache.drill.exec.record.metadata.MetadataUtils; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/TestColumnsArrayFramework.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/TestColumnsArrayFramework.java index e7a0188..8c7e645 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/TestColumnsArrayFramework.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/TestColumnsArrayFramework.java @@ -35,7 +35,7 @@ import org.apache.drill.exec.physical.impl.scan.TestFileScanFramework.BaseFileSc import org.apache.drill.exec.physical.impl.scan.TestFileScanFramework.DummyFileWork; import org.apache.drill.exec.physical.impl.scan.columns.ColumnsArrayManager; import org.apache.drill.exec.physical.impl.scan.columns.ColumnsScanFramework; -import org.apache.drill.exec.physical.impl.scan.columns.ColumnsScanFramework.ColumnsSchemaNegotiator; +import org.apache.drill.exec.physical.impl.scan.columns.ColumnsSchemaNegotiator; import org.apache.drill.exec.physical.impl.scan.columns.ColumnsScanFramework.FileReaderCreator; import org.apache.drill.exec.physical.impl.scan.file.BaseFileScanFramework; import org.apache.drill.exec.physical.impl.scan.framework.ManagedReader;