You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by hy...@apache.org on 2014/09/04 14:06:17 UTC
git commit: TAJO-937: Should use tajo.util.VersionInfo instead of
TajoConstants.TAJO_VERSION. (Mai Hai Thanh via hyunsik)
Repository: tajo
Updated Branches:
refs/heads/master 0e4362744 -> bdc75750e
TAJO-937: Should use tajo.util.VersionInfo instead of TajoConstants.TAJO_VERSION. (Mai Hai Thanh via hyunsik)
Closes #131
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/bdc75750
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/bdc75750
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/bdc75750
Branch: refs/heads/master
Commit: bdc75750e9026a3c1bc0a9a7008505cb0bbedca4
Parents: 0e43627
Author: Hyunsik Choi <hy...@apache.org>
Authored: Thu Sep 4 16:12:40 2014 +0900
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Thu Sep 4 16:12:40 2014 +0900
----------------------------------------------------------------------
CHANGES | 3 +++
.../src/main/java/org/apache/tajo/cli/VersionCommand.java | 4 ++--
tajo-common/src/main/java/org/apache/tajo/TajoConstants.java | 1 -
tajo-core/src/main/java/org/apache/tajo/master/TajoMaster.java | 4 ++--
.../src/main/java/org/apache/tajo/jdbc/TajoDatabaseMetaData.java | 4 ++--
5 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/bdc75750/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 707fb38..c64c08e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -31,6 +31,9 @@ Release 0.9.0 - unreleased
IMPROVEMENT
+ TAJO-937: Should use tajo.util.VersionInfo instead of
+ TajoConstants.TAJO_VERSION. (Mai Hai Thanh via hyunsik)
+
TAJO-991: Running PullServer on a dedicated JVM process which separates from worker.
(Hyoungjun Kim)
http://git-wip-us.apache.org/repos/asf/tajo/blob/bdc75750/tajo-client/src/main/java/org/apache/tajo/cli/VersionCommand.java
----------------------------------------------------------------------
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 b62c425..c3a1f75 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 class VersionCommand extends TajoShellCommand {
@Override
public void invoke(String[] cmd) throws Exception {
- context.getOutput().println(TajoConstants.TAJO_VERSION);
+ context.getOutput().println(VersionInfo.getVersion());
}
@Override
http://git-wip-us.apache.org/repos/asf/tajo/blob/bdc75750/tajo-common/src/main/java/org/apache/tajo/TajoConstants.java
----------------------------------------------------------------------
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 ffe8c02..be61783 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";
http://git-wip-us.apache.org/repos/asf/tajo/blob/bdc75750/tajo-core/src/main/java/org/apache/tajo/master/TajoMaster.java
----------------------------------------------------------------------
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 8d4a6a3..e393783 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
@@ -36,7 +36,6 @@ import org.apache.hadoop.yarn.event.EventHandler;
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 +59,7 @@ import org.apache.tajo.util.ClassUtil;
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 +143,7 @@ public class TajoMaster extends CompositeService {
}
public String getVersion() {
- return TajoConstants.TAJO_VERSION;
+ return VersionInfo.getVersion();
}
public TajoMasterClientService getTajoMasterClientService() {
http://git-wip-us.apache.org/repos/asf/tajo/blob/bdc75750/tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoDatabaseMetaData.java
----------------------------------------------------------------------
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 1b73047..c422751 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 @@ package org.apache.tajo.jdbc;
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 +26,7 @@ import org.apache.tajo.client.TajoClient;
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 +83,7 @@ public class TajoDatabaseMetaData implements DatabaseMetaData {
@Override
public String getDatabaseProductVersion() throws SQLException {
- return TajoConstants.TAJO_VERSION;
+ return VersionInfo.getVersion();
}
@Override