drill-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jinfengni <...@git.apache.org>
Subject [GitHub] drill pull request #906: DRILL-5546: Handle schema change exception failure ...
Date Wed, 30 Aug 2017 05:59:46 GMT
Github user jinfengni commented on a diff in the pull request:

    https://github.com/apache/drill/pull/906#discussion_r135976739
  
    --- Diff: exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestEmptyBatchMiniPlan.java
---
    @@ -0,0 +1,453 @@
    +/*
    + * 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
    + * <p/>
    + * http://www.apache.org/licenses/LICENSE-2.0
    + * <p/>
    + * 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.unit;
    +
    +import com.google.common.collect.Lists;
    +import org.apache.calcite.rel.RelFieldCollation;
    +import org.apache.calcite.rel.core.JoinRelType;
    +import org.apache.drill.common.expression.SchemaPath;
    +import org.apache.drill.common.types.TypeProtos;
    +import org.apache.drill.common.util.FileUtils;
    +import org.apache.drill.exec.physical.base.PhysicalOperator;
    +import org.apache.drill.exec.physical.config.ExternalSort;
    +import org.apache.drill.exec.physical.config.Filter;
    +import org.apache.drill.exec.physical.config.FlattenPOP;
    +import org.apache.drill.exec.physical.config.HashAggregate;
    +import org.apache.drill.exec.physical.config.HashJoinPOP;
    +import org.apache.drill.exec.physical.config.Limit;
    +import org.apache.drill.exec.physical.config.MergeJoinPOP;
    +import org.apache.drill.exec.physical.config.Project;
    +import org.apache.drill.exec.physical.config.StreamingAggregate;
    +import org.apache.drill.exec.physical.config.UnionAll;
    +import org.apache.drill.exec.planner.physical.AggPrelBase;
    +import org.apache.drill.exec.record.BatchSchema;
    +import org.apache.drill.exec.record.RecordBatch;
    +import org.apache.drill.exec.store.dfs.DrillFileSystem;
    +import org.apache.drill.test.rowSet.SchemaBuilder;
    +import org.apache.hadoop.conf.Configuration;
    +import org.apache.hadoop.fs.FileSystem;
    +import org.junit.BeforeClass;
    +import org.junit.Ignore;
    +import org.junit.Test;
    +
    +import java.util.Collections;
    +import java.util.List;
    +
    +public class TestEmptyBatchMiniPlan extends MiniPlanUnitTestBase{
    +  protected static DrillFileSystem fs;
    +
    +  @BeforeClass
    +  public static void initFS() throws Exception {
    +    Configuration conf = new Configuration();
    +    conf.set(FileSystem.FS_DEFAULT_NAME_KEY, FileSystem.DEFAULT_FS);
    +    fs = new DrillFileSystem(conf);
    +  }
    +
    +  @Test
    +  public void testEmptyJsonInput() throws Exception {
    +    RecordBatch scanBatch = createEmptyBatchFromJson();
    +
    +    new MiniPlanTestBuilder()
    +        .root(scanBatch)
    +        .expectNullBatch(true)
    +        .go();
    +  }
    +
    +  @Test
    +  public void testProjectEmpty() throws Exception {
    +    final PhysicalOperator project = new Project(parseExprs("x+5", "x"), null);
    +    testSingleInputEmptyBatchHandling(project);
    +  }
    +
    +  @Test
    +  public void testFilterEmpty() throws Exception {
    +    final PhysicalOperator filter = new Filter(null, parseExpr("a=5"), 1.0f);
    +    testSingleInputEmptyBatchHandling(filter);
    +  }
    +
    +  @Test
    +  public void testHashAggEmpty() throws Exception {
    +    final PhysicalOperator hashAgg = new HashAggregate(null, AggPrelBase.OperatorPhase.PHASE_1of1,
parseExprs("a", "a"), parseExprs("sum(b)", "b_sum"), 1.0f);
    +    testSingleInputEmptyBatchHandling(hashAgg);
    +  }
    +
    +  @Test
    +  public void testStreamingAggEmpty() throws Exception {
    +    final PhysicalOperator hashAgg = new StreamingAggregate(null, parseExprs("a", "a"),
parseExprs("sum(b)", "b_sum"), 1.0f);
    +    testSingleInputEmptyBatchHandling(hashAgg);
    +  }
    +
    +  @Test
    +  public void testSortEmpty() throws Exception {
    +    final PhysicalOperator sort = new ExternalSort(null,
    +        Lists.newArrayList(ordering("b", RelFieldCollation.Direction.ASCENDING, RelFieldCollation.NullDirection.FIRST)),
false);
    +    testSingleInputEmptyBatchHandling(sort);
    +  }
    +
    +  @Test
    +  public void testLimitEmpty() throws Exception {
    +    final PhysicalOperator limit = new Limit(null, 10, 5);
    +    testSingleInputEmptyBatchHandling(limit);
    +  }
    +
    +  @Test
    +  public void testFlattenEmpty() throws Exception {
    +    final PhysicalOperator flatten = new FlattenPOP(null, SchemaPath.getSimplePath("col1"));
    +    testSingleInputEmptyBatchHandling(flatten);
    +  }
    +
    +  @Test
    +  public void testUnionEmptyBoth() throws Exception {
    +    final PhysicalOperator unionAll = new UnionAll(Collections.EMPTY_LIST); // Children
list is provided through RecordBatch
    +    testTwoInputEmptyBatchHandling(unionAll);
    +  }
    +
    +  @Test
    +  public void testHashJoinEmptyBoth() throws Exception {
    +   final PhysicalOperator join = new HashJoinPOP(null, null, Lists.newArrayList(joinCond("a",
"EQUALS", "b")), JoinRelType.INNER);
    +    testTwoInputEmptyBatchHandling(join);
    +  }
    +
    +  @Test
    +  public void testLeftHashJoinEmptyBoth() throws Exception {
    +    final PhysicalOperator join = new HashJoinPOP(null, null, Lists.newArrayList(joinCond("a",
"EQUALS", "b")), JoinRelType.LEFT);
    +    testTwoInputEmptyBatchHandling(join);
    +  }
    +
    +  @Test
    +  public void testRightHashJoinEmptyBoth() throws Exception {
    +    final PhysicalOperator join = new HashJoinPOP(null, null, Lists.newArrayList(joinCond("a",
"EQUALS", "b")), JoinRelType.RIGHT);
    +    testTwoInputEmptyBatchHandling(join);
    +  }
    +
    +  @Test
    +  public void testFullHashJoinEmptyBoth() throws Exception {
    +    final PhysicalOperator join = new HashJoinPOP(null, null, Lists.newArrayList(joinCond("a",
"EQUALS", "b")), JoinRelType.FULL);
    +    testTwoInputEmptyBatchHandling(join);
    +  }
    +
    +  @Test
    +  public void testMergeJoinEmptyBoth() throws Exception {
    +    final PhysicalOperator join = new MergeJoinPOP(null, null, Lists.newArrayList(joinCond("a",
"EQUALS", "b")), JoinRelType.INNER);
    +    testTwoInputEmptyBatchHandling(join);
    +  }
    +
    +  @Test
    +  public void testLeftMergeJoinEmptyBoth() throws Exception {
    +    final PhysicalOperator join = new MergeJoinPOP(null, null, Lists.newArrayList(joinCond("a",
"EQUALS", "b")), JoinRelType.LEFT);
    +    testTwoInputEmptyBatchHandling(join);
    +  }
    +
    +  @Test
    +  public void testRightMergeJoinEmptyBoth() throws Exception {
    +    final PhysicalOperator join = new MergeJoinPOP(null, null, Lists.newArrayList(joinCond("a",
"EQUALS", "b")), JoinRelType.RIGHT);
    +    testTwoInputEmptyBatchHandling(join);
    +  }
    +
    +  @Test
    +  @Ignore("Full Merge join is not supported.")
    +  public void testFullMergeJoinEmptyBoth() throws Exception {
    +    final PhysicalOperator join = new MergeJoinPOP(null, null, Lists.newArrayList(joinCond("a",
"EQUALS", "b")), JoinRelType.FULL);
    +    testTwoInputEmptyBatchHandling(join);
    +  }
    +
    +  @Test
    +  public void testUnionLeftEmtpy() throws Exception {
    +    final PhysicalOperator unionAll = new UnionAll(Collections.EMPTY_LIST); // Children
list is provided through RecordBatch
    +
    +    RecordBatch left = createEmptyBatchFromJson();
    +
    +    String file = FileUtils.getResourceAsFile("/tpchmulti/region/01.parquet").toURI().toString();
    +
    +    RecordBatch scanBatch = new ParquetScanBuilder()
    +        .fileSystem(fs)
    +        .columnsToRead("R_REGIONKEY")
    +        .inputPaths(Lists.newArrayList(file))
    +        .build();
    +
    +    RecordBatch projectBatch = new PopBuilder()
    +        .physicalOperator(new Project(parseExprs("R_REGIONKEY+10", "regionkey"), null))
    +        .addInput(scanBatch)
    +        .build();
    +
    +    RecordBatch unionBatch = new PopBuilder()
    +        .physicalOperator(unionAll)
    +        .addInput(left)
    +        .addInput(projectBatch)
    +        .build();
    +
    +    BatchSchema expectedSchema = new SchemaBuilder()
    +        .add("regionkey", TypeProtos.MinorType.BIGINT)
    +        .build();
    +
    +    new MiniPlanTestBuilder()
    +        .root(unionBatch)
    +        .expectSchema(expectedSchema)
    +        .baselineValues(10L)
    +        .baselineValues(11L)
    +        .go();
    +  }
    +
    +
    +  @Test
    +  public void testHashJoinLeftEmpty() throws Exception {
    +    RecordBatch left = createEmptyBatchFromJson();
    +
    +    List<String> rightJsonBatches = Lists.newArrayList(
    +        "[{\"a\": 50, \"b\" : 10 }]");
    +
    +    RecordBatch rightScan = new JsonScanBuilder()
    +        .jsonBatches(rightJsonBatches)
    +        .columnsToRead("a", "b")
    +        .build();
    +
    +    RecordBatch joinBatch = new PopBuilder()
    +        .physicalOperator(new HashJoinPOP(null, null, Lists.newArrayList(joinCond("a",
"EQUALS", "a2")), JoinRelType.INNER))
    +        .addInput(left)
    +        .addInput(rightScan)
    +        .build();
    +
    +    BatchSchema expectedSchema = new SchemaBuilder()
    +        .addNullable("a", TypeProtos.MinorType.BIGINT)
    +        .addNullable("b", TypeProtos.MinorType.BIGINT)
    +        .withSVMode(BatchSchema.SelectionVectorMode.NONE)
    +        .build();
    +
    +    new MiniPlanTestBuilder()
    +        .root(joinBatch)
    +        .expectSchema(expectedSchema)
    +        .expectZeroRow(true)
    +        .go();
    +  }
    +
    +  @Test
    +  public void testHashJoinRightEmpty() throws Exception {
    +    List<String> leftJsonBatches = Lists.newArrayList(
    +        "[{\"a\": 50, \"b\" : 10 }]");
    +
    +    RecordBatch leftScan = new JsonScanBuilder()
    +        .jsonBatches(leftJsonBatches)
    +        .columnsToRead("a", "b")
    +        .build();
    +
    +    RecordBatch right = createEmptyBatchFromJson();
    +
    +    RecordBatch joinBatch = new PopBuilder()
    +        .physicalOperator(new HashJoinPOP(null, null, Lists.newArrayList(joinCond("a",
"EQUALS", "a2")), JoinRelType.INNER))
    +        .addInput(leftScan)
    +        .addInput(right)
    +        .build();
    +
    +    BatchSchema expectedSchema = new SchemaBuilder()
    +        .addNullable("a", TypeProtos.MinorType.BIGINT)
    +        .addNullable("b", TypeProtos.MinorType.BIGINT)
    +        .withSVMode(BatchSchema.SelectionVectorMode.NONE)
    +        .build();
    +
    +    new MiniPlanTestBuilder()
    +        .root(joinBatch)
    +        .expectSchema(expectedSchema)
    +        .expectZeroRow(true)
    +        .go();
    +  }
    +
    +
    +  @Test
    +  public void testLeftHashJoinLeftEmpty() throws Exception {
    +    RecordBatch left = createEmptyBatchFromJson();
    +
    +    List<String> rightJsonBatches = Lists.newArrayList(
    +        "[{\"a\": 50, \"b\" : 10 }]");
    +
    +    RecordBatch rightScan = new JsonScanBuilder()
    +        .jsonBatches(rightJsonBatches)
    +        .columnsToRead("a", "b")
    +        .build();
    +
    +    RecordBatch joinBatch = new PopBuilder()
    +        .physicalOperator(new HashJoinPOP(null, null, Lists.newArrayList(joinCond("a",
"EQUALS", "a2")), JoinRelType.LEFT))
    +        .addInput(left)
    +        .addInput(rightScan)
    +        .build();
    +
    +    BatchSchema expectedSchema = new SchemaBuilder()
    +        .addNullable("a", TypeProtos.MinorType.BIGINT)
    +        .addNullable("b", TypeProtos.MinorType.BIGINT)
    +        .withSVMode(BatchSchema.SelectionVectorMode.NONE)
    +        .build();
    +
    +    new MiniPlanTestBuilder()
    +        .root(joinBatch)
    +        .expectSchema(expectedSchema)
    +        .expectZeroRow(true)
    +        .go();
    +  }
    +
    +  @Test
    +  public void testLeftHashJoinRightEmpty() throws Exception {
    +    List<String> leftJsonBatches = Lists.newArrayList(
    +        "[{\"a\": 50, \"b\" : 10 }]");
    +
    +    RecordBatch leftScan = new JsonScanBuilder()
    +        .jsonBatches(leftJsonBatches)
    +        .columnsToRead("a", "b")
    +        .build();
    +
    +    RecordBatch right = createEmptyBatchFromJson();
    +
    +    RecordBatch joinBatch = new PopBuilder()
    +        .physicalOperator(new HashJoinPOP(null, null, Lists.newArrayList(joinCond("a",
"EQUALS", "a2")), JoinRelType.LEFT))
    +        .addInput(leftScan)
    +        .addInput(right)
    +        .build();
    +
    +    BatchSchema expectedSchema = new SchemaBuilder()
    +        .addNullable("a", TypeProtos.MinorType.BIGINT)
    +        .addNullable("b", TypeProtos.MinorType.BIGINT)
    +        .withSVMode(BatchSchema.SelectionVectorMode.NONE)
    +        .build();
    +
    +    new MiniPlanTestBuilder()
    +        .root(joinBatch)
    +        .expectSchema(expectedSchema)
    +        .baselineValues(50L, 10L)
    +        .go();
    +  }
    +
    +  @Test
    +  public void testUnionFilterAll() throws Exception {
    +    List<String> leftJsonBatches = Lists.newArrayList(
    +        "[{\"a\": 5, \"b\" : 1 }]");
    +
    +    List<String> rightJsonBatches = Lists.newArrayList(
    +        "[{\"a\": 50, \"b\" : 10 }]");
    +
    +    RecordBatch leftScan = new JsonScanBuilder()
    +        .jsonBatches(leftJsonBatches)
    +        .columnsToRead("a", "b")
    +        .build();
    +
    +    RecordBatch leftFilter = new PopBuilder()
    +        .physicalOperator(new Filter(null, parseExpr("a < 0"), 1.0f))
    +        .addInput(leftScan)
    +        .build();
    +
    +    RecordBatch rightScan = new JsonScanBuilder()
    +        .jsonBatches(rightJsonBatches)
    +        .columnsToRead("a", "b")
    +        .build();
    +
    +    RecordBatch rightFilter = new PopBuilder()
    +        .physicalOperator(new Filter(null, parseExpr("a < 0"), 1.0f))
    +        .addInput(rightScan)
    +        .build();
    +
    +    RecordBatch batch = new PopBuilder()
    +        .physicalOperator(new UnionAll(Collections.EMPTY_LIST)) // Children list is provided
through RecordBatch
    +        .addInput(leftFilter)
    +        .addInput(rightFilter)
    +        .build();
    +
    +    BatchSchema expectedSchema = new SchemaBuilder()
    +        .addNullable("a", TypeProtos.MinorType.BIGINT)
    +        .addNullable("b", TypeProtos.MinorType.BIGINT)
    +        .withSVMode(BatchSchema.SelectionVectorMode.NONE)
    +        .build();
    +
    +    new MiniPlanTestBuilder()
    +        .root(batch)
    +        .expectSchema(expectedSchema)
    +        .expectZeroRow(true)
    +        .go();
    +  }
    +
    +  @Test
    +  public void testOutputProjectEmpty() throws Exception {
    --- End diff --
    
    Add unit case for *, foo.*, bar.*, map and array reference.
    
    I did not cover the case of error in expression tree materializer. If you have an example
to produce error in tree materializer, maybe you can share it here. On the other hand, as
explained above, the code path is an existing code block. 


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message