From 56c687b5861c49525915318cf74f3fbd9a88c9e1 Mon Sep 17 00:00:00 2001 From: Xiaoyang Han Date: Thu, 8 Oct 2026 05:28:25 +0800 Subject: [PATCH] fix(mst2): place chunk-map SQL tests after production items Move the unchanged cfg(test) SQL qualification regression module to the end of native_chunk_map.rs. This fixes the exact #78 all-target/all-feature Clippy items_after_test_module failure without a lint allow or any production or test assertion change. The raw streaming implementation merged in #79 is retained. Nightly formatting, diff and locked offline metadata checks pass; corrected native build/tests remain pending. --- src/jupiter/storage/native_chunk_map.rs | 55 +++++++++++++------------ 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/src/jupiter/storage/native_chunk_map.rs b/src/jupiter/storage/native_chunk_map.rs index 7dcbaa22..5ce849a8 100644 --- a/src/jupiter/storage/native_chunk_map.rs +++ b/src/jupiter/storage/native_chunk_map.rs @@ -605,33 +605,6 @@ fn qualify_relations(schema: &str, sql: &str) -> String { qualified } -#[cfg(test)] -mod sql_tests { - use super::*; - - #[test] - fn authority_relations_are_qualified_without_rewriting_catalog_literals() { - let sql = "SELECT 'mst2_metadata_storage_scope','quoted ''mst2_chunk_map''',\"mst2_chunk_map\" FROM mst2_metadata_storage_scope s JOIN mst2_verified_object f ON s.singleton=1 JOIN mst2_chunk_map m ON true JOIN mst2_chunk_map_leaf l ON true JOIN mst2_chunk_map_node n ON true JOIN mst2_chunk_map_source r ON true WHERE c.relname='mst2_metadata_storage_scope'"; - let qualified = qualify_relations("schema\"name", sql); - assert!(qualified.contains(&format!( - "FROM {}.mst2_metadata_storage_scope", - quoted("schema\"name") - ))); - for name in [ - "mst2_verified_object", - "mst2_chunk_map", - "mst2_chunk_map_leaf", - "mst2_chunk_map_node", - "mst2_chunk_map_source", - ] { - assert!(qualified.contains(&format!("JOIN {}.{name}", quoted("schema\"name")))); - } - assert!(qualified.starts_with( - "SELECT 'mst2_metadata_storage_scope','quoted ''mst2_chunk_map''',\"mst2_chunk_map\"" - )); - assert!(qualified.ends_with("WHERE c.relname='mst2_metadata_storage_scope'")); - } -} fn bounded_bytes(row: &QueryResult, name: &str) -> Result, SnapshotError> { row.try_get::>>("", name) .map_err(db_error)? @@ -682,3 +655,31 @@ impl super::Storage { .await } } + +#[cfg(test)] +mod sql_tests { + use super::*; + + #[test] + fn authority_relations_are_qualified_without_rewriting_catalog_literals() { + let sql = "SELECT 'mst2_metadata_storage_scope','quoted ''mst2_chunk_map''',\"mst2_chunk_map\" FROM mst2_metadata_storage_scope s JOIN mst2_verified_object f ON s.singleton=1 JOIN mst2_chunk_map m ON true JOIN mst2_chunk_map_leaf l ON true JOIN mst2_chunk_map_node n ON true JOIN mst2_chunk_map_source r ON true WHERE c.relname='mst2_metadata_storage_scope'"; + let qualified = qualify_relations("schema\"name", sql); + assert!(qualified.contains(&format!( + "FROM {}.mst2_metadata_storage_scope", + quoted("schema\"name") + ))); + for name in [ + "mst2_verified_object", + "mst2_chunk_map", + "mst2_chunk_map_leaf", + "mst2_chunk_map_node", + "mst2_chunk_map_source", + ] { + assert!(qualified.contains(&format!("JOIN {}.{name}", quoted("schema\"name")))); + } + assert!(qualified.starts_with( + "SELECT 'mst2_metadata_storage_scope','quoted ''mst2_chunk_map''',\"mst2_chunk_map\"" + )); + assert!(qualified.ends_with("WHERE c.relname='mst2_metadata_storage_scope'")); + } +}