[incubator-doris] branch master updated: [Bug] Missing `in memory` property for old version of partition info (#2948)

[zhaoc]

This is an automated email from the ASF dual-hosted git repository.

zhaoc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git


The following commit(s) were added to refs/heads/master by this push:
     new cfcc29f  [Bug] Missing `in memory` property for old version of 
partition info (#2948)
cfcc29f is described below

commit cfcc29fb218e7c9f78e1955b50940317b7bd2ae5
Author: Mingyu Chen <morningman....@gmail.com>
AuthorDate: Wed Feb 19 20:19:00 2020 +0800

    [Bug] Missing `in memory` property for old version of partition info (#2948)
    
    This bug is introduced by PR #2846
---
 fe/src/main/cup/sql_parser.cup                               | 2 +-
 fe/src/main/java/org/apache/doris/catalog/PartitionInfo.java | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/fe/src/main/cup/sql_parser.cup b/fe/src/main/cup/sql_parser.cup
index d6ee476..62f3925 100644
--- a/fe/src/main/cup/sql_parser.cup
+++ b/fe/src/main/cup/sql_parser.cup
@@ -1721,7 +1721,7 @@ opt_engine ::=
 
 opt_key_value_map ::=
     {:
-    RESULT = null;
+    RESULT = Maps.newHashMap();
     :}
     | LPAREN key_value_map:map RPAREN
     {:
diff --git a/fe/src/main/java/org/apache/doris/catalog/PartitionInfo.java 
b/fe/src/main/java/org/apache/doris/catalog/PartitionInfo.java
index 61886a5..7aae1c8 100644
--- a/fe/src/main/java/org/apache/doris/catalog/PartitionInfo.java
+++ b/fe/src/main/java/org/apache/doris/catalog/PartitionInfo.java
@@ -151,6 +151,9 @@ public class PartitionInfo implements Writable {
             idToReplicationNum.put(partitionId, replicationNum);
             if (Catalog.getCurrentCatalogJournalVersion() >= 
FeMetaVersion.VERSION_72) {
                 idToInMemory.put(partitionId, in.readBoolean());
+            } else {
+                // for compatibility, default is false
+                idToInMemory.put(partitionId, false);
             }
         }
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org