Unify version information (#617)

apache · Feb 1, 2019 · 0c864c4 · 0c864c4
1 parent 381bef8
commit 0c864c4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/fe/src/main/java/org/apache/doris/qe/GlobalVariable.java b/fe/src/main/java/org/apache/doris/qe/GlobalVariable.java
@@ -25,7 +25,7 @@
 // NOTE: If you want access your variable safe, please hold VariableMgr's lock before access.
 public final class GlobalVariable {
     @VariableMgr.VarAttr(name = "version_comment", flag = VariableMgr.READ_ONLY)
-    public static String versionComment = "Palo version " + Version.PALO_BUILD_VERSION;
+    public static String versionComment = "Doris version " + Version.PALO_BUILD_VERSION;
 
     @VariableMgr.VarAttr(name = "version", flag = VariableMgr.READ_ONLY)
     public static String version = "5.1.0";

diff --git a/fe/src/main/java/org/apache/doris/qe/StmtExecutor.java b/fe/src/main/java/org/apache/doris/qe/StmtExecutor.java
@@ -57,6 +57,7 @@
 import org.apache.doris.common.util.ProfileManager;
 import org.apache.doris.common.util.RuntimeProfile;
 import org.apache.doris.common.util.TimeUtils;
+import org.apache.doris.common.Version;
 import org.apache.doris.mysql.MysqlChannel;
 import org.apache.doris.mysql.MysqlEofPacket;
 import org.apache.doris.mysql.MysqlSerializer;
@@ -129,7 +130,7 @@ public void initProfile(long beginTimeInNanoSecond) {
 
         summaryProfile.addInfoString(ProfileManager.QUERY_TYPE, "Query");
         summaryProfile.addInfoString(ProfileManager.QUERY_STATE, context.getState().toString());
-        summaryProfile.addInfoString("Palo Version", "Palo version 2.0");
+        summaryProfile.addInfoString("Doris Version", Version.PALO_BUILD_VERSION);
         summaryProfile.addInfoString(ProfileManager.USER, context.getQualifiedUser());
         summaryProfile.addInfoString(ProfileManager.DEFAULT_DB, context.getDatabase());
         summaryProfile.addInfoString(ProfileManager.SQL_STATEMENT, originStmt);

diff --git a/fe/src/main/java/org/apache/doris/task/ExportExportingTask.java b/fe/src/main/java/org/apache/doris/task/ExportExportingTask.java
@@ -28,6 +28,7 @@
 import org.apache.doris.common.util.ProfileManager;
 import org.apache.doris.common.util.RuntimeProfile;
 import org.apache.doris.common.util.TimeUtils;
+import org.apache.doris.common.Version;
 import org.apache.doris.load.ExportFailMsg;
 import org.apache.doris.load.ExportJob;
 import org.apache.doris.qe.Coordinator;
@@ -251,7 +252,7 @@ private void initProfile() {
 
         summaryProfile.addInfoString(ProfileManager.QUERY_TYPE, "Query");
         summaryProfile.addInfoString(ProfileManager.QUERY_STATE, job.getState().toString());
-        summaryProfile.addInfoString("Palo Version", "Palo version 2.0");
+        summaryProfile.addInfoString("Doris Version", Version.PALO_BUILD_VERSION);
         summaryProfile.addInfoString(ProfileManager.USER, "xxx");
         summaryProfile.addInfoString(ProfileManager.DEFAULT_DB, String.valueOf(job.getDbId()));
         summaryProfile.addInfoString(ProfileManager.SQL_STATEMENT, job.getSql());