Update and refine code framework.

xuchenhao · xuchenhao · commit 940d4db4e025 · 2026-02-11T13:46:57.000+08:00
diff --git a/be/src/exec/rowid_fetcher.cpp b/be/src/exec/rowid_fetcher.cpp
@@ -422,7 +422,7 @@ Status RowIdStorageReader::read_by_rowids(const PMultiGetRequest& request,
                     << ", row_size:" << row_size;
             *response->add_row_locs() = row_loc;
         });
-        // TODO: supoort session variable enable_page_cache and enable_file_cache_olap_tables if necessary.
+        // TODO: supoort session variable enable_page_cache and disable_file_cache if necessary.
         SegmentCacheHandle segment_cache;
         RETURN_IF_ERROR(scope_timer_run(
                 [&]() {
diff --git a/be/src/io/file_factory.cpp b/be/src/io/file_factory.cpp
@@ -66,8 +66,8 @@ io::FileReaderOptions FileFactory::get_reader_options(RuntimeState* state,
             .mtime = fd.mtime,
     };
     if (config::enable_file_cache && state != nullptr &&
-        state->query_options().__isset.enable_file_cache_external_catalogs &&
-        state->query_options().enable_file_cache_external_catalogs) {
+        state->query_options().__isset.enable_file_cache_external_catalog &&
+        state->query_options().enable_file_cache_external_catalog) {
         opts.cache_type = io::FileCachePolicy::FILE_BLOCK_CACHE;
     }
     if (state != nullptr && state->query_options().__isset.file_cache_base_path &&
diff --git a/be/src/io/io_common.h b/be/src/io/io_common.h
@@ -79,7 +79,6 @@ struct IOContext {
     // FIXME(plat1ko): Seems `is_disposable` can be inferred from the `reader_type`?
     bool is_disposable = false;
     bool is_index_data = false;
-    // have not been used in Doris
     bool read_file_cache = true;
     // TODO(lightman): use following member variables to control file cache
     bool is_persistent = false;
diff --git a/be/src/olap/rowset/beta_rowset_reader.cpp b/be/src/olap/rowset/beta_rowset_reader.cpp
@@ -221,7 +221,7 @@ Status BetaRowsetReader::get_segment_iterators(RowsetReaderContext* read_context
     if (_read_context->runtime_state != nullptr) {
         _read_options.io_ctx.query_id = &_read_context->runtime_state->query_id();
         _read_options.io_ctx.is_disposable =
-                !_read_context->runtime_state->query_options().enable_file_cache_olap_tables;
+                !_read_context->runtime_state->query_options().enable_file_cache_olap_table;
     }
 
     if (_read_context->condition_cache_digest) {
diff --git a/be/src/runtime/query_context.cpp b/be/src/runtime/query_context.cpp
@@ -113,6 +113,8 @@ QueryContext::QueryContext(TUniqueId query_id, ExecEnv* exec_env,
 
     bool initialize_context_holder =
             config::enable_file_cache && config::enable_file_cache_query_limit &&
+            !(query_options.query_type == TQueryType::EXTERNAL &&
+              !query_options.enable_file_cache_external_catalog) &&
             query_options.__isset.file_cache_query_limit_percent &&
             query_options.file_cache_query_limit_percent < 100;
 
diff --git a/be/src/vec/exec/scan/file_scanner.cpp b/be/src/vec/exec/scan/file_scanner.cpp
@@ -169,7 +169,7 @@ Status FileScanner::init(RuntimeState* state, const VExprContextSPtrs& conjuncts
     RETURN_IF_ERROR(_init_io_ctx());
     _io_ctx->file_cache_stats = _file_cache_statistics.get();
     _io_ctx->file_reader_stats = _file_reader_stats.get();
-    _io_ctx->is_disposable = !_state->query_options().enable_file_cache_external_catalogs;
+    _io_ctx->is_disposable = !_state->query_options().enable_file_cache_external_catalog;
 
     if (_is_load) {
         _src_row_desc.reset(new RowDescriptor(_state->desc_tbl(),
@@ -1812,7 +1812,7 @@ void FileScanner::update_realtime_counters() {
 
 void FileScanner::_collect_profile_before_close() {
     Scanner::_collect_profile_before_close();
-    if (config::enable_file_cache && _state->query_options().enable_file_cache_external_catalogs &&
+    if (config::enable_file_cache && _state->query_options().enable_file_cache_external_catalog &&
         _profile != nullptr) {
         io::FileCacheProfileReporter cache_profile(_profile);
         cache_profile.update(_file_cache_statistics.get());
diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalScanNode.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalScanNode.java
@@ -44,7 +44,7 @@ public abstract class ExternalScanNode extends ScanNode {
     protected boolean needCheckColumnPriv;
 
     protected final FederationBackendPolicy backendPolicy = (ConnectContext.get() != null
-            && (ConnectContext.get().getSessionVariable().enableFileCacheExternalCatalogs
+            && (ConnectContext.get().getSessionVariable().enableFileCacheExternalCatalog
                 || ConnectContext.get().getSessionVariable().getUseConsistentHashForExternalScan()))
             ? new FederationBackendPolicy(NodeSelectionStrategy.CONSISTENT_HASHING)
             : new FederationBackendPolicy();
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/parser/LogicalPlanBuilder.java
@@ -9135,15 +9135,14 @@ public LogicalPlan visitWarmUpSelect(DorisParser.WarmUpSelectContext ctx) {
 
         LogicalProject project = new LogicalProject(projectList, filter);
 
-        if (Config.isNotCloudMode() && (!ConnectContext.get().getSessionVariable().isEnableFileCacheOlapTables()
-                && !ConnectContext.get().getSessionVariable().isEnableFileCacheExternalCatalogs())) {
+        if (Config.isNotCloudMode() && !ConnectContext.get().getSessionVariable().isEnableFileCacheExternalCatalog()) {
             throw new AnalysisException("WARM UP SELECT requires session variable"
-                    + " enable_file_cache_olap_tables=true or enable_file_cache_external_catalogs=true");
+                    + "  enable_file_cache_external_catalog=true");
         }
 
-        if (Config.isCloudMode() && !ConnectContext.get().getSessionVariable().isEnableFileCacheOlapTables()) {
+        if (Config.isCloudMode() && !ConnectContext.get().getSessionVariable().isEnableFileCacheOlapTable()) {
             throw new AnalysisException("WARM UP SELECT requires session variable"
-                    + " enable_file_cache_olap_tables=true in cloud mode");
+                    + " enable_file_cache_olap_table=true in cloud mode");
         }
 
         UnboundBlackholeSink<?> sink = new UnboundBlackholeSink<>(project,
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/OlapTableSink.java b/fe/fe-core/src/main/java/org/apache/doris/planner/OlapTableSink.java
@@ -156,7 +156,7 @@ public void init(TUniqueId loadId, long txnId, long dbId, long loadChannelTimeou
         tSink.setLoadChannelTimeoutS(loadChannelTimeoutS);
         tSink.setSendBatchParallelism(sendBatchParallelism);
         tSink.setWriteFileCache(ConnectContext.get() != null
-                ? !ConnectContext.get().getSessionVariable().isDisableFileCache()
+                ? ConnectContext.get().getSessionVariable().isEnableFileCacheOlapTable()
                 : false);
         this.isStrictMode = isStrictMode;
         this.txnId = txnId;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/NereidsCoordinator.java b/fe/fe-core/src/main/java/org/apache/doris/qe/NereidsCoordinator.java
@@ -130,7 +130,7 @@ public NereidsCoordinator(Long jobId, TUniqueId queryId, DescriptorTable descTab
                 descTable, timezone, loadZeroTolerance, enableProfile
         );
         // same reason in `setForInsert`
-        this.coordinatorContext.queryOptions.setEnableFileCacheOlapTables(false);
+        this.coordinatorContext.queryOptions.setEnableFileCacheOlapTable(false);
         this.needEnqueue = false;
 
         Preconditions.checkState(!fragments.isEmpty()
@@ -490,7 +490,7 @@ private void setForInsert(long jobId) {
         JobProcessor jobProc = new LoadProcessor(this.coordinatorContext, jobId);
         this.coordinatorContext.setJobProcessor(jobProc);
         // Set this field to true to avoid data entering the normal cache LRU queue
-        this.coordinatorContext.queryOptions.setEnableFileCacheOlapTables(false);
+        this.coordinatorContext.queryOptions.setEnableFileCacheOlapTable(false);
         this.coordinatorContext.queryOptions.setNewVersionUnixTimestamp(true);
     }
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
@@ -473,8 +473,15 @@ public class SessionVariable implements Serializable, Writable {
     public static final String TOPN_OPT_LIMIT_THRESHOLD = "topn_opt_limit_threshold";
     public static final String TOPN_FILTER_RATIO = "topn_filter_ratio";
     public static final String ENABLE_SNAPSHOT_POINT_QUERY = "enable_snapshot_point_query";
-    public static final String ENABLE_FILE_CACHE_OLAP_TABLES = "enable_file_cache_olap_tables";
-    public static final String ENABLE_FILE_CACHE_EXTERNAL_CATALOGS = "enable_file_cache_external_catalogs";
+
+    // deprecated
+    public static final String ENABLE_FILE_CACHE = "enable_file_cache";
+
+    // deprecated
+    public static final String DISABLE_FILE_CACHE = "disable_file_cache";
+
+    public static final String ENABLE_FILE_CACHE_OLAP_TABLE = "enable_file_cache_olap_table";
+    public static final String ENABLE_FILE_CACHE_EXTERNAL_CATALOG = "enable_file_cache_external_catalog";
 
     public static final String FILE_CACHE_QUERY_LIMIT_PERCENT = "file_cache_query_limit_percent";
 
@@ -2134,19 +2141,32 @@ public boolean isEnableHboNonStrictMatchingMode() {
     @VariableMgr.VarAttr(name = GROUP_BY_AND_HAVING_USE_ALIAS_FIRST, varType = VariableAnnotation.DEPRECATED)
     public boolean groupByAndHavingUseAliasFirst = false;
 
-    @VariableMgr.VarAttr(name = ENABLE_FILE_CACHE_OLAP_TABLES, needForward = true, description = {
+    // Whether disable block file cache. Block cache only works when FE's query options sets disableFileCache false
+    // along with BE's config `enable_file_cache` true
+    @VariableMgr.VarAttr(name = DISABLE_FILE_CACHE, needForward = true, varType = VariableAnnotation.DEPRECATED)
+    public boolean disableFileCache = false;
+
+    // Whether enable block file cache. Only take effect when BE config item enable_file_cache is true.
+    @VariableMgr.VarAttr(name = ENABLE_FILE_CACHE, needForward = true, varType = VariableAnnotation.DEPRECATED,
+            description = {"是否启用 file cache。该变量只有在 be.conf 中 enable_file_cache=true 时才有效，"
+                    + "如果 be.conf 中 enable_file_cache=false，该 BE 节点的 file cache 处于禁用状态。",
+                "Set whether to use file cache. This variable takes effect only if the BE config "
+                    + "enable_file_cache=true. The cache is not used when BE config enable_file_cache=false."})
+    public boolean enableFileCache = false;
+
+    @VariableMgr.VarAttr(name = ENABLE_FILE_CACHE_OLAP_TABLE, needForward = true, description = {
             "是否启用 olap table file cache。该变量只有在 be.conf 中 enable_file_cache=true 时才有效，"
                     + "如果 be.conf 中 enable_file_cache=false，该 BE 节点的 file cache 处于禁用状态。",
-            "Set wether to use olap table file cache. This variable takes effect only if the BE config enable_file_cache=true. "
-                    + "The cache is not used when BE config enable_file_cache=false."})
-    public boolean enableFileCacheOlapTables = true;
+            "Set whether to use olap table file cache. This variable takes effect only if the BE config "
+                    + "enable_file_cache=true. The cache is not used when BE config enable_file_cache=false."})
+    public boolean enableFileCacheOlapTable = true;
 
-    @VariableMgr.VarAttr(name = ENABLE_FILE_CACHE_EXTERNAL_CATALOGS, needForward = true, description = {
+    @VariableMgr.VarAttr(name = ENABLE_FILE_CACHE_EXTERNAL_CATALOG, needForward = true, description = {
             "是否启用 external catalog file cache。该变量只有在 be.conf 中 enable_file_cache=true 时才有效，"
                     + "如果 be.conf 中 enable_file_cache=false，该 BE 节点的 file cache 处于禁用状态。",
-            "Set wether to use external catalog file cache. This variable takes effect only if the BE config enable_file_cache=true. "
-                    + "The cache is not used when BE config enable_file_cache=false."})
-    public boolean enableFileCacheExternalCatalogs = false;
+            "Set whether to use external catalog file cache. This variable takes effect only if the BE config "
+                    + "enable_file_cache=true. The cache is not used when BE config enable_file_cache=false."})
+    public boolean enableFileCacheExternalCatalog = false;
 
     // Specify base path for file cache, or chose a random path.
     @VariableMgr.VarAttr(name = FILE_CACHE_BASE_PATH, needForward = true, description = {
@@ -4030,11 +4050,11 @@ public void setResourceGroup(String resourceGroup) {
     }
 
     public boolean isDisableFileCache() {
-        return Config.isCloudMode() ? !enableFileCacheOlapTables : false;
+        return Config.isCloudMode() ? disableFileCache : false;
     }
 
     public void setDisableFileCache(boolean disableFileCache) {
-        this.enableFileCacheOlapTables = !disableFileCache;
+        this.disableFileCache = disableFileCache;
     }
 
     public boolean isDisableColocatePlan() {
@@ -4872,20 +4892,28 @@ public long convertBoolToLong(Boolean val) {
         return val ? 1 : 0;
     }
 
-    public boolean isEnableFileCacheOlapTables() {
-        return enableFileCacheOlapTables;
+    public boolean isEnableFileCache() {
+        return enableFileCache;
     }
 
-    public void setEnableFileCacheOlapTables(boolean enableFileCacheOlapTables) {
-        this.enableFileCacheOlapTables = enableFileCacheOlapTables;
+    public void setEnableFileCache(boolean enableFileCache) {
+        this.enableFileCache = enableFileCache;
     }
 
-    public boolean isEnableFileCacheExternalCatalogs() {
-        return enableFileCacheExternalCatalogs;
+    public boolean isEnableFileCacheOlapTable() {
+        return enableFileCacheOlapTable;
     }
 
-    public void setEnableFileCacheExternalCatalogs(boolean enableFileCacheExternalCatalogs) {
-        this.enableFileCacheExternalCatalogs = enableFileCacheExternalCatalogs;
+    public void setEnableFileCacheOlapTable(boolean enableFileCacheOlapTable) {
+        this.enableFileCacheOlapTable = enableFileCacheOlapTable;
+    }
+
+    public boolean isEnableFileCacheExternalCatalog() {
+        return enableFileCache;
+    }
+
+    public void setEnableFileCacheExternalCatalog(boolean enableFileCacheExternalCatalog) {
+        this.enableFileCacheExternalCatalog = enableFileCacheExternalCatalog;
     }
 
     public String getFileCacheBasePath() {
@@ -5074,6 +5102,8 @@ public TQueryOptions toThrift() {
 
         tResult.setSkipDeleteBitmap(skipDeleteBitmap);
 
+        tResult.setEnableFileCache(enableFileCache);
+
         tResult.setEnablePageCache(enablePageCache);
 
         tResult.setEnableParquetFilePageCache(enableParquetFilePageCache);
@@ -5117,9 +5147,7 @@ public TQueryOptions toThrift() {
         tResult.setParallelScanMinRowsPerScanner(parallelScanMinRowsPerScanner);
         tResult.setOptimizeIndexScanParallelism(optimizeIndexScanParallelism);
         tResult.setSkipBadTablet(skipBadTablet);
-
-        tResult.setEnableFileCacheOlapTables(enableFileCacheOlapTables);
-        tResult.setEnableFileCacheExternalCatalogs(enableFileCacheExternalCatalogs);
+        tResult.setDisableFileCache(disableFileCache);
 
         tResult.setEnablePreferCachedRowset(getEnablePreferCachedRowset());
         tResult.setQueryFreshnessToleranceMs(getQueryFreshnessToleranceMs());
diff --git a/fe/fe-core/src/main/java/org/apache/doris/statistics/util/StatisticsUtil.java b/fe/fe-core/src/main/java/org/apache/doris/statistics/util/StatisticsUtil.java
@@ -223,6 +223,7 @@ public static AutoCloseConnectContext buildConnectContext(boolean useFileCacheFo
         sessionVariable.parallelPipelineTaskNum = Config.statistics_sql_parallel_exec_instance_num;
         sessionVariable.setQueryTimeoutS(StatisticsUtil.getAnalyzeTimeout());
         sessionVariable.insertTimeoutS = StatisticsUtil.getAnalyzeTimeout();
+        sessionVariable.enableFileCache = false;
         sessionVariable.forbidUnknownColStats = false;
         sessionVariable.enablePushDownMinMaxOnUnique = true;
         sessionVariable.enablePushDownStringMinMax = true;
@@ -242,7 +243,7 @@ public static AutoCloseConnectContext buildConnectContext(boolean useFileCacheFo
                 LOG.warn("failed to connect to cloud cluster", e);
                 return ctx;
             }
-            sessionVariable.enableFileCacheOlapTables = useFileCacheForStat;
+            sessionVariable.enableFileCacheOlapTable = useFileCacheForStat;
             return ctx;
         } else {
             return new AutoCloseConnectContext(connectContext);
diff --git a/fe/fe-core/src/test/java/org/apache/doris/nereids/parser/NereidsParserTest.java b/fe/fe-core/src/test/java/org/apache/doris/nereids/parser/NereidsParserTest.java
@@ -1393,6 +1393,7 @@ public void testAdminRotateTdeRootKey() {
     @Test
     public void testWarmUpSelect() {
         ConnectContext ctx = ConnectContext.get();
+        ctx.getSessionVariable().setEnableFileCacheOlapTable(true);
         NereidsParser nereidsParser = new NereidsParser();
 
         // Test basic warm up select statement
diff --git a/gensrc/thrift/PaloInternalService.thrift b/gensrc/thrift/PaloInternalService.thrift
@@ -201,7 +201,8 @@ struct TQueryOptions {
   // deprecated
   60: optional i32 partitioned_hash_agg_rows_threshold = 0 // deprecated
 
-  61: optional bool enable_file_cache_deprecated = false // deprecated
+  // deprecated
+  61: optional bool enable_file_cache = false
 
   62: optional i32 insert_timeout = 14400
 
@@ -424,17 +425,21 @@ struct TQueryOptions {
   183: optional bool enable_use_hybrid_sort = false;
   184: optional i32 cte_max_recursion_depth;
 
+
   185: optional bool enable_parquet_file_page_cache = true;
 
   195: optional bool enable_left_semi_direct_return_opt;
 
   // For cloud, to control if the content would be written into file cache
   // In write path, to control if the content would be written into file cache.
   // In read path, read from file cache or remote storage when execute query.
-  186: optional bool enable_file_cache_olap_tables = true;
-  187: optional bool enable_file_cache_external_catalogs = false;
 
+  // deprecated
+  1000: optional bool disable_file_cache = false
   1001: optional i32 file_cache_query_limit_percent = -1
+
+  1002: optional bool enable_file_cache_olap_table = true;
+  1003: optional bool enable_file_cache_external_catalog = false;
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ Status BetaRowsetReader::get_segment_iterators(RowsetReaderContext* read_context`
`221`	`221`	`if (_read_context->runtime_state != nullptr) {`
`222`	`222`	`_read_options.io_ctx.query_id = &_read_context->runtime_state->query_id();`
`223`	`223`	`_read_options.io_ctx.is_disposable =`
`224`		`- !_read_context->runtime_state->query_options().enable_file_cache_olap_tables;`
	`224`	`+ !_read_context->runtime_state->query_options().enable_file_cache_olap_table;`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`if (_read_context->condition_cache_digest) {`