Repository: tajo Updated Branches: refs/heads/master 688bc5c11 -> d794c1d7b
TAJO-1811: Catalog server address must be set dynamically during test. Closes #724 Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/d794c1d7 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/d794c1d7 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/d794c1d7 Branch: refs/heads/master Commit: d794c1d7b0825a50522dc20aa77a284c2f3e4eff Parents: 688bc5c Author: Jihoon Son <[email protected]> Authored: Thu Sep 3 22:33:53 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Thu Sep 3 22:33:53 2015 +0900 ---------------------------------------------------------------------- CHANGES | 3 +++ .../src/test/java/org/apache/tajo/catalog/CatalogTestingUtil.java | 2 ++ .../src/test/java/org/apache/tajo/CatalogTestingUtil.java | 2 ++ .../src/test/java/org/apache/tajo/QueryTestCaseBase.java | 3 ++- 4 files changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/d794c1d7/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index d3d47be..e93e4e8 100644 --- a/CHANGES +++ b/CHANGES @@ -244,6 +244,9 @@ Release 0.11.0 - unreleased BUG FIXES + TAJO-1811: Catalog server address must be set dynamically during test. + (jihoon) + TAJO-1802: PythonScriptEngine copies controller and tajo util whenever it is initialized. (jihoon) http://git-wip-us.apache.org/repos/asf/tajo/blob/d794c1d7/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/CatalogTestingUtil.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/CatalogTestingUtil.java b/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/CatalogTestingUtil.java index 924c0bb..22fc23a 100644 --- a/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/CatalogTestingUtil.java +++ b/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/CatalogTestingUtil.java @@ -22,6 +22,7 @@ import org.apache.tajo.annotation.NotNull; import org.apache.tajo.annotation.Nullable; import org.apache.tajo.catalog.store.*; import org.apache.tajo.conf.TajoConf; +import org.apache.tajo.conf.TajoConf.ConfVars; import org.apache.tajo.exception.UnsupportedCatalogStore; public class CatalogTestingUtil { @@ -53,6 +54,7 @@ public class CatalogTestingUtil { String catalogUri) { conf.set(CatalogConstants.STORE_CLASS, catalogClass.getCanonicalName()); conf.set(CatalogConstants.CATALOG_URI, catalogUri); + conf.setVar(ConfVars.CATALOG_ADDRESS, "localhost:0"); return conf; } http://git-wip-us.apache.org/repos/asf/tajo/blob/d794c1d7/tajo-cluster-tests/src/test/java/org/apache/tajo/CatalogTestingUtil.java ---------------------------------------------------------------------- diff --git a/tajo-cluster-tests/src/test/java/org/apache/tajo/CatalogTestingUtil.java b/tajo-cluster-tests/src/test/java/org/apache/tajo/CatalogTestingUtil.java index cbc409b..3f45ede 100644 --- a/tajo-cluster-tests/src/test/java/org/apache/tajo/CatalogTestingUtil.java +++ b/tajo-cluster-tests/src/test/java/org/apache/tajo/CatalogTestingUtil.java @@ -23,6 +23,7 @@ import org.apache.tajo.annotation.Nullable; import org.apache.tajo.catalog.CatalogConstants; import org.apache.tajo.catalog.store.*; import org.apache.tajo.conf.TajoConf; +import org.apache.tajo.conf.TajoConf.ConfVars; import org.apache.tajo.exception.UnsupportedCatalogStore; public class CatalogTestingUtil { @@ -54,6 +55,7 @@ public class CatalogTestingUtil { String catalogUri) { conf.set(CatalogConstants.STORE_CLASS, catalogClass.getCanonicalName()); conf.set(CatalogConstants.CATALOG_URI, catalogUri); + conf.setVar(ConfVars.CATALOG_ADDRESS, "localhost:0"); return conf; } http://git-wip-us.apache.org/repos/asf/tajo/blob/d794c1d7/tajo-cluster-tests/src/test/java/org/apache/tajo/QueryTestCaseBase.java ---------------------------------------------------------------------- diff --git a/tajo-cluster-tests/src/test/java/org/apache/tajo/QueryTestCaseBase.java b/tajo-cluster-tests/src/test/java/org/apache/tajo/QueryTestCaseBase.java index bfafd6d..f521587 100644 --- a/tajo-cluster-tests/src/test/java/org/apache/tajo/QueryTestCaseBase.java +++ b/tajo-cluster-tests/src/test/java/org/apache/tajo/QueryTestCaseBase.java @@ -979,7 +979,8 @@ public class QueryTestCaseBase { if (expr.getType() == OpType.CreateTable) { CreateTable createTable = (CreateTable) expr; String tableName = createTable.getTableName(); - assertTrue("Table [" + tableName + "] creation is failed.", client.updateQuery(parsedResult.getHistoryStatement())); + assertTrue("Table [" + tableName + "] creation is failed.", + client.updateQuery(parsedResult.getHistoryStatement())); TableDesc createdTable = client.getTableDesc(tableName); String createdTableName = createdTable.getName();
