Return-Path: X-Original-To: apmail-tajo-commits-archive@minotaur.apache.org Delivered-To: apmail-tajo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E213218BD1 for ; Tue, 23 Jun 2015 22:49:14 +0000 (UTC) Received: (qmail 63851 invoked by uid 500); 23 Jun 2015 22:49:14 -0000 Delivered-To: apmail-tajo-commits-archive@tajo.apache.org Received: (qmail 63797 invoked by uid 500); 23 Jun 2015 22:49:14 -0000 Mailing-List: contact commits-help@tajo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tajo.apache.org Delivered-To: mailing list commits@tajo.apache.org Received: (qmail 63641 invoked by uid 99); 23 Jun 2015 22:49:14 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Jun 2015 22:49:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 38DC5E0501; Tue, 23 Jun 2015 22:49:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hyunsik@apache.org To: commits@tajo.apache.org Date: Tue, 23 Jun 2015 22:49:14 -0000 Message-Id: <88e64e117259415693a86bf5ad98bf10@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/7] tajo git commit: TAJO-1616: Implement TablespaceManager to load Tablespaces. Repository: tajo Updated Branches: refs/heads/TAJO-1616 [created] 6cc7e5c60 http://git-wip-us.apache.org/repos/asf/tajo/blob/6cc7e5c6/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 80d0fff..ce2a926 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"); - FileTablespace sm = (FileTablespace) TableSpaceManager.getFileStorageManager(conf); + FileTablespace sm = TableSpaceManager.getLocalFs(); 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"); - FileTablespace sm = (FileTablespace) TableSpaceManager.getFileStorageManager(conf); + FileTablespace sm = TableSpaceManager.getLocalFs(); 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"); - FileTablespace sm = (FileTablespace) TableSpaceManager.getFileStorageManager(conf); + FileTablespace sm = TableSpaceManager.getLocalFs(); 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); } - FileTablespace sm = (FileTablespace) TableSpaceManager.getFileStorageManager(conf); + FileTablespace sm = TableSpaceManager.getLocalFs(); 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"); - FileTablespace sm = (FileTablespace) TableSpaceManager.getFileStorageManager(conf); + FileTablespace sm = TableSpaceManager.getLocalFs(); 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 = TableSpaceManager.getFileStorageManager(conf).getScanner(meta, schema, fragment); + Scanner scanner = TableSpaceManager.getLocalFs().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"); - FileTablespace sm = (FileTablespace) TableSpaceManager.getFileStorageManager(conf); + FileTablespace sm = TableSpaceManager.getLocalFs(); Appender appender = sm.getAppender(meta, schema, tablePath); appender.enableStats(); appender.init(); @@ -544,7 +544,7 @@ public class TestStorages { assertEquals(appender.getStats().getNumBytes().longValue(), status.getLen()); FileFragment fragment = new FileFragment("table", tablePath, 0, status.getLen()); - Scanner scanner = TableSpaceManager.getFileStorageManager(conf).getScanner(meta, schema, fragment); + Scanner scanner = TableSpaceManager.getLocalFs().getScanner(meta, schema, fragment); scanner.init(); Tuple retrieved; @@ -582,7 +582,7 @@ public class TestStorages { meta.putOption(StorageConstants.RCFILE_SERDE, BinarySerializerDeserializer.class.getName()); Path tablePath = new Path(testDir, "testVariousTypes.data"); - FileTablespace sm = (FileTablespace) TableSpaceManager.getFileStorageManager(conf); + FileTablespace sm = TableSpaceManager.getLocalFs(); Appender appender = sm.getAppender(meta, schema, tablePath); appender.enableStats(); appender.init(); @@ -613,7 +613,7 @@ public class TestStorages { assertEquals(appender.getStats().getNumBytes().longValue(), status.getLen()); FileFragment fragment = new FileFragment("table", tablePath, 0, status.getLen()); - Scanner scanner = TableSpaceManager.getFileStorageManager(conf).getScanner(meta, schema, fragment); + Scanner scanner = TableSpaceManager.getLocalFs().getScanner(meta, schema, fragment); scanner.init(); Tuple retrieved; @@ -651,7 +651,7 @@ public class TestStorages { meta.putOption(StorageConstants.SEQUENCEFILE_SERDE, TextSerializerDeserializer.class.getName()); Path tablePath = new Path(testDir, "testVariousTypes.data"); - FileTablespace sm = (FileTablespace) TableSpaceManager.getFileStorageManager(conf); + FileTablespace sm = TableSpaceManager.getLocalFs(); Appender appender = sm.getAppender(meta, schema, tablePath); appender.enableStats(); appender.init(); @@ -682,7 +682,7 @@ public class TestStorages { assertEquals(appender.getStats().getNumBytes().longValue(), status.getLen()); FileFragment fragment = new FileFragment("table", tablePath, 0, status.getLen()); - Scanner scanner = TableSpaceManager.getFileStorageManager(conf).getScanner(meta, schema, fragment); + Scanner scanner = TableSpaceManager.getLocalFs().getScanner(meta, schema, fragment); scanner.init(); assertTrue(scanner instanceof SequenceFileScanner); @@ -724,7 +724,7 @@ public class TestStorages { meta.putOption(StorageConstants.SEQUENCEFILE_SERDE, BinarySerializerDeserializer.class.getName()); Path tablePath = new Path(testDir, "testVariousTypes.data"); - FileTablespace sm = (FileTablespace) TableSpaceManager.getFileStorageManager(conf); + FileTablespace sm = TableSpaceManager.getLocalFs(); Appender appender = sm.getAppender(meta, schema, tablePath); appender.enableStats(); appender.init(); @@ -756,7 +756,7 @@ public class TestStorages { assertEquals(appender.getStats().getNumBytes().longValue(), status.getLen()); FileFragment fragment = new FileFragment("table", tablePath, 0, status.getLen()); - Scanner scanner = TableSpaceManager.getFileStorageManager(conf).getScanner(meta, schema, fragment); + Scanner scanner = TableSpaceManager.getLocalFs().getScanner(meta, schema, fragment); scanner.init(); assertTrue(scanner instanceof SequenceFileScanner); @@ -786,7 +786,7 @@ public class TestStorages { TableMeta meta = CatalogUtil.newTableMeta(storeType, options); Path tablePath = new Path(testDir, "testTime.data"); - FileTablespace sm = (FileTablespace) TableSpaceManager.getFileStorageManager(conf); + FileTablespace sm = TableSpaceManager.getLocalFs(); Appender appender = sm.getAppender(meta, schema, tablePath); appender.init(); @@ -801,7 +801,7 @@ public class TestStorages { FileStatus status = fs.getFileStatus(tablePath); FileFragment fragment = new FileFragment("table", tablePath, 0, status.getLen()); - Scanner scanner = TableSpaceManager.getFileStorageManager(conf).getScanner(meta, schema, fragment); + Scanner scanner = TableSpaceManager.getLocalFs().getScanner(meta, schema, fragment); scanner.init(); Tuple retrieved; @@ -827,7 +827,7 @@ public class TestStorages { TableMeta meta = CatalogUtil.newTableMeta(storeType); Path tablePath = new Path(testDir, "Seekable.data"); - FileTablespace sm = (FileTablespace) TableSpaceManager.getFileStorageManager(conf); + FileTablespace sm = TableSpaceManager.getLocalFs(); FileAppender appender = (FileAppender) sm.getAppender(meta, schema, tablePath); appender.enableStats(); appender.init(); @@ -869,7 +869,7 @@ public class TestStorages { long readBytes = 0; long readRows = 0; for (long offset : offsets) { - scanner = TableSpaceManager.getFileStorageManager(conf).getScanner(meta, schema, + scanner = TableSpaceManager.getLocalFs().getScanner(meta, schema, new FileFragment("table", tablePath, prevOffset, offset - prevOffset), schema); scanner.init(); @@ -909,7 +909,7 @@ public class TestStorages { } if (storeType.equalsIgnoreCase("RAW")) { - TableSpaceManager.clearCache(); + OldStorageManager.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 */ @@ -917,7 +917,7 @@ public class TestStorages { conf.setInt(RawFile.WRITE_BUFFER_SIZE, record + headerSize); } - FileTablespace sm = (FileTablespace) TableSpaceManager.getFileStorageManager(conf); + FileTablespace sm = TableSpaceManager.getLocalFs(); Path tablePath = new Path(testDir, "testMaxValue.data"); Appender appender = sm.getAppender(meta, schema, tablePath); @@ -950,7 +950,7 @@ public class TestStorages { if (storeType.equalsIgnoreCase("RAW")){ - TableSpaceManager.clearCache(); + OldStorageManager.clearCache(); } } @@ -972,7 +972,7 @@ public class TestStorages { meta.setOptions(CatalogUtil.newPhysicalProperties(storeType)); Path tablePath = new Path(testDir, "testLessThanSchemaSize.data"); - FileTablespace sm = (FileTablespace) TableSpaceManager.getFileStorageManager(conf); + FileTablespace sm = TableSpaceManager.getLocalFs(); Appender appender = sm.getAppender(meta, dataSchema, tablePath); appender.init(); @@ -998,7 +998,7 @@ public class TestStorages { inSchema.addColumn("col5", Type.INT8); FileFragment fragment = new FileFragment("table", tablePath, 0, status.getLen()); - Scanner scanner = TableSpaceManager.getFileStorageManager(conf).getScanner(meta, inSchema, fragment); + Scanner scanner = TableSpaceManager.getLocalFs().getScanner(meta, inSchema, fragment); Schema target = new Schema(); @@ -1036,7 +1036,7 @@ public class TestStorages { meta.setOptions(CatalogUtil.newPhysicalProperties(storeType)); Path tablePath = new Path(testDir, "test_storetype_oversize.data"); - FileTablespace sm = (FileTablespace) TableSpaceManager.getFileStorageManager(conf); + FileTablespace sm = TableSpaceManager.getLocalFs(); Appender appender = sm.getAppender(meta, dataSchema, tablePath); appender.init(); http://git-wip-us.apache.org/repos/asf/tajo/blob/6cc7e5c6/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 bcfca0f..1a62f52 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 @@ -89,7 +89,8 @@ public class TestBSTIndex { meta = CatalogUtil.newTableMeta(storeType); Path tablePath = new Path(testDir, "testFindValue_" + storeType); - Appender appender = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)).getAppender(meta, schema, tablePath); + Appender appender = ((FileTablespace)TableSpaceManager.getLocalFs()) + .getAppender(meta, schema, tablePath); appender.init(); Tuple tuple; for (int i = 0; i < TUPLE_NUM; i++) { @@ -124,7 +125,7 @@ public class TestBSTIndex { creater.setLoadNum(LOAD_NUM); creater.open(); - SeekableScanner scanner = TableSpaceManager.getSeekableScanner(conf, meta, schema, tablet, schema); + SeekableScanner scanner = OldStorageManager.getSeekableScanner(conf, meta, schema, tablet, schema); scanner.init(); Tuple keyTuple; @@ -147,7 +148,7 @@ public class TestBSTIndex { tuple = new VTuple(keySchema.size()); BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "testFindValue_" + storeType + ".idx"), keySchema, comp); reader.open(); - scanner = TableSpaceManager.getSeekableScanner(conf, meta, schema, tablet, schema); + scanner = OldStorageManager.getSeekableScanner(conf, meta, schema, tablet, schema); scanner.init(); for (int i = 0; i < TUPLE_NUM - 1; i++) { @@ -177,7 +178,7 @@ public class TestBSTIndex { meta = CatalogUtil.newTableMeta(storeType); Path tablePath = new Path(testDir, "testBuildIndexWithAppender_" + storeType); - FileAppender appender = (FileAppender) ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) + FileAppender appender = (FileAppender) ((FileTablespace)TableSpaceManager.getLocalFs()) .getAppender(meta, schema, tablePath); appender.init(); @@ -226,7 +227,7 @@ public class TestBSTIndex { BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "testBuildIndexWithAppender_" + storeType + ".idx"), keySchema, comp); reader.open(); - SeekableScanner scanner = TableSpaceManager.getSeekableScanner(conf, meta, schema, tablet, schema); + SeekableScanner scanner = OldStorageManager.getSeekableScanner(conf, meta, schema, tablet, schema); scanner.init(); for (int i = 0; i < TUPLE_NUM - 1; i++) { @@ -256,7 +257,7 @@ public class TestBSTIndex { meta = CatalogUtil.newTableMeta(storeType); Path tablePath = StorageUtil.concatPath(testDir, "testFindOmittedValue_" + storeType); - Appender appender = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)).getAppender(meta, schema, tablePath); + Appender appender = ((FileTablespace)TableSpaceManager.getLocalFs()).getAppender(meta, schema, tablePath); appender.init(); Tuple tuple; for (int i = 0; i < TUPLE_NUM; i += 2) { @@ -289,7 +290,7 @@ public class TestBSTIndex { creater.setLoadNum(LOAD_NUM); creater.open(); - SeekableScanner scanner = TableSpaceManager.getSeekableScanner(conf, meta, schema, tablet, schema); + SeekableScanner scanner = OldStorageManager.getSeekableScanner(conf, meta, schema, tablet, schema); scanner.init(); Tuple keyTuple; @@ -326,7 +327,8 @@ public class TestBSTIndex { meta = CatalogUtil.newTableMeta(storeType); Path tablePath = new Path(testDir, "testFindNextKeyValue_" + storeType); - Appender appender = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)).getAppender(meta, schema, tablePath); + Appender appender = ((FileTablespace)TableSpaceManager.getLocalFs()) + .getAppender(meta, schema, tablePath); appender.init(); Tuple tuple; for (int i = 0; i < TUPLE_NUM; i++) { @@ -360,7 +362,7 @@ public class TestBSTIndex { creater.setLoadNum(LOAD_NUM); creater.open(); - SeekableScanner scanner = TableSpaceManager.getSeekableScanner(conf, meta, schema, tablet, schema); + SeekableScanner scanner = OldStorageManager.getSeekableScanner(conf, meta, schema, tablet, schema); scanner.init(); Tuple keyTuple; @@ -383,7 +385,7 @@ public class TestBSTIndex { BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "testFindNextKeyValue_" + storeType + ".idx"), keySchema, comp); reader.open(); - scanner = TableSpaceManager.getSeekableScanner(conf, meta, schema, tablet, schema); + scanner = OldStorageManager.getSeekableScanner(conf, meta, schema, tablet, schema); scanner.init(); Tuple result; @@ -416,7 +418,7 @@ public class TestBSTIndex { meta = CatalogUtil.newTableMeta(storeType); Path tablePath = new Path(testDir, "testFindNextKeyOmittedValue_" + storeType); - Appender appender = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) + Appender appender = (((FileTablespace)TableSpaceManager.getLocalFs())) .getAppender(meta, schema, tablePath); appender.init(); Tuple tuple; @@ -451,7 +453,7 @@ public class TestBSTIndex { creater.setLoadNum(LOAD_NUM); creater.open(); - SeekableScanner scanner = TableSpaceManager.getSeekableScanner(conf, meta, schema, tablet, schema); + SeekableScanner scanner = OldStorageManager.getSeekableScanner(conf, meta, schema, tablet, schema); scanner.init(); Tuple keyTuple; @@ -474,7 +476,7 @@ public class TestBSTIndex { BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "testFindNextKeyOmittedValue_" + storeType + ".idx"), keySchema, comp); reader.open(); - scanner = TableSpaceManager.getSeekableScanner(conf, meta, schema, tablet, schema); + scanner = OldStorageManager.getSeekableScanner(conf, meta, schema, tablet, schema); scanner.init(); Tuple result; @@ -496,7 +498,8 @@ public class TestBSTIndex { meta = CatalogUtil.newTableMeta(storeType); Path tablePath = new Path(testDir, "testFindMinValue" + storeType); - Appender appender = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)).getAppender(meta, schema, tablePath); + Appender appender = ((FileTablespace)TableSpaceManager.getLocalFs()) + .getAppender(meta, schema, tablePath); appender.init(); Tuple tuple; @@ -530,7 +533,7 @@ public class TestBSTIndex { creater.setLoadNum(LOAD_NUM); creater.open(); - SeekableScanner scanner = TableSpaceManager.getSeekableScanner(conf, meta, schema, tablet, schema); + SeekableScanner scanner = OldStorageManager.getSeekableScanner(conf, meta, schema, tablet, schema); scanner.init(); Tuple keyTuple; @@ -555,7 +558,7 @@ public class TestBSTIndex { BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "testFindMinValue_" + storeType + ".idx"), keySchema, comp); reader.open(); - scanner = TableSpaceManager.getSeekableScanner(conf, meta, schema, tablet, schema); + scanner = OldStorageManager.getSeekableScanner(conf, meta, schema, tablet, schema); scanner.init(); tuple.put(0, DatumFactory.createInt8(0)); @@ -579,7 +582,8 @@ public class TestBSTIndex { meta = CatalogUtil.newTableMeta(storeType); Path tablePath = new Path(testDir, "testMinMax_" + storeType); - Appender appender = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)).getAppender(meta, schema, tablePath); + Appender appender = ((FileTablespace)TableSpaceManager.getLocalFs()) + .getAppender(meta, schema, tablePath); appender.init(); Tuple tuple; for (int i = 5; i < TUPLE_NUM; i += 2) { @@ -613,7 +617,7 @@ public class TestBSTIndex { creater.setLoadNum(LOAD_NUM); creater.open(); - SeekableScanner scanner = TableSpaceManager.getSeekableScanner(conf, meta, schema, tablet, schema); + SeekableScanner scanner = OldStorageManager.getSeekableScanner(conf, meta, schema, tablet, schema); scanner.init(); Tuple keyTuple; @@ -683,7 +687,8 @@ public class TestBSTIndex { meta = CatalogUtil.newTableMeta(storeType); Path tablePath = new Path(testDir, "testConcurrentAccess_" + storeType); - Appender appender = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)).getAppender(meta, schema, tablePath); + Appender appender = ((FileTablespace)TableSpaceManager.getLocalFs()) + .getAppender(meta, schema, tablePath); appender.init(); Tuple tuple; @@ -718,7 +723,7 @@ public class TestBSTIndex { creater.setLoadNum(LOAD_NUM); creater.open(); - SeekableScanner scanner = TableSpaceManager.getSeekableScanner(conf, meta, schema, tablet, schema); + SeekableScanner scanner = OldStorageManager.getSeekableScanner(conf, meta, schema, tablet, schema); scanner.init(); Tuple keyTuple; @@ -763,7 +768,8 @@ public class TestBSTIndex { meta = CatalogUtil.newTableMeta(storeType); Path tablePath = new Path(testDir, "testFindValueDescOrder_" + storeType); - Appender appender = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)).getAppender(meta, schema, tablePath); + Appender appender = ((FileTablespace)TableSpaceManager.getLocalFs()) + .getAppender(meta, schema, tablePath); appender.init(); Tuple tuple; @@ -799,7 +805,7 @@ public class TestBSTIndex { creater.setLoadNum(LOAD_NUM); creater.open(); - SeekableScanner scanner = TableSpaceManager.getSeekableScanner(conf, meta, schema, tablet, schema); + SeekableScanner scanner = OldStorageManager.getSeekableScanner(conf, meta, schema, tablet, schema); scanner.init(); Tuple keyTuple; @@ -824,7 +830,7 @@ public class TestBSTIndex { BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "testFindValueDescOrder_" + storeType + ".idx"), keySchema, comp); reader.open(); - scanner = TableSpaceManager.getSeekableScanner(conf, meta, schema, tablet, schema); + scanner = OldStorageManager.getSeekableScanner(conf, meta, schema, tablet, schema); scanner.init(); for (int i = (TUPLE_NUM - 1); i > 0; i--) { @@ -854,7 +860,7 @@ public class TestBSTIndex { meta = CatalogUtil.newTableMeta(storeType); Path tablePath = new Path(testDir, "testFindNextKeyValueDescOrder_" + storeType); - Appender appender = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)).getAppender(meta, schema, tablePath); + Appender appender = ((FileTablespace)TableSpaceManager.getLocalFs()).getAppender(meta, schema, tablePath); appender.init(); Tuple tuple; @@ -889,7 +895,7 @@ public class TestBSTIndex { creater.setLoadNum(LOAD_NUM); creater.open(); - SeekableScanner scanner = TableSpaceManager.getSeekableScanner(conf, meta, schema, tablet, schema); + SeekableScanner scanner = OldStorageManager.getSeekableScanner(conf, meta, schema, tablet, schema); scanner.init(); Tuple keyTuple; @@ -917,7 +923,7 @@ public class TestBSTIndex { assertEquals(keySchema, reader.getKeySchema()); assertEquals(comp, reader.getComparator()); - scanner = TableSpaceManager.getSeekableScanner(conf, meta, schema, tablet, schema); + scanner = OldStorageManager.getSeekableScanner(conf, meta, schema, tablet, schema); scanner.init(); Tuple result; http://git-wip-us.apache.org/repos/asf/tajo/blob/6cc7e5c6/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 49da04b..5ad7a27 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 @@ -77,7 +77,7 @@ public class TestSingleCSVFileBSTIndex { Path tablePath = StorageUtil.concatPath(testDir, "testFindValueInSingleCSV", "table.csv"); fs.mkdirs(tablePath.getParent()); - Appender appender = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)).getAppender(meta, schema, tablePath); + Appender appender = ((FileTablespace)TableSpaceManager.getLocalFs()).getAppender(meta, schema, tablePath); appender.init(); Tuple tuple; for (int i = 0; i < TUPLE_NUM; i++) { @@ -166,7 +166,7 @@ public class TestSingleCSVFileBSTIndex { Path tablePath = StorageUtil.concatPath(testDir, "testFindNextKeyValueInSingleCSV", "table1.csv"); fs.mkdirs(tablePath.getParent()); - Appender appender = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)).getAppender(meta, schema, tablePath); + Appender appender = ((FileTablespace) TableSpaceManager.getLocalFs()).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/6cc7e5c6/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 adc7a05..2fbf5d6 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 @@ -69,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 = TableSpaceManager.getFileStorageManager(conf).getScanner(meta, schema, fragment); + Scanner scanner = TableSpaceManager.getLocalFs().getScanner(meta, schema, fragment); scanner.init(); Tuple tuple = scanner.next();