fix(query): add config to the embed mode to clarify this mode (#18710)

* fix(query): add config to the embed mode to clarify this mode

* fix(query): add config to the embed mode to clarify this mode

* fix(query): add config to the embed mode to clarify this mode

Author: zhang2014

.github/actions/build_bindings_python/action.yml

@@ -18,7 +18,7 @@ runs:
         raw_version="${{ inputs.version }}"
         # Remove v prefix and suffixes: v1.2.809-nightly -> 1.2.809
         VERSION=$(echo "$raw_version" | sed 's/^v//' | sed 's/-nightly//' | sed 's/-p[0-9]*//')
-        
+
         echo "building version: $raw_version -> $VERSION"
         # Replace any existing version in Cargo.toml and pyproject.toml
         sed "s/^version = \".*\"/version = \"$VERSION\"/" Cargo.toml > Cargo.toml.tmp
@@ -117,4 +117,3 @@ runs:
         python -m pytest tests/ -v --tb=short
 
         echo "All Python binding tests passed!"
-

.github/workflows/bindings.python.yml

@@ -44,12 +44,12 @@ jobs:
             echo "Error: No version provided for workflow_call"
             exit 1
           fi
-          
+
           # Validate version format
           if [[ ! $VERSION =~ ^v[0-9]+\.[0-9]+\.[0-9]+.*$ ]]; then
             echo "Warning: Version $VERSION may not follow semantic versioning (vX.Y.Z)"
           fi
-          
+
           echo "Final version: $VERSION"
           echo "version=$VERSION" >> $GITHUB_OUTPUT
 
@@ -116,17 +116,17 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      
+
       - name: Install dependencies
         run: |
           # Install OpenSSL and necessary tools
           brew install openssl@3
-          
+
           # Use vendored OpenSSL to avoid cross-compilation issues
           echo "OPENSSL_STATIC=1" >> $GITHUB_ENV
           echo "OPENSSL_VENDORED=1" >> $GITHUB_ENV
           echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV
-          
+
       - uses: ./.github/actions/build_bindings_python
         with:
           target: ${{ matrix.target }}

src/bendpy/src/lib.rs

@@ -89,6 +89,7 @@ fn create_embedded_config(
 
     // Query configuration
     conf.query.tenant_id = Tenant::new_literal("python_binding");
+    conf.query.embedded_mode = true;
     conf.query.cluster_id = "".to_string();
     conf.query.warehouse_id = "".to_string();
     conf.query.node_id = "embedded_node".to_string();

src/query/config/src/config.rs

@@ -1791,6 +1791,8 @@ pub struct QueryConfig {
     /// If in management mode, only can do some meta level operations(database/table/user/stage etc.) with metasrv.
     #[clap(long)]
     pub management_mode: bool,
+    #[clap(long)]
+    pub embedded_mode: bool,
 
     /// Deprecated: jwt_key_file is deprecated, use jwt_key_files to add a list of available jwks url
     #[clap(long, value_name = "VALUE", default_value_t)]
@@ -2017,6 +2019,7 @@ impl TryInto<InnerQueryConfig> for QueryConfig {
             max_query_log_size: self.max_query_log_size,
             databend_enterprise_license: self.databend_enterprise_license,
             management_mode: self.management_mode,
+            embedded_mode: self.embedded_mode,
             parquet_fast_read_bytes: self.parquet_fast_read_bytes,
             max_storage_io_requests: self.max_storage_io_requests,
             jwt_key_file: self.jwt_key_file,
@@ -2159,6 +2162,7 @@ impl From<InnerQueryConfig> for QueryConfig {
             settings: HashMap::new(),
             resources_management: None,
             enable_queries_executor: inner.enable_queries_executor,
+            embedded_mode: inner.embedded_mode,
         }
     }
 }

src/query/config/src/global.rs

@@ -48,6 +48,8 @@ impl GlobalConfig {
     /// Embedded mode is determined by empty cluster_id and warehouse_id
     pub fn is_embedded_mode() -> bool {
         let config = Self::instance();
-        config.query.cluster_id.is_empty() && config.query.warehouse_id.is_empty()
+        config.query.embedded_mode
+            && config.query.cluster_id.is_empty()
+            && config.query.warehouse_id.is_empty()
     }
 }

src/query/config/src/inner.rs

@@ -209,6 +209,7 @@ pub struct QueryConfig {
     pub databend_enterprise_license: Option<String>,
     /// If in management mode, only can do some meta level operations(database/table/user/stage etc.) with metasrv.
     pub management_mode: bool,
+    pub embedded_mode: bool,
 
     pub parquet_fast_read_bytes: Option<u64>,
     pub max_storage_io_requests: Option<u64>,
@@ -302,6 +303,7 @@ impl Default for QueryConfig {
             max_query_log_size: 10_000,
             databend_enterprise_license: None,
             management_mode: false,
+            embedded_mode: false,
             parquet_fast_read_bytes: None,
             max_storage_io_requests: None,
             jwt_key_file: "".to_string(),

src/query/service/tests/it/storages/testdata/configs_table_basic.txt

@@ -163,6 +163,7 @@ DB.Table: 'system'.'configs', Table: configs-table_id:1, ver:0, Engine: SystemCo
 | 'query'   | 'default_storage_format'                             | 'auto'                                                                                                                                                                                                    | ''       |
 | 'query'   | 'disable_system_table_load'                          | 'false'                                                                                                                                                                                                   | ''       |
 | 'query'   | 'discovery_address'                                  | ''                                                                                                                                                                                                        | ''       |
+| 'query'   | 'embedded_mode'                                      | 'false'                                                                                                                                                                                                   | ''       |
 | 'query'   | 'enable_meta_data_upgrade_json_to_pb_from_v307'      | 'false'                                                                                                                                                                                                   | ''       |
 | 'query'   | 'enable_queries_executor'                            | 'false'                                                                                                                                                                                                   | ''       |
 | 'query'   | 'enable_udf_js_script'                               | 'true'                                                                                                                                                                                                    | ''       |