database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[PALO-3059] added the variable of collation_server

Browse Source
This commit is contained in:
lide-reed
2018-01-03 19:52:40 +08:00
parent 724a1d0f87
commit 78c45dfddd
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fe/src/com/baidu/palo/common/FeConstants.java
View File

@ -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;
}

7
fe/src/com/baidu/palo/common/FeMetaVersion.java
View File

@ -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;
}

8
fe/src/com/baidu/palo/qe/SessionVariable.java
View File

@ -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);
}
}
}