diff options
Diffstat (limited to 'exec/java-exec/src/test/java/org/apache/drill/test/rowSet')
13 files changed, 64 insertions, 23 deletions
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 |