diff options
Diffstat (limited to 'exec/java-exec')
42 files changed, 175 insertions, 67 deletions
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/ColumnBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/ColumnBuilder.java index 33a8eeb8c..19d86453d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/ColumnBuilder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/ColumnBuilder.java @@ -162,7 +162,7 @@ public class ColumnBuilder { (NullableVector) vector); } else { vectorState = SimpleVectorState.vectorState(columnSchema, - colWriter.scalar(), vector); + colWriter.events(), vector); } // Create the column state which binds the vector and writer together. @@ -261,7 +261,7 @@ public class ColumnBuilder { offsetVectorState = new OffsetVectorState( (((AbstractArrayWriter) writer.array()).offsetWriter()), offsetVector, - writer.array().entry()); + writer.array().entry().events()); } else { offsetVectorState = new NullVectorState(); } @@ -397,7 +397,8 @@ public class ColumnBuilder { // Create the list vector state that tracks the list vector lifecycle. - final ListVectorState vectorState = new ListVectorState(listWriter, memberState.writer(), listVector); + final ListVectorState vectorState = new ListVectorState(listWriter, + memberState.writer().events(), listVector); // Assemble it all into a union column state. @@ -504,7 +505,7 @@ public class ColumnBuilder { // For a repeated list, we only care about final RepeatedListVectorState vectorState = new RepeatedListVectorState( - arrayWriter.array(), vector); + arrayWriter, vector); // Build the container that tracks the array contents diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/ColumnState.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/ColumnState.java index 95f011a23..36b9db810 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/ColumnState.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/ColumnState.java @@ -22,9 +22,10 @@ import org.apache.drill.exec.record.metadata.ColumnMetadata; import org.apache.drill.exec.vector.ValueVector; import org.apache.drill.exec.vector.accessor.ObjectType; import org.apache.drill.exec.vector.accessor.ScalarWriter; -import org.apache.drill.exec.vector.accessor.ScalarWriter.ColumnWriterListener; import org.apache.drill.exec.vector.accessor.impl.HierarchicalFormatter; import org.apache.drill.exec.vector.accessor.writer.AbstractObjectWriter; +import org.apache.drill.exec.vector.accessor.writer.WriterEvents; +import org.apache.drill.exec.vector.accessor.writer.WriterEvents.ColumnWriterListener; /** * Represents the write-time state for a column including the writer and the (optional) @@ -53,13 +54,13 @@ public abstract class ColumnState { AbstractObjectWriter colWriter, VectorState vectorState) { super(loader, colWriter, vectorState); - ScalarWriter scalarWriter; + WriterEvents scalarEvents; if (colWriter.type() == ObjectType.ARRAY) { - scalarWriter = writer.array().scalar(); + scalarEvents = writer.array().entry().events(); } else { - scalarWriter = writer.scalar(); + scalarEvents = writer.events(); } - scalarWriter.bindListener(this); + scalarEvents.bindListener(this); } @Override diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/ListState.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/ListState.java index 3488e7bb7..37104f437 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/ListState.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/ListState.java @@ -32,12 +32,12 @@ import org.apache.drill.exec.record.metadata.VariantMetadata; import org.apache.drill.exec.record.metadata.VariantSchema; import org.apache.drill.exec.vector.accessor.ObjectWriter; import org.apache.drill.exec.vector.accessor.VariantWriter; -import org.apache.drill.exec.vector.accessor.WriterPosition; import org.apache.drill.exec.vector.accessor.impl.HierarchicalFormatter; import org.apache.drill.exec.vector.accessor.writer.ListWriterImpl; import org.apache.drill.exec.vector.accessor.writer.SimpleListShim; import org.apache.drill.exec.vector.accessor.writer.UnionVectorShim; import org.apache.drill.exec.vector.accessor.writer.UnionWriterImpl; +import org.apache.drill.exec.vector.accessor.writer.WriterEvents; import org.apache.drill.exec.vector.complex.ListVector; import org.apache.drill.exec.vector.complex.UnionVector; @@ -123,7 +123,7 @@ public class ListState extends ContainerState memberVectorState = new NullVectorState(); } - public ListVectorState(ListWriterImpl writer, WriterPosition elementWriter, ListVector vector) { + public ListVectorState(ListWriterImpl writer, WriterEvents elementWriter, ListVector vector) { this.schema = writer.schema(); this.vector = vector; bitsVectorState = new IsSetVectorState(writer, vector.getBitsVector()); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/NullableVectorState.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/NullableVectorState.java index b01292074..90dc3fe58 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/NullableVectorState.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/NullableVectorState.java @@ -38,7 +38,7 @@ public class NullableVectorState implements VectorState { this.schema = writer.schema(); this.vector = vector; - this.writer = (NullableScalarWriter) writer.scalar(); + this.writer = (NullableScalarWriter) writer.events(); bitsState = new IsSetVectorState(this.writer.bitsWriter(), vector.getBitsVector()); valuesState = SimpleVectorState.vectorState(this.writer.schema(), this.writer.baseWriter(), vector.getValuesVector()); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/RepeatedListState.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/RepeatedListState.java index ab64dded3..39d7d4423 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/RepeatedListState.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/RepeatedListState.java @@ -87,12 +87,12 @@ public class RepeatedListState extends ContainerState implements RepeatedListWri private final RepeatedListVector vector; private final OffsetVectorState offsetsState; - public RepeatedListVectorState(ArrayWriter arrayWriter, RepeatedListVector vector) { + public RepeatedListVectorState(AbstractObjectWriter arrayWriter, RepeatedListVector vector) { this.vector = vector; - this.arrayWriter = arrayWriter; + this.arrayWriter = arrayWriter.array(); offsetsState = new OffsetVectorState( - arrayWriter, vector.getOffsetVector(), - arrayWriter.entryType() == null ? null : arrayWriter.array()); + arrayWriter.events(), vector.getOffsetVector(), + this.arrayWriter.entryType() == null ? null : arrayWriter.events()); } /** @@ -105,7 +105,7 @@ public class RepeatedListState extends ContainerState implements RepeatedListWri */ public void updateChildWriter(AbstractObjectWriter childWriter) { - offsetsState.setChildWriter(childWriter.array()); + offsetsState.setChildWriter(childWriter.events()); } @SuppressWarnings("unchecked") diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/RepeatedVectorState.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/RepeatedVectorState.java index 8dd4839ce..1d01b9d08 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/RepeatedVectorState.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/RepeatedVectorState.java @@ -23,7 +23,7 @@ import org.apache.drill.exec.vector.ValueVector; import org.apache.drill.exec.vector.accessor.ArrayWriter; import org.apache.drill.exec.vector.accessor.impl.HierarchicalFormatter; import org.apache.drill.exec.vector.accessor.writer.AbstractArrayWriter; -import org.apache.drill.exec.vector.accessor.writer.AbstractScalarWriter; +import org.apache.drill.exec.vector.accessor.writer.AbstractScalarWriterImpl; import org.apache.drill.exec.vector.complex.RepeatedValueVector; /** @@ -47,7 +47,7 @@ public class RepeatedVectorState implements VectorState { // vector, and the scalar (value) portion of the array writer. arrayWriter = (AbstractArrayWriter) writer; - AbstractScalarWriter colWriter = (AbstractScalarWriter) writer.scalar(); + AbstractScalarWriterImpl colWriter = (AbstractScalarWriterImpl) writer.entry().events(); valuesState = SimpleVectorState.vectorState(writer.schema(), colWriter, vector.getDataVector()); // Create the offsets state with the offset vector portion of the repeated diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/SingleVectorState.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/SingleVectorState.java index e57373caa..538435375 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/SingleVectorState.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/SingleVectorState.java @@ -29,6 +29,7 @@ import org.apache.drill.exec.vector.VariableWidthVector; import org.apache.drill.exec.vector.accessor.WriterPosition; import org.apache.drill.exec.vector.accessor.impl.HierarchicalFormatter; import org.apache.drill.exec.vector.accessor.writer.OffsetVectorWriter; +import org.apache.drill.exec.vector.accessor.writer.WriterEvents; /** * Base class for a single vector. Handles the bulk of work for that vector. @@ -41,7 +42,7 @@ public abstract class SingleVectorState implements VectorState { public abstract static class SimpleVectorState extends SingleVectorState { - public SimpleVectorState(WriterPosition writer, + public SimpleVectorState(WriterEvents writer, ValueVector mainVector) { super(writer, mainVector); } @@ -74,7 +75,7 @@ public abstract class SingleVectorState implements VectorState { public static class FixedWidthVectorState extends SimpleVectorState { - public FixedWidthVectorState(WriterPosition writer, ValueVector mainVector) { + public FixedWidthVectorState(WriterEvents writer, ValueVector mainVector) { super(writer, mainVector); } @@ -87,7 +88,7 @@ public abstract class SingleVectorState implements VectorState { public static class IsSetVectorState extends FixedWidthVectorState { - public IsSetVectorState(WriterPosition writer, ValueVector mainVector) { + public IsSetVectorState(WriterEvents writer, ValueVector mainVector) { super(writer, mainVector); } @@ -112,7 +113,7 @@ public abstract class SingleVectorState implements VectorState { private final ColumnMetadata schema; - public VariableWidthVectorState(ColumnMetadata schema, WriterPosition writer, ValueVector mainVector) { + public VariableWidthVectorState(ColumnMetadata schema, WriterEvents writer, ValueVector mainVector) { super(writer, mainVector); this.schema = schema; } @@ -147,13 +148,13 @@ public abstract class SingleVectorState implements VectorState { private WriterPosition childWriter; - public OffsetVectorState(WriterPosition writer, ValueVector mainVector, + public OffsetVectorState(WriterEvents writer, ValueVector mainVector, WriterPosition childWriter) { super(writer, mainVector); this.childWriter = childWriter; } - public void setChildWriter(WriterPosition childWriter) { + public void setChildWriter(WriterEvents childWriter) { this.childWriter = childWriter; } @@ -224,11 +225,11 @@ public abstract class SingleVectorState implements VectorState { } } - protected final WriterPosition writer; + protected final WriterEvents writer; protected final ValueVector mainVector; protected ValueVector backupVector; - public SingleVectorState(WriterPosition writer, ValueVector mainVector) { + public SingleVectorState(WriterEvents writer, ValueVector mainVector) { this.writer = writer; this.mainVector = mainVector; } @@ -359,7 +360,7 @@ public abstract class SingleVectorState implements VectorState { @Override public boolean isProjected() { return true; } - public static SimpleVectorState vectorState(ColumnMetadata schema, WriterPosition writer, ValueVector mainVector) { + public static SimpleVectorState vectorState(ColumnMetadata schema, WriterEvents writer, ValueVector mainVector) { if (schema.isVariableWidth()) { return new VariableWidthVectorState(schema, writer, mainVector); } else { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/TupleState.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/TupleState.java index ff531f717..eace69ebb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/TupleState.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/TupleState.java @@ -35,7 +35,6 @@ import org.apache.drill.exec.record.metadata.TupleSchema; import org.apache.drill.exec.vector.ValueVector; import org.apache.drill.exec.vector.accessor.ObjectWriter; import org.apache.drill.exec.vector.accessor.TupleWriter; -import org.apache.drill.exec.vector.accessor.TupleWriter.TupleWriterListener; import org.apache.drill.exec.vector.accessor.impl.HierarchicalFormatter; import org.apache.drill.exec.vector.accessor.writer.AbstractObjectWriter; import org.apache.drill.exec.vector.accessor.writer.AbstractTupleWriter; @@ -92,7 +91,7 @@ import org.apache.drill.exec.vector.complex.AbstractMapVector; */ public abstract class TupleState extends ContainerState - implements TupleWriterListener { + implements AbstractTupleWriter.TupleWriterListener { /** * Represents a map column (either single or repeated). Includes maps that diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/filter/RuntimeFilterRouter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/filter/RuntimeFilterRouter.java index a4946a96c..b59c17eeb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/filter/RuntimeFilterRouter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/filter/RuntimeFilterRouter.java @@ -18,6 +18,7 @@ package org.apache.drill.exec.work.filter; import org.apache.commons.collections.CollectionUtils; +import org.apache.drill.common.exceptions.UserException; import org.apache.drill.exec.ops.SendingAccountor; import org.apache.drill.exec.physical.base.AbstractPhysicalVisitor; import org.apache.drill.exec.physical.base.Exchange; @@ -172,9 +173,14 @@ public class RuntimeFilterRouter { } } + @SuppressWarnings("unchecked") private Wrapper findTargetWrapper(Wrapper wrapper, TargetPhysicalOperatorVisitor targetOpVisitor) { targetOpVisitor.setCurrentFragment(wrapper.getNode()); - wrapper.getNode().getRoot().accept(targetOpVisitor, null); + try { + wrapper.getNode().getRoot().accept(targetOpVisitor, null); + } catch (Throwable e) { + throw UserException.systemError(e).build(); + } boolean contain = targetOpVisitor.isContain(); if (contain) { return wrapper; @@ -233,6 +239,7 @@ public class RuntimeFilterRouter { return null; } + @Override public boolean isContain() { return contain; } @@ -284,6 +291,7 @@ public class RuntimeFilterRouter { return null; } + @Override public boolean isContain() { return contain; } diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestConstantColumnLoader.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestConstantColumnLoader.java index ffdb06ecf..b45374be2 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestConstantColumnLoader.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestConstantColumnLoader.java @@ -20,6 +20,7 @@ package org.apache.drill.exec.physical.impl.scan.project; import java.util.ArrayList; import java.util.List; +import org.apache.drill.categories.RowSetTests; import org.apache.drill.common.types.TypeProtos.DataMode; import org.apache.drill.common.types.TypeProtos.MajorType; import org.apache.drill.common.types.TypeProtos.MinorType; @@ -32,6 +33,7 @@ import org.apache.drill.test.SubOperatorTest; import org.apache.drill.test.rowSet.RowSet.SingleRowSet; import org.apache.drill.test.rowSet.RowSetComparison; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * Drill allows file metadata columns (also called "implicit" columns.) @@ -39,6 +41,7 @@ import org.junit.Test; * values. The ConstantColumnLoader builds and populates these columns. */ +@Category(RowSetTests.class) public class TestConstantColumnLoader extends SubOperatorTest { private static class DummyColumn implements ConstantColumnSpec { diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestNullColumnLoader.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestNullColumnLoader.java index 90b9f7182..a825fad36 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestNullColumnLoader.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestNullColumnLoader.java @@ -25,6 +25,7 @@ import java.util.List; import org.apache.drill.common.types.TypeProtos.DataMode; import org.apache.drill.common.types.TypeProtos.MajorType; import org.apache.drill.common.types.TypeProtos.MinorType; +import org.apache.drill.categories.RowSetTests; import org.apache.drill.common.types.Types; import org.apache.drill.exec.physical.rowSet.ResultVectorCache; import org.apache.drill.exec.physical.rowSet.impl.NullResultVectorCacheImpl; @@ -37,6 +38,7 @@ import org.apache.drill.test.SubOperatorTest; import org.apache.drill.test.rowSet.RowSet.SingleRowSet; import org.apache.drill.test.rowSet.RowSetComparison; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * Test the mechanism that handles all-null columns during projection. @@ -49,6 +51,7 @@ import org.junit.Test; * any other type and mode. */ +@Category(RowSetTests.class) public class TestNullColumnLoader extends SubOperatorTest { private ResolvedNullColumn makeNullCol(String name, MajorType nullType) { diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestRowBatchMerger.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestRowBatchMerger.java index 289b418e5..ef7e01fe4 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestRowBatchMerger.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestRowBatchMerger.java @@ -33,11 +33,15 @@ import org.apache.drill.test.rowSet.RowSet.SingleRowSet; import org.apache.drill.test.rowSet.RowSetComparison; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.experimental.categories.Category; import io.netty.buffer.DrillBuf; import static org.apache.drill.test.rowSet.RowSetUtilities.mapValue; import static org.apache.drill.test.rowSet.RowSetUtilities.singleMap; + +import org.apache.drill.categories.RowSetTests; + import static org.apache.drill.test.rowSet.RowSetUtilities.mapArray; @@ -50,6 +54,7 @@ import static org.apache.drill.test.rowSet.RowSetUtilities.mapArray; * vector. */ +@Category(RowSetTests.class) public class TestRowBatchMerger extends SubOperatorTest { public static class RowSetSource implements VectorSource { diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestScanLevelProjection.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestScanLevelProjection.java index c58991aa8..cc58b6cd7 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestScanLevelProjection.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestScanLevelProjection.java @@ -22,6 +22,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import org.apache.drill.categories.RowSetTests; import org.apache.drill.common.exceptions.UserException; import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.exec.physical.impl.scan.ScanTestUtils; @@ -30,12 +31,14 @@ import org.apache.drill.exec.physical.rowSet.project.RequestedTuple.RequestedCol import org.apache.drill.exec.record.metadata.ProjectionType; import org.apache.drill.test.SubOperatorTest; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * Test the level of projection done at the level of the scan as a whole; * before knowledge of table "implicit" columns or the specific table schema. */ +@Category(RowSetTests.class) public class TestScanLevelProjection extends SubOperatorTest { /** diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestSchemaLevelProjection.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestSchemaLevelProjection.java index c10e5fc7a..800d4dc29 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestSchemaLevelProjection.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestSchemaLevelProjection.java @@ -26,6 +26,7 @@ import static org.junit.Assert.fail; import java.util.List; +import org.apache.drill.categories.RowSetTests; import org.apache.drill.common.exceptions.UserException; import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.exec.physical.impl.scan.project.ResolvedTuple.ResolvedRow; @@ -35,6 +36,7 @@ import org.apache.drill.exec.record.metadata.SchemaBuilder; import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.test.SubOperatorTest; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * "Schema level projection" describes one side of the projection @@ -44,6 +46,7 @@ import org.junit.Test; * combines these to map out the actual projection. */ +@Category(RowSetTests.class) public class TestSchemaLevelProjection extends SubOperatorTest { /** diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestSchemaSmoothing.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestSchemaSmoothing.java index d008a9d8c..a21b1e472 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestSchemaSmoothing.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/project/TestSchemaSmoothing.java @@ -24,6 +24,7 @@ import static org.junit.Assert.fail; import java.util.List; +import org.apache.drill.categories.RowSetTests; import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.exec.physical.impl.protocol.SchemaTracker; import org.apache.drill.exec.physical.impl.scan.ScanTestUtils; @@ -38,6 +39,7 @@ import org.apache.drill.test.SubOperatorTest; import org.apache.drill.test.rowSet.RowSet.SingleRowSet; import org.apache.drill.test.rowSet.RowSetComparison; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * Tests schema smoothing at the schema projection level. @@ -79,6 +81,7 @@ import org.junit.Test; * the future to know what data will be scanned.) */ +@Category(RowSetTests.class) public class TestSchemaSmoothing extends SubOperatorTest { /** diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestProjectedTuple.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestProjectedTuple.java index 69d56a1bc..2966bd561 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestProjectedTuple.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestProjectedTuple.java @@ -27,6 +27,7 @@ import static org.junit.Assert.fail; import java.util.ArrayList; import java.util.List; +import org.apache.drill.categories.RowSetTests; import org.apache.drill.common.exceptions.UserException; import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.exec.physical.rowSet.project.ImpliedTupleRequest; @@ -36,7 +37,9 @@ import org.apache.drill.exec.physical.rowSet.project.RequestedTupleImpl; import org.apache.drill.exec.record.metadata.ProjectionType; import org.junit.Ignore; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(RowSetTests.class) public class TestProjectedTuple { @Test diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderEmptyProject.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderEmptyProject.java index 15fd04948..9150bc127 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderEmptyProject.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderEmptyProject.java @@ -24,6 +24,7 @@ import static org.junit.Assert.fail; import java.util.List; +import org.apache.drill.categories.RowSetTests; import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.exec.physical.rowSet.ResultSetLoader; @@ -36,9 +37,10 @@ import org.apache.drill.test.SubOperatorTest; import org.apache.drill.test.rowSet.RowSetBuilder; import org.apache.drill.test.rowSet.RowSetUtilities; import org.junit.Test; - +import org.junit.experimental.categories.Category; import org.apache.drill.shaded.guava.com.google.common.collect.Lists; +@Category(RowSetTests.class) public class TestResultSetLoaderEmptyProject extends SubOperatorTest { /** diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderLimits.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderLimits.java index fff86d754..059fc016f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderLimits.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderLimits.java @@ -23,6 +23,7 @@ import static org.junit.Assert.fail; import java.util.Arrays; +import org.apache.drill.categories.RowSetTests; import org.apache.drill.common.types.TypeProtos.DataMode; import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.exec.physical.rowSet.ResultSetLoader; @@ -32,6 +33,7 @@ import org.apache.drill.exec.record.metadata.SchemaBuilder; import org.apache.drill.exec.vector.ValueVector; import org.apache.drill.test.SubOperatorTest; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * Tests of the row limit functionality of the result set loader. The @@ -45,6 +47,7 @@ import org.junit.Test; * the row limit turns out to be too large.) */ +@Category(RowSetTests.class) public class TestResultSetLoaderLimits extends SubOperatorTest { /** diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderMapArray.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderMapArray.java index 9b75e9bb3..4a203faa6 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderMapArray.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderMapArray.java @@ -28,6 +28,7 @@ import static org.junit.Assert.assertTrue; import java.util.Arrays; import java.util.Iterator; +import org.apache.drill.categories.RowSetTests; import org.apache.drill.common.types.TypeProtos.DataMode; import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.exec.physical.rowSet.ResultSetLoader; @@ -49,6 +50,7 @@ import org.apache.drill.test.rowSet.RowSet.SingleRowSet; import org.apache.drill.test.rowSet.RowSetReader; import org.apache.drill.test.rowSet.RowSetUtilities; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * Test map array support in the result set loader. @@ -59,6 +61,7 @@ import org.junit.Test; * constructs not to be tackled lightly. */ +@Category(RowSetTests.class) public class TestResultSetLoaderMapArray extends SubOperatorTest { @Test diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderMaps.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderMaps.java index ac4ab8f53..48614de55 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderMaps.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderMaps.java @@ -28,6 +28,7 @@ import static org.junit.Assert.fail; import java.util.Arrays; +import org.apache.drill.categories.RowSetTests; import org.apache.drill.common.exceptions.UserException; import org.apache.drill.common.types.TypeProtos.DataMode; import org.apache.drill.common.types.TypeProtos.MinorType; @@ -49,12 +50,14 @@ import org.apache.drill.test.rowSet.RowSet.SingleRowSet; import org.apache.drill.test.rowSet.RowSetReader; import org.apache.drill.test.rowSet.RowSetUtilities; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * Test (non-array) map support in the result set loader and related classes. */ +@Category(RowSetTests.class) public class TestResultSetLoaderMaps extends SubOperatorTest { @Test diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderOmittedValues.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderOmittedValues.java index a888fce0b..ec37a6d6f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderOmittedValues.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderOmittedValues.java @@ -23,6 +23,7 @@ import static org.junit.Assert.assertTrue; import java.util.Arrays; +import org.apache.drill.categories.RowSetTests; import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.exec.physical.rowSet.ResultSetLoader; import org.apache.drill.exec.physical.rowSet.RowSetLoader; @@ -37,8 +38,10 @@ import org.apache.drill.test.rowSet.RowSet.SingleRowSet; import org.apache.drill.test.rowSet.RowSetReader; import org.apache.drill.test.rowSet.RowSetUtilities; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(RowSetTests.class) public class TestResultSetLoaderOmittedValues extends SubOperatorTest { /** diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderOverflow.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderOverflow.java index 9b11380af..a82e3c3bf 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderOverflow.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderOverflow.java @@ -23,6 +23,7 @@ import static org.junit.Assert.fail; import java.util.Arrays; +import org.apache.drill.categories.RowSetTests; import org.apache.drill.common.exceptions.UserException; import org.apache.drill.common.types.TypeProtos.DataMode; import org.apache.drill.common.types.TypeProtos.MinorType; @@ -40,13 +41,14 @@ import org.apache.drill.test.SubOperatorTest; import org.apache.drill.test.rowSet.RowSet; import org.apache.drill.test.rowSet.RowSetReader; import org.junit.Test; - +import org.junit.experimental.categories.Category; import org.apache.drill.shaded.guava.com.google.common.base.Charsets; /** * Exercise the vector overflow functionality for the result set loader. */ +@Category(RowSetTests.class) public class TestResultSetLoaderOverflow extends SubOperatorTest { /** diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderProjection.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderProjection.java index 3ab0c3c2e..66295123f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderProjection.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderProjection.java @@ -26,6 +26,7 @@ import static org.junit.Assert.assertTrue; import java.util.Arrays; import java.util.List; +import org.apache.drill.categories.RowSetTests; import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.common.types.TypeProtos.DataMode; import org.apache.drill.common.types.TypeProtos.MinorType; @@ -42,11 +43,13 @@ import org.apache.drill.test.rowSet.RowSet; import org.apache.drill.test.rowSet.RowSet.SingleRowSet; import org.apache.drill.test.rowSet.RowSetUtilities; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * Test of the basics of the projection mechanism. */ +@Category(RowSetTests.class) public class TestResultSetLoaderProjection extends SubOperatorTest { /** diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderProtocol.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderProtocol.java index 8fb600d34..dc0236d09 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderProtocol.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderProtocol.java @@ -29,6 +29,7 @@ import static org.junit.Assert.fail; import java.util.Arrays; +import org.apache.drill.categories.RowSetTests; import org.apache.drill.common.exceptions.UserException; import org.apache.drill.common.types.TypeProtos.DataMode; import org.apache.drill.common.types.TypeProtos.MinorType; @@ -44,11 +45,11 @@ import org.apache.drill.exec.vector.accessor.TupleWriter.UndefinedColumnExceptio import org.apache.drill.test.SubOperatorTest; import org.apache.drill.test.rowSet.RowSet; import org.apache.drill.test.rowSet.RowSet.SingleRowSet; -import org.apache.drill.test.rowSet.test.TestColumnConvertor.TestConvertor; +import org.apache.drill.test.rowSet.test.TestColumnConverter.TestConverter; import org.apache.drill.test.rowSet.RowSetReader; import org.apache.drill.test.rowSet.RowSetUtilities; -import org.junit.Ignore; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * Tests of the overall result set loader protocol focusing on which operations @@ -72,6 +73,7 @@ import org.junit.Test; * current state. */ +@Category(RowSetTests.class) public class TestResultSetLoaderProtocol extends SubOperatorTest { @Test @@ -611,7 +613,6 @@ public class TestResultSetLoaderProtocol extends SubOperatorTest { * required, nullable and repeated columns. */ - @Ignore("Not yet") @Test public void testTypeConversion() { TupleMetadata schema = new SchemaBuilder() @@ -620,18 +621,19 @@ public class TestResultSetLoaderProtocol extends SubOperatorTest { .addArray("n3", MinorType.INT) .buildSchema(); - // Add a type convertor. Passed in as a factory + // Add a type converter. Passed in as a factory // since we must create a new one for each row set writer. - schema.metadata("n1").setTypeConverter(TestConvertor.factory()); - schema.metadata("n2").setTypeConverter(TestConvertor.factory()); - schema.metadata("n3").setTypeConverter(TestConvertor.factory()); + schema.metadata("n1").setTypeConverter(TestConverter.factory()); + schema.metadata("n2").setTypeConverter(TestConverter.factory()); + schema.metadata("n3").setTypeConverter(TestConverter.factory()); ResultSetLoaderImpl.ResultSetOptions options = new OptionBuilder() .setSchema(schema) .setRowCountLimit(ValueVector.MAX_ROW_COUNT) .build(); ResultSetLoader rsLoader = new ResultSetLoaderImpl(fixture.allocator(), options); + rsLoader.startBatch(); // Write data as both a string as an integer @@ -640,7 +642,7 @@ public class TestResultSetLoaderProtocol extends SubOperatorTest { rootWriter.addRow(234, 23, intArray(234, 235)); RowSet actual = fixture.wrap(rsLoader.harvest()); - // Build the expected vector without a type convertor. + // Build the expected vector without a type converter. TupleMetadata expectedSchema = new SchemaBuilder() .add("n1", MinorType.INT) diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderRepeatedList.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderRepeatedList.java index 32940da95..b73440746 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderRepeatedList.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderRepeatedList.java @@ -29,6 +29,7 @@ import java.util.Arrays; import org.apache.drill.common.types.TypeProtos.DataMode; import org.apache.drill.common.types.TypeProtos.MinorType; +import org.apache.drill.categories.RowSetTests; import org.apache.drill.common.types.Types; import org.apache.drill.exec.physical.rowSet.ResultSetLoader; import org.apache.drill.exec.physical.rowSet.RowSetLoader; @@ -53,7 +54,7 @@ import org.apache.drill.test.rowSet.RowSetReader; import org.apache.drill.test.rowSet.RowSetUtilities; import org.apache.drill.test.rowSet.RowSet.SingleRowSet; import org.junit.Test; - +import org.junit.experimental.categories.Category; import org.apache.drill.shaded.guava.com.google.common.base.Charsets; /** @@ -64,6 +65,7 @@ import org.apache.drill.shaded.guava.com.google.common.base.Charsets; * Repeated lists appear to be used only by JSON. */ +@Category(RowSetTests.class) public class TestResultSetLoaderRepeatedList extends SubOperatorTest { @Test diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderTorture.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderTorture.java index 6e7427548..31ea3c633 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderTorture.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderTorture.java @@ -22,6 +22,7 @@ import static org.junit.Assert.assertTrue; import java.util.Arrays; +import org.apache.drill.categories.RowSetTests; import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.exec.physical.rowSet.ResultSetLoader; import org.apache.drill.exec.physical.rowSet.RowSetLoader; @@ -40,7 +41,7 @@ import org.apache.drill.test.SubOperatorTest; import org.apache.drill.test.rowSet.RowSet; import org.apache.drill.test.rowSet.RowSetReader; import org.junit.Test; - +import org.junit.experimental.categories.Category; import org.apache.drill.shaded.guava.com.google.common.base.Charsets; /** @@ -64,6 +65,7 @@ import org.apache.drill.shaded.guava.com.google.common.base.Charsets; * things in a single query. */ +@Category(RowSetTests.class) public class TestResultSetLoaderTorture extends SubOperatorTest { private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestResultSetLoaderTorture.class); diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderUnions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderUnions.java index 09c7eb096..8329306d5 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderUnions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderUnions.java @@ -32,6 +32,7 @@ import java.util.Arrays; import org.apache.drill.common.types.TypeProtos.DataMode; import org.apache.drill.common.types.TypeProtos.MajorType; import org.apache.drill.common.types.TypeProtos.MinorType; +import org.apache.drill.categories.RowSetTests; import org.apache.drill.common.types.Types; import org.apache.drill.exec.physical.rowSet.ResultSetLoader; import org.apache.drill.exec.physical.rowSet.RowSetLoader; @@ -64,7 +65,7 @@ import org.apache.drill.test.rowSet.RowSetBuilder; import org.apache.drill.test.rowSet.RowSetReader; import org.apache.drill.test.rowSet.RowSetUtilities; import org.junit.Test; - +import org.junit.experimental.categories.Category; import org.apache.drill.shaded.guava.com.google.common.base.Charsets; /** @@ -74,6 +75,8 @@ import org.apache.drill.shaded.guava.com.google.common.base.Charsets; * Most operators do not support them. But, JSON uses them, so they must * be made to work in the result set loader layer. */ + +@Category(RowSetTests.class) public class TestResultSetLoaderUnions extends SubOperatorTest { @Test diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetSchemaChange.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetSchemaChange.java index 0055376bd..2dcd001dc 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetSchemaChange.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetSchemaChange.java @@ -23,6 +23,7 @@ import static org.junit.Assert.assertTrue; import java.util.Arrays; +import org.apache.drill.categories.RowSetTests; import org.apache.drill.common.types.TypeProtos.DataMode; import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.exec.physical.rowSet.ResultSetLoader; @@ -38,7 +39,9 @@ import org.apache.drill.test.rowSet.RowSet.SingleRowSet; import org.apache.drill.test.rowSet.RowSetReader; import org.apache.drill.test.rowSet.RowSetUtilities; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(RowSetTests.class) public class TestResultSetSchemaChange extends SubOperatorTest { /** diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultVectorCache.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultVectorCache.java index 6d0cce708..03853f08c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultVectorCache.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultVectorCache.java @@ -23,6 +23,7 @@ import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; +import org.apache.drill.categories.RowSetTests; import org.apache.drill.common.types.TypeProtos.DataMode; import org.apache.drill.common.types.TypeProtos.MajorType; import org.apache.drill.common.types.TypeProtos.MinorType; @@ -32,7 +33,9 @@ import org.apache.drill.exec.vector.IntVector; import org.apache.drill.exec.vector.ValueVector; import org.apache.drill.test.SubOperatorTest; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(RowSetTests.class) public class TestResultVectorCache extends SubOperatorTest { @Test diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestColumnConvertor.java b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestColumnConverter.java index b7d865de1..f989b0c95 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestColumnConvertor.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestColumnConverter.java @@ -18,6 +18,9 @@ package org.apache.drill.test.rowSet.test; import static org.apache.drill.test.rowSet.RowSetUtilities.strArray; + +import org.apache.drill.categories.RowSetTests; + import static org.apache.drill.test.rowSet.RowSetUtilities.intArray; import org.apache.drill.common.types.TypeProtos.MinorType; @@ -26,29 +29,31 @@ import org.apache.drill.exec.record.metadata.SchemaBuilder; import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.vector.accessor.ColumnConversionFactory; import org.apache.drill.exec.vector.accessor.ScalarWriter; -import org.apache.drill.exec.vector.accessor.writer.AbstractWriteConvertor; -import org.apache.drill.exec.vector.accessor.writer.ConcreteWriter; +import org.apache.drill.exec.vector.accessor.writer.AbstractWriteConverter; +import org.apache.drill.exec.vector.accessor.writer.AbstractScalarWriter; import org.apache.drill.test.SubOperatorTest; import org.apache.drill.test.rowSet.RowSet; import org.apache.drill.test.rowSet.RowSetBuilder; import org.apache.drill.test.rowSet.RowSetUtilities; import org.apache.drill.test.rowSet.RowSet.SingleRowSet; import org.junit.Test; +import org.junit.experimental.categories.Category; /** - * Tests the column type convertor feature of the column metadata + * Tests the column type converter feature of the column metadata * and of the RowSetWriter. */ -public class TestColumnConvertor extends SubOperatorTest { +@Category(RowSetTests.class) +public class TestColumnConverter extends SubOperatorTest { /** * Simple type converter that allows string-to-int conversions. * Inherits usual int value support from the base writer. */ - public static class TestConvertor extends AbstractWriteConvertor { + public static class TestConverter extends AbstractWriteConverter { - public TestConvertor(ScalarWriter baseWriter) { + public TestConverter(ScalarWriter baseWriter) { super(baseWriter); } @@ -60,16 +65,16 @@ public class TestColumnConvertor extends SubOperatorTest { public static ColumnConversionFactory factory() { return new ColumnConversionFactory() { @Override - public ConcreteWriter newWriter(ColumnMetadata colDefn, - ConcreteWriter baseWriter) { - return new TestConvertor(baseWriter); + public AbstractScalarWriter newWriter(ColumnMetadata colDefn, + ScalarWriter baseWriter) { + return new TestConverter(baseWriter); } }; } } @Test - public void testScalarConvertor() { + public void testScalarConverter() { // Create the schema @@ -78,11 +83,11 @@ public class TestColumnConvertor extends SubOperatorTest { .addNullable("n2", MinorType.INT) .buildSchema(); - // Add a type convertor. Passed in as a factory + // Add a type converter. Passed in as a factory // since we must create a new one for each row set writer. - schema.metadata("n1").setTypeConverter(TestConvertor.factory()); - schema.metadata("n2").setTypeConverter(TestConvertor.factory()); + schema.metadata("n1").setTypeConverter(TestConverter.factory()); + schema.metadata("n2").setTypeConverter(TestConverter.factory()); // Write data as both a string as an integer @@ -91,7 +96,7 @@ public class TestColumnConvertor extends SubOperatorTest { .addRow(234, 23) .build(); - // Build the expected vector without a type convertor. + // Build the expected vector without a type converter. TupleMetadata expectedSchema = new SchemaBuilder() .add("n1", MinorType.INT) @@ -108,7 +113,7 @@ public class TestColumnConvertor extends SubOperatorTest { } @Test - public void testArrayConvertor() { + public void testArrayConverter() { // Create the schema @@ -116,10 +121,10 @@ public class TestColumnConvertor extends SubOperatorTest { .addArray("n", MinorType.INT) .buildSchema(); - // Add a type convertor. Passed in as a factory + // Add a type converter. Passed in as a factory // since we must create a new one for each row set writer. - schema.metadata("n").setTypeConverter(TestConvertor.factory()); + schema.metadata("n").setTypeConverter(TestConverter.factory()); // Write data as both a string as an integer @@ -128,7 +133,7 @@ public class TestColumnConvertor extends SubOperatorTest { .addSingleCol(intArray(234, 235)) .build(); - // Build the expected vector without a type convertor. + // Build the expected vector without a type converter. TupleMetadata expectedSchema = new SchemaBuilder() .addArray("n", MinorType.INT) diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestFixedWidthWriter.java b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestFixedWidthWriter.java index 09d9d9ef5..3eba578ae 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestFixedWidthWriter.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestFixedWidthWriter.java @@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; +import org.apache.drill.categories.RowSetTests; import org.apache.drill.common.types.TypeProtos.DataMode; import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.exec.record.MaterializedField; @@ -29,10 +30,11 @@ import org.apache.drill.exec.vector.IntVector; import org.apache.drill.exec.vector.accessor.ColumnAccessors.IntColumnWriter; import org.apache.drill.exec.vector.accessor.ColumnWriterIndex; import org.apache.drill.exec.vector.accessor.ScalarWriter; -import org.apache.drill.exec.vector.accessor.ScalarWriter.ColumnWriterListener; import org.apache.drill.exec.vector.accessor.ValueType; +import org.apache.drill.exec.vector.accessor.writer.WriterEvents.ColumnWriterListener; import org.apache.drill.test.SubOperatorTest; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * Test the int writer as a typical example of a fixed-width @@ -40,6 +42,7 @@ import org.junit.Test; * overflow, and filling in empty values. */ +@Category(RowSetTests.class) public class TestFixedWidthWriter extends SubOperatorTest { public static class TestIndex implements ColumnWriterIndex { diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestHyperVectorReaders.java b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestHyperVectorReaders.java index ea1490216..e07318edd 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestHyperVectorReaders.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestHyperVectorReaders.java @@ -25,6 +25,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import org.apache.drill.categories.RowSetTests; import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.exec.record.metadata.SchemaBuilder; import org.apache.drill.exec.record.metadata.TupleMetadata; @@ -39,6 +40,7 @@ import org.apache.drill.test.rowSet.RowSetReader; import org.apache.drill.test.rowSet.RowSetUtilities; import org.apache.drill.test.rowSet.RowSetWriter; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * Test the reader mechanism that reads rows indexed via an SV4. @@ -51,6 +53,7 @@ import org.junit.Test; * This test does not cover repeated vectors; those tests should be added. */ +@Category(RowSetTests.class) public class TestHyperVectorReaders extends SubOperatorTest { /** diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestIndirectReaders.java b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestIndirectReaders.java index db1c882b4..727c6d010 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestIndirectReaders.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestIndirectReaders.java @@ -17,6 +17,7 @@ */ package org.apache.drill.test.rowSet.test; +import org.apache.drill.categories.RowSetTests; import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.exec.record.metadata.SchemaBuilder; import org.apache.drill.exec.record.metadata.TupleMetadata; @@ -32,6 +33,7 @@ import org.apache.drill.test.rowSet.RowSet.SingleRowSet; import org.apache.drill.test.rowSet.RowSetReader; import org.apache.drill.test.rowSet.RowSetUtilities; import org.junit.Test; +import org.junit.experimental.categories.Category; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -44,6 +46,7 @@ import static org.junit.Assert.assertTrue; * so if the index works for one reader, it will for for all. */ +@Category(RowSetTests.class) public class TestIndirectReaders extends SubOperatorTest { /** diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestMapAccessors.java b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestMapAccessors.java index 7c67fc43c..4e18546b3 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestMapAccessors.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestMapAccessors.java @@ -26,6 +26,7 @@ import static org.junit.Assert.assertTrue; import java.util.Iterator; +import org.apache.drill.categories.RowSetTests; import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.exec.record.MaterializedField; import org.apache.drill.exec.record.metadata.SchemaBuilder; @@ -48,6 +49,7 @@ import org.apache.drill.test.rowSet.RowSetBuilder; import org.apache.drill.test.rowSet.RowSetComparison; import org.apache.drill.test.rowSet.RowSetReader; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * Test map support in the column readers and writers. @@ -57,6 +59,7 @@ import org.junit.Test; * schema, which makes this mechanism far simpler. */ +@Category(RowSetTests.class) public class TestMapAccessors extends SubOperatorTest { @Test diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestOffsetVectorWriter.java b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestOffsetVectorWriter.java index 0801d84a8..91396e67e 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestOffsetVectorWriter.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestOffsetVectorWriter.java @@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; +import org.apache.drill.categories.RowSetTests; import org.apache.drill.common.types.TypeProtos.DataMode; import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.exec.record.MaterializedField; @@ -28,13 +29,14 @@ import org.apache.drill.exec.record.metadata.SchemaBuilder; import org.apache.drill.exec.vector.UInt4Vector; import org.apache.drill.exec.vector.ValueVector; import org.apache.drill.exec.vector.accessor.ScalarWriter; -import org.apache.drill.exec.vector.accessor.ScalarWriter.ColumnWriterListener; import org.apache.drill.exec.vector.accessor.ValueType; import org.apache.drill.exec.vector.accessor.writer.OffsetVectorWriterImpl; +import org.apache.drill.exec.vector.accessor.writer.WriterEvents.ColumnWriterListener; import org.apache.drill.test.SubOperatorTest; import org.apache.drill.test.rowSet.test.TestFixedWidthWriter.TestIndex; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.experimental.categories.Category; import io.netty.buffer.DrillBuf; @@ -49,6 +51,7 @@ import io.netty.buffer.DrillBuf; * counts.) */ +@Category(RowSetTests.class) public class TestOffsetVectorWriter extends SubOperatorTest { /** diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestRepeatedListAccessors.java b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestRepeatedListAccessors.java index 3fb0f5686..72c145e56 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestRepeatedListAccessors.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestRepeatedListAccessors.java @@ -27,6 +27,7 @@ import static org.junit.Assert.assertTrue; import static org.apache.drill.test.rowSet.RowSetUtilities.objArray; import static org.apache.drill.test.rowSet.RowSetUtilities.singleObjArray; +import org.apache.drill.categories.RowSetTests; import org.apache.drill.common.types.TypeProtos.DataMode; import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.exec.record.BatchSchema; @@ -56,6 +57,7 @@ import org.apache.drill.test.rowSet.RowSetReader; import org.apache.drill.test.rowSet.RowSetUtilities; import org.apache.drill.test.rowSet.RowSetWriter; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * Test the basics of repeated list support in the schema builder, @@ -64,6 +66,7 @@ import org.junit.Test; * on to the result set loader tests. */ +@Category(RowSetTests.class) public class TestRepeatedListAccessors extends SubOperatorTest { /** diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestRowSet.java b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestRowSet.java index b660672e8..db871567d 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestRowSet.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestRowSet.java @@ -28,6 +28,7 @@ import static org.junit.Assert.fail; import java.io.UnsupportedEncodingException; import java.util.Arrays; +import org.apache.drill.categories.RowSetTests; import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.exec.record.metadata.SchemaBuilder; import org.apache.drill.exec.record.metadata.TupleMetadata; @@ -50,6 +51,7 @@ import org.apache.drill.test.rowSet.RowSetReader; import org.apache.drill.test.rowSet.RowSetUtilities; import org.apache.drill.test.rowSet.RowSetWriter; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * Test row sets. Since row sets are a thin wrapper around vectors, @@ -71,6 +73,7 @@ import org.junit.Test; * A list is an array of variants. Variants are tested elsewhere. */ +@Category(RowSetTests.class) public class TestRowSet extends SubOperatorTest { private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestRowSet.class); diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestRowSetComparison.java b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestRowSetComparison.java index 867f61f5b..41eec8016 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestRowSetComparison.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestRowSetComparison.java @@ -17,6 +17,7 @@ */ package org.apache.drill.test.rowSet.test; +import org.apache.drill.categories.RowSetTests; import org.apache.drill.common.types.TypeProtos; import org.apache.drill.exec.memory.BufferAllocator; import org.apache.drill.exec.memory.RootAllocator; @@ -28,7 +29,9 @@ import org.apache.drill.test.rowSet.RowSetComparison; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(RowSetTests.class) public class TestRowSetComparison { private BufferAllocator allocator; diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestScalarAccessors.java b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestScalarAccessors.java index 2f2d96472..e6635f081 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestScalarAccessors.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestScalarAccessors.java @@ -25,6 +25,7 @@ import static org.junit.Assert.assertTrue; import java.math.BigDecimal; import java.util.Arrays; +import org.apache.drill.categories.RowSetTests; import org.apache.drill.common.types.TypeProtos.DataMode; import org.apache.drill.common.types.TypeProtos.MajorType; import org.apache.drill.common.types.TypeProtos.MinorType; @@ -39,7 +40,7 @@ import org.apache.drill.test.rowSet.RowSetReader; import org.joda.time.Period; import org.apache.drill.test.rowSet.RowSet.SingleRowSet; import org.junit.Test; - +import org.junit.experimental.categories.Category; import org.apache.drill.shaded.guava.com.google.common.collect.Lists; /** @@ -54,6 +55,7 @@ import org.apache.drill.shaded.guava.com.google.common.collect.Lists; // TODO: Decimal28Sparse // TODO: Decimal38Sparse +@Category(RowSetTests.class) public class TestScalarAccessors extends SubOperatorTest { @Test diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestSchemaBuilder.java b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestSchemaBuilder.java index 358330d2f..995019708 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestSchemaBuilder.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestSchemaBuilder.java @@ -24,6 +24,7 @@ import static org.junit.Assert.assertTrue; import org.apache.drill.common.types.TypeProtos.DataMode; import org.apache.drill.common.types.TypeProtos.MinorType; +import org.apache.drill.categories.RowSetTests; import org.apache.drill.common.types.Types; import org.apache.drill.exec.record.MaterializedField; import org.apache.drill.exec.record.metadata.ColumnMetadata; @@ -37,12 +38,15 @@ import org.apache.drill.exec.record.metadata.UnionBuilder; import org.apache.drill.exec.record.metadata.VariantMetadata; import org.apache.drill.test.DrillTest; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * The schema builder for tests has grown complex to handle maps, unions, * lists and repeated lists. This test verifies that it assembles the various * pieces correctly for the various nesting combinations. */ + +@Category(RowSetTests.class) public class TestSchemaBuilder extends DrillTest { @Test diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestVariableWidthWriter.java b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestVariableWidthWriter.java index 1c430fd87..c40bbd772 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestVariableWidthWriter.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestVariableWidthWriter.java @@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; +import org.apache.drill.categories.RowSetTests; import org.apache.drill.common.types.TypeProtos.DataMode; import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.exec.record.MaterializedField; @@ -28,15 +29,16 @@ import org.apache.drill.exec.record.metadata.SchemaBuilder; import org.apache.drill.exec.vector.VarCharVector; import org.apache.drill.exec.vector.accessor.ColumnAccessors.VarCharColumnWriter; import org.apache.drill.exec.vector.accessor.ScalarWriter; -import org.apache.drill.exec.vector.accessor.ScalarWriter.ColumnWriterListener; import org.apache.drill.exec.vector.accessor.ValueType; +import org.apache.drill.exec.vector.accessor.writer.WriterEvents.ColumnWriterListener; import org.apache.drill.test.SubOperatorTest; import org.apache.drill.test.rowSet.test.TestFixedWidthWriter.TestIndex; import org.bouncycastle.util.Arrays; import org.junit.Test; - +import org.junit.experimental.categories.Category; import org.apache.drill.shaded.guava.com.google.common.base.Charsets; +@Category(RowSetTests.class) public class TestVariableWidthWriter extends SubOperatorTest { /** diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestVariantAccessors.java b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestVariantAccessors.java index 3d017c31f..b468c31f5 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestVariantAccessors.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestVariantAccessors.java @@ -26,6 +26,7 @@ import static org.junit.Assert.assertTrue; import java.util.List; +import org.apache.drill.categories.RowSetTests; import org.apache.drill.common.types.TypeProtos.MajorType; import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.exec.record.BatchSchema; @@ -57,6 +58,7 @@ import org.apache.drill.test.rowSet.RowSetWriter; import org.apache.drill.test.rowSet.RowSet.ExtendableRowSet; import org.apache.drill.test.rowSet.RowSet.SingleRowSet; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * Tests for readers and writers for union and list types. @@ -67,6 +69,8 @@ import org.junit.Test; * result set builder. It does not, however, work in the Project * and other operators. Some assembly required for future use.) */ + +@Category(RowSetTests.class) public class TestVariantAccessors extends SubOperatorTest { @Test |