Repository: tajo Updated Branches: refs/heads/master 54b2c645c -> 7615b7576
TAJO-1285: Refactoring Magic Number to HAConstants. (DaeMyung Kang via jaehwa) Closes #336 Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/7615b757 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/7615b757 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/7615b757 Branch: refs/heads/master Commit: 7615b7576d2d40758f55cae3f4ea3346322cef0f Parents: 54b2c64 Author: JaeHwa Jung <[email protected]> Authored: Thu Jan 8 11:20:54 2015 +0900 Committer: JaeHwa Jung <[email protected]> Committed: Thu Jan 8 11:22:18 2015 +0900 ---------------------------------------------------------------------- CHANGES | 3 +++ .../java/org/apache/tajo/ha/HAServiceUtil.java | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/7615b757/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index d20e9d4..9ca4579 100644 --- a/CHANGES +++ b/CHANGES @@ -27,6 +27,9 @@ Release 0.9.1 - unreleased IMPROVEMENT + TAJO-1285: Refactoring Magic Number to HAConstants. + (DaeMyung Kang via jaehwa) + TAJO-1245: Add documentation about PostgreSQL and Oracle Catalog driver. (jihoon) http://git-wip-us.apache.org/repos/asf/tajo/blob/7615b757/tajo-common/src/main/java/org/apache/tajo/ha/HAServiceUtil.java ---------------------------------------------------------------------- diff --git a/tajo-common/src/main/java/org/apache/tajo/ha/HAServiceUtil.java b/tajo-common/src/main/java/org/apache/tajo/ha/HAServiceUtil.java index b62d73b..52c2ade 100644 --- a/tajo-common/src/main/java/org/apache/tajo/ha/HAServiceUtil.java +++ b/tajo-common/src/main/java/org/apache/tajo/ha/HAServiceUtil.java @@ -97,19 +97,19 @@ public class HAServiceUtil { String[] addresses = data.split("_"); switch (type) { - case 1: + case HAConstants.MASTER_UMBILICAL_RPC_ADDRESS: masterAddress = NetUtils.createSocketAddr(hostAddress); break; - case 2: + case HAConstants.MASTER_CLIENT_RPC_ADDRESS: masterAddress = NetUtils.createSocketAddr(addresses[0]); break; - case 3: + case HAConstants.RESOURCE_TRACKER_RPC_ADDRESS: masterAddress = NetUtils.createSocketAddr(addresses[1]); break; - case 4: + case HAConstants.CATALOG_ADDRESS: masterAddress = NetUtils.createSocketAddr(addresses[2]); break; - case 5: + case HAConstants.MASTER_INFO_ADDRESS: masterAddress = NetUtils.createSocketAddr(addresses[3]); break; default: @@ -125,23 +125,23 @@ public class HAServiceUtil { if (masterAddress == null) { switch (type) { - case 1: + case HAConstants.MASTER_UMBILICAL_RPC_ADDRESS: masterAddress = NetUtils.createSocketAddr(conf.getVar(TajoConf.ConfVars .TAJO_MASTER_UMBILICAL_RPC_ADDRESS)); break; - case 2: + case HAConstants.MASTER_CLIENT_RPC_ADDRESS: masterAddress = NetUtils.createSocketAddr(conf.getVar(TajoConf.ConfVars .TAJO_MASTER_CLIENT_RPC_ADDRESS)); break; - case 3: + case HAConstants.RESOURCE_TRACKER_RPC_ADDRESS: masterAddress = NetUtils.createSocketAddr(conf.getVar(TajoConf.ConfVars .RESOURCE_TRACKER_RPC_ADDRESS)); break; - case 4: + case HAConstants.CATALOG_ADDRESS: masterAddress = NetUtils.createSocketAddr(conf.getVar(TajoConf.ConfVars .CATALOG_ADDRESS)); break; - case 5: + case HAConstants.MASTER_INFO_ADDRESS: masterAddress = NetUtils.createSocketAddr(conf.getVar(TajoConf.ConfVars .TAJO_MASTER_INFO_ADDRESS)); break;
