feat(query): make product name configurable (#20129)

Author: sundy-li

src/query/config/src/config.rs

@@ -1632,6 +1632,10 @@ pub struct QueryConfig {
     #[clap(long, value_name = "VALUE", default_value = "admin")]
     pub tenant_id: String,
 
+    /// Product name used in user-visible server version strings.
+    #[clap(long, value_name = "VALUE", default_value = "Databend Query")]
+    pub product_name: String,
+
     /// ID for construct the cluster.
     #[clap(long, value_name = "VALUE", default_value_t)]
     pub cluster_id: String,

src/query/service/src/sessions/query_ctx.rs

@@ -211,11 +211,18 @@ impl QueryContext {
     pub fn create_from_shared(shared: Arc<QueryContextShared>) -> Arc<QueryContext> {
         debug!("Creating new QueryContext instance");
 
-        let tenant = GlobalConfig::instance().query.tenant_id.clone();
+        let query_config = &GlobalConfig::instance().query;
+        let tenant = query_config.tenant_id.clone();
         let query_settings = Settings::create(tenant);
+        let product_name = query_config.common.product_name.trim();
+        let version = if product_name.is_empty() {
+            shared.version.commit_detail.to_string()
+        } else {
+            format!("{} {}", product_name, shared.version.commit_detail)
+        };
         Arc::new(QueryContext {
             partition_queue: Arc::new(RwLock::new(VecDeque::new())),
-            version: format!("Databend Query {}", shared.version.commit_detail),
+            version,
             mysql_version: format!("{MYSQL_VERSION}-{}", shared.version.commit_detail),
             shared,
             query_settings,

src/query/service/tests/it/configs.rs

@@ -84,6 +84,7 @@ fn test_env_config_s3() -> anyhow::Result<()> {
             ("STORAGE_WEBHDFS_ENDPOINT_URL", Some("endpoint_url")),
             ("STORAGE_WEBHDFS_ROOT", Some("/path/to/root")),
             ("QUERY_TABLE_ENGINE_MEMORY_ENABLED", Some("true")),
+            ("QUERY_PRODUCT_NAME", Some("Cloud Query")),
             ("CONFIG_FILE", None),
         ],
         || {
@@ -94,6 +95,7 @@ fn test_env_config_s3() -> anyhow::Result<()> {
             assert_eq!("DEBUG", configured.log.level);
 
             assert_eq!("tenant-1", configured.query.tenant_id);
+            assert_eq!("Cloud Query", configured.query.product_name);
             assert_eq!("cluster-1", configured.query.cluster_id);
             assert_eq!("127.0.0.1", configured.query.mysql_handler_host);
             assert_eq!(3306, configured.query.mysql_handler_port);
@@ -677,6 +679,7 @@ fn test_override_config() -> anyhow::Result<()> {
 
 [query]
 tenant_id = "tenant_id_from_file"
+product_name = "Cloud Query"
 cluster_id = ""
 num_cpus = 0
 mysql_handler_host = "127.0.0.1"
@@ -811,6 +814,7 @@ path = "_cache"
             assert!(!cfg.log.query.log_query_on);
 
             assert_eq!("tenant_id_from_env", cfg.query.tenant_id);
+            assert_eq!("Cloud Query", cfg.query.product_name);
             assert_eq!("access_key_id_from_env", cfg.storage.s3.access_key_id);
             assert_eq!("s3", cfg.storage.typ);
 

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

@@ -224,6 +224,7 @@ DB.Table: 'system'.'configs', Table: configs-table_id:1, ver:0, Engine: SystemCo
 | 'query'   | 'network_policy_whitelist'                           | ''                                                                                                                                                                                                        | ''       |
 | 'query'   | 'num_cpus'                                           | '0'                                                                                                                                                                                                       | ''       |
 | 'query'   | 'parquet_fast_read_bytes'                            | 'null'                                                                                                                                                                                                    | ''       |
+| 'query'   | 'product_name'                                       | 'Databend Query'                                                                                                                                                                                          | ''       |
 | 'query'   | 'quota'                                              | 'null'                                                                                                                                                                                                    | ''       |
 | 'query'   | 'resources_management'                               | 'null'                                                                                                                                                                                                    | ''       |
 | 'query'   | 'rpc_client_timeout_secs'                            | '0'                                                                                                                                                                                                       | ''       |