make access partition table be config

apache · Aug 29, 2023 · 7518577 · 7518577
1 parent 080c824
commit 7518577
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 4 deletions.
diff --git a/proxy/src/grpc/sql_query.rs b/proxy/src/grpc/sql_query.rs
@@ -82,7 +82,15 @@ impl Proxy {
 
         let req_context = req.context.as_ref().unwrap();
         let schema = &req_context.database;
-        match self.handle_sql(ctx, schema, &req.sql, false).await? {
+        match self
+            .handle_sql(
+                ctx,
+                schema,
+                &req.sql,
+                self.access_partition_table.enable_other,
+            )
+            .await?
+        {
             SqlResponse::Forwarded(resp) => Ok(resp),
             SqlResponse::Local(output) => convert_output(&output, self.resp_compress_min_length),
         }
@@ -138,7 +146,12 @@ impl Proxy {
         let resp_compress_min_length = self.resp_compress_min_length;
         let output = self
             .as_ref()
-            .fetch_sql_query_output(ctx, schema, &req.sql, false)
+            .fetch_sql_query_output(
+                ctx,
+                schema,
+                &req.sql,
+                self.access_partition_table.enable_other,
+            )
             .await?;
 
         match output {

diff --git a/proxy/src/http/sql.rs b/proxy/src/http/sql.rs
@@ -50,7 +50,12 @@ impl Proxy {
         let ctx = Context::new(ctx.timeout, None);
 
         match self
-            .handle_sql(&ctx, schema, &req.query, true)
+            .handle_sql(
+                &ctx,
+                schema,
+                &req.query,
+                self.access_partition_table.enable_http,
+            )
             .await
             .map_err(|e| {
                 error!("Handle sql query failed, ctx:{ctx:?}, req:{req:?}, err:{e}");

diff --git a/proxy/src/lib.rs b/proxy/src/lib.rs
@@ -71,6 +71,7 @@ use interpreters::{
 use log::{error, info};
 use query_frontend::plan::Plan;
 use router::{endpoint::Endpoint, Router};
+use serde::{Deserialize, Serialize};
 use snafu::{OptionExt, ResultExt};
 use table_engine::{
     engine::{EngineRuntimes, TableState},
@@ -92,6 +93,21 @@ use crate::{
 // Because the clock may have errors, choose 1 hour as the error buffer
 const QUERY_EXPIRED_BUFFER: Duration = Duration::from_secs(60 * 60);
 
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct AccessPartitionTableConfig {
+    pub enable_http: bool,
+    pub enable_other: bool,
+}
+
+impl Default for AccessPartitionTableConfig {
+    fn default() -> Self {
+        Self {
+            enable_http: true,
+            enable_other: false,
+        }
+    }
+}
+
 pub struct Proxy {
     router: Arc<dyn Router + Send + Sync>,
     forwarder: ForwarderRef,
@@ -102,6 +118,7 @@ pub struct Proxy {
     hotspot_recorder: Arc<HotspotRecorder>,
     engine_runtimes: Arc<EngineRuntimes>,
     cluster_with_meta: bool,
+    access_partition_table: AccessPartitionTableConfig,
 }
 
 impl Proxy {
@@ -117,6 +134,7 @@ impl Proxy {
         hotspot_recorder: Arc<HotspotRecorder>,
         engine_runtimes: Arc<EngineRuntimes>,
         cluster_with_meta: bool,
+        access_partition_table: AccessPartitionTableConfig,
     ) -> Self {
         let forwarder = Arc::new(Forwarder::new(
             forward_config,
@@ -134,6 +152,7 @@ impl Proxy {
             hotspot_recorder,
             engine_runtimes,
             cluster_with_meta,
+            access_partition_table,
         }
     }
 

diff --git a/server/src/config.rs b/server/src/config.rs
@@ -19,7 +19,7 @@ use std::collections::HashMap;
 use cluster::config::SchemaConfig;
 use common_types::schema::TIMESTAMP_COLUMN;
 use meta_client::types::ShardId;
-use proxy::{forward, hotspot};
+use proxy::{forward, hotspot, AccessPartitionTableConfig};
 use router::{
     endpoint::Endpoint,
     rule_based::{ClusterView, RuleList},
@@ -137,6 +137,9 @@ pub struct ServerConfig {
 
     /// Whether to deduplicate requests
     pub enable_query_dedup: bool,
+
+    /// Whether enable to access partition table
+    pub enable_partition_table_access: AccessPartitionTableConfig,
 }
 
 impl Default for ServerConfig {
@@ -158,6 +161,7 @@ impl Default for ServerConfig {
             hotspot: hotspot::Config::default(),
             remote_client: remote_engine_client::Config::default(),
             enable_query_dedup: false,
+            enable_partition_table_access: AccessPartitionTableConfig::default(),
         }
     }
 }

diff --git a/server/src/server.rs b/server/src/server.rs
@@ -401,6 +401,7 @@ impl Builder {
             hotspot_recorder.clone(),
             engine_runtimes.clone(),
             self.cluster.is_some(),
+            self.server_config.enable_partition_table_access,
         ));
 
         let http_service = http::Builder::new(http_config)