small refactor.

src/query/service/src/servers/http/v1/http_query_handlers.rs

@@ -48,11 +48,11 @@ use crate::servers::http::error::QueryError;
 use crate::servers::http::middleware::EndpointKind;
 use crate::servers::http::middleware::HTTPSessionMiddleware;
 use crate::servers::http::middleware::MetricsMiddleware;
+use crate::servers::http::v1::query::string_block::StringBlock;
 use crate::servers::http::v1::query::Progresses;
 use crate::servers::http::v1::HttpQueryContext;
 use crate::servers::http::v1::HttpQueryManager;
 use crate::servers::http::v1::HttpSessionConf;
-use crate::servers::http::v1::StringBlock;
 use crate::servers::HttpHandlerKind;
 use crate::sessions::QueryAffect;
 

src/query/service/src/servers/http/v1/mod.rs

@@ -17,7 +17,6 @@ mod http_query_handlers;
 mod query;
 mod session;
 mod stage;
-pub mod string_block;
 mod suggestions;
 
 pub use discovery::discovery_nodes;
@@ -42,7 +41,6 @@ pub use session::ClientSessionManager;
 pub(crate) use session::SessionClaim;
 pub use stage::upload_to_stage;
 pub use stage::UploadToStageResponse;
-pub(crate) use string_block::StringBlock;
 pub use suggestions::list_suggestions;
 pub use suggestions::SuggestionsResponse;
 

src/query/service/src/servers/http/v1/query/mod.rs

@@ -20,6 +20,7 @@ mod http_query_context;
 mod http_query_manager;
 mod page_manager;
 pub mod sized_spsc;
+pub mod string_block;
 
 pub(crate) use execute_state::ExecuteState;
 pub use execute_state::ExecuteStateKind;

src/query/service/src/servers/http/v1/query/page_manager.rs

@@ -25,9 +25,9 @@ use log::debug;
 use log::info;
 use parking_lot::RwLock;
 
+use super::string_block::block_to_strings;
+use super::string_block::StringBlock;
 use crate::servers::http::v1::query::sized_spsc::SizedChannelReceiver;
-use crate::servers::http::v1::string_block::block_to_strings;
-use crate::servers::http::v1::StringBlock;
 
 #[derive(Debug, PartialEq, Eq)]
 pub enum Wait {

src/query/service/src/servers/http/v1/string_block.rs → src/query/service/src/servers/http/v1/query/string_block.rs

@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::sync::Arc;
-
 use databend_common_exception::Result;
 use databend_common_expression::Column;
 use databend_common_expression::DataBlock;
@@ -25,8 +23,6 @@ pub struct StringBlock {
     pub(crate) data: Vec<Vec<Option<String>>>,
 }
 
-pub type StringBlockRef = Arc<StringBlock>;
-
 fn data_is_null(column: &Column, row_index: usize) -> bool {
     match column {
         Column::Null { .. } => true,