You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by ji...@apache.org on 2014/03/19 07:11:21 UTC
git commit: TAJO-687: TajoMaster should pass tajoConf to create
catalogServer. (DaeMyung Kang via jihoon)
Repository: incubator-tajo
Updated Branches:
refs/heads/master b178b70db -> 5f7934e6b
TAJO-687: TajoMaster should pass tajoConf to create catalogServer. (DaeMyung Kang via jihoon)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tajo/commit/5f7934e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/5f7934e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/5f7934e6
Branch: refs/heads/master
Commit: 5f7934e6bb5aab412c676396f27e4267f55caf2c
Parents: b178b70
Author: Jihoon Son <ji...@apache.org>
Authored: Wed Mar 19 15:10:43 2014 +0900
Committer: Jihoon Son <ji...@apache.org>
Committed: Wed Mar 19 15:10:43 2014 +0900
----------------------------------------------------------------------
CHANGES.txt | 3 +++
.../main/java/org/apache/tajo/catalog/LocalCatalogWrapper.java | 6 +++++-
.../src/main/java/org/apache/tajo/master/TajoMaster.java | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/5f7934e6/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d51dfcb..2495fe7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -276,6 +276,9 @@ Release 0.8.0 - unreleased
BUG FIXES
+ TAJO-687: TajoMaster should pass tajoConf to create catalogServer.
+ (DaeMyung Kang via jihoon)
+
TAJO-690: infinite loop occurs when rack task is assigning. (jinho)
TAJO-689: NoSuchElementException occurs during assigning the leaf tasks. (jinho)
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/5f7934e6/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/LocalCatalogWrapper.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/LocalCatalogWrapper.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/LocalCatalogWrapper.java
index eb062fd..df9bd2c 100644
--- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/LocalCatalogWrapper.java
+++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/LocalCatalogWrapper.java
@@ -43,7 +43,11 @@ public class LocalCatalogWrapper extends AbstractCatalogClient {
}
public LocalCatalogWrapper(final CatalogServer server) {
- super(server.getConf(), null);
+ this(server, server.getConf());
+ }
+
+ public LocalCatalogWrapper(final CatalogServer server, final TajoConf conf) {
+ super(conf, null);
this.catalog = server;
this.stub = server.getHandler();
}
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/5f7934e6/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/TajoMaster.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/TajoMaster.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/TajoMaster.java
index c42b0f3..9fcfca9 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/TajoMaster.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/TajoMaster.java
@@ -163,7 +163,7 @@ public class TajoMaster extends CompositeService {
catalogServer = new CatalogServer(initBuiltinFunctions());
addIfService(catalogServer);
- catalog = new LocalCatalogWrapper(catalogServer);
+ catalog = new LocalCatalogWrapper(catalogServer, systemConf);
globalEngine = new GlobalEngine(context);
addIfService(globalEngine);