Repository: tajo Updated Branches: refs/heads/master 682635852 -> 8dad551ec
http://git-wip-us.apache.org/repos/asf/tajo/blob/8dad551e/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/index/TestBSTIndex.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/index/TestBSTIndex.java b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/index/TestBSTIndex.java index a9d8ce2..18d5012 100644 --- a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/index/TestBSTIndex.java +++ b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/index/TestBSTIndex.java @@ -60,7 +60,7 @@ public class TestBSTIndex { this.dataFormat = type; conf = new TajoConf(); conf.setVar(TajoConf.ConfVars.ROOT_DIR, TEST_PATH); - schema = new Schema(); + schema = SchemaFactory.newV1(); schema.addColumn(new Column("int", Type.INT4)); schema.addColumn(new Column("long", Type.INT8)); schema.addColumn(new Column("double", Type.FLOAT8)); @@ -111,7 +111,7 @@ public class TestBSTIndex { sortKeys[0] = new SortSpec(schema.getColumn("long"), true, false); sortKeys[1] = new SortSpec(schema.getColumn("double"), true, false); - Schema keySchema = new Schema(); + Schema keySchema = SchemaFactory.newV1(); keySchema.addColumn(new Column("long", Type.INT8)); keySchema.addColumn(new Column("double", Type.FLOAT8)); @@ -187,7 +187,7 @@ public class TestBSTIndex { sortKeys[0] = new SortSpec(schema.getColumn("long"), true, false); sortKeys[1] = new SortSpec(schema.getColumn("double"), true, false); - Schema keySchema = new Schema(); + Schema keySchema = SchemaFactory.newV1(); keySchema.addColumn(new Column("long", Type.INT8)); keySchema.addColumn(new Column("double", Type.FLOAT8)); @@ -280,7 +280,7 @@ public class TestBSTIndex { sortKeys[0] = new SortSpec(schema.getColumn("long"), true, false); sortKeys[1] = new SortSpec(schema.getColumn("double"), true, false); - Schema keySchema = new Schema(); + Schema keySchema = SchemaFactory.newV1(); keySchema.addColumn(new Column("long", Type.INT8)); keySchema.addColumn(new Column("double", Type.FLOAT8)); @@ -353,7 +353,7 @@ public class TestBSTIndex { sortKeys[0] = new SortSpec(schema.getColumn("int"), true, false); sortKeys[1] = new SortSpec(schema.getColumn("long"), true, false); - Schema keySchema = new Schema(); + Schema keySchema = SchemaFactory.newV1(); keySchema.addColumn(new Column("int", Type.INT4)); keySchema.addColumn(new Column("long", Type.INT8)); @@ -446,7 +446,7 @@ public class TestBSTIndex { sortKeys[0] = new SortSpec(schema.getColumn("int"), true, false); sortKeys[1] = new SortSpec(schema.getColumn("long"), true, false); - Schema keySchema = new Schema(); + Schema keySchema = SchemaFactory.newV1(); keySchema.addColumn(new Column("int", Type.INT4)); keySchema.addColumn(new Column("long", Type.INT8)); @@ -529,7 +529,7 @@ public class TestBSTIndex { sortKeys[0] = new SortSpec(schema.getColumn("long"), true, false); sortKeys[1] = new SortSpec(schema.getColumn("double"), true, false); - Schema keySchema = new Schema(); + Schema keySchema = SchemaFactory.newV1(); keySchema.addColumn(new Column("long", Type.INT8)); keySchema.addColumn(new Column("double", Type.FLOAT8)); @@ -614,7 +614,7 @@ public class TestBSTIndex { sortKeys[0] = new SortSpec(schema.getColumn("int"), true, false); sortKeys[1] = new SortSpec(schema.getColumn("long"), true, false); - Schema keySchema = new Schema(); + Schema keySchema = SchemaFactory.newV1(); keySchema.addColumn(new Column("int", Type.INT4)); keySchema.addColumn(new Column("long", Type.INT8)); @@ -721,7 +721,7 @@ public class TestBSTIndex { sortKeys[0] = new SortSpec(schema.getColumn("int"), true, false); sortKeys[1] = new SortSpec(schema.getColumn("long"), true, false); - Schema keySchema = new Schema(); + Schema keySchema = SchemaFactory.newV1(); keySchema.addColumn(new Column("int", Type.INT4)); keySchema.addColumn(new Column("long", Type.INT8)); @@ -803,7 +803,7 @@ public class TestBSTIndex { sortKeys[0] = new SortSpec(schema.getColumn("long"), false, false); sortKeys[1] = new SortSpec(schema.getColumn("double"), false, false); - Schema keySchema = new Schema(); + Schema keySchema = SchemaFactory.newV1(); keySchema.addColumn(new Column("long", Type.INT8)); keySchema.addColumn(new Column("double", Type.FLOAT8)); @@ -896,7 +896,7 @@ public class TestBSTIndex { sortKeys[0] = new SortSpec(schema.getColumn("int"), false, false); sortKeys[1] = new SortSpec(schema.getColumn("long"), false, false); - Schema keySchema = new Schema(); + Schema keySchema = SchemaFactory.newV1(); keySchema.addColumn(new Column("int", Type.INT4)); keySchema.addColumn(new Column("long", Type.INT8)); @@ -996,7 +996,7 @@ public class TestBSTIndex { sortKeys[0] = new SortSpec(schema.getColumn("long"), true, false); sortKeys[1] = new SortSpec(schema.getColumn("double"), true, false); - Schema keySchema = new Schema(); + Schema keySchema = SchemaFactory.newV1(); keySchema.addColumn(new Column("long", Type.INT8)); keySchema.addColumn(new Column("double", Type.FLOAT8)); http://git-wip-us.apache.org/repos/asf/tajo/blob/8dad551e/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/index/TestSingleCSVFileBSTIndex.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/index/TestSingleCSVFileBSTIndex.java b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/index/TestSingleCSVFileBSTIndex.java index b2ca5b8..1053853 100644 --- a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/index/TestSingleCSVFileBSTIndex.java +++ b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/index/TestSingleCSVFileBSTIndex.java @@ -56,7 +56,7 @@ public class TestSingleCSVFileBSTIndex { public TestSingleCSVFileBSTIndex() { conf = new TajoConf(); conf.setVar(ConfVars.ROOT_DIR, TEST_PATH); - schema = new Schema(); + schema = SchemaFactory.newV1(); schema.addColumn(new Column("int", Type.INT4)); schema.addColumn(new Column("long", Type.INT8)); schema.addColumn(new Column("double", Type.FLOAT8)); @@ -99,7 +99,7 @@ public class TestSingleCSVFileBSTIndex { sortKeys[0] = new SortSpec(schema.getColumn("long"), true, false); sortKeys[1] = new SortSpec(schema.getColumn("double"), true, false); - Schema keySchema = new Schema(); + Schema keySchema = SchemaFactory.newV1(); keySchema.addColumn(new Column("long", Type.INT8)); keySchema.addColumn(new Column("double", Type.FLOAT8)); @@ -190,7 +190,7 @@ public class TestSingleCSVFileBSTIndex { sortKeys[0] = new SortSpec(schema.getColumn("int"), true, false); sortKeys[1] = new SortSpec(schema.getColumn("long"), true, false); - Schema keySchema = new Schema(); + Schema keySchema = SchemaFactory.newV1(); keySchema.addColumn(new Column("int", Type.INT4)); keySchema.addColumn(new Column("long", Type.INT8)); http://git-wip-us.apache.org/repos/asf/tajo/blob/8dad551e/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/json/TestJsonSerDe.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/json/TestJsonSerDe.java b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/json/TestJsonSerDe.java index 75e59da..c2ce9e7 100644 --- a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/json/TestJsonSerDe.java +++ b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/json/TestJsonSerDe.java @@ -23,6 +23,7 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.tajo.catalog.CatalogUtil; import org.apache.tajo.catalog.Schema; +import org.apache.tajo.catalog.SchemaFactory; import org.apache.tajo.catalog.TableMeta; import org.apache.tajo.common.TajoDataTypes; import org.apache.tajo.conf.TajoConf; @@ -39,7 +40,7 @@ import java.net.URL; import static org.junit.Assert.*; public class TestJsonSerDe { - private static Schema schema = new Schema(); + private static Schema schema = SchemaFactory.newV1(); static { schema.addColumn("col1", TajoDataTypes.Type.BOOLEAN); @@ -104,7 +105,7 @@ public class TestJsonSerDe { FileStatus status = fs.getFileStatus(tablePath); FileFragment fragment = new FileFragment("table", tablePath, 0, status.getLen()); - Schema schema = new Schema(); + Schema schema = SchemaFactory.newV1(); schema.addColumn("col1", TajoDataTypes.Type.TEXT); schema.addColumn("col2", TajoDataTypes.Type.TEXT); schema.addColumn("col3", TajoDataTypes.Type.TEXT); http://git-wip-us.apache.org/repos/asf/tajo/blob/8dad551e/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/parquet/TestReadWrite.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/parquet/TestReadWrite.java b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/parquet/TestReadWrite.java index ea223e7..b39bfce 100644 --- a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/parquet/TestReadWrite.java +++ b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/parquet/TestReadWrite.java @@ -24,6 +24,7 @@ import org.apache.hadoop.fs.LocalFileSystem; import org.apache.hadoop.fs.Path; import org.apache.tajo.catalog.Column; import org.apache.tajo.catalog.Schema; +import org.apache.tajo.catalog.SchemaFactory; import org.apache.tajo.common.TajoDataTypes.Type; import org.apache.tajo.conf.TajoConf; import org.apache.tajo.datum.DatumFactory; @@ -67,7 +68,7 @@ public class TestReadWrite { columns.add(new Column("mynull", Type.NULL_TYPE)); Column[] columnsArray = new Column[columns.size()]; columnsArray = columns.toArray(columnsArray); - return new Schema(columnsArray); + return SchemaFactory.newV1(columnsArray); } @Test http://git-wip-us.apache.org/repos/asf/tajo/blob/8dad551e/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/parquet/TestSchemaConverter.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/parquet/TestSchemaConverter.java b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/parquet/TestSchemaConverter.java index ba3f72e..87b5c34 100644 --- a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/parquet/TestSchemaConverter.java +++ b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/parquet/TestSchemaConverter.java @@ -22,6 +22,7 @@ import org.apache.parquet.schema.MessageType; import org.apache.parquet.schema.MessageTypeParser; import org.apache.tajo.catalog.Column; import org.apache.tajo.catalog.Schema; +import org.apache.tajo.catalog.SchemaFactory; import org.apache.tajo.common.TajoDataTypes.Type; import org.junit.Test; @@ -80,7 +81,7 @@ public class TestSchemaConverter { columns.add(new Column("myprotobuf", Type.PROTOBUF)); Column[] columnsArray = new Column[columns.size()]; columnsArray = columns.toArray(columnsArray); - return new Schema(columnsArray); + return SchemaFactory.newV1(columnsArray); } private Schema createAllTypesConvertedSchema() { @@ -95,7 +96,7 @@ public class TestSchemaConverter { columns.add(new Column("myfixed", Type.BLOB)); Column[] columnsArray = new Column[columns.size()]; columnsArray = columns.toArray(columnsArray); - return new Schema(columnsArray); + return SchemaFactory.newV1(columnsArray); } private void testTajoToParquetConversion( http://git-wip-us.apache.org/repos/asf/tajo/blob/8dad551e/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/raw/TestDirectRawFile.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/raw/TestDirectRawFile.java b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/raw/TestDirectRawFile.java index fb69fa4..1a5a41e 100644 --- a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/raw/TestDirectRawFile.java +++ b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/raw/TestDirectRawFile.java @@ -26,10 +26,7 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hdfs.MiniDFSCluster; import org.apache.tajo.BuiltinStorages; -import org.apache.tajo.catalog.CatalogUtil; -import org.apache.tajo.catalog.Schema; -import org.apache.tajo.catalog.SchemaUtil; -import org.apache.tajo.catalog.TableMeta; +import org.apache.tajo.catalog.*; import org.apache.tajo.common.TajoDataTypes; import org.apache.tajo.conf.TajoConf; import org.apache.tajo.datum.DatumFactory; @@ -130,7 +127,7 @@ public class TestDirectRawFile { } static { - schema = new Schema(); + schema = SchemaFactory.newV1(); schema.addColumn("col0", TajoDataTypes.Type.BOOLEAN); schema.addColumn("col1", TajoDataTypes.Type.INT2); schema.addColumn("col2", TajoDataTypes.Type.INT4); http://git-wip-us.apache.org/repos/asf/tajo/blob/8dad551e/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/JdbcMetadataProviderBase.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/JdbcMetadataProviderBase.java b/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/JdbcMetadataProviderBase.java index eff1b9c..f53c3ed 100644 --- a/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/JdbcMetadataProviderBase.java +++ b/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/JdbcMetadataProviderBase.java @@ -208,7 +208,7 @@ public abstract class JdbcMetadataProviderBase implements MetadataProvider { }); // transform the pair list into collection for columns - final Schema schema = new Schema(Collections2.transform(columns, new Function<Pair<Integer,Column>, Column>() { + final Schema schema = SchemaFactory.newV1(Collections2.transform(columns, new Function<Pair<Integer,Column>, Column>() { @Override public Column apply(@Nullable Pair<Integer, Column> columnPair) { return columnPair.getSecond();
