From bee568420afab67f004ff4f3cbf9d3d53d4e110e Mon Sep 17 00:00:00 2001 From: mhthanh Date: Wed, 3 Sep 2014 17:42:22 +0900 Subject: [PATCH 1/3] TAJO-937: Should use tajo.util.VersionInfo instead of TajoConstants.TAJO_VERSION --- .../src/main/java/org/apache/tajo/cli/VersionCommand.java | 4 ++-- tajo-common/src/main/java/org/apache/tajo/TajoConstants.java | 1 - .../src/main/java/org/apache/tajo/master/TajoMaster.java | 5 +++-- .../main/java/org/apache/tajo/jdbc/TajoDatabaseMetaData.java | 5 +++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tajo-client/src/main/java/org/apache/tajo/cli/VersionCommand.java b/tajo-client/src/main/java/org/apache/tajo/cli/VersionCommand.java index b62c4259c1..c3a1f75b5c 100644 --- a/tajo-client/src/main/java/org/apache/tajo/cli/VersionCommand.java +++ b/tajo-client/src/main/java/org/apache/tajo/cli/VersionCommand.java @@ -18,7 +18,7 @@ package org.apache.tajo.cli; -import org.apache.tajo.TajoConstants; +import org.apache.tajo.util.VersionInfo; public class VersionCommand extends TajoShellCommand { @@ -33,7 +33,7 @@ public String getCommand() { @Override public void invoke(String[] cmd) throws Exception { - context.getOutput().println(TajoConstants.TAJO_VERSION); + context.getOutput().println(VersionInfo.getVersion()); } @Override diff --git a/tajo-common/src/main/java/org/apache/tajo/TajoConstants.java b/tajo-common/src/main/java/org/apache/tajo/TajoConstants.java index ffe8c02db9..be617830ed 100644 --- a/tajo-common/src/main/java/org/apache/tajo/TajoConstants.java +++ b/tajo-common/src/main/java/org/apache/tajo/TajoConstants.java @@ -19,7 +19,6 @@ package org.apache.tajo; public class TajoConstants { - public static final String TAJO_VERSION = "0.9.0-SNAPSHOT"; public static final String SYSTEM_CONF_FILENAME = "system_conf.xml"; public static final String SYSTEM_DIR_NAME = "system"; 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 8d4a6a3b7b..fa68372a16 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 @@ -19,6 +19,7 @@ package org.apache.tajo.master; import com.google.protobuf.ServiceException; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; @@ -36,7 +37,6 @@ import org.apache.hadoop.yarn.util.Clock; import org.apache.hadoop.yarn.util.RackResolver; import org.apache.hadoop.yarn.util.SystemClock; -import org.apache.tajo.TajoConstants; import org.apache.tajo.catalog.*; import org.apache.tajo.catalog.function.Function; import org.apache.tajo.common.TajoDataTypes.Type; @@ -60,6 +60,7 @@ import org.apache.tajo.util.CommonTestingUtil; import org.apache.tajo.util.NetUtils; import org.apache.tajo.util.StringUtils; +import org.apache.tajo.util.VersionInfo; import org.apache.tajo.util.metrics.TajoSystemMetrics; import org.apache.tajo.webapp.QueryExecutorServlet; import org.apache.tajo.webapp.StaticHttpServer; @@ -143,7 +144,7 @@ public String getMasterName() { } public String getVersion() { - return TajoConstants.TAJO_VERSION; + return VersionInfo.getVersion(); } public TajoMasterClientService getTajoMasterClientService() { diff --git a/tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoDatabaseMetaData.java b/tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoDatabaseMetaData.java index 1b73047ebc..c9e0e0af44 100644 --- a/tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoDatabaseMetaData.java +++ b/tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoDatabaseMetaData.java @@ -19,7 +19,7 @@ import com.google.common.collect.Lists; import com.google.protobuf.ServiceException; -import org.apache.tajo.TajoConstants; + import org.apache.tajo.annotation.Nullable; import org.apache.tajo.catalog.*; import org.apache.tajo.client.ResultSetUtil; @@ -27,6 +27,7 @@ import org.apache.tajo.common.TajoDataTypes.Type; import org.apache.tajo.datum.NullDatum; import org.apache.tajo.datum.TextDatum; +import org.apache.tajo.util.VersionInfo; import java.sql.*; import java.util.*; @@ -83,7 +84,7 @@ public String getDatabaseProductName() throws SQLException { @Override public String getDatabaseProductVersion() throws SQLException { - return TajoConstants.TAJO_VERSION; + return VersionInfo.getVersion(); } @Override From 46a4c6609b50cbb07e4fae3e58706a4062bb0e44 Mon Sep 17 00:00:00 2001 From: mhthanh Date: Wed, 3 Sep 2014 17:46:18 +0900 Subject: [PATCH 2/3] TAJO-937: Should use tajo.util.VersionInfo instead of TajoConstants.TAJO_VERSION --- tajo-core/src/main/java/org/apache/tajo/master/TajoMaster.java | 1 - 1 file changed, 1 deletion(-) 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 fa68372a16..e393783730 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 @@ -19,7 +19,6 @@ package org.apache.tajo.master; import com.google.protobuf.ServiceException; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; From b7dcb575e8b0b0cb7a0d25ecc1d0dde4063a45c8 Mon Sep 17 00:00:00 2001 From: mhthanh Date: Wed, 3 Sep 2014 17:46:18 +0900 Subject: [PATCH 3/3] TAJO-937: Should use tajo.util.VersionInfo instead of TajoConstants.TAJO_VERSION --- tajo-core/src/main/java/org/apache/tajo/master/TajoMaster.java | 1 - .../src/main/java/org/apache/tajo/jdbc/TajoDatabaseMetaData.java | 1 - 2 files changed, 2 deletions(-) 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 fa68372a16..e393783730 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 @@ -19,7 +19,6 @@ package org.apache.tajo.master; import com.google.protobuf.ServiceException; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; diff --git a/tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoDatabaseMetaData.java b/tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoDatabaseMetaData.java index c9e0e0af44..c4227517c4 100644 --- a/tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoDatabaseMetaData.java +++ b/tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoDatabaseMetaData.java @@ -19,7 +19,6 @@ import com.google.common.collect.Lists; import com.google.protobuf.ServiceException; - import org.apache.tajo.annotation.Nullable; import org.apache.tajo.catalog.*; import org.apache.tajo.client.ResultSetUtil;