http://git-wip-us.apache.org/repos/asf/tajo/blob/6cc7e5c6/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 0963658..0e2ce42 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,8 +109,7 @@ public class TestFullOuterMergeJoinExec { TableMeta dep3Meta = CatalogUtil.newTableMeta("CSV"); Path dep3Path = new Path(testDir, "dep3.csv"); - Appender appender1 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) - .getAppender(dep3Meta, dep3Schema, dep3Path); + Appender appender1 = ((FileTablespace) TableSpaceManager.getLocalFs()).getAppender(dep3Meta, dep3Schema, dep3Path); appender1.init(); VTuple tuple = new VTuple(dep3Schema.size()); for (int i = 0; i < 10; i++) { @@ -148,8 +147,7 @@ public class TestFullOuterMergeJoinExec { TableMeta dep4Meta = CatalogUtil.newTableMeta("CSV"); Path dep4Path = new Path(testDir, "dep4.csv"); - Appender appender4 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) - .getAppender(dep4Meta, dep4Schema, dep4Path); + Appender appender4 = ((FileTablespace) TableSpaceManager.getLocalFs()).getAppender(dep4Meta, dep4Schema, dep4Path); appender4.init(); VTuple tuple4 = new VTuple(dep4Schema.size()); for (int i = 0; i < 11; i++) { @@ -180,8 +178,7 @@ public class TestFullOuterMergeJoinExec { TableMeta job3Meta = CatalogUtil.newTableMeta("CSV"); Path job3Path = new Path(testDir, "job3.csv"); - Appender appender2 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) - .getAppender(job3Meta, job3Schema, job3Path); + Appender appender2 = ((FileTablespace) TableSpaceManager.getLocalFs()).getAppender(job3Meta, job3Schema, job3Path); appender2.init(); VTuple tuple2 = new VTuple(job3Schema.size()); for (int i = 1; i < 4; i++) { @@ -220,8 +217,7 @@ public class TestFullOuterMergeJoinExec { TableMeta emp3Meta = CatalogUtil.newTableMeta("CSV"); Path emp3Path = new Path(testDir, "emp3.csv"); - Appender appender3 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) - .getAppender(emp3Meta, emp3Schema, emp3Path); + Appender appender3 = ((FileTablespace) TableSpaceManager.getLocalFs()).getAppender(emp3Meta, emp3Schema, emp3Path); appender3.init(); VTuple tuple3 = new VTuple(emp3Schema.size()); @@ -273,7 +269,7 @@ public class TestFullOuterMergeJoinExec { TableMeta phone3Meta = CatalogUtil.newTableMeta("CSV"); Path phone3Path = new Path(testDir, "phone3.csv"); - Appender appender5 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) + Appender appender5 = ((FileTablespace) TableSpaceManager.getLocalFs()) .getAppender(phone3Meta, phone3Schema, phone3Path); appender5.init(); appender5.flush(); @@ -282,7 +278,7 @@ public class TestFullOuterMergeJoinExec { catalog.createTable(phone3); analyzer = new SQLAnalyzer(); - planner = new LogicalPlanner(catalog); + planner = new LogicalPlanner(catalog, TableSpaceManager.getInstance()); defaultContext = LocalTajoTestingUtility.createDummyContext(conf); } @@ -316,9 +312,9 @@ public class TestFullOuterMergeJoinExec { enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.MERGE_JOIN); FileFragment[] emp3Frags = - FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), Integer.MAX_VALUE); + FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getUri()), Integer.MAX_VALUE); FileFragment[] dep3Frags = - FileTablespace.splitNG(conf, DEP3_NAME, dep3.getMeta(), new Path(dep3.getPath()), Integer.MAX_VALUE); + FileTablespace.splitNG(conf, DEP3_NAME, dep3.getMeta(), new Path(dep3.getUri()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(emp3Frags, dep3Frags); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testFullOuterMergeJoin0"); @@ -353,9 +349,9 @@ public class TestFullOuterMergeJoinExec { enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.MERGE_JOIN); FileFragment[] emp3Frags = - FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), Integer.MAX_VALUE); + FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getUri()), Integer.MAX_VALUE); FileFragment[] job3Frags = - FileTablespace.splitNG(conf, JOB3_NAME, job3.getMeta(), new Path(job3.getPath()), Integer.MAX_VALUE); + FileTablespace.splitNG(conf, JOB3_NAME, job3.getMeta(), new Path(job3.getUri()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(job3Frags, emp3Frags); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testFullOuterMergeJoin1"); @@ -390,9 +386,9 @@ public class TestFullOuterMergeJoinExec { enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.MERGE_JOIN); FileFragment[] emp3Frags = - FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), Integer.MAX_VALUE); + FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getUri()), Integer.MAX_VALUE); FileFragment[] job3Frags = - FileTablespace.splitNG(conf, JOB3_NAME, job3.getMeta(), new Path(job3.getPath()), Integer.MAX_VALUE); + FileTablespace.splitNG(conf, JOB3_NAME, job3.getMeta(), new Path(job3.getUri()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(job3Frags, emp3Frags); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testFullOuterMergeJoin2"); @@ -428,9 +424,9 @@ public class TestFullOuterMergeJoinExec { enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.MERGE_JOIN); FileFragment[] emp3Frags = - FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), Integer.MAX_VALUE); + FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getUri()), Integer.MAX_VALUE); FileFragment[] dep4Frags = - FileTablespace.splitNG(conf, DEP4_NAME, dep4.getMeta(), new Path(dep4.getPath()), Integer.MAX_VALUE); + FileTablespace.splitNG(conf, DEP4_NAME, dep4.getMeta(), new Path(dep4.getUri()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(emp3Frags, dep4Frags); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testFullOuterMergeJoin3"); @@ -468,9 +464,9 @@ public class TestFullOuterMergeJoinExec { enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.MERGE_JOIN); FileFragment[] emp3Frags = - FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), Integer.MAX_VALUE); + FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getUri()), Integer.MAX_VALUE); FileFragment[] phone3Frags = - FileTablespace.splitNG(conf, PHONE3_NAME, phone3.getMeta(), new Path(phone3.getPath()), + FileTablespace.splitNG(conf, PHONE3_NAME, phone3.getMeta(), new Path(phone3.getUri()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(emp3Frags, phone3Frags); @@ -507,9 +503,9 @@ public class TestFullOuterMergeJoinExec { enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.MERGE_JOIN); FileFragment[] emp3Frags = - FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), Integer.MAX_VALUE); + FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getUri()), Integer.MAX_VALUE); FileFragment[] phone3Frags = - FileTablespace.splitNG(conf, PHONE3_NAME, phone3.getMeta(), new Path(phone3.getPath()), + FileTablespace.splitNG(conf, PHONE3_NAME, phone3.getMeta(), new Path(phone3.getUri()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(phone3Frags,emp3Frags);
http://git-wip-us.apache.org/repos/asf/tajo/blob/6cc7e5c6/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 f1d4718..d54df1c 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 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) + Appender appender = ((FileTablespace) TableSpaceManager.getLocalFs()) .getAppender(employeeMeta, employeeSchema, employeePath); appender.init(); VTuple 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 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) + appender = ((FileTablespace) TableSpaceManager.getLocalFs()) .getAppender(peopleMeta, peopleSchema, peoplePath); appender.init(); tuple = new VTuple(peopleSchema.size()); @@ -128,7 +128,7 @@ public class TestHashAntiJoinExec { people = CatalogUtil.newTableDesc("default.people", peopleSchema, peopleMeta, peoplePath); catalog.createTable(people); analyzer = new SQLAnalyzer(); - planner = new LogicalPlanner(catalog); + planner = new LogicalPlanner(catalog, TableSpaceManager.getInstance()); optimizer = new LogicalOptimizer(conf); } @@ -149,9 +149,9 @@ public class TestHashAntiJoinExec { @Test public final void testHashAntiJoin() throws IOException, PlanningException { FileFragment[] empFrags = FileTablespace.splitNG(conf, "default.e", employee.getMeta(), - new Path(employee.getPath()), Integer.MAX_VALUE); + new Path(employee.getUri()), Integer.MAX_VALUE); FileFragment[] peopleFrags = FileTablespace.splitNG(conf, "default.p", people.getMeta(), - new Path(people.getPath()), Integer.MAX_VALUE); + new Path(people.getUri()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(empFrags, peopleFrags); http://git-wip-us.apache.org/repos/asf/tajo/blob/6cc7e5c6/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 77d524e..a8826ee 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 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) + Appender appender = ((FileTablespace) TableSpaceManager.getLocalFs()) .getAppender(employeeMeta, employeeSchema, employeePath); appender.init(); VTuple 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 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) + appender = ((FileTablespace) TableSpaceManager.getLocalFs()) .getAppender(peopleMeta, peopleSchema, peoplePath); appender.init(); tuple = new VTuple(peopleSchema.size()); @@ -126,7 +126,7 @@ public class TestHashJoinExec { people = CatalogUtil.newTableDesc("default.people", peopleSchema, peopleMeta, peoplePath); catalog.createTable(people); analyzer = new SQLAnalyzer(); - planner = new LogicalPlanner(catalog); + planner = new LogicalPlanner(catalog, TableSpaceManager.getInstance()); defaultContext = LocalTajoTestingUtility.createDummyContext(conf); } @@ -151,9 +151,9 @@ public class TestHashJoinExec { enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.IN_MEMORY_HASH_JOIN); FileFragment[] empFrags = FileTablespace.splitNG(conf, "default.e", employee.getMeta(), - new Path(employee.getPath()), Integer.MAX_VALUE); + new Path(employee.getUri()), Integer.MAX_VALUE); FileFragment[] peopleFrags = FileTablespace.splitNG(conf, "default.p", people.getMeta(), - new Path(people.getPath()), Integer.MAX_VALUE); + new Path(people.getUri()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(empFrags, peopleFrags); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testHashInnerJoin"); @@ -194,9 +194,9 @@ public class TestHashJoinExec { enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.IN_MEMORY_HASH_JOIN); FileFragment[] peopleFrags = FileTablespace.splitNG(conf, "default.p", people.getMeta(), - new Path(people.getPath()), Integer.MAX_VALUE); + new Path(people.getUri()), Integer.MAX_VALUE); FileFragment[] empFrags = FileTablespace.splitNG(conf, "default.e", employee.getMeta(), - new Path(employee.getPath()), Integer.MAX_VALUE); + new Path(employee.getUri()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(empFrags, peopleFrags); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testHashInnerJoin"); http://git-wip-us.apache.org/repos/asf/tajo/blob/6cc7e5c6/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 cc9560f..ae90502 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 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) + Appender appender = ((FileTablespace) TableSpaceManager.getLocalFs()) .getAppender(employeeMeta, employeeSchema, employeePath); appender.init(); VTuple 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 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) + appender = ((FileTablespace) TableSpaceManager.getLocalFs()) .getAppender(peopleMeta, peopleSchema, peoplePath); appender.init(); tuple = new VTuple(peopleSchema.size()); @@ -133,7 +133,7 @@ public class TestHashSemiJoinExec { people = CatalogUtil.newTableDesc("default.people", peopleSchema, peopleMeta, peoplePath); catalog.createTable(people); analyzer = new SQLAnalyzer(); - planner = new LogicalPlanner(catalog); + planner = new LogicalPlanner(catalog, TableSpaceManager.getInstance()); optimizer = new LogicalOptimizer(conf); } @@ -154,9 +154,9 @@ public class TestHashSemiJoinExec { @Test public final void testHashSemiJoin() throws IOException, PlanningException { FileFragment[] empFrags = FileTablespace.splitNG(conf, "default.e", employee.getMeta(), - new Path(employee.getPath()), Integer.MAX_VALUE); + new Path(employee.getUri()), Integer.MAX_VALUE); FileFragment[] peopleFrags = FileTablespace.splitNG(conf, "default.p", people.getMeta(), - new Path(people.getPath()), Integer.MAX_VALUE); + new Path(people.getUri()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(empFrags, peopleFrags); @@ -177,8 +177,8 @@ public class TestHashSemiJoinExec { MergeJoinExec join = (MergeJoinExec) exec; ExternalSortExec sortLeftChild = (ExternalSortExec) join.getLeftChild(); ExternalSortExec sortRightChild = (ExternalSortExec) join.getRightChild(); - SeqScanExec scanLeftChild = (SeqScanExec) sortLeftChild.getChild(); - SeqScanExec scanRightChild = (SeqScanExec) sortRightChild.getChild(); + SeqScanExec scanLeftChild = sortLeftChild.getChild(); + SeqScanExec scanRightChild = sortRightChild.getChild(); // 'people' should be outer table. So, the below code guarantees that people becomes the outer table. if (scanLeftChild.getTableName().equals("default.people")) { http://git-wip-us.apache.org/repos/asf/tajo/blob/6cc7e5c6/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 4b4ed45..bbb441c 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,8 +105,7 @@ public class TestLeftOuterHashJoinExec { TableMeta dep3Meta = CatalogUtil.newTableMeta("CSV"); Path dep3Path = new Path(testDir, "dep3.csv"); - Appender appender1 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) - .getAppender(dep3Meta, dep3Schema, dep3Path); + Appender appender1 = ((FileTablespace) TableSpaceManager.getLocalFs()).getAppender(dep3Meta, dep3Schema, dep3Path); appender1.init(); VTuple tuple = new VTuple(dep3Schema.size()); for (int i = 0; i < 10; i++) { @@ -135,7 +134,7 @@ public class TestLeftOuterHashJoinExec { TableMeta job3Meta = CatalogUtil.newTableMeta("CSV"); Path job3Path = new Path(testDir, "job3.csv"); - Appender appender2 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) + Appender appender2 = ((FileTablespace) TableSpaceManager.getLocalFs()) .getAppender(job3Meta, job3Schema, job3Path); appender2.init(); VTuple tuple2 = new VTuple(job3Schema.size()); @@ -175,7 +174,7 @@ public class TestLeftOuterHashJoinExec { TableMeta emp3Meta = CatalogUtil.newTableMeta("CSV"); Path emp3Path = new Path(testDir, "emp3.csv"); - Appender appender3 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) + Appender appender3 = ((FileTablespace) TableSpaceManager.getLocalFs()) .getAppender(emp3Meta, emp3Schema, emp3Path); appender3.init(); VTuple tuple3 = new VTuple(emp3Schema.size()); @@ -228,7 +227,7 @@ public class TestLeftOuterHashJoinExec { TableMeta phone3Meta = CatalogUtil.newTableMeta("CSV"); Path phone3Path = new Path(testDir, "phone3.csv"); - Appender appender5 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) + Appender appender5 = ((FileTablespace) TableSpaceManager.getLocalFs()) .getAppender(phone3Meta, phone3Schema, phone3Path); appender5.init(); @@ -240,7 +239,7 @@ public class TestLeftOuterHashJoinExec { analyzer = new SQLAnalyzer(); - planner = new LogicalPlanner(catalog); + planner = new LogicalPlanner(catalog, TableSpaceManager.getInstance()); defaultContext = LocalTajoTestingUtility.createDummyContext(conf); } @@ -271,9 +270,9 @@ public class TestLeftOuterHashJoinExec { enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.IN_MEMORY_HASH_JOIN); FileFragment[] dep3Frags = FileTablespace.splitNG(conf, DEP3_NAME, dep3.getMeta(), - new Path(dep3.getPath()), Integer.MAX_VALUE); + new Path(dep3.getUri()), Integer.MAX_VALUE); FileFragment[] emp3Frags = FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), - new Path(emp3.getPath()), Integer.MAX_VALUE); + new Path(emp3.getUri()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(dep3Frags, emp3Frags); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestLeftOuterHashJoinExec0"); @@ -301,9 +300,9 @@ public class TestLeftOuterHashJoinExec { @Test public final void testLeftOuter_HashJoinExec1() throws IOException, PlanningException { FileFragment[] job3Frags = FileTablespace.splitNG(conf, JOB3_NAME, job3.getMeta(), - new Path(job3.getPath()), Integer.MAX_VALUE); + new Path(job3.getUri()), Integer.MAX_VALUE); FileFragment[] emp3Frags = FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), - new Path(emp3.getPath()), Integer.MAX_VALUE); + new Path(emp3.getUri()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(job3Frags, emp3Frags); @@ -335,9 +334,9 @@ public class TestLeftOuterHashJoinExec { public final void testLeftOuter_HashJoinExec2() throws IOException, PlanningException { FileFragment[] emp3Frags = FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), - new Path(emp3.getPath()), Integer.MAX_VALUE); + new Path(emp3.getUri()), Integer.MAX_VALUE); FileFragment[] job3Frags = FileTablespace.splitNG(conf, JOB3_NAME, job3.getMeta(), - new Path(job3.getPath()), Integer.MAX_VALUE); + new Path(job3.getUri()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(emp3Frags, job3Frags); @@ -371,9 +370,9 @@ public class TestLeftOuterHashJoinExec { public final void testLeftOuter_HashJoinExec3() throws IOException, PlanningException { FileFragment[] emp3Frags = FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), - new Path(emp3.getPath()), Integer.MAX_VALUE); + new Path(emp3.getUri()), Integer.MAX_VALUE); FileFragment[] phone3Frags = FileTablespace.splitNG(conf, PHONE3_NAME, phone3.getMeta(), - new Path(phone3.getPath()), Integer.MAX_VALUE); + new Path(phone3.getUri()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(emp3Frags, phone3Frags); @@ -406,9 +405,9 @@ public class TestLeftOuterHashJoinExec { public final void testLeftOuter_HashJoinExec4() throws IOException, PlanningException { FileFragment[] emp3Frags = FileTablespace.splitNG(conf, "default.emp3", emp3.getMeta(), - new Path(emp3.getPath()), Integer.MAX_VALUE); + new Path(emp3.getUri()), Integer.MAX_VALUE); FileFragment[] phone3Frags = FileTablespace.splitNG(conf, "default.phone3", phone3.getMeta(), - new Path(phone3.getPath()), Integer.MAX_VALUE); + new Path(phone3.getUri()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(phone3Frags, emp3Frags); http://git-wip-us.apache.org/repos/asf/tajo/blob/6cc7e5c6/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 370d03e..d0d0983 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 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) + Appender appender = ((FileTablespace) TableSpaceManager.getLocalFs()) .getAppender(employeeMeta, employeeSchema, employeePath); appender.init(); VTuple 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 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) + appender = ((FileTablespace) TableSpaceManager.getLocalFs()) .getAppender(peopleMeta, peopleSchema, peoplePath); appender.init(); tuple = new VTuple(peopleSchema.size()); @@ -139,7 +139,7 @@ public class TestMergeJoinExec { people = CatalogUtil.newTableDesc("default.people", peopleSchema, peopleMeta, peoplePath); catalog.createTable(people); analyzer = new SQLAnalyzer(); - planner = new LogicalPlanner(catalog); + planner = new LogicalPlanner(catalog, TableSpaceManager.getInstance()); } @After @@ -162,9 +162,9 @@ public class TestMergeJoinExec { Enforcer enforcer = new Enforcer(); enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.MERGE_JOIN); - FileFragment[] empFrags = FileTablespace.splitNG(conf, "default.e", employee.getMeta(), new Path(employee.getPath()), + FileFragment[] empFrags = FileTablespace.splitNG(conf, "default.e", employee.getMeta(), new Path(employee.getUri()), Integer.MAX_VALUE); - FileFragment[] peopleFrags = FileTablespace.splitNG(conf, "default.p", people.getMeta(), new Path(people.getPath()), + FileFragment[] peopleFrags = FileTablespace.splitNG(conf, "default.p", people.getMeta(), new Path(people.getUri()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(empFrags, peopleFrags); http://git-wip-us.apache.org/repos/asf/tajo/blob/6cc7e5c6/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 c73b89f..4866323 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 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) + Appender appender = ((FileTablespace) TableSpaceManager.getLocalFs()) .getAppender(employeeMeta, schema, employeePath); appender.init(); VTuple 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 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) + appender = ((FileTablespace) TableSpaceManager.getLocalFs()) .getAppender(peopleMeta, peopleSchema, peoplePath); appender.init(); tuple = new VTuple(peopleSchema.size()); @@ -125,7 +125,7 @@ public class TestNLJoinExec { people = CatalogUtil.newTableDesc("default.people", peopleSchema, peopleMeta, peoplePath); catalog.createTable(people); analyzer = new SQLAnalyzer(); - planner = new LogicalPlanner(catalog); + planner = new LogicalPlanner(catalog, TableSpaceManager.getInstance()); masterPlan = new MasterPlan(LocalTajoTestingUtility.newQueryId(), null, null); } @@ -144,9 +144,9 @@ public class TestNLJoinExec { @Test public final void testNLCrossJoin() throws IOException, PlanningException { FileFragment[] empFrags = FileTablespace.splitNG(conf, "default.e", employee.getMeta(), - new Path(employee.getPath()), Integer.MAX_VALUE); + new Path(employee.getUri()), Integer.MAX_VALUE); FileFragment[] peopleFrags = FileTablespace.splitNG(conf, "default.p", people.getMeta(), - new Path(people.getPath()), Integer.MAX_VALUE); + new Path(people.getUri()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(empFrags, peopleFrags); @@ -173,9 +173,9 @@ public class TestNLJoinExec { @Test public final void testNLInnerJoin() throws IOException, PlanningException { FileFragment[] empFrags = FileTablespace.splitNG(conf, "default.e", employee.getMeta(), - new Path(employee.getPath()), Integer.MAX_VALUE); + new Path(employee.getUri()), Integer.MAX_VALUE); FileFragment[] peopleFrags = FileTablespace.splitNG(conf, "default.p", people.getMeta(), - new Path(people.getPath()), Integer.MAX_VALUE); + new Path(people.getUri()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(empFrags, peopleFrags); http://git-wip-us.apache.org/repos/asf/tajo/blob/6cc7e5c6/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java index be519bf..b2a228a 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java @@ -98,7 +98,7 @@ public class TestPhysicalPlanner { util.startCatalogCluster(); conf = util.getConfiguration(); testDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/TestPhysicalPlanner"); - sm = (FileTablespace) TableSpaceManager.getFileStorageManager(conf); + sm = TableSpaceManager.getLocalFs(); catalog = util.getMiniCatalogCluster().getCatalog(); catalog.createTablespace(DEFAULT_TABLESPACE_NAME, testDir.toUri().toString()); catalog.createDatabase(DEFAULT_DATABASE_NAME, DEFAULT_TABLESPACE_NAME); @@ -164,7 +164,7 @@ public class TestPhysicalPlanner { appender.close(); catalog.createTable(score); analyzer = new SQLAnalyzer(); - planner = new LogicalPlanner(catalog); + planner = new LogicalPlanner(catalog, TableSpaceManager.getInstance()); optimizer = new LogicalOptimizer(conf); defaultContext = LocalTajoTestingUtility.createDummyContext(conf); @@ -180,7 +180,7 @@ public class TestPhysicalPlanner { Schema scoreSchmea = score.getSchema(); TableMeta scoreLargeMeta = CatalogUtil.newTableMeta("RAW", new KeyValueSet()); - Appender appender = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) + Appender appender = ((FileTablespace) TableSpaceManager.getLocalFs()) .getAppender(scoreLargeMeta, scoreSchmea, scoreLargePath); appender.enableStats(); appender.init(); @@ -238,7 +238,7 @@ public class TestPhysicalPlanner { @Test public final void testCreateScanPlan() throws IOException, PlanningException { FileFragment[] frags = FileTablespace.splitNG(conf, "default.employee", employee.getMeta(), - new Path(employee.getPath()), Integer.MAX_VALUE); + new Path(employee.getUri()), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testCreateScanPlan"); TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newTaskAttemptId(masterPlan), @@ -269,7 +269,7 @@ public class TestPhysicalPlanner { @Test public final void testCreateScanWithFilterPlan() throws IOException, PlanningException { FileFragment[] frags = FileTablespace.splitNG(conf, "default.employee", employee.getMeta(), - new Path(employee.getPath()), Integer.MAX_VALUE); + new Path(employee.getUri()), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testCreateScanWithFilterPlan"); TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newTaskAttemptId(masterPlan), @@ -297,7 +297,7 @@ public class TestPhysicalPlanner { @Test public final void testGroupByPlan() throws IOException, PlanningException { - FileFragment[] frags = FileTablespace.splitNG(conf, "default.score", score.getMeta(), new Path(score.getPath()), + FileFragment[] frags = FileTablespace.splitNG(conf, "default.score", score.getMeta(), new Path(score.getUri()), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testGroupByPlan"); TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), @@ -328,7 +328,7 @@ public class TestPhysicalPlanner { @Test public final void testHashGroupByPlanWithALLField() throws IOException, PlanningException { // TODO - currently, this query does not use hash-based group operator. - FileFragment[] frags = FileTablespace.splitNG(conf, "default.score", score.getMeta(), new Path(score.getPath()), + FileFragment[] frags = FileTablespace.splitNG(conf, "default.score", score.getMeta(), new Path(score.getUri()), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testHashGroupByPlanWithALLField"); @@ -358,7 +358,7 @@ public class TestPhysicalPlanner { @Test public final void testSortGroupByPlan() throws IOException, PlanningException { - FileFragment[] frags = FileTablespace.splitNG(conf, "default.score", score.getMeta(), new Path(score.getPath()), + FileFragment[] frags = FileTablespace.splitNG(conf, "default.score", score.getMeta(), new Path(score.getUri()), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testSortGroupByPlan"); TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), @@ -421,7 +421,7 @@ public class TestPhysicalPlanner { @Test public final void testStorePlan() throws IOException, PlanningException { - FileFragment[] frags = FileTablespace.splitNG(conf, "default.score", score.getMeta(), new Path(score.getPath()), + FileFragment[] frags = FileTablespace.splitNG(conf, "default.score", score.getMeta(), new Path(score.getUri()), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testStorePlan"); TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), @@ -442,7 +442,7 @@ public class TestPhysicalPlanner { exec.next(); exec.close(); - Scanner scanner = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) + Scanner scanner = ((FileTablespace) TableSpaceManager.getLocalFs()) .getFileScanner(outputMeta, rootNode.getOutSchema(), ctx.getOutputPath()); scanner.init(); Tuple tuple; @@ -468,7 +468,7 @@ public class TestPhysicalPlanner { assertTrue("Checking meaningfulness of test", stats.getNumBytes() > StorageUnit.MB); FileFragment[] frags = FileTablespace.splitNG(conf, "default.score_large", largeScore.getMeta(), - new Path(largeScore.getPath()), Integer.MAX_VALUE); + new Path(largeScore.getUri()), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testStorePlanWithMaxOutputFileSize"); QueryContext queryContext = new QueryContext(conf, session); @@ -502,7 +502,7 @@ public class TestPhysicalPlanner { // checking the file contents long totalNum = 0; for (FileStatus status : fs.listStatus(ctx.getOutputPath().getParent())) { - Scanner scanner = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)).getFileScanner( + Scanner scanner = ((FileTablespace) TableSpaceManager.getLocalFs()).getFileScanner( CatalogUtil.newTableMeta("CSV"), rootNode.getOutSchema(), status.getPath()); @@ -518,7 +518,7 @@ public class TestPhysicalPlanner { @Test public final void testStorePlanWithRCFile() throws IOException, PlanningException { - FileFragment[] frags = FileTablespace.splitNG(conf, "default.score", score.getMeta(), new Path(score.getPath()), + FileFragment[] frags = FileTablespace.splitNG(conf, "default.score", score.getMeta(), new Path(score.getUri()), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testStorePlanWithRCFile"); TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), @@ -539,7 +539,7 @@ public class TestPhysicalPlanner { exec.next(); exec.close(); - Scanner scanner = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)).getFileScanner( + Scanner scanner = ((FileTablespace) TableSpaceManager.getLocalFs()).getFileScanner( outputMeta, rootNode.getOutSchema(), ctx.getOutputPath()); scanner.init(); Tuple tuple; @@ -559,7 +559,7 @@ public class TestPhysicalPlanner { @Test public final void testEnforceForDefaultColumnPartitionStorePlan() throws IOException, PlanningException { - FileFragment[] frags = FileTablespace.splitNG(conf, "default.score", score.getMeta(), new Path(score.getPath()), + FileFragment[] frags = FileTablespace.splitNG(conf, "default.score", score.getMeta(), new Path(score.getUri()), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testStorePlan"); TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), @@ -586,7 +586,7 @@ public class TestPhysicalPlanner { Enforcer enforcer = new Enforcer(); enforcer.enforceColumnPartitionAlgorithm(createTableNode.getPID(), ColumnPartitionAlgorithm.HASH_PARTITION); - FileFragment[] frags = FileTablespace.splitNG(conf, "default.score", score.getMeta(), new Path(score.getPath()), + FileFragment[] frags = FileTablespace.splitNG(conf, "default.score", score.getMeta(), new Path(score.getUri()), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testStorePlan"); TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), @@ -610,7 +610,7 @@ public class TestPhysicalPlanner { Enforcer enforcer = new Enforcer(); enforcer.enforceColumnPartitionAlgorithm(createTableNode.getPID(), ColumnPartitionAlgorithm.SORT_PARTITION); - FileFragment[] frags = FileTablespace.splitNG(conf, "default.score", score.getMeta(), new Path(score.getPath()), + FileFragment[] frags = FileTablespace.splitNG(conf, "default.score", score.getMeta(), new Path(score.getUri()), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testStorePlan"); TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), @@ -626,7 +626,7 @@ public class TestPhysicalPlanner { @Test public final void testPartitionedStorePlan() throws IOException, PlanningException { - FileFragment[] frags = FileTablespace.splitNG(conf, "default.score", score.getMeta(), new Path(score.getPath()), + FileFragment[] frags = FileTablespace.splitNG(conf, "default.score", score.getMeta(), new Path(score.getUri()), Integer.MAX_VALUE); TaskAttemptId id = LocalTajoTestingUtility.newTaskAttemptId(masterPlan); TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), id, new FileFragment[] { frags[0] }, @@ -696,7 +696,7 @@ public class TestPhysicalPlanner { // Preparing working dir and input fragments FileFragment[] frags = FileTablespace.splitNG(conf, "default.score_large", largeScore.getMeta(), - new Path(largeScore.getPath()), Integer.MAX_VALUE); + new Path(largeScore.getUri()), Integer.MAX_VALUE); TaskAttemptId id = LocalTajoTestingUtility.newTaskAttemptId(masterPlan); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testPartitionedStorePlanWithMaxFileSize"); @@ -759,7 +759,7 @@ public class TestPhysicalPlanner { @Test public final void testPartitionedStorePlanWithEmptyGroupingSet() throws IOException, PlanningException { - FileFragment[] frags = FileTablespace.splitNG(conf, "default.score", score.getMeta(), new Path(score.getPath()), + FileFragment[] frags = FileTablespace.splitNG(conf, "default.score", score.getMeta(), new Path(score.getUri()), Integer.MAX_VALUE); TaskAttemptId id = LocalTajoTestingUtility.newTaskAttemptId(masterPlan); @@ -826,7 +826,7 @@ public class TestPhysicalPlanner { @Test public final void testAggregationFunction() throws IOException, PlanningException { - FileFragment[] frags = FileTablespace.splitNG(conf, "default.score", score.getMeta(), new Path(score.getPath()), + FileFragment[] frags = FileTablespace.splitNG(conf, "default.score", score.getMeta(), new Path(score.getUri()), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testAggregationFunction"); TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), @@ -857,7 +857,7 @@ public class TestPhysicalPlanner { @Test public final void testCountFunction() throws IOException, PlanningException { - FileFragment[] frags = FileTablespace.splitNG(conf, "default.score", score.getMeta(), new Path(score.getPath()), + FileFragment[] frags = FileTablespace.splitNG(conf, "default.score", score.getMeta(), new Path(score.getUri()), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testCountFunction"); TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), @@ -885,7 +885,7 @@ public class TestPhysicalPlanner { @Test public final void testGroupByWithNullValue() throws IOException, PlanningException { - FileFragment[] frags = FileTablespace.splitNG(conf, "default.score", score.getMeta(), new Path(score.getPath()), + FileFragment[] frags = FileTablespace.splitNG(conf, "default.score", score.getMeta(), new Path(score.getUri()), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testGroupByWithNullValue"); TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), @@ -911,7 +911,7 @@ public class TestPhysicalPlanner { @Test public final void testUnionPlan() throws IOException, PlanningException, CloneNotSupportedException { FileFragment[] frags = FileTablespace.splitNG(conf, "default.employee", employee.getMeta(), - new Path(employee.getPath()), Integer.MAX_VALUE); + new Path(employee.getUri()), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testUnionPlan"); TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newTaskAttemptId(masterPlan), @@ -976,7 +976,7 @@ public class TestPhysicalPlanner { //@Test public final void testCreateIndex() throws IOException, PlanningException { FileFragment[] frags = FileTablespace.splitNG(conf, "default.employee", employee.getMeta(), - new Path(employee.getPath()), Integer.MAX_VALUE); + new Path(employee.getUri()), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testCreateIndex"); TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newTaskAttemptId(masterPlan), @@ -1003,7 +1003,7 @@ public class TestPhysicalPlanner { @Test public final void testDuplicateEliminate() throws IOException, PlanningException { FileFragment[] frags = FileTablespace.splitNG(conf, "default.score", score.getMeta(), - new Path(score.getPath()), Integer.MAX_VALUE); + new Path(score.getUri()), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testDuplicateEliminate"); TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), @@ -1037,7 +1037,7 @@ public class TestPhysicalPlanner { @Test public final void testSortEnforcer() throws IOException, PlanningException { FileFragment[] frags = FileTablespace.splitNG(conf, "default.employee", employee.getMeta(), - new Path(employee.getPath()), Integer.MAX_VALUE); + new Path(employee.getUri()), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testSortEnforcer"); Expr context = analyzer.parse(SORT_QUERY[0]); @@ -1087,7 +1087,7 @@ public class TestPhysicalPlanner { @Test public final void testGroupByEnforcer() throws IOException, PlanningException { - FileFragment[] frags = FileTablespace.splitNG(conf, "default.score", score.getMeta(), new Path(score.getPath()), + FileFragment[] frags = FileTablespace.splitNG(conf, "default.score", score.getMeta(), new Path(score.getUri()), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testGroupByEnforcer"); Expr context = analyzer.parse(QUERIES[7]); http://git-wip-us.apache.org/repos/asf/tajo/blob/6cc7e5c6/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestProgressExternalSortExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestProgressExternalSortExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestProgressExternalSortExec.java index d7bc36b..1b54948 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestProgressExternalSortExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestProgressExternalSortExec.java @@ -86,7 +86,7 @@ public class TestProgressExternalSortExec { TableMeta employeeMeta = CatalogUtil.newTableMeta("RAW"); Path employeePath = new Path(testDir, "employee.csv"); - Appender appender = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) + Appender appender = ((FileTablespace) TableSpaceManager.getLocalFs()) .getAppender(employeeMeta, schema, employeePath); appender.enableStats(); appender.init(); @@ -110,7 +110,7 @@ public class TestProgressExternalSortExec { employeePath.toUri()); catalog.createTable(employee); analyzer = new SQLAnalyzer(); - planner = new LogicalPlanner(catalog); + planner = new LogicalPlanner(catalog, TableSpaceManager.getInstance()); } @After @@ -135,7 +135,7 @@ public class TestProgressExternalSortExec { private void testProgress(int sortBufferBytesNum) throws Exception { FileFragment[] frags = FileTablespace.splitNG(conf, "default.employee", employee.getMeta(), - new Path(employee.getPath()), Integer.MAX_VALUE); + new Path(employee.getUri()), Integer.MAX_VALUE); Path workDir = new Path(testDir, TestExternalSortExec.class.getName()); TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newTaskAttemptId(), new FileFragment[] { frags[0] }, workDir); http://git-wip-us.apache.org/repos/asf/tajo/blob/6cc7e5c6/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterHashJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterHashJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterHashJoinExec.java index 088de50..c956f29 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterHashJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterHashJoinExec.java @@ -100,7 +100,7 @@ public class TestRightOuterHashJoinExec { TableMeta dep3Meta = CatalogUtil.newTableMeta("CSV"); Path dep3Path = new Path(testDir, "dep3.csv"); - Appender appender1 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) + Appender appender1 = ((FileTablespace) TableSpaceManager.getLocalFs()) .getAppender(dep3Meta, dep3Schema, dep3Path); appender1.init(); VTuple tuple = new VTuple(dep3Schema.size()); @@ -130,7 +130,7 @@ public class TestRightOuterHashJoinExec { TableMeta job3Meta = CatalogUtil.newTableMeta("CSV"); Path job3Path = new Path(testDir, "job3.csv"); - Appender appender2 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) + Appender appender2 = ((FileTablespace) TableSpaceManager.getLocalFs()) .getAppender(job3Meta, job3Schema, job3Path); appender2.init(); VTuple tuple2 = new VTuple(job3Schema.size()); @@ -170,7 +170,7 @@ public class TestRightOuterHashJoinExec { TableMeta emp3Meta = CatalogUtil.newTableMeta("CSV"); Path emp3Path = new Path(testDir, "emp3.csv"); - Appender appender3 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) + Appender appender3 = ((FileTablespace) TableSpaceManager.getLocalFs()) .getAppender(emp3Meta, emp3Schema, emp3Path); appender3.init(); VTuple tuple3 = new VTuple(emp3Schema.size()); @@ -212,7 +212,7 @@ public class TestRightOuterHashJoinExec { catalog.createTable(emp3); analyzer = new SQLAnalyzer(); - planner = new LogicalPlanner(catalog); + planner = new LogicalPlanner(catalog, TableSpaceManager.getInstance()); defaultContext = LocalTajoTestingUtility.createDummyContext(conf); } @@ -229,9 +229,9 @@ public class TestRightOuterHashJoinExec { @Test public final void testRightOuter_HashJoinExec0() throws IOException, PlanningException { - FileFragment[] emp3Frags = FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), + FileFragment[] emp3Frags = FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getUri()), Integer.MAX_VALUE); - FileFragment[] dep3Frags = FileTablespace.splitNG(conf, DEP3_NAME, dep3.getMeta(), new Path(dep3.getPath()), + FileFragment[] dep3Frags = FileTablespace.splitNG(conf, DEP3_NAME, dep3.getMeta(), new Path(dep3.getUri()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(emp3Frags, dep3Frags); @@ -270,9 +270,9 @@ public class TestRightOuterHashJoinExec { @Test public final void testRightOuter_HashJoinExec1() throws IOException, PlanningException { - FileFragment[] job3Frags = FileTablespace.splitNG(conf, JOB3_NAME, job3.getMeta(), new Path(job3.getPath()), + FileFragment[] job3Frags = FileTablespace.splitNG(conf, JOB3_NAME, job3.getMeta(), new Path(job3.getUri()), Integer.MAX_VALUE); - FileFragment[] emp3Frags = FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), + FileFragment[] emp3Frags = FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getUri()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(emp3Frags, job3Frags); @@ -311,9 +311,9 @@ public class TestRightOuterHashJoinExec { @Test public final void testRightOuter_HashJoinExec2() throws IOException, PlanningException { - FileFragment[] emp3Frags = FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), + FileFragment[] emp3Frags = FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getUri()), Integer.MAX_VALUE); - FileFragment[] job3Frags = FileTablespace.splitNG(conf, JOB3_NAME, job3.getMeta(), new Path(job3.getPath()), + FileFragment[] job3Frags = FileTablespace.splitNG(conf, JOB3_NAME, job3.getMeta(), new Path(job3.getUri()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(job3Frags, emp3Frags); http://git-wip-us.apache.org/repos/asf/tajo/blob/6cc7e5c6/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterMergeJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterMergeJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterMergeJoinExec.java index 9d01c8f..25f0ca4 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterMergeJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterMergeJoinExec.java @@ -107,7 +107,7 @@ public class TestRightOuterMergeJoinExec { TableMeta dep3Meta = CatalogUtil.newTableMeta("CSV"); Path dep3Path = new Path(testDir, "dep3.csv"); - Appender appender1 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) + Appender appender1 = ((FileTablespace) TableSpaceManager.getLocalFs()) .getAppender(dep3Meta, dep3Schema, dep3Path); appender1.init(); VTuple tuple = new VTuple(dep3Schema.size()); @@ -146,7 +146,7 @@ public class TestRightOuterMergeJoinExec { TableMeta dep4Meta = CatalogUtil.newTableMeta("CSV"); Path dep4Path = new Path(testDir, "dep4.csv"); - Appender appender4 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) + Appender appender4 = ((FileTablespace) TableSpaceManager.getLocalFs()) .getAppender(dep4Meta, dep4Schema, dep4Path); appender4.init(); VTuple tuple4 = new VTuple(dep4Schema.size()); @@ -178,7 +178,7 @@ public class TestRightOuterMergeJoinExec { TableMeta job3Meta = CatalogUtil.newTableMeta("CSV"); Path job3Path = new Path(testDir, "job3.csv"); - Appender appender2 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) + Appender appender2 = ((FileTablespace) TableSpaceManager.getLocalFs()) .getAppender(job3Meta, job3Schema, job3Path); appender2.init(); VTuple tuple2 = new VTuple(job3Schema.size()); @@ -218,7 +218,7 @@ public class TestRightOuterMergeJoinExec { TableMeta emp3Meta = CatalogUtil.newTableMeta("CSV"); Path emp3Path = new Path(testDir, "emp3.csv"); - Appender appender3 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) + Appender appender3 = ((FileTablespace) TableSpaceManager.getLocalFs()) .getAppender(emp3Meta, emp3Schema, emp3Path); appender3.init(); VTuple tuple3 = new VTuple(emp3Schema.size()); @@ -271,7 +271,7 @@ public class TestRightOuterMergeJoinExec { TableMeta phone3Meta = CatalogUtil.newTableMeta("CSV"); Path phone3Path = new Path(testDir, "phone3.csv"); - Appender appender5 = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) + Appender appender5 = ((FileTablespace) TableSpaceManager.getLocalFs()) .getAppender(phone3Meta, phone3Schema, phone3Path); appender5.init(); @@ -281,7 +281,7 @@ public class TestRightOuterMergeJoinExec { catalog.createTable(phone3); analyzer = new SQLAnalyzer(); - planner = new LogicalPlanner(catalog); + planner = new LogicalPlanner(catalog, TableSpaceManager.getInstance()); defaultContext = LocalTajoTestingUtility.createDummyContext(conf); } @@ -314,9 +314,9 @@ public class TestRightOuterMergeJoinExec { Enforcer enforcer = new Enforcer(); enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.MERGE_JOIN); - FileFragment[] emp3Frags = FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), + FileFragment[] emp3Frags = FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getUri()), Integer.MAX_VALUE); - FileFragment[] dep3Frags = FileTablespace.splitNG(conf, DEP3_NAME, dep3.getMeta(), new Path(dep3.getPath()), + FileFragment[] dep3Frags = FileTablespace.splitNG(conf, DEP3_NAME, dep3.getMeta(), new Path(dep3.getUri()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(emp3Frags, dep3Frags); @@ -352,9 +352,9 @@ public class TestRightOuterMergeJoinExec { enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.MERGE_JOIN); FileFragment[] emp3Frags = - FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), Integer.MAX_VALUE); + FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getUri()), Integer.MAX_VALUE); FileFragment[] job3Frags = - FileTablespace.splitNG(conf, JOB3_NAME, job3.getMeta(), new Path(job3.getPath()), Integer.MAX_VALUE); + FileTablespace.splitNG(conf, JOB3_NAME, job3.getMeta(), new Path(job3.getUri()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(job3Frags, emp3Frags); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testRightOuterMergeJoin1"); @@ -388,9 +388,9 @@ public class TestRightOuterMergeJoinExec { enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.MERGE_JOIN); FileFragment[] emp3Frags = - FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), Integer.MAX_VALUE); + FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getUri()), Integer.MAX_VALUE); FileFragment[] job3Frags = - FileTablespace.splitNG(conf, JOB3_NAME, job3.getMeta(), new Path(job3.getPath()), Integer.MAX_VALUE); + FileTablespace.splitNG(conf, JOB3_NAME, job3.getMeta(), new Path(job3.getUri()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(job3Frags, emp3Frags); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testRightOuterMergeJoin2"); @@ -424,9 +424,9 @@ public class TestRightOuterMergeJoinExec { enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.MERGE_JOIN); FileFragment[] emp3Frags = - FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), Integer.MAX_VALUE); + FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getUri()), Integer.MAX_VALUE); FileFragment[] dep4Frags = - FileTablespace.splitNG(conf, DEP4_NAME, dep4.getMeta(), new Path(dep4.getPath()), Integer.MAX_VALUE); + FileTablespace.splitNG(conf, DEP4_NAME, dep4.getMeta(), new Path(dep4.getUri()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(emp3Frags, dep4Frags); Path workDir = CommonTestingUtil.getTestDir(TajoTestingCluster.DEFAULT_TEST_DIRECTORY + "/testRightOuter_MergeJoin3"); @@ -461,9 +461,9 @@ public class TestRightOuterMergeJoinExec { enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.MERGE_JOIN); FileFragment[] emp3Frags = - FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), Integer.MAX_VALUE); + FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getUri()), Integer.MAX_VALUE); FileFragment[] phone3Frags = - FileTablespace.splitNG(conf, PHONE3_NAME, phone3.getMeta(), new Path(phone3.getPath()), + FileTablespace.splitNG(conf, PHONE3_NAME, phone3.getMeta(), new Path(phone3.getUri()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(emp3Frags, phone3Frags); @@ -498,8 +498,8 @@ public class TestRightOuterMergeJoinExec { enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.MERGE_JOIN); FileFragment[] emp3Frags = - FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getPath()), Integer.MAX_VALUE); - FileFragment[] phone3Frags = FileTablespace.splitNG(conf, PHONE3_NAME, phone3.getMeta(), new Path(phone3.getPath()), + FileTablespace.splitNG(conf, EMP3_NAME, emp3.getMeta(), new Path(emp3.getUri()), Integer.MAX_VALUE); + FileFragment[] phone3Frags = FileTablespace.splitNG(conf, PHONE3_NAME, phone3.getMeta(), new Path(phone3.getUri()), Integer.MAX_VALUE); FileFragment[] merged = TUtil.concat(phone3Frags,emp3Frags); http://git-wip-us.apache.org/repos/asf/tajo/blob/6cc7e5c6/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java index 0f92bec..ce12faf 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java @@ -69,7 +69,7 @@ public class TestSortExec { util = TpchTestBase.getInstance().getTestingCluster(); catalog = util.getMaster().getCatalog(); workDir = CommonTestingUtil.getTestDir(TEST_PATH); - sm = (FileTablespace) TableSpaceManager.getFileStorageManager(conf); + sm = TableSpaceManager.getLocalFs(); Schema schema = new Schema(); schema.addColumn("managerid", Type.INT4); @@ -81,7 +81,7 @@ public class TestSortExec { tablePath = StorageUtil.concatPath(workDir, "employee", "table1"); sm.getFileSystem().mkdirs(tablePath.getParent()); - Appender appender = ((FileTablespace) TableSpaceManager.getFileStorageManager(conf)) + Appender appender = ((FileTablespace) TableSpaceManager.getLocalFs()) .getAppender(employeeMeta, schema, tablePath); appender.init(); VTuple tuple = new VTuple(schema.size()); @@ -101,7 +101,7 @@ public class TestSortExec { catalog.createTable(desc); analyzer = new SQLAnalyzer(); - planner = new LogicalPlanner(catalog); + planner = new LogicalPlanner(catalog, TableSpaceManager.getInstance()); optimizer = new LogicalOptimizer(conf); } http://git-wip-us.apache.org/repos/asf/tajo/blob/6cc7e5c6/tajo-core/src/test/java/org/apache/tajo/engine/query/TestCTASQuery.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestCTASQuery.java b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestCTASQuery.java index de2a13e..2758d7d 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestCTASQuery.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestCTASQuery.java @@ -71,7 +71,7 @@ public class TestCTASQuery extends QueryTestCaseBase { assertEquals("key", partitionDesc.getExpressionSchema().getRootColumns().get(0).getSimpleName()); FileSystem fs = FileSystem.get(testBase.getTestingCluster().getConfiguration()); - Path path = new Path(desc.getPath()); + Path path = new Path(desc.getUri()); assertTrue(fs.isDirectory(path)); assertTrue(fs.isDirectory(new Path(path.toUri() + "/key=17.0"))); assertTrue(fs.isDirectory(new Path(path.toUri() + "/key=36.0"))); @@ -114,7 +114,7 @@ public class TestCTASQuery extends QueryTestCaseBase { assertEquals("key", partitionDesc.getExpressionSchema().getRootColumns().get(0).getSimpleName()); FileSystem fs = FileSystem.get(cluster.getConfiguration()); - Path path = new Path(desc.getPath()); + Path path = new Path(desc.getUri()); assertTrue(fs.isDirectory(path)); assertTrue(fs.isDirectory(new Path(path.toUri() + "/key=17.0"))); assertTrue(fs.isDirectory(new Path(path.toUri() + "/key=36.0"))); @@ -267,7 +267,7 @@ public class TestCTASQuery extends QueryTestCaseBase { TableDesc desc = client.getTableDesc("managed_table1"); assertNotNull(desc); - assertEquals("managed_table1", new Path(desc.getPath()).getName()); + assertEquals("managed_table1", new Path(desc.getUri()).getName()); } else { assertFalse(client.existTable("managed_Table1")); assertTrue(client.existTable("MANAGED_TABLE1")); @@ -275,7 +275,7 @@ public class TestCTASQuery extends QueryTestCaseBase { TableDesc desc = client.getTableDesc("MANAGED_TABLE1"); assertNotNull(desc); - assertEquals("MANAGED_TABLE1", new Path(desc.getPath()).getName()); + assertEquals("MANAGED_TABLE1", new Path(desc.getUri()).getName()); } } } http://git-wip-us.apache.org/repos/asf/tajo/blob/6cc7e5c6/tajo-core/src/test/java/org/apache/tajo/engine/query/TestCreateTable.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestCreateTable.java b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestCreateTable.java index f1a3ddc..b19a488 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestCreateTable.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestCreateTable.java @@ -107,9 +107,9 @@ public class TestCreateTable extends QueryTestCaseBase { // checking the existence of the table directory and validating the path Path warehouseDir = TajoConf.getWarehouseDir(testingCluster.getConfiguration()); FileSystem fs = warehouseDir.getFileSystem(testingCluster.getConfiguration()); - assertTrue(fs.exists(new Path(oldTableDesc.getPath()))); + assertTrue(fs.exists(new Path(oldTableDesc.getUri()))); assertEquals(StorageUtil.concatPath(warehouseDir, databaseName, originalTableName), - new Path(oldTableDesc.getPath())); + new Path(oldTableDesc.getUri())); // Rename client.executeQuery("ALTER TABLE " + CatalogUtil.denormalizeIdentifier(oldFQTableName) @@ -118,8 +118,8 @@ public class TestCreateTable extends QueryTestCaseBase { // checking the existence of the new table directory and validating the path final String newFQTableName = CatalogUtil.buildFQName(databaseName, newTableName); TableDesc newTableDesc = client.getTableDesc(newFQTableName); - assertTrue(fs.exists(new Path(newTableDesc.getPath()))); - assertEquals(StorageUtil.concatPath(warehouseDir, databaseName, newTableName), new Path(newTableDesc.getPath())); + assertTrue(fs.exists(new Path(newTableDesc.getUri()))); + assertEquals(StorageUtil.concatPath(warehouseDir, databaseName, newTableName), new Path(newTableDesc.getUri())); } @Test
