From 8ce9d667dd60626f500ffb1bf11e6703cb2f99b6 Mon Sep 17 00:00:00 2001
From: morningman <morningman@163.com>
Date: Sat, 24 Aug 2024 00:16:03 +0800
Subject: [PATCH] [fix](catalog) fix use-meta-cache bug

pick part of apache/doris#39239
set default value of use_meta_cache to false, same as previous version,
to avoid compatibility issue.
This should be totally fixed in doris 3.0.2
---
 .../java/org/apache/doris/datasource/ExternalCatalog.java  | 7 +------
 gensrc/script/gen_build_version.sh                         | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalCatalog.java
index 265e4f3523286d..cfacc2d95ed1df 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalCatalog.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalCatalog.java
@@ -101,7 +101,7 @@ public abstract class ExternalCatalog
     public static final String DORIS_VERSION = "doris.version";
     public static final String DORIS_VERSION_VALUE = Version.DORIS_BUILD_VERSION + "-" + Version.DORIS_BUILD_SHORT_HASH;
     public static final String USE_META_CACHE = "use_meta_cache";
-    public static final boolean DEFAULT_USE_META_CACHE = true;
+    public static final boolean DEFAULT_USE_META_CACHE = false;
 
     // Unique id of this catalog, will be assigned after catalog is loaded.
     @SerializedName(value = "id")
@@ -290,11 +290,6 @@ public void checkProperties() throws DdlException {
                 throw new DdlException("Invalid properties: " + CatalogMgr.METADATA_REFRESH_INTERVAL_SEC);
             }
         }
-
-        if (properties.getOrDefault(ExternalCatalog.USE_META_CACHE, "true").equals("false")) {
-            LOG.warn("force to set use_meta_cache to true for catalog: {} when creating", name);
-            getCatalogProperty().addProperty(ExternalCatalog.USE_META_CACHE, "true");
-        }
     }
 
     /**
diff --git a/gensrc/script/gen_build_version.sh b/gensrc/script/gen_build_version.sh
index 6f39775c01032c..a9d23c1398bd51 100755
--- a/gensrc/script/gen_build_version.sh
+++ b/gensrc/script/gen_build_version.sh
@@ -31,7 +31,7 @@ build_version_prefix="doris"
 build_version_major=3
 build_version_minor=0
 build_version_patch=1
-build_version_rc_version="rc04"
+build_version_rc_version="rc04-patch1"
 
 build_version="${build_version_prefix}-${build_version_major}.${build_version_minor}.${build_version_patch}-${build_version_rc_version}"