This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 08f2f3de775 [fix](merge-cloud) Keep PartitionInfo compatible with the
cloud mode (#32008)
08f2f3de775 is described below
commit 08f2f3de77548c670224383602f3ce9a33936379
Author: walter <[email protected]>
AuthorDate: Tue Mar 12 20:23:36 2024 +0800
[fix](merge-cloud) Keep PartitionInfo compatible with the cloud mode
(#32008)
---
.../java/org/apache/doris/catalog/PartitionInfo.java | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/catalog/PartitionInfo.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/PartitionInfo.java
index 70aee07fad2..52be459731f 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/PartitionInfo.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/PartitionInfo.java
@@ -25,6 +25,7 @@ import org.apache.doris.analysis.PartitionDesc;
import org.apache.doris.analysis.PartitionValue;
import org.apache.doris.analysis.SinglePartitionDesc;
import org.apache.doris.common.AnalysisException;
+import org.apache.doris.common.Config;
import org.apache.doris.common.DdlException;
import org.apache.doris.common.FeMetaVersion;
import org.apache.doris.common.io.Text;
@@ -419,6 +420,14 @@ public class PartitionInfo implements Writable {
idToReplicaAllocation.get(entry.getKey()).write(out);
out.writeBoolean(idToInMemory.get(entry.getKey()));
+ if (Config.isCloudMode()) {
+ // HACK: the origin implementation of the cloud mode has code
likes:
+ //
+ // out.writeBoolean(idToPersistent.get(entry.getKey()));
+ //
+ // keep the compatibility here.
+ out.writeBoolean(false);
+ }
}
int size = partitionExprs.size();
out.writeInt(size);
@@ -452,6 +461,14 @@ public class PartitionInfo implements Writable {
}
idToInMemory.put(partitionId, in.readBoolean());
+ if (Config.isCloudMode()) {
+ // HACK: the origin implementation of the cloud mode has code
likes:
+ //
+ // idToPersistent.put(partitionId, in.readBoolean());
+ //
+ // keep the compatibility here.
+ in.readBoolean();
+ }
}
if (Env.getCurrentEnvJournalVersion() >= FeMetaVersion.VERSION_125) {
int size = in.readInt();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
