diff --git a/fe/src/com/baidu/palo/common/FeConstants.java b/fe/src/com/baidu/palo/common/FeConstants.java index e8d32b8c5d..06a57f0d3f 100644 --- a/fe/src/com/baidu/palo/common/FeConstants.java +++ b/fe/src/com/baidu/palo/common/FeConstants.java @@ -38,5 +38,5 @@ public class FeConstants { // general model // Current meta data version. Use this version to write journals and image - public static int meta_version = FeMetaVersion.VERSION_36; + public static int meta_version = FeMetaVersion.VERSION_37; } diff --git a/fe/src/com/baidu/palo/common/FeMetaVersion.java b/fe/src/com/baidu/palo/common/FeMetaVersion.java index dc1d1e9750..46a6e83afe 100644 --- a/fe/src/com/baidu/palo/common/FeMetaVersion.java +++ b/fe/src/com/baidu/palo/common/FeMetaVersion.java @@ -72,8 +72,11 @@ public final class FeMetaVersion { // update the BE in cluster, because of forgeting // to remove backend in cluster when drop backend or // decommission in latest versions. - public static final int VERSION_35= 35; + public static final int VERSION_35 = 35; // persist diskAvailableCapacity - public static final int VERSION_36= 36; + public static final int VERSION_36 = 36; + + // added collation_server to variables (palo-3059) + public static final int VERSION_37 = 37; } diff --git a/fe/src/com/baidu/palo/qe/SessionVariable.java b/fe/src/com/baidu/palo/qe/SessionVariable.java index f78ba5aba6..981a113299 100644 --- a/fe/src/com/baidu/palo/qe/SessionVariable.java +++ b/fe/src/com/baidu/palo/qe/SessionVariable.java @@ -17,6 +17,8 @@ package com.baidu.palo.qe; import com.baidu.palo.thrift.TQueryOptions; import com.baidu.palo.common.io.Writable; +import com.baidu.palo.catalog.Catalog; +import com.baidu.palo.common.FeMetaVersion; import com.baidu.palo.common.io.Text; import java.io.Serializable; @@ -400,7 +402,6 @@ public class SessionVariable implements Serializable, Writable { out.writeLong(sqlSelectLimit); out.writeBoolean(sqlAutoIsNull); Text.writeString(out, collationDatabase); - Text.writeString(out, collationServer); Text.writeString(out, collationConnection); Text.writeString(out, charsetServer); Text.writeString(out, charsetResults); @@ -413,6 +414,7 @@ public class SessionVariable implements Serializable, Writable { out.writeBoolean(isReportSucc); out.writeInt(queryTimeoutS); out.writeLong(maxExecMemByte); + Text.writeString(out, collationServer); } @Override @@ -431,7 +433,6 @@ public class SessionVariable implements Serializable, Writable { sqlSelectLimit = in.readLong(); sqlAutoIsNull = in.readBoolean(); collationDatabase = Text.readString(in); - collationServer = Text.readString(in); collationConnection = Text.readString(in); charsetServer = Text.readString(in); charsetResults = Text.readString(in); @@ -444,5 +445,8 @@ public class SessionVariable implements Serializable, Writable { isReportSucc = in.readBoolean(); queryTimeoutS = in.readInt(); maxExecMemByte = in.readLong(); + if (Catalog.getCurrentCatalogJournalVersion() >= FeMetaVersion.VERSION_37) { + collationServer = Text.readString(in); + } } }