TAJO-1613: Rename StorageManager to Tablespace. Closes #578
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/d261234f Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/d261234f Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/d261234f Branch: refs/heads/master Commit: d261234ff1bc981c9f05b99650938ed2a9feb200 Parents: 4b1b779 Author: Hyunsik Choi <[email protected]> Authored: Mon May 18 21:36:52 2015 -0700 Committer: Hyunsik Choi <[email protected]> Committed: Mon May 18 21:36:52 2015 -0700 ---------------------------------------------------------------------- CHANGES | 2 + .../engine/planner/PhysicalPlannerImpl.java | 6 +- .../planner/physical/ColPartitionStoreExec.java | 2 +- .../planner/physical/PhysicalPlanUtil.java | 4 +- .../physical/RangeShuffleFileWriteExec.java | 2 +- .../engine/planner/physical/SeqScanExec.java | 4 +- .../engine/planner/physical/StoreTableExec.java | 2 +- .../org/apache/tajo/master/GlobalEngine.java | 4 +- .../java/org/apache/tajo/master/TajoMaster.java | 6 +- .../apache/tajo/master/exec/DDLExecutor.java | 6 +- .../exec/NonForwardQueryResultFileScanner.java | 16 +- .../apache/tajo/master/exec/QueryExecutor.java | 4 +- .../tajo/querymaster/QueryMasterTask.java | 4 +- .../apache/tajo/querymaster/Repartitioner.java | 32 +- .../java/org/apache/tajo/querymaster/Stage.java | 12 +- .../org/apache/tajo/worker/TajoQueryEngine.java | 1 - .../main/java/org/apache/tajo/worker/Task.java | 2 +- .../org/apache/tajo/BackendTestingUtil.java | 2 +- .../planner/physical/TestBNLJoinExec.java | 12 +- .../planner/physical/TestBSTIndexExec.java | 6 +- .../planner/physical/TestExternalSortExec.java | 4 +- .../physical/TestFullOuterHashJoinExec.java | 24 +- .../physical/TestFullOuterMergeJoinExec.java | 38 +- .../planner/physical/TestHashAntiJoinExec.java | 8 +- .../planner/physical/TestHashJoinExec.java | 12 +- .../planner/physical/TestHashSemiJoinExec.java | 8 +- .../physical/TestLeftOuterHashJoinExec.java | 28 +- .../planner/physical/TestMergeJoinExec.java | 8 +- .../engine/planner/physical/TestNLJoinExec.java | 12 +- .../planner/physical/TestPhysicalPlanner.java | 56 +- .../physical/TestProgressExternalSortExec.java | 4 +- .../physical/TestRightOuterHashJoinExec.java | 18 +- .../physical/TestRightOuterMergeJoinExec.java | 36 +- .../engine/planner/physical/TestSortExec.java | 8 +- .../tajo/engine/query/TestHBaseTable.java | 22 +- .../apache/tajo/engine/query/TestJoinQuery.java | 2 +- .../org/apache/tajo/jdbc/TestResultSet.java | 4 +- .../tajo/master/TestExecutionBlockCursor.java | 4 +- .../org/apache/tajo/storage/TestRowFile.java | 4 +- .../org/apache/tajo/storage/MergeScanner.java | 2 +- .../org/apache/tajo/storage/StorageManager.java | 373 ----- .../org/apache/tajo/storage/TableSpace.java | 74 - .../apache/tajo/storage/TableSpaceManager.java | 30 +- .../org/apache/tajo/storage/Tablespace.java | 360 +++++ .../src/main/resources/storage-default.xml | 4 +- .../src/test/resources/storage-default.xml | 4 +- .../tajo/storage/hbase/HBasePutAppender.java | 4 +- .../apache/tajo/storage/hbase/HBaseScanner.java | 4 +- .../tajo/storage/hbase/HBaseStorageManager.java | 1148 ---------------- .../tajo/storage/hbase/HBaseTablespace.java | 1147 ++++++++++++++++ .../storage/hbase/TestHBaseStorageManager.java | 4 +- .../org/apache/tajo/storage/FileAppender.java | 2 +- .../apache/tajo/storage/FileStorageManager.java | 1271 ------------------ .../org/apache/tajo/storage/FileTablespace.java | 1227 +++++++++++++++++ .../storage/HashShuffleAppenderManager.java | 2 +- .../tajo/storage/TestCompressionStorages.java | 2 +- .../tajo/storage/TestFileStorageManager.java | 10 +- .../apache/tajo/storage/TestFileSystems.java | 4 +- .../apache/tajo/storage/TestMergeScanner.java | 2 +- .../org/apache/tajo/storage/TestStorages.java | 28 +- .../apache/tajo/storage/index/TestBSTIndex.java | 20 +- .../index/TestSingleCSVFileBSTIndex.java | 4 +- .../src/test/resources/storage-default.xml | 4 +- 63 files changed, 3014 insertions(+), 3145 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/d261234f/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 2e9f2c5..dee6f14 100644 --- a/CHANGES +++ b/CHANGES @@ -299,6 +299,8 @@ Release 0.11.0 - unreleased SUB TASKS + TAJO-1613: Rename StorageManager to Tablespace. (hyunsik) + TAJO-1359: Add nested field projector and language extension to project nested record. (hyunsik) http://git-wip-us.apache.org/repos/asf/tajo/blob/d261234f/tajo-core/src/main/java/org/apache/tajo/engine/planner/PhysicalPlannerImpl.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/PhysicalPlannerImpl.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/PhysicalPlannerImpl.java index ff42d5f..0252051 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/PhysicalPlannerImpl.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/PhysicalPlannerImpl.java @@ -251,7 +251,7 @@ public class PhysicalPlannerImpl implements PhysicalPlanner { FragmentProto[] fragmentProtos = ctx.getTables(tableId); List<Fragment> fragments = FragmentConvertor.convert(ctx.getConf(), fragmentProtos); for (Fragment frag : fragments) { - size += StorageManager.getFragmentLength(ctx.getConf(), frag); + size += Tablespace.getFragmentLength(ctx.getConf(), frag); } } return size; @@ -924,7 +924,7 @@ public class PhysicalPlannerImpl implements PhysicalPlanner { if (broadcastFlag) { PartitionedTableScanNode partitionedTableScanNode = (PartitionedTableScanNode) scanNode; List<Fragment> fileFragments = TUtil.newList(); - FileStorageManager fileStorageManager = (FileStorageManager) TableSpaceManager.getFileStorageManager(ctx.getConf()); + FileTablespace fileStorageManager = (FileTablespace) TableSpaceManager.getFileStorageManager(ctx.getConf()); for (Path path : partitionedTableScanNode.getInputPaths()) { fileFragments.addAll(TUtil.newList(fileStorageManager.split(scanNode.getCanonicalName(), path))); } @@ -1188,7 +1188,7 @@ public class PhysicalPlannerImpl implements PhysicalPlanner { FragmentConvertor.convert(ctx.getConf(), fragmentProtos); String indexName = IndexUtil.getIndexNameOfFrag(fragments.get(0), annotation.getSortKeys()); - FileStorageManager sm = (FileStorageManager) TableSpaceManager.getFileStorageManager(ctx.getConf()); + FileTablespace sm = (FileTablespace) TableSpaceManager.getFileStorageManager(ctx.getConf()); Path indexPath = new Path(sm.getTablePath(annotation.getTableName()), "index"); TupleComparator comp = new BaseTupleComparator(annotation.getKeySchema(), http://git-wip-us.apache.org/repos/asf/tajo/blob/d261234f/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/ColPartitionStoreExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/ColPartitionStoreExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/ColPartitionStoreExec.java index 8d53a6f..3121671 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/ColPartitionStoreExec.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/ColPartitionStoreExec.java @@ -165,7 +165,7 @@ public abstract class ColPartitionStoreExec extends UnaryPhysicalExec { actualFilePath = new Path(lastFileName + "_" + suffixId); } - appender = ((FileStorageManager) TableSpaceManager.getFileStorageManager(context.getConf())) + appender = ((FileTablespace) TableSpaceManager.getFileStorageManager(context.getConf())) .getAppender(meta, outSchema, actualFilePath); appender.enableStats(); http://git-wip-us.apache.org/repos/asf/tajo/blob/d261234f/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/PhysicalPlanUtil.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/PhysicalPlanUtil.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/PhysicalPlanUtil.java index 92bf3b5..d240edb 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/PhysicalPlanUtil.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/PhysicalPlanUtil.java @@ -35,7 +35,7 @@ import org.apache.tajo.plan.logical.NodeType; import org.apache.tajo.plan.logical.PersistentStoreNode; import org.apache.tajo.plan.util.PlannerUtil; import org.apache.tajo.storage.BaseTupleComparator; -import org.apache.tajo.storage.FileStorageManager; +import org.apache.tajo.storage.FileTablespace; import org.apache.tajo.storage.StorageConstants; import org.apache.tajo.storage.TupleComparator; import org.apache.tajo.storage.fragment.FileFragment; @@ -141,7 +141,7 @@ public class PhysicalPlanUtil { int currentDepth, int maxDepth) throws IOException { // Intermediate directory if (fs.isDirectory(path)) { - FileStatus[] files = fs.listStatus(path, FileStorageManager.hiddenFileFilter); + FileStatus[] files = fs.listStatus(path, FileTablespace.hiddenFileFilter); if (files != null && files.length > 0) { for (FileStatus eachFile : files) { http://git-wip-us.apache.org/repos/asf/tajo/blob/d261234f/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/RangeShuffleFileWriteExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/RangeShuffleFileWriteExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/RangeShuffleFileWriteExec.java index 6fd2ce4..7bf9e66 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/RangeShuffleFileWriteExec.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/RangeShuffleFileWriteExec.java @@ -77,7 +77,7 @@ public class RangeShuffleFileWriteExec extends UnaryPhysicalExec { context.getDataChannel().getStoreType() : "RAW"); FileSystem fs = new RawLocalFileSystem(); fs.mkdirs(storeTablePath); - this.appender = (FileAppender) ((FileStorageManager) TableSpaceManager.getFileStorageManager(context.getConf())) + this.appender = (FileAppender) ((FileTablespace) TableSpaceManager.getFileStorageManager(context.getConf())) .getAppender(meta, outSchema, new Path(storeTablePath, "output")); this.appender.enableStats(); this.appender.init(); http://git-wip-us.apache.org/repos/asf/tajo/blob/d261234f/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/SeqScanExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/SeqScanExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/SeqScanExec.java index 7c82649..b01af6c 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/SeqScanExec.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/SeqScanExec.java @@ -202,9 +202,9 @@ public class SeqScanExec extends ScanExec { FragmentConvertor.convert(context.getConf(), fragments), projected ); } else { - StorageManager storageManager = TableSpaceManager.getStorageManager( + Tablespace tablespace = TableSpaceManager.getStorageManager( context.getConf(), plan.getTableDesc().getMeta().getStoreType()); - this.scanner = storageManager.getScanner(meta, + this.scanner = tablespace.getScanner(meta, plan.getPhysicalSchema(), fragments[0], projected); } scanner.init(); http://git-wip-us.apache.org/repos/asf/tajo/blob/d261234f/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/StoreTableExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/StoreTableExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/StoreTableExec.java index b0263d7..5b17eee 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/StoreTableExec.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/StoreTableExec.java @@ -90,7 +90,7 @@ public class StoreTableExec extends UnaryPhysicalExec { lastFileName = new Path(lastFileName + "_" + suffixId); } - appender = ((FileStorageManager) TableSpaceManager.getFileStorageManager(context.getConf())) + appender = ((FileTablespace) TableSpaceManager.getFileStorageManager(context.getConf())) .getAppender(meta, appenderSchema, lastFileName); if (suffixId > 0) { http://git-wip-us.apache.org/repos/asf/tajo/blob/d261234f/tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java b/tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java index aeb4166..2cd585f 100644 --- a/tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java +++ b/tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java @@ -53,7 +53,7 @@ import org.apache.tajo.plan.verifier.LogicalPlanVerifier; import org.apache.tajo.plan.verifier.PreLogicalPlanVerifier; import org.apache.tajo.plan.verifier.VerificationState; import org.apache.tajo.plan.verifier.VerifyException; -import org.apache.tajo.storage.StorageManager; +import org.apache.tajo.storage.Tablespace; import org.apache.tajo.storage.TableSpaceManager; import org.apache.tajo.util.CommonTestingUtil; @@ -68,7 +68,7 @@ public class GlobalEngine extends AbstractService { private final static Log LOG = LogFactory.getLog(GlobalEngine.class); private final MasterContext context; - private final StorageManager sm; + private final Tablespace sm; private SQLAnalyzer analyzer; private CatalogService catalog; http://git-wip-us.apache.org/repos/asf/tajo/blob/d261234f/tajo-core/src/main/java/org/apache/tajo/master/TajoMaster.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/master/TajoMaster.java b/tajo-core/src/main/java/org/apache/tajo/master/TajoMaster.java index abf070e..c41fdde 100644 --- a/tajo-core/src/main/java/org/apache/tajo/master/TajoMaster.java +++ b/tajo-core/src/main/java/org/apache/tajo/master/TajoMaster.java @@ -53,7 +53,7 @@ import org.apache.tajo.rule.SelfDiagnosisRuleSession; import org.apache.tajo.service.ServiceTracker; import org.apache.tajo.service.ServiceTrackerFactory; import org.apache.tajo.session.SessionManager; -import org.apache.tajo.storage.StorageManager; +import org.apache.tajo.storage.Tablespace; import org.apache.tajo.storage.TableSpaceManager; import org.apache.tajo.util.*; import org.apache.tajo.util.history.HistoryReader; @@ -114,7 +114,7 @@ public class TajoMaster extends CompositeService { private CatalogServer catalogServer; private CatalogService catalog; - private StorageManager storeManager; + private Tablespace storeManager; private GlobalEngine globalEngine; private AsyncDispatcher dispatcher; private TajoMasterClientService tajoMasterClientService; @@ -477,7 +477,7 @@ public class TajoMaster extends CompositeService { return globalEngine; } - public StorageManager getStorageManager() { + public Tablespace getStorageManager() { return storeManager; } http://git-wip-us.apache.org/repos/asf/tajo/blob/d261234f/tajo-core/src/main/java/org/apache/tajo/master/exec/DDLExecutor.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/master/exec/DDLExecutor.java b/tajo-core/src/main/java/org/apache/tajo/master/exec/DDLExecutor.java index 888194d..93c950e 100644 --- a/tajo-core/src/main/java/org/apache/tajo/master/exec/DDLExecutor.java +++ b/tajo-core/src/main/java/org/apache/tajo/master/exec/DDLExecutor.java @@ -36,7 +36,7 @@ import org.apache.tajo.master.TajoMaster; import org.apache.tajo.plan.LogicalPlan; import org.apache.tajo.plan.logical.*; import org.apache.tajo.plan.util.PlannerUtil; -import org.apache.tajo.storage.StorageManager; +import org.apache.tajo.storage.Tablespace; import org.apache.tajo.storage.StorageUtil; import org.apache.tajo.storage.TableSpaceManager; @@ -54,12 +54,12 @@ public class DDLExecutor { private final TajoMaster.MasterContext context; private final CatalogService catalog; - private final StorageManager storageManager; + private final Tablespace tablespace; public DDLExecutor(TajoMaster.MasterContext context) { this.context = context; this.catalog = context.getCatalog(); - this.storageManager = context.getStorageManager(); + this.tablespace = context.getStorageManager(); } public boolean execute(QueryContext queryContext, LogicalPlan plan) throws IOException { http://git-wip-us.apache.org/repos/asf/tajo/blob/d261234f/tajo-core/src/main/java/org/apache/tajo/master/exec/NonForwardQueryResultFileScanner.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/master/exec/NonForwardQueryResultFileScanner.java b/tajo-core/src/main/java/org/apache/tajo/master/exec/NonForwardQueryResultFileScanner.java index d2022b5..8f6c6f9 100644 --- a/tajo-core/src/main/java/org/apache/tajo/master/exec/NonForwardQueryResultFileScanner.java +++ b/tajo-core/src/main/java/org/apache/tajo/master/exec/NonForwardQueryResultFileScanner.java @@ -78,11 +78,11 @@ public class NonForwardQueryResultFileScanner implements NonForwardQueryResultSc /** * Set partition path and depth if ScanNode's qualification exists * - * @param storageManager target storage manager to be set with partition info + * @param tablespace target storage manager to be set with partition info */ - private void setPartition(StorageManager storageManager) { + private void setPartition(Tablespace tablespace) { if (tableDesc.isExternal() && tableDesc.hasPartition() && scanNode.getQual() != null && - storageManager instanceof FileStorageManager) { + tablespace instanceof FileTablespace) { StringBuffer path = new StringBuffer(); int depth = 0; if (tableDesc.hasPartition()) { @@ -94,17 +94,17 @@ public class NonForwardQueryResultFileScanner implements NonForwardQueryResultSc depth++; } } - ((FileStorageManager)storageManager).setPartitionPath(path.toString()); - ((FileStorageManager)storageManager).setCurrentDepth(depth); + ((FileTablespace) tablespace).setPartitionPath(path.toString()); + ((FileTablespace) tablespace).setCurrentDepth(depth); scanNode.setQual(null); } } private void initSeqScanExec() throws IOException { - StorageManager storageManager = TableSpaceManager.getStorageManager(tajoConf, tableDesc.getMeta().getStoreType()); + Tablespace tablespace = TableSpaceManager.getStorageManager(tajoConf, tableDesc.getMeta().getStoreType()); List<Fragment> fragments = null; - setPartition(storageManager); - fragments = storageManager.getNonForwardSplit(tableDesc, currentFragmentIndex, MAX_FRAGMENT_NUM_PER_SCAN); + setPartition(tablespace); + fragments = tablespace.getNonForwardSplit(tableDesc, currentFragmentIndex, MAX_FRAGMENT_NUM_PER_SCAN); if (fragments != null && !fragments.isEmpty()) { FragmentProto[] fragmentProtos = FragmentConvertor.toFragmentProtoArray(fragments.toArray(new Fragment[] {})); http://git-wip-us.apache.org/repos/asf/tajo/blob/d261234f/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java b/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java index 695c38e..6ab096f 100644 --- a/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java +++ b/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java @@ -438,7 +438,7 @@ public class QueryExecutor { String storeType = PlannerUtil.getStoreType(plan); if (storeType != null) { - StorageManager sm = TableSpaceManager.getStorageManager(context.getConf(), storeType); + Tablespace sm = TableSpaceManager.getStorageManager(context.getConf(), storeType); StorageProperty storageProperty = sm.getStorageProperty(); if (!storageProperty.isSupportsInsertInto()) { throw new VerifyException("Inserting into non-file storage is not supported."); @@ -476,7 +476,7 @@ public class QueryExecutor { String storeType = PlannerUtil.getStoreType(plan); if (storeType != null) { - StorageManager sm = TableSpaceManager.getStorageManager(planner.getConf(), storeType); + Tablespace sm = TableSpaceManager.getStorageManager(planner.getConf(), storeType); StorageProperty storageProperty = sm.getStorageProperty(); if (storageProperty.isSortedInsert()) { String tableName = PlannerUtil.getStoreTableName(plan); http://git-wip-us.apache.org/repos/asf/tajo/blob/d261234f/tajo-core/src/main/java/org/apache/tajo/querymaster/QueryMasterTask.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/querymaster/QueryMasterTask.java b/tajo-core/src/main/java/org/apache/tajo/querymaster/QueryMasterTask.java index d77001c..a48f0a0 100644 --- a/tajo-core/src/main/java/org/apache/tajo/querymaster/QueryMasterTask.java +++ b/tajo-core/src/main/java/org/apache/tajo/querymaster/QueryMasterTask.java @@ -55,7 +55,7 @@ import org.apache.tajo.plan.rewrite.LogicalPlanRewriteRule; import org.apache.tajo.plan.util.PlannerUtil; import org.apache.tajo.plan.verifier.VerifyException; import org.apache.tajo.session.Session; -import org.apache.tajo.storage.StorageManager; +import org.apache.tajo.storage.Tablespace; import org.apache.tajo.storage.StorageProperty; import org.apache.tajo.storage.StorageUtil; import org.apache.tajo.storage.TableSpaceManager; @@ -308,7 +308,7 @@ public class QueryMasterTask extends CompositeService { } public synchronized void startQuery() { - StorageManager sm = null; + Tablespace sm = null; LogicalPlan plan = null; try { if (query != null) { http://git-wip-us.apache.org/repos/asf/tajo/blob/d261234f/tajo-core/src/main/java/org/apache/tajo/querymaster/Repartitioner.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/querymaster/Repartitioner.java b/tajo-core/src/main/java/org/apache/tajo/querymaster/Repartitioner.java index b43b506..0e1b501 100644 --- a/tajo-core/src/main/java/org/apache/tajo/querymaster/Repartitioner.java +++ b/tajo-core/src/main/java/org/apache/tajo/querymaster/Repartitioner.java @@ -91,8 +91,8 @@ public class Repartitioner { for (int i = 0; i < scans.length; i++) { TableDesc tableDesc = masterContext.getTableDescMap().get(scans[i].getCanonicalName()); if (tableDesc == null) { // if it is a real table stored on storage - FileStorageManager storageManager = - (FileStorageManager) TableSpaceManager.getFileStorageManager(stage.getContext().getConf()); + FileTablespace storageManager = + (FileTablespace) TableSpaceManager.getFileStorageManager(stage.getContext().getConf()); tablePath = storageManager.getTablePath(scans[i].getTableName()); if (execBlock.getUnionScanMap() != null && !execBlock.getUnionScanMap().isEmpty()) { @@ -112,13 +112,13 @@ public class Repartitioner { throw new IOException(e); } - StorageManager storageManager = + Tablespace tablespace = TableSpaceManager.getStorageManager(stage.getContext().getConf(), tableDesc.getMeta().getStoreType()); - // if table has no data, storageManager will return empty FileFragment. + // if table has no data, tablespace will return empty FileFragment. // So, we need to handle FileFragment by its size. // If we don't check its size, it can cause IndexOutOfBoundsException. - List<Fragment> fileFragments = storageManager.getSplits(scans[i].getCanonicalName(), tableDesc); + List<Fragment> fileFragments = tablespace.getSplits(scans[i].getCanonicalName(), tableDesc); if (fileFragments.size() > 0) { fragments[i] = fileFragments.get(0); } else { @@ -407,8 +407,8 @@ public class Repartitioner { Path[] partitionScanPaths = null; TableDesc tableDesc = masterContext.getTableDescMap().get(eachScan.getCanonicalName()); if (eachScan.getType() == NodeType.PARTITIONS_SCAN) { - FileStorageManager storageManager = - (FileStorageManager) TableSpaceManager.getFileStorageManager(stage.getContext().getConf()); + FileTablespace storageManager = + (FileTablespace) TableSpaceManager.getFileStorageManager(stage.getContext().getConf()); PartitionedTableScanNode partitionScan = (PartitionedTableScanNode)eachScan; partitionScanPaths = partitionScan.getInputPaths(); @@ -416,9 +416,9 @@ public class Repartitioner { getFragmentsFromPartitionedTable(storageManager, eachScan, tableDesc); partitionScan.setInputPaths(partitionScanPaths); } else { - StorageManager storageManager = TableSpaceManager.getStorageManager(stage.getContext().getConf(), + Tablespace tablespace = TableSpaceManager.getStorageManager(stage.getContext().getConf(), tableDesc.getMeta().getStoreType()); - Collection<Fragment> scanFragments = storageManager.getSplits(eachScan.getCanonicalName(), + Collection<Fragment> scanFragments = tablespace.getSplits(eachScan.getCanonicalName(), tableDesc, eachScan); if (scanFragments != null) { rightFragments.addAll(scanFragments); @@ -488,7 +488,7 @@ public class Repartitioner { /** * It creates a number of fragments for all partitions. */ - public static List<Fragment> getFragmentsFromPartitionedTable(FileStorageManager sm, + public static List<Fragment> getFragmentsFromPartitionedTable(FileTablespace sm, ScanNode scan, TableDesc table) throws IOException { if (!(scan instanceof PartitionedTableScanNode)) { @@ -535,14 +535,14 @@ public class Repartitioner { PartitionedTableScanNode partitionScan = (PartitionedTableScanNode)scan; partitionScanPaths = partitionScan.getInputPaths(); // set null to inputPaths in getFragmentsFromPartitionedTable() - FileStorageManager storageManager = - (FileStorageManager) TableSpaceManager.getFileStorageManager(stage.getContext().getConf()); + FileTablespace storageManager = + (FileTablespace) TableSpaceManager.getFileStorageManager(stage.getContext().getConf()); scanFragments = getFragmentsFromPartitionedTable(storageManager, scan, desc); } else { - StorageManager storageManager = + Tablespace tablespace = TableSpaceManager.getStorageManager(stage.getContext().getConf(), desc.getMeta().getStoreType()); - scanFragments = storageManager.getSplits(scan.getCanonicalName(), desc, scan); + scanFragments = tablespace.getSplits(scan.getCanonicalName(), desc, scan); } if (scanFragments != null) { @@ -645,7 +645,7 @@ public class Repartitioner { ExecutionBlock execBlock = stage.getBlock(); ScanNode scan = execBlock.getScanNodes()[0]; Path tablePath; - tablePath = ((FileStorageManager) TableSpaceManager.getFileStorageManager(stage.getContext().getConf())) + tablePath = ((FileTablespace) TableSpaceManager.getFileStorageManager(stage.getContext().getConf())) .getTablePath(scan.getTableName()); ExecutionBlock sampleChildBlock = masterPlan.getChild(stage.getId(), 0); @@ -811,7 +811,7 @@ public class Repartitioner { ExecutionBlock execBlock = stage.getBlock(); ScanNode scan = execBlock.getScanNodes()[0]; Path tablePath; - tablePath = ((FileStorageManager) TableSpaceManager.getFileStorageManager(stage.getContext().getConf())) + tablePath = ((FileTablespace) TableSpaceManager.getFileStorageManager(stage.getContext().getConf())) .getTablePath(scan.getTableName()); Fragment frag = new FileFragment(scan.getCanonicalName(), tablePath, 0, 0, new String[]{UNKNOWN_HOST}); http://git-wip-us.apache.org/repos/asf/tajo/blob/d261234f/tajo-core/src/main/java/org/apache/tajo/querymaster/Stage.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/querymaster/Stage.java b/tajo-core/src/main/java/org/apache/tajo/querymaster/Stage.java index 548ea26..160bfaa 100644 --- a/tajo-core/src/main/java/org/apache/tajo/querymaster/Stage.java +++ b/tajo-core/src/main/java/org/apache/tajo/querymaster/Stage.java @@ -59,8 +59,8 @@ import org.apache.tajo.master.event.TaskAttemptToSchedulerEvent.TaskAttemptSched import org.apache.tajo.plan.logical.*; import org.apache.tajo.plan.util.PlannerUtil; import org.apache.tajo.querymaster.Task.IntermediateEntry; -import org.apache.tajo.storage.FileStorageManager; -import org.apache.tajo.storage.StorageManager; +import org.apache.tajo.storage.FileTablespace; +import org.apache.tajo.storage.Tablespace; import org.apache.tajo.storage.TableSpaceManager; import org.apache.tajo.storage.fragment.Fragment; import org.apache.tajo.unit.StorageUnit; @@ -1089,13 +1089,13 @@ public class Stage implements EventHandler<StageEvent> { // span a number of blocks or possibly consists of a number of files. if (scan.getType() == NodeType.PARTITIONS_SCAN) { // After calling this method, partition paths are removed from the physical plan. - FileStorageManager storageManager = - (FileStorageManager) TableSpaceManager.getFileStorageManager(stage.getContext().getConf()); + FileTablespace storageManager = + (FileTablespace) TableSpaceManager.getFileStorageManager(stage.getContext().getConf()); fragments = Repartitioner.getFragmentsFromPartitionedTable(storageManager, scan, table); } else { - StorageManager storageManager = + Tablespace tablespace = TableSpaceManager.getStorageManager(stage.getContext().getConf(), meta.getStoreType()); - fragments = storageManager.getSplits(scan.getCanonicalName(), table, scan); + fragments = tablespace.getSplits(scan.getCanonicalName(), table, scan); } Stage.scheduleFragments(stage, fragments); http://git-wip-us.apache.org/repos/asf/tajo/blob/d261234f/tajo-core/src/main/java/org/apache/tajo/worker/TajoQueryEngine.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/worker/TajoQueryEngine.java b/tajo-core/src/main/java/org/apache/tajo/worker/TajoQueryEngine.java index 925c047..b47bf2f 100644 --- a/tajo-core/src/main/java/org/apache/tajo/worker/TajoQueryEngine.java +++ b/tajo-core/src/main/java/org/apache/tajo/worker/TajoQueryEngine.java @@ -24,7 +24,6 @@ import org.apache.tajo.engine.planner.PhysicalPlannerImpl; import org.apache.tajo.plan.logical.LogicalNode; import org.apache.tajo.engine.planner.physical.PhysicalExec; import org.apache.tajo.exception.InternalException; -import org.apache.tajo.storage.StorageManager; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/tajo/blob/d261234f/tajo-core/src/main/java/org/apache/tajo/worker/Task.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/worker/Task.java b/tajo-core/src/main/java/org/apache/tajo/worker/Task.java index 01f56b8..4716dcc 100644 --- a/tajo-core/src/main/java/org/apache/tajo/worker/Task.java +++ b/tajo-core/src/main/java/org/apache/tajo/worker/Task.java @@ -161,7 +161,7 @@ public class Task { this.sortComp = new BaseTupleComparator(finalSchema, sortNode.getSortKeys()); } } else { - Path outFilePath = ((FileStorageManager) TableSpaceManager.getFileStorageManager(systemConf)) + Path outFilePath = ((FileTablespace) TableSpaceManager.getFileStorageManager(systemConf)) .getAppenderFilePath(taskId, queryContext.getStagingDir()); LOG.info("Output File Path: " + outFilePath); context.setOutputPath(outFilePath); http://git-wip-us.apache.org/repos/asf/tajo/blob/d261234f/tajo-core/src/test/java/org/apache/tajo/BackendTestingUtil.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/BackendTestingUtil.java b/tajo-core/src/test/java/org/apache/tajo/BackendTestingUtil.java index a1c6011..b5be9d0 100644 --- a/tajo-core/src/test/java/org/apache/tajo/BackendTestingUtil.java +++ b/tajo-core/src/test/java/org/apache/tajo/BackendTestingUtil.java @@ -46,7 +46,7 @@ public class BackendTestingUtil { public static void writeTmpTable(TajoConf conf, Path tablePath) throws IOException { - FileStorageManager sm = (FileStorageManager) TableSpaceManager.getFileStorageManager(conf); + FileTablespace sm = (FileTablespace) TableSpaceManager.getFileStorageManager(conf); Appender appender; Path filePath = new Path(tablePath, "table.csv"); http://git-wip-us.apache.org/repos/asf/tajo/blob/d261234f/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBNLJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBNLJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBNLJoinExec.java index 104e09b..ae28233 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBNLJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBNLJoinExec.java @@ -86,7 +86,7 @@ public class TestBNLJoinExec { TableMeta employeeMeta = CatalogUtil.newTableMeta("CSV"); Path employeePath = new Path(testDir, "employee.csv"); - Appender appender = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)) + Appender appender = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) .getAppender(employeeMeta, schema, employeePath); appender.init(); Tuple tuple = new VTuple(schema.size()); @@ -108,7 +108,7 @@ public class TestBNLJoinExec { peopleSchema.addColumn("age", Type.INT4); TableMeta peopleMeta = CatalogUtil.newTableMeta("CSV"); Path peoplePath = new Path(testDir, "people.csv"); - appender = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)) + appender = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) .getAppender(peopleMeta, peopleSchema, peoplePath); appender.init(); tuple = new VTuple(peopleSchema.size()); @@ -149,10 +149,10 @@ public class TestBNLJoinExec { Enforcer enforcer = new Enforcer(); enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.BLOCK_NESTED_LOOP_JOIN); - FileFragment[] empFrags = FileStorageManager.splitNG(conf, "default.e", employee.getMeta(), + FileFragment[] empFrags = FileTablespace.splitNG(conf, "default.e", employee.getMeta(), new Path(employee.getPath()), Integer.MAX_VALUE); - FileFragment[] peopleFrags = FileStorageManager.splitNG(conf, "default.p", people.getMeta(), + FileFragment[] peopleFrags = FileTablespace.splitNG(conf, "default.p", people.getMeta(), new Path(people.getPath()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(empFrags, peopleFrags); @@ -182,9 +182,9 @@ public class TestBNLJoinExec { LogicalNode plan = planner.createPlan(LocalTajoTestingUtility.createDummyContext(conf), context).getRootBlock().getRoot(); - FileFragment[] empFrags = FileStorageManager.splitNG(conf, "default.e", employee.getMeta(), + FileFragment[] empFrags = FileTablespace.splitNG(conf, "default.e", employee.getMeta(), new Path(employee.getPath()), Integer.MAX_VALUE); - FileFragment[] peopleFrags = FileStorageManager.splitNG(conf, "default.p", people.getMeta(), + FileFragment[] peopleFrags = FileTablespace.splitNG(conf, "default.p", people.getMeta(), new Path(people.getPath()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(empFrags, peopleFrags); http://git-wip-us.apache.org/repos/asf/tajo/blob/d261234f/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBSTIndexExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBSTIndexExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBSTIndexExec.java index a8597e9..62144d2 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBSTIndexExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBSTIndexExec.java @@ -65,7 +65,7 @@ public class TestBSTIndexExec { private SQLAnalyzer analyzer; private LogicalPlanner planner; private LogicalOptimizer optimizer; - private FileStorageManager sm; + private FileTablespace sm; private Schema idxSchema; private BaseTupleComparator comp; private BSTIndex.BSTIndexWriter writer; @@ -90,7 +90,7 @@ public class TestBSTIndexExec { Path workDir = CommonTestingUtil.getTestDir(); catalog.createTablespace(DEFAULT_TABLESPACE_NAME, workDir.toUri().toString()); catalog.createDatabase(TajoConstants.DEFAULT_DATABASE_NAME, DEFAULT_TABLESPACE_NAME); - sm = (FileStorageManager) TableSpaceManager.getFileStorageManager(conf); + sm = (FileTablespace) TableSpaceManager.getFileStorageManager(conf); idxPath = new Path(workDir, "test.idx"); @@ -162,7 +162,7 @@ public class TestBSTIndexExec { this.rndKey = rnd.nextInt(250); final String QUERY = "select * from employee where managerId = " + rndKey; - FileFragment[] frags = FileStorageManager.splitNG(conf, "default.employee", meta, tablePath, Integer.MAX_VALUE); + FileFragment[] frags = FileTablespace.splitNG(conf, "default.employee", meta, tablePath, Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testEqual"); TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newTaskAttemptId(), new FileFragment[] { frags[0] }, workDir); http://git-wip-us.apache.org/repos/asf/tajo/blob/d261234f/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java index 221a622..8aea2b6 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java @@ -82,7 +82,7 @@ public class TestExternalSortExec { TableMeta employeeMeta = CatalogUtil.newTableMeta("CSV"); Path employeePath = new Path(testDir, "employee.csv"); - Appender appender = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)) + Appender appender = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) .getAppender(employeeMeta, schema, employeePath); appender.enableStats(); appender.init(); @@ -119,7 +119,7 @@ public class TestExternalSortExec { @Test public final void testNext() throws IOException, PlanningException { - FileFragment[] frags = FileStorageManager.splitNG(conf, "default.employee", employee.getMeta(), + FileFragment[] frags = FileTablespace.splitNG(conf, "default.employee", employee.getMeta(), new Path(employee.getPath()), Integer.MAX_VALUE); Path workDir = new Path(testDir, TestExternalSortExec.class.getName()); TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), http://git-wip-us.apache.org/repos/asf/tajo/blob/d261234f/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterHashJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterHashJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterHashJoinExec.java index 501557f..75ae439 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterHashJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterHashJoinExec.java @@ -104,7 +104,7 @@ public class TestFullOuterHashJoinExec { TableMeta dep3Meta = CatalogUtil.newTableMeta("CSV"); Path dep3Path = new Path(testDir, "dep3.csv"); - Appender appender1 = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)) + Appender appender1 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) .getAppender(dep3Meta, dep3Schema, dep3Path); appender1.init(); Tuple tuple = new VTuple(dep3Schema.size()); @@ -134,7 +134,7 @@ public class TestFullOuterHashJoinExec { TableMeta job3Meta = CatalogUtil.newTableMeta("CSV"); Path job3Path = new Path(testDir, "job3.csv"); - Appender appender2 = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)) + Appender appender2 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) .getAppender(job3Meta, job3Schema, job3Path); appender2.init(); Tuple tuple2 = new VTuple(job3Schema.size()); @@ -174,7 +174,7 @@ public class TestFullOuterHashJoinExec { TableMeta emp3Meta = CatalogUtil.newTableMeta("CSV"); Path emp3Path = new Path(testDir, "emp3.csv"); - Appender appender3 = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)) + Appender appender3 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) .getAppender(emp3Meta, emp3Schema, emp3Path); appender3.init(); Tuple tuple3 = new VTuple(emp3Schema.size()); @@ -227,7 +227,7 @@ public class TestFullOuterHashJoinExec { TableMeta phone3Meta = CatalogUtil.newTableMeta("CSV"); Path phone3Path = new Path(testDir, "phone3.csv"); - Appender appender5 = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)) + Appender appender5 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) .getAppender(phone3Meta, phone3Schema, phone3Path); appender5.init(); @@ -266,9 +266,9 @@ public class TestFullOuterHashJoinExec { Enforcer enforcer = new Enforcer(); enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.IN_MEMORY_HASH_JOIN); - FileFragment[] dep3Frags = FileStorageManager.splitNG(conf, DEP3_NAME, dep3.getMeta(), new Path(dep3.getPath()), + FileFragment[] dep3Frags = FileTablespace.splitNG(conf, DEP3_NAME, dep3.getMeta(), new Path(dep3.getPath()), Integer.MAX_VALUE); - FileFragment[] emp3Frags = FileStorageManager.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), + FileFragment[] emp3Frags = FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(dep3Frags, emp3Frags); @@ -305,9 +305,9 @@ public class TestFullOuterHashJoinExec { Enforcer enforcer = new Enforcer(); enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.IN_MEMORY_HASH_JOIN); - FileFragment[] job3Frags = FileStorageManager.splitNG(conf, JOB3_NAME, job3.getMeta(), new Path(job3.getPath()), + FileFragment[] job3Frags = FileTablespace.splitNG(conf, JOB3_NAME, job3.getMeta(), new Path(job3.getPath()), Integer.MAX_VALUE); - FileFragment[] emp3Frags = FileStorageManager.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), + FileFragment[] emp3Frags = FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(job3Frags, emp3Frags); @@ -343,9 +343,9 @@ public class TestFullOuterHashJoinExec { Enforcer enforcer = new Enforcer(); enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.IN_MEMORY_HASH_JOIN); - FileFragment[] emp3Frags = FileStorageManager.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), + FileFragment[] emp3Frags = FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), Integer.MAX_VALUE); - FileFragment[] job3Frags = FileStorageManager.splitNG(conf, JOB3_NAME, job3.getMeta(), new Path(job3.getPath()), + FileFragment[] job3Frags = FileTablespace.splitNG(conf, JOB3_NAME, job3.getMeta(), new Path(job3.getPath()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(emp3Frags, job3Frags); @@ -382,9 +382,9 @@ public class TestFullOuterHashJoinExec { Enforcer enforcer = new Enforcer(); enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.IN_MEMORY_HASH_JOIN); - FileFragment[] emp3Frags = FileStorageManager.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), + FileFragment[] emp3Frags = FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), Integer.MAX_VALUE); - FileFragment[] phone3Frags = FileStorageManager.splitNG(conf, PHONE3_NAME, phone3.getMeta(), new Path(phone3.getPath()), + FileFragment[] phone3Frags = FileTablespace.splitNG(conf, PHONE3_NAME, phone3.getMeta(), new Path(phone3.getPath()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(emp3Frags, phone3Frags); http://git-wip-us.apache.org/repos/asf/tajo/blob/d261234f/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterMergeJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterMergeJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterMergeJoinExec.java index 4b8e1fa..6804746 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterMergeJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterMergeJoinExec.java @@ -109,7 +109,7 @@ public class TestFullOuterMergeJoinExec { TableMeta dep3Meta = CatalogUtil.newTableMeta("CSV"); Path dep3Path = new Path(testDir, "dep3.csv"); - Appender appender1 = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)) + Appender appender1 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) .getAppender(dep3Meta, dep3Schema, dep3Path); appender1.init(); Tuple tuple = new VTuple(dep3Schema.size()); @@ -148,7 +148,7 @@ public class TestFullOuterMergeJoinExec { TableMeta dep4Meta = CatalogUtil.newTableMeta("CSV"); Path dep4Path = new Path(testDir, "dep4.csv"); - Appender appender4 = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)) + Appender appender4 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) .getAppender(dep4Meta, dep4Schema, dep4Path); appender4.init(); Tuple tuple4 = new VTuple(dep4Schema.size()); @@ -180,7 +180,7 @@ public class TestFullOuterMergeJoinExec { TableMeta job3Meta = CatalogUtil.newTableMeta("CSV"); Path job3Path = new Path(testDir, "job3.csv"); - Appender appender2 = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)) + Appender appender2 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) .getAppender(job3Meta, job3Schema, job3Path); appender2.init(); Tuple tuple2 = new VTuple(job3Schema.size()); @@ -220,7 +220,7 @@ public class TestFullOuterMergeJoinExec { TableMeta emp3Meta = CatalogUtil.newTableMeta("CSV"); Path emp3Path = new Path(testDir, "emp3.csv"); - Appender appender3 = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)) + Appender appender3 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) .getAppender(emp3Meta, emp3Schema, emp3Path); appender3.init(); Tuple tuple3 = new VTuple(emp3Schema.size()); @@ -273,7 +273,7 @@ public class TestFullOuterMergeJoinExec { TableMeta phone3Meta = CatalogUtil.newTableMeta("CSV"); Path phone3Path = new Path(testDir, "phone3.csv"); - Appender appender5 = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)) + Appender appender5 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) .getAppender(phone3Meta, phone3Schema, phone3Path); appender5.init(); appender5.flush(); @@ -316,9 +316,9 @@ public class TestFullOuterMergeJoinExec { enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.MERGE_JOIN); FileFragment[] emp3Frags = - FileStorageManager.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), Integer.MAX_VALUE); + FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), Integer.MAX_VALUE); FileFragment[] dep3Frags = - FileStorageManager.splitNG(conf, DEP3_NAME, dep3.getMeta(), new Path(dep3.getPath()), Integer.MAX_VALUE); + FileTablespace.splitNG(conf, DEP3_NAME, dep3.getMeta(), new Path(dep3.getPath()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(emp3Frags, dep3Frags); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testFullOuterMergeJoin0"); @@ -353,9 +353,9 @@ public class TestFullOuterMergeJoinExec { enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.MERGE_JOIN); FileFragment[] emp3Frags = - FileStorageManager.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), Integer.MAX_VALUE); + FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), Integer.MAX_VALUE); FileFragment[] job3Frags = - FileStorageManager.splitNG(conf, JOB3_NAME, job3.getMeta(), new Path(job3.getPath()), Integer.MAX_VALUE); + FileTablespace.splitNG(conf, JOB3_NAME, job3.getMeta(), new Path(job3.getPath()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(job3Frags, emp3Frags); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testFullOuterMergeJoin1"); @@ -390,9 +390,9 @@ public class TestFullOuterMergeJoinExec { enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.MERGE_JOIN); FileFragment[] emp3Frags = - FileStorageManager.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), Integer.MAX_VALUE); + FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), Integer.MAX_VALUE); FileFragment[] job3Frags = - FileStorageManager.splitNG(conf, JOB3_NAME, job3.getMeta(), new Path(job3.getPath()), Integer.MAX_VALUE); + FileTablespace.splitNG(conf, JOB3_NAME, job3.getMeta(), new Path(job3.getPath()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(job3Frags, emp3Frags); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testFullOuterMergeJoin2"); @@ -428,9 +428,9 @@ public class TestFullOuterMergeJoinExec { enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.MERGE_JOIN); FileFragment[] emp3Frags = - FileStorageManager.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), Integer.MAX_VALUE); + FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), Integer.MAX_VALUE); FileFragment[] dep4Frags = - FileStorageManager.splitNG(conf, DEP4_NAME, dep4.getMeta(), new Path(dep4.getPath()), Integer.MAX_VALUE); + FileTablespace.splitNG(conf, DEP4_NAME, dep4.getMeta(), new Path(dep4.getPath()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(emp3Frags, dep4Frags); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testFullOuterMergeJoin3"); @@ -468,10 +468,10 @@ public class TestFullOuterMergeJoinExec { enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.MERGE_JOIN); FileFragment[] emp3Frags = - FileStorageManager.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), Integer.MAX_VALUE); + FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), Integer.MAX_VALUE); FileFragment[] phone3Frags = - FileStorageManager.splitNG(conf, PHONE3_NAME, phone3.getMeta(), new Path(phone3.getPath()), - Integer.MAX_VALUE); + FileTablespace.splitNG(conf, PHONE3_NAME, phone3.getMeta(), new Path(phone3.getPath()), + Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(emp3Frags, phone3Frags); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testFullOuterMergeJoin4"); @@ -507,10 +507,10 @@ public class TestFullOuterMergeJoinExec { enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.MERGE_JOIN); FileFragment[] emp3Frags = - FileStorageManager.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), Integer.MAX_VALUE); + FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), Integer.MAX_VALUE); FileFragment[] phone3Frags = - FileStorageManager.splitNG(conf, PHONE3_NAME, phone3.getMeta(), new Path(phone3.getPath()), - Integer.MAX_VALUE); + FileTablespace.splitNG(conf, PHONE3_NAME, phone3.getMeta(), new Path(phone3.getPath()), + Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(phone3Frags,emp3Frags); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testFullOuterMergeJoin5"); http://git-wip-us.apache.org/repos/asf/tajo/blob/d261234f/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashAntiJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashAntiJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashAntiJoinExec.java index 624aae0..b8f93e2 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashAntiJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashAntiJoinExec.java @@ -83,7 +83,7 @@ public class TestHashAntiJoinExec { TableMeta employeeMeta = CatalogUtil.newTableMeta("CSV"); Path employeePath = new Path(testDir, "employee.csv"); - Appender appender = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)) + Appender appender = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) .getAppender(employeeMeta, employeeSchema, employeePath); appender.init(); Tuple tuple = new VTuple(employeeSchema.size()); @@ -109,7 +109,7 @@ public class TestHashAntiJoinExec { peopleSchema.addColumn("age", Type.INT4); TableMeta peopleMeta = CatalogUtil.newTableMeta("CSV"); Path peoplePath = new Path(testDir, "people.csv"); - appender = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)) + appender = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) .getAppender(peopleMeta, peopleSchema, peoplePath); appender.init(); tuple = new VTuple(peopleSchema.size()); @@ -148,9 +148,9 @@ public class TestHashAntiJoinExec { @Test public final void testHashAntiJoin() throws IOException, PlanningException { - FileFragment[] empFrags = FileStorageManager.splitNG(conf, "default.e", employee.getMeta(), + FileFragment[] empFrags = FileTablespace.splitNG(conf, "default.e", employee.getMeta(), new Path(employee.getPath()), Integer.MAX_VALUE); - FileFragment[] peopleFrags = FileStorageManager.splitNG(conf, "default.p", people.getMeta(), + FileFragment[] peopleFrags = FileTablespace.splitNG(conf, "default.p", people.getMeta(), new Path(people.getPath()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(empFrags, peopleFrags); http://git-wip-us.apache.org/repos/asf/tajo/blob/d261234f/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashJoinExec.java index 36d02b1..acaf10c 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashJoinExec.java @@ -85,7 +85,7 @@ public class TestHashJoinExec { TableMeta employeeMeta = CatalogUtil.newTableMeta("CSV"); Path employeePath = new Path(testDir, "employee.csv"); - Appender appender = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)) + Appender appender = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) .getAppender(employeeMeta, employeeSchema, employeePath); appender.init(); Tuple tuple = new VTuple(employeeSchema.size()); @@ -108,7 +108,7 @@ public class TestHashJoinExec { peopleSchema.addColumn("age", Type.INT4); TableMeta peopleMeta = CatalogUtil.newTableMeta("CSV"); Path peoplePath = new Path(testDir, "people.csv"); - appender = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)) + appender = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) .getAppender(peopleMeta, peopleSchema, peoplePath); appender.init(); tuple = new VTuple(peopleSchema.size()); @@ -150,9 +150,9 @@ public class TestHashJoinExec { Enforcer enforcer = new Enforcer(); enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.IN_MEMORY_HASH_JOIN); - FileFragment[] empFrags = FileStorageManager.splitNG(conf, "default.e", employee.getMeta(), + FileFragment[] empFrags = FileTablespace.splitNG(conf, "default.e", employee.getMeta(), new Path(employee.getPath()), Integer.MAX_VALUE); - FileFragment[] peopleFrags = FileStorageManager.splitNG(conf, "default.p", people.getMeta(), + FileFragment[] peopleFrags = FileTablespace.splitNG(conf, "default.p", people.getMeta(), new Path(people.getPath()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(empFrags, peopleFrags); @@ -193,9 +193,9 @@ public class TestHashJoinExec { Enforcer enforcer = new Enforcer(); enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.IN_MEMORY_HASH_JOIN); - FileFragment[] peopleFrags = FileStorageManager.splitNG(conf, "default.p", people.getMeta(), + FileFragment[] peopleFrags = FileTablespace.splitNG(conf, "default.p", people.getMeta(), new Path(people.getPath()), Integer.MAX_VALUE); - FileFragment[] empFrags = FileStorageManager.splitNG(conf, "default.e", employee.getMeta(), + FileFragment[] empFrags = FileTablespace.splitNG(conf, "default.e", employee.getMeta(), new Path(employee.getPath()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(empFrags, peopleFrags); http://git-wip-us.apache.org/repos/asf/tajo/blob/d261234f/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashSemiJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashSemiJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashSemiJoinExec.java index 1a0151a..b87799d 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashSemiJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashSemiJoinExec.java @@ -84,7 +84,7 @@ public class TestHashSemiJoinExec { TableMeta employeeMeta = CatalogUtil.newTableMeta("CSV"); Path employeePath = new Path(testDir, "employee.csv"); - Appender appender = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)) + Appender appender = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) .getAppender(employeeMeta, employeeSchema, employeePath); appender.init(); Tuple tuple = new VTuple(employeeSchema.size()); @@ -110,7 +110,7 @@ public class TestHashSemiJoinExec { peopleSchema.addColumn("age", Type.INT4); TableMeta peopleMeta = CatalogUtil.newTableMeta("CSV"); Path peoplePath = new Path(testDir, "people.csv"); - appender = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)) + appender = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) .getAppender(peopleMeta, peopleSchema, peoplePath); appender.init(); tuple = new VTuple(peopleSchema.size()); @@ -153,9 +153,9 @@ public class TestHashSemiJoinExec { @Test public final void testHashSemiJoin() throws IOException, PlanningException { - FileFragment[] empFrags = FileStorageManager.splitNG(conf, "default.e", employee.getMeta(), + FileFragment[] empFrags = FileTablespace.splitNG(conf, "default.e", employee.getMeta(), new Path(employee.getPath()), Integer.MAX_VALUE); - FileFragment[] peopleFrags = FileStorageManager.splitNG(conf, "default.p", people.getMeta(), + FileFragment[] peopleFrags = FileTablespace.splitNG(conf, "default.p", people.getMeta(), new Path(people.getPath()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(empFrags, peopleFrags); http://git-wip-us.apache.org/repos/asf/tajo/blob/d261234f/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterHashJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterHashJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterHashJoinExec.java index 127d309..4a1ca32 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterHashJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterHashJoinExec.java @@ -105,7 +105,7 @@ public class TestLeftOuterHashJoinExec { TableMeta dep3Meta = CatalogUtil.newTableMeta("CSV"); Path dep3Path = new Path(testDir, "dep3.csv"); - Appender appender1 = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)) + Appender appender1 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) .getAppender(dep3Meta, dep3Schema, dep3Path); appender1.init(); Tuple tuple = new VTuple(dep3Schema.size()); @@ -135,7 +135,7 @@ public class TestLeftOuterHashJoinExec { TableMeta job3Meta = CatalogUtil.newTableMeta("CSV"); Path job3Path = new Path(testDir, "job3.csv"); - Appender appender2 = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)) + Appender appender2 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) .getAppender(job3Meta, job3Schema, job3Path); appender2.init(); Tuple tuple2 = new VTuple(job3Schema.size()); @@ -175,7 +175,7 @@ public class TestLeftOuterHashJoinExec { TableMeta emp3Meta = CatalogUtil.newTableMeta("CSV"); Path emp3Path = new Path(testDir, "emp3.csv"); - Appender appender3 = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)) + Appender appender3 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) .getAppender(emp3Meta, emp3Schema, emp3Path); appender3.init(); Tuple tuple3 = new VTuple(emp3Schema.size()); @@ -228,7 +228,7 @@ public class TestLeftOuterHashJoinExec { TableMeta phone3Meta = CatalogUtil.newTableMeta("CSV"); Path phone3Path = new Path(testDir, "phone3.csv"); - Appender appender5 = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)) + Appender appender5 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) .getAppender(phone3Meta, phone3Schema, phone3Path); appender5.init(); @@ -270,9 +270,9 @@ public class TestLeftOuterHashJoinExec { Enforcer enforcer = new Enforcer(); enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.IN_MEMORY_HASH_JOIN); - FileFragment[] dep3Frags = FileStorageManager.splitNG(conf, DEP3_NAME, dep3.getMeta(), + FileFragment[] dep3Frags = FileTablespace.splitNG(conf, DEP3_NAME, dep3.getMeta(), new Path(dep3.getPath()), Integer.MAX_VALUE); - FileFragment[] emp3Frags = FileStorageManager.splitNG(conf, EMP3_NAME, emp3.getMeta(), + FileFragment[] emp3Frags = FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(dep3Frags, emp3Frags); @@ -300,9 +300,9 @@ public class TestLeftOuterHashJoinExec { @Test public final void testLeftOuter_HashJoinExec1() throws IOException, PlanningException { - FileFragment[] job3Frags = FileStorageManager.splitNG(conf, JOB3_NAME, job3.getMeta(), + FileFragment[] job3Frags = FileTablespace.splitNG(conf, JOB3_NAME, job3.getMeta(), new Path(job3.getPath()), Integer.MAX_VALUE); - FileFragment[] emp3Frags = FileStorageManager.splitNG(conf, EMP3_NAME, emp3.getMeta(), + FileFragment[] emp3Frags = FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(job3Frags, emp3Frags); @@ -334,9 +334,9 @@ public class TestLeftOuterHashJoinExec { @Test public final void testLeftOuter_HashJoinExec2() throws IOException, PlanningException { - FileFragment[] emp3Frags = FileStorageManager.splitNG(conf, EMP3_NAME, emp3.getMeta(), + FileFragment[] emp3Frags = FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), Integer.MAX_VALUE); - FileFragment[] job3Frags = FileStorageManager.splitNG(conf, JOB3_NAME, job3.getMeta(), + FileFragment[] job3Frags = FileTablespace.splitNG(conf, JOB3_NAME, job3.getMeta(), new Path(job3.getPath()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(emp3Frags, job3Frags); @@ -370,9 +370,9 @@ public class TestLeftOuterHashJoinExec { @Test public final void testLeftOuter_HashJoinExec3() throws IOException, PlanningException { - FileFragment[] emp3Frags = FileStorageManager.splitNG(conf, EMP3_NAME, emp3.getMeta(), + FileFragment[] emp3Frags = FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), Integer.MAX_VALUE); - FileFragment[] phone3Frags = FileStorageManager.splitNG(conf, PHONE3_NAME, phone3.getMeta(), + FileFragment[] phone3Frags = FileTablespace.splitNG(conf, PHONE3_NAME, phone3.getMeta(), new Path(phone3.getPath()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(emp3Frags, phone3Frags); @@ -405,9 +405,9 @@ public class TestLeftOuterHashJoinExec { @Test public final void testLeftOuter_HashJoinExec4() throws IOException, PlanningException { - FileFragment[] emp3Frags = FileStorageManager.splitNG(conf, "default.emp3", emp3.getMeta(), + FileFragment[] emp3Frags = FileTablespace.splitNG(conf, "default.emp3", emp3.getMeta(), new Path(emp3.getPath()), Integer.MAX_VALUE); - FileFragment[] phone3Frags = FileStorageManager.splitNG(conf, "default.phone3", phone3.getMeta(), + FileFragment[] phone3Frags = FileTablespace.splitNG(conf, "default.phone3", phone3.getMeta(), new Path(phone3.getPath()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(phone3Frags, emp3Frags); http://git-wip-us.apache.org/repos/asf/tajo/blob/d261234f/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestMergeJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestMergeJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestMergeJoinExec.java index c83d436..5201774 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestMergeJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestMergeJoinExec.java @@ -85,7 +85,7 @@ public class TestMergeJoinExec { TableMeta employeeMeta = CatalogUtil.newTableMeta("CSV"); Path employeePath = new Path(testDir, "employee.csv"); - Appender appender = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)) + Appender appender = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) .getAppender(employeeMeta, employeeSchema, employeePath); appender.init(); Tuple tuple = new VTuple(employeeSchema.size()); @@ -114,7 +114,7 @@ public class TestMergeJoinExec { peopleSchema.addColumn("age", Type.INT4); TableMeta peopleMeta = CatalogUtil.newTableMeta("CSV"); Path peoplePath = new Path(testDir, "people.csv"); - appender = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)) + appender = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) .getAppender(peopleMeta, peopleSchema, peoplePath); appender.init(); tuple = new VTuple(peopleSchema.size()); @@ -162,9 +162,9 @@ public class TestMergeJoinExec { Enforcer enforcer = new Enforcer(); enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.MERGE_JOIN); - FileFragment[] empFrags = FileStorageManager.splitNG(conf, "default.e", employee.getMeta(), new Path(employee.getPath()), + FileFragment[] empFrags = FileTablespace.splitNG(conf, "default.e", employee.getMeta(), new Path(employee.getPath()), Integer.MAX_VALUE); - FileFragment[] peopleFrags = FileStorageManager.splitNG(conf, "default.p", people.getMeta(), new Path(people.getPath()), + FileFragment[] peopleFrags = FileTablespace.splitNG(conf, "default.p", people.getMeta(), new Path(people.getPath()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(empFrags, peopleFrags); http://git-wip-us.apache.org/repos/asf/tajo/blob/d261234f/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestNLJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestNLJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestNLJoinExec.java index ff9fdae..97cc216 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestNLJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestNLJoinExec.java @@ -83,7 +83,7 @@ public class TestNLJoinExec { TableMeta employeeMeta = CatalogUtil.newTableMeta("CSV"); Path employeePath = new Path(testDir, "employee.csv"); - Appender appender = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)) + Appender appender = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) .getAppender(employeeMeta, schema, employeePath); appender.init(); Tuple tuple = new VTuple(schema.size()); @@ -107,7 +107,7 @@ public class TestNLJoinExec { peopleSchema.addColumn("age", Type.INT4); TableMeta peopleMeta = CatalogUtil.newTableMeta("CSV"); Path peoplePath = new Path(testDir, "people.csv"); - appender = ((FileStorageManager) TableSpaceManager.getFileStorageManager(conf)) + appender = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) .getAppender(peopleMeta, peopleSchema, peoplePath); appender.init(); tuple = new VTuple(peopleSchema.size()); @@ -143,9 +143,9 @@ public class TestNLJoinExec { @Test public final void testNLCrossJoin() throws IOException, PlanningException { - FileFragment[] empFrags = FileStorageManager.splitNG(conf, "default.e", employee.getMeta(), + FileFragment[] empFrags = FileTablespace.splitNG(conf, "default.e", employee.getMeta(), new Path(employee.getPath()), Integer.MAX_VALUE); - FileFragment[] peopleFrags = FileStorageManager.splitNG(conf, "default.p", people.getMeta(), + FileFragment[] peopleFrags = FileTablespace.splitNG(conf, "default.p", people.getMeta(), new Path(people.getPath()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(empFrags, peopleFrags); @@ -172,9 +172,9 @@ public class TestNLJoinExec { @Test public final void testNLInnerJoin() throws IOException, PlanningException { - FileFragment[] empFrags = FileStorageManager.splitNG(conf, "default.e", employee.getMeta(), + FileFragment[] empFrags = FileTablespace.splitNG(conf, "default.e", employee.getMeta(), new Path(employee.getPath()), Integer.MAX_VALUE); - FileFragment[] peopleFrags = FileStorageManager.splitNG(conf, "default.p", people.getMeta(), + FileFragment[] peopleFrags = FileTablespace.splitNG(conf, "default.p", people.getMeta(), new Path(people.getPath()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(empFrags, peopleFrags);
