Repository: tajo Updated Branches: refs/heads/master 36a703c5d -> 5491f0e75
http://git-wip-us.apache.org/repos/asf/tajo/blob/5491f0e7/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestStorages.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestStorages.java b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestStorages.java index 6a0080c..286902a 100644 --- a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestStorages.java +++ b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestStorages.java @@ -155,7 +155,7 @@ public class TestStorages { TableMeta meta = CatalogUtil.newTableMeta(storeType); Path tablePath = new Path(testDir, "Splitable.data"); - FileStorageManager sm = (FileStorageManager)StorageManager.getFileStorageManager(conf); + FileStorageManager sm = (FileStorageManager) TableSpaceManager.getFileStorageManager(conf); Appender appender = sm.getAppender(meta, schema, tablePath); appender.enableStats(); appender.init(); @@ -210,7 +210,7 @@ public class TestStorages { TableMeta meta = CatalogUtil.newTableMeta(storeType); Path tablePath = new Path(testDir, "Splitable.data"); - FileStorageManager sm = (FileStorageManager)StorageManager.getFileStorageManager(conf); + FileStorageManager sm = (FileStorageManager) TableSpaceManager.getFileStorageManager(conf); Appender appender = sm.getAppender(meta, schema, tablePath); appender.enableStats(); appender.init(); @@ -271,7 +271,7 @@ public class TestStorages { } Path tablePath = new Path(testDir, "testProjection.data"); - FileStorageManager sm = (FileStorageManager)StorageManager.getFileStorageManager(conf); + FileStorageManager sm = (FileStorageManager) TableSpaceManager.getFileStorageManager(conf); Appender appender = sm.getAppender(meta, schema, tablePath); appender.init(); int tupleNum = 10000; @@ -347,7 +347,7 @@ public class TestStorages { meta.putOption(StorageConstants.AVRO_SCHEMA_URL, path); } - FileStorageManager sm = (FileStorageManager)StorageManager.getFileStorageManager(conf); + FileStorageManager sm = (FileStorageManager) TableSpaceManager.getFileStorageManager(conf); Path tablePath = new Path(testDir, "testVariousTypes.data"); Appender appender = sm.getAppender(meta, schema, tablePath); appender.init(); @@ -425,7 +425,7 @@ public class TestStorages { } Path tablePath = new Path(testDir, "testVariousTypes.data"); - FileStorageManager sm = (FileStorageManager)StorageManager.getFileStorageManager(conf); + FileStorageManager sm = (FileStorageManager) TableSpaceManager.getFileStorageManager(conf); Appender appender = sm.getAppender(meta, schema, tablePath); appender.init(); @@ -469,7 +469,7 @@ public class TestStorages { FileStatus status = fs.getFileStatus(tablePath); FileFragment fragment = new FileFragment("table", tablePath, 0, status.getLen()); - Scanner scanner = StorageManager.getFileStorageManager(conf).getScanner(meta, schema, fragment); + Scanner scanner = TableSpaceManager.getFileStorageManager(conf).getScanner(meta, schema, fragment); scanner.init(); Tuple retrieved; @@ -513,7 +513,7 @@ public class TestStorages { meta.putOption(StorageConstants.CSVFILE_SERDE, TextSerializerDeserializer.class.getName()); Path tablePath = new Path(testDir, "testVariousTypes.data"); - FileStorageManager sm = (FileStorageManager)StorageManager.getFileStorageManager(conf); + FileStorageManager sm = (FileStorageManager) TableSpaceManager.getFileStorageManager(conf); Appender appender = sm.getAppender(meta, schema, tablePath); appender.enableStats(); appender.init(); @@ -545,7 +545,7 @@ public class TestStorages { assertEquals(appender.getStats().getNumBytes().longValue(), status.getLen()); FileFragment fragment = new FileFragment("table", tablePath, 0, status.getLen()); - Scanner scanner = StorageManager.getFileStorageManager(conf).getScanner(meta, schema, fragment); + Scanner scanner = TableSpaceManager.getFileStorageManager(conf).getScanner(meta, schema, fragment); scanner.init(); Tuple retrieved; @@ -583,7 +583,7 @@ public class TestStorages { meta.putOption(StorageConstants.RCFILE_SERDE, BinarySerializerDeserializer.class.getName()); Path tablePath = new Path(testDir, "testVariousTypes.data"); - FileStorageManager sm = (FileStorageManager)StorageManager.getFileStorageManager(conf); + FileStorageManager sm = (FileStorageManager) TableSpaceManager.getFileStorageManager(conf); Appender appender = sm.getAppender(meta, schema, tablePath); appender.enableStats(); appender.init(); @@ -615,7 +615,7 @@ public class TestStorages { assertEquals(appender.getStats().getNumBytes().longValue(), status.getLen()); FileFragment fragment = new FileFragment("table", tablePath, 0, status.getLen()); - Scanner scanner = StorageManager.getFileStorageManager(conf).getScanner(meta, schema, fragment); + Scanner scanner = TableSpaceManager.getFileStorageManager(conf).getScanner(meta, schema, fragment); scanner.init(); Tuple retrieved; @@ -653,7 +653,7 @@ public class TestStorages { meta.putOption(StorageConstants.SEQUENCEFILE_SERDE, TextSerializerDeserializer.class.getName()); Path tablePath = new Path(testDir, "testVariousTypes.data"); - FileStorageManager sm = (FileStorageManager)StorageManager.getFileStorageManager(conf); + FileStorageManager sm = (FileStorageManager) TableSpaceManager.getFileStorageManager(conf); Appender appender = sm.getAppender(meta, schema, tablePath); appender.enableStats(); appender.init(); @@ -685,7 +685,7 @@ public class TestStorages { assertEquals(appender.getStats().getNumBytes().longValue(), status.getLen()); FileFragment fragment = new FileFragment("table", tablePath, 0, status.getLen()); - Scanner scanner = StorageManager.getFileStorageManager(conf).getScanner(meta, schema, fragment); + Scanner scanner = TableSpaceManager.getFileStorageManager(conf).getScanner(meta, schema, fragment); scanner.init(); assertTrue(scanner instanceof SequenceFileScanner); @@ -727,7 +727,7 @@ public class TestStorages { meta.putOption(StorageConstants.SEQUENCEFILE_SERDE, BinarySerializerDeserializer.class.getName()); Path tablePath = new Path(testDir, "testVariousTypes.data"); - FileStorageManager sm = (FileStorageManager)StorageManager.getFileStorageManager(conf); + FileStorageManager sm = (FileStorageManager) TableSpaceManager.getFileStorageManager(conf); Appender appender = sm.getAppender(meta, schema, tablePath); appender.enableStats(); appender.init(); @@ -759,7 +759,7 @@ public class TestStorages { assertEquals(appender.getStats().getNumBytes().longValue(), status.getLen()); FileFragment fragment = new FileFragment("table", tablePath, 0, status.getLen()); - Scanner scanner = StorageManager.getFileStorageManager(conf).getScanner(meta, schema, fragment); + Scanner scanner = TableSpaceManager.getFileStorageManager(conf).getScanner(meta, schema, fragment); scanner.init(); assertTrue(scanner instanceof SequenceFileScanner); @@ -789,7 +789,7 @@ public class TestStorages { TableMeta meta = CatalogUtil.newTableMeta(storeType, options); Path tablePath = new Path(testDir, "testTime.data"); - FileStorageManager sm = (FileStorageManager)StorageManager.getFileStorageManager(conf); + FileStorageManager sm = (FileStorageManager) TableSpaceManager.getFileStorageManager(conf); Appender appender = sm.getAppender(meta, schema, tablePath); appender.init(); @@ -805,7 +805,7 @@ public class TestStorages { FileStatus status = fs.getFileStatus(tablePath); FileFragment fragment = new FileFragment("table", tablePath, 0, status.getLen()); - Scanner scanner = StorageManager.getFileStorageManager(conf).getScanner(meta, schema, fragment); + Scanner scanner = TableSpaceManager.getFileStorageManager(conf).getScanner(meta, schema, fragment); scanner.init(); Tuple retrieved; @@ -831,7 +831,7 @@ public class TestStorages { TableMeta meta = CatalogUtil.newTableMeta(storeType); Path tablePath = new Path(testDir, "Seekable.data"); - FileStorageManager sm = (FileStorageManager)StorageManager.getFileStorageManager(conf); + FileStorageManager sm = (FileStorageManager) TableSpaceManager.getFileStorageManager(conf); FileAppender appender = (FileAppender) sm.getAppender(meta, schema, tablePath); appender.enableStats(); appender.init(); @@ -873,7 +873,7 @@ public class TestStorages { long readBytes = 0; long readRows = 0; for (long offset : offsets) { - scanner = StorageManager.getFileStorageManager(conf).getScanner(meta, schema, + scanner = TableSpaceManager.getFileStorageManager(conf).getScanner(meta, schema, new FileFragment("table", tablePath, prevOffset, offset - prevOffset), schema); scanner.init(); @@ -913,7 +913,7 @@ public class TestStorages { } if (storeType.equalsIgnoreCase("RAW")) { - StorageManager.clearCache(); + TableSpaceManager.clearCache(); /* TAJO-1250 reproduce BufferOverflow of RAWFile */ int headerSize = 4 + 2 + 1; //Integer record length + Short null-flag length + 1 byte null flags /* max varint32: 5 bytes, max varint64: 10 bytes */ @@ -921,7 +921,7 @@ public class TestStorages { conf.setInt(RawFile.WRITE_BUFFER_SIZE, record + headerSize); } - FileStorageManager sm = (FileStorageManager) StorageManager.getFileStorageManager(conf); + FileStorageManager sm = (FileStorageManager) TableSpaceManager.getFileStorageManager(conf); Path tablePath = new Path(testDir, "testMaxValue.data"); Appender appender = sm.getAppender(meta, schema, tablePath); @@ -955,7 +955,7 @@ public class TestStorages { if (storeType.equalsIgnoreCase("RAW")){ - StorageManager.clearCache(); + TableSpaceManager.clearCache(); } } @@ -977,7 +977,7 @@ public class TestStorages { meta.setOptions(CatalogUtil.newPhysicalProperties(storeType)); Path tablePath = new Path(testDir, "testLessThanSchemaSize.data"); - FileStorageManager sm = (FileStorageManager) StorageManager.getFileStorageManager(conf); + FileStorageManager sm = (FileStorageManager) TableSpaceManager.getFileStorageManager(conf); Appender appender = sm.getAppender(meta, dataSchema, tablePath); appender.init(); @@ -1003,7 +1003,7 @@ public class TestStorages { inSchema.addColumn("col5", Type.INT8); FileFragment fragment = new FileFragment("table", tablePath, 0, status.getLen()); - Scanner scanner = StorageManager.getFileStorageManager(conf).getScanner(meta, inSchema, fragment); + Scanner scanner = TableSpaceManager.getFileStorageManager(conf).getScanner(meta, inSchema, fragment); Schema target = new Schema(); @@ -1041,7 +1041,7 @@ public class TestStorages { meta.setOptions(CatalogUtil.newPhysicalProperties(storeType)); Path tablePath = new Path(testDir, "test_storetype_oversize.data"); - FileStorageManager sm = (FileStorageManager) StorageManager.getFileStorageManager(conf); + FileStorageManager sm = (FileStorageManager) TableSpaceManager.getFileStorageManager(conf); Appender appender = sm.getAppender(meta, dataSchema, tablePath); appender.init(); http://git-wip-us.apache.org/repos/asf/tajo/blob/5491f0e7/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 114a9cc..ae0fd58 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 @@ -22,7 +22,6 @@ import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.tajo.catalog.*; -import org.apache.tajo.catalog.proto.CatalogProtos.StoreType; import org.apache.tajo.common.TajoDataTypes.Type; import org.apache.tajo.conf.TajoConf; import org.apache.tajo.datum.DatumFactory; @@ -90,7 +89,7 @@ public class TestBSTIndex { meta = CatalogUtil.newTableMeta(storeType); Path tablePath = new Path(testDir, "testFindValue_" + storeType); - Appender appender = ((FileStorageManager)StorageManager.getFileStorageManager(conf)).getAppender(meta, schema, tablePath); + Appender appender = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)).getAppender(meta, schema, tablePath); appender.init(); Tuple tuple; for (int i = 0; i < TUPLE_NUM; i++) { @@ -125,7 +124,7 @@ public class TestBSTIndex { creater.setLoadNum(LOAD_NUM); creater.open(); - SeekableScanner scanner = FileStorageManager.getSeekableScanner(conf, meta, schema, tablet, schema); + SeekableScanner scanner = TableSpaceManager.getSeekableScanner(conf, meta, schema, tablet, schema); scanner.init(); Tuple keyTuple; @@ -148,7 +147,7 @@ public class TestBSTIndex { tuple = new VTuple(keySchema.size()); BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "testFindValue_" + storeType + ".idx"), keySchema, comp); reader.open(); - scanner = FileStorageManager.getSeekableScanner(conf, meta, schema, tablet, schema); + scanner = TableSpaceManager.getSeekableScanner(conf, meta, schema, tablet, schema); scanner.init(); for (int i = 0; i < TUPLE_NUM - 1; i++) { @@ -178,7 +177,7 @@ public class TestBSTIndex { meta = CatalogUtil.newTableMeta(storeType); Path tablePath = new Path(testDir, "testBuildIndexWithAppender_" + storeType); - FileAppender appender = (FileAppender) ((FileStorageManager)StorageManager.getFileStorageManager(conf)) + FileAppender appender = (FileAppender) ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)) .getAppender(meta, schema, tablePath); appender.init(); @@ -227,7 +226,7 @@ public class TestBSTIndex { BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "testBuildIndexWithAppender_" + storeType + ".idx"), keySchema, comp); reader.open(); - SeekableScanner scanner = FileStorageManager.getSeekableScanner(conf, meta, schema, tablet, schema); + SeekableScanner scanner = TableSpaceManager.getSeekableScanner(conf, meta, schema, tablet, schema); scanner.init(); for (int i = 0; i < TUPLE_NUM - 1; i++) { @@ -257,7 +256,7 @@ public class TestBSTIndex { meta = CatalogUtil.newTableMeta(storeType); Path tablePath = StorageUtil.concatPath(testDir, "testFindOmittedValue_" + storeType); - Appender appender = ((FileStorageManager)StorageManager.getFileStorageManager(conf)).getAppender(meta, schema, tablePath); + Appender appender = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)).getAppender(meta, schema, tablePath); appender.init(); Tuple tuple; for (int i = 0; i < TUPLE_NUM; i += 2) { @@ -290,7 +289,7 @@ public class TestBSTIndex { creater.setLoadNum(LOAD_NUM); creater.open(); - SeekableScanner scanner = FileStorageManager.getSeekableScanner(conf, meta, schema, tablet, schema); + SeekableScanner scanner = TableSpaceManager.getSeekableScanner(conf, meta, schema, tablet, schema); scanner.init(); Tuple keyTuple; @@ -327,7 +326,7 @@ public class TestBSTIndex { meta = CatalogUtil.newTableMeta(storeType); Path tablePath = new Path(testDir, "testFindNextKeyValue_" + storeType); - Appender appender = ((FileStorageManager)StorageManager.getFileStorageManager(conf)).getAppender(meta, schema, tablePath); + Appender appender = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)).getAppender(meta, schema, tablePath); appender.init(); Tuple tuple; for (int i = 0; i < TUPLE_NUM; i++) { @@ -361,7 +360,7 @@ public class TestBSTIndex { creater.setLoadNum(LOAD_NUM); creater.open(); - SeekableScanner scanner = FileStorageManager.getSeekableScanner(conf, meta, schema, tablet, schema); + SeekableScanner scanner = TableSpaceManager.getSeekableScanner(conf, meta, schema, tablet, schema); scanner.init(); Tuple keyTuple; @@ -384,7 +383,7 @@ public class TestBSTIndex { BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "testFindNextKeyValue_" + storeType + ".idx"), keySchema, comp); reader.open(); - scanner = FileStorageManager.getSeekableScanner(conf, meta, schema, tablet, schema); + scanner = TableSpaceManager.getSeekableScanner(conf, meta, schema, tablet, schema); scanner.init(); Tuple result; @@ -417,7 +416,7 @@ public class TestBSTIndex { meta = CatalogUtil.newTableMeta(storeType); Path tablePath = new Path(testDir, "testFindNextKeyOmittedValue_" + storeType); - Appender appender = ((FileStorageManager)StorageManager.getFileStorageManager(conf)) + Appender appender = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)) .getAppender(meta, schema, tablePath); appender.init(); Tuple tuple; @@ -452,7 +451,7 @@ public class TestBSTIndex { creater.setLoadNum(LOAD_NUM); creater.open(); - SeekableScanner scanner = FileStorageManager.getSeekableScanner(conf, meta, schema, tablet, schema); + SeekableScanner scanner = TableSpaceManager.getSeekableScanner(conf, meta, schema, tablet, schema); scanner.init(); Tuple keyTuple; @@ -475,7 +474,7 @@ public class TestBSTIndex { BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "testFindNextKeyOmittedValue_" + storeType + ".idx"), keySchema, comp); reader.open(); - scanner = FileStorageManager.getSeekableScanner(conf, meta, schema, tablet, schema); + scanner = TableSpaceManager.getSeekableScanner(conf, meta, schema, tablet, schema); scanner.init(); Tuple result; @@ -497,7 +496,7 @@ public class TestBSTIndex { meta = CatalogUtil.newTableMeta(storeType); Path tablePath = new Path(testDir, "testFindMinValue" + storeType); - Appender appender = ((FileStorageManager)StorageManager.getFileStorageManager(conf)).getAppender(meta, schema, tablePath); + Appender appender = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)).getAppender(meta, schema, tablePath); appender.init(); Tuple tuple; @@ -531,7 +530,7 @@ public class TestBSTIndex { creater.setLoadNum(LOAD_NUM); creater.open(); - SeekableScanner scanner = FileStorageManager.getSeekableScanner(conf, meta, schema, tablet, schema); + SeekableScanner scanner = TableSpaceManager.getSeekableScanner(conf, meta, schema, tablet, schema); scanner.init(); Tuple keyTuple; @@ -556,7 +555,7 @@ public class TestBSTIndex { BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "testFindMinValue_" + storeType + ".idx"), keySchema, comp); reader.open(); - scanner = FileStorageManager.getSeekableScanner(conf, meta, schema, tablet, schema); + scanner = TableSpaceManager.getSeekableScanner(conf, meta, schema, tablet, schema); scanner.init(); tuple.put(0, DatumFactory.createInt8(0)); @@ -580,7 +579,7 @@ public class TestBSTIndex { meta = CatalogUtil.newTableMeta(storeType); Path tablePath = new Path(testDir, "testMinMax_" + storeType); - Appender appender = ((FileStorageManager)StorageManager.getFileStorageManager(conf)).getAppender(meta, schema, tablePath); + Appender appender = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)).getAppender(meta, schema, tablePath); appender.init(); Tuple tuple; for (int i = 5; i < TUPLE_NUM; i += 2) { @@ -614,7 +613,7 @@ public class TestBSTIndex { creater.setLoadNum(LOAD_NUM); creater.open(); - SeekableScanner scanner = FileStorageManager.getSeekableScanner(conf, meta, schema, tablet, schema); + SeekableScanner scanner = TableSpaceManager.getSeekableScanner(conf, meta, schema, tablet, schema); scanner.init(); Tuple keyTuple; @@ -684,7 +683,7 @@ public class TestBSTIndex { meta = CatalogUtil.newTableMeta(storeType); Path tablePath = new Path(testDir, "testConcurrentAccess_" + storeType); - Appender appender = ((FileStorageManager)StorageManager.getFileStorageManager(conf)).getAppender(meta, schema, tablePath); + Appender appender = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)).getAppender(meta, schema, tablePath); appender.init(); Tuple tuple; @@ -719,7 +718,7 @@ public class TestBSTIndex { creater.setLoadNum(LOAD_NUM); creater.open(); - SeekableScanner scanner = FileStorageManager.getSeekableScanner(conf, meta, schema, tablet, schema); + SeekableScanner scanner = TableSpaceManager.getSeekableScanner(conf, meta, schema, tablet, schema); scanner.init(); Tuple keyTuple; @@ -764,7 +763,7 @@ public class TestBSTIndex { meta = CatalogUtil.newTableMeta(storeType); Path tablePath = new Path(testDir, "testFindValueDescOrder_" + storeType); - Appender appender = ((FileStorageManager)StorageManager.getFileStorageManager(conf)).getAppender(meta, schema, tablePath); + Appender appender = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)).getAppender(meta, schema, tablePath); appender.init(); Tuple tuple; @@ -800,7 +799,7 @@ public class TestBSTIndex { creater.setLoadNum(LOAD_NUM); creater.open(); - SeekableScanner scanner = FileStorageManager.getSeekableScanner(conf, meta, schema, tablet, schema); + SeekableScanner scanner = TableSpaceManager.getSeekableScanner(conf, meta, schema, tablet, schema); scanner.init(); Tuple keyTuple; @@ -825,7 +824,7 @@ public class TestBSTIndex { BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "testFindValueDescOrder_" + storeType + ".idx"), keySchema, comp); reader.open(); - scanner = FileStorageManager.getSeekableScanner(conf, meta, schema, tablet, schema); + scanner = TableSpaceManager.getSeekableScanner(conf, meta, schema, tablet, schema); scanner.init(); for (int i = (TUPLE_NUM - 1); i > 0; i--) { @@ -855,7 +854,7 @@ public class TestBSTIndex { meta = CatalogUtil.newTableMeta(storeType); Path tablePath = new Path(testDir, "testFindNextKeyValueDescOrder_" + storeType); - Appender appender = ((FileStorageManager)StorageManager.getFileStorageManager(conf)).getAppender(meta, schema, tablePath); + Appender appender = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)).getAppender(meta, schema, tablePath); appender.init(); Tuple tuple; @@ -890,7 +889,7 @@ public class TestBSTIndex { creater.setLoadNum(LOAD_NUM); creater.open(); - SeekableScanner scanner = StorageManager.getSeekableScanner(conf, meta, schema, tablet, schema); + SeekableScanner scanner = TableSpaceManager.getSeekableScanner(conf, meta, schema, tablet, schema); scanner.init(); Tuple keyTuple; @@ -918,7 +917,7 @@ public class TestBSTIndex { assertEquals(keySchema, reader.getKeySchema()); assertEquals(comp, reader.getComparator()); - scanner = StorageManager.getSeekableScanner(conf, meta, schema, tablet, schema); + scanner = TableSpaceManager.getSeekableScanner(conf, meta, schema, tablet, schema); scanner.init(); Tuple result; http://git-wip-us.apache.org/repos/asf/tajo/blob/5491f0e7/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 cb94353..cebeeb2 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 @@ -22,7 +22,6 @@ import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.tajo.catalog.*; -import org.apache.tajo.catalog.proto.CatalogProtos.StoreType; import org.apache.tajo.common.TajoDataTypes.Type; import org.apache.tajo.conf.TajoConf; import org.apache.tajo.conf.TajoConf.ConfVars; @@ -78,7 +77,7 @@ public class TestSingleCSVFileBSTIndex { Path tablePath = StorageUtil.concatPath(testDir, "testFindValueInSingleCSV", "table.csv"); fs.mkdirs(tablePath.getParent()); - Appender appender = ((FileStorageManager)StorageManager.getFileStorageManager(conf)).getAppender(meta, schema, tablePath); + Appender appender = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)).getAppender(meta, schema, tablePath); appender.init(); Tuple tuple; for (int i = 0; i < TUPLE_NUM; i++) { @@ -167,7 +166,7 @@ public class TestSingleCSVFileBSTIndex { Path tablePath = StorageUtil.concatPath(testDir, "testFindNextKeyValueInSingleCSV", "table1.csv"); fs.mkdirs(tablePath.getParent()); - Appender appender = ((FileStorageManager)StorageManager.getFileStorageManager(conf)).getAppender(meta, schema, tablePath); + Appender appender = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)).getAppender(meta, schema, tablePath); appender.init(); Tuple tuple; for(int i = 0 ; i < TUPLE_NUM; i ++ ) { http://git-wip-us.apache.org/repos/asf/tajo/blob/5491f0e7/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 349da07..48e2db9 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 @@ -24,16 +24,12 @@ import org.apache.hadoop.fs.Path; import org.apache.tajo.catalog.CatalogUtil; import org.apache.tajo.catalog.Schema; import org.apache.tajo.catalog.TableMeta; -import org.apache.tajo.catalog.proto.CatalogProtos; import org.apache.tajo.common.TajoDataTypes; import org.apache.tajo.conf.TajoConf; import org.apache.tajo.datum.Datum; import org.apache.tajo.datum.DatumFactory; import org.apache.tajo.datum.NullDatum; -import org.apache.tajo.storage.Scanner; -import org.apache.tajo.storage.StorageManager; -import org.apache.tajo.storage.Tuple; -import org.apache.tajo.storage.VTuple; +import org.apache.tajo.storage.*; import org.apache.tajo.storage.fragment.FileFragment; import org.junit.Test; @@ -73,7 +69,7 @@ public class TestJsonSerDe { FileSystem fs = FileSystem.getLocal(conf); FileStatus status = fs.getFileStatus(tablePath); FileFragment fragment = new FileFragment("table", tablePath, 0, status.getLen()); - Scanner scanner = StorageManager.getFileStorageManager(conf).getScanner(meta, schema, fragment); + Scanner scanner = TableSpaceManager.getFileStorageManager(conf).getScanner(meta, schema, fragment); scanner.init(); Tuple tuple = scanner.next();
