Resolve merge conflicts

Author: dantengsky

src/query/service/tests/it/storages/fuse/operations/gc.rs

@@ -299,7 +299,7 @@ mod utils {
 
         let blocks: std::vec::Vec<DataBlock> = stream.try_collect().await?;
         for block in blocks {
-            let stats = gen_columns_statistics(&block)?;
+            let stats = gen_columns_statistics(&block, None)?;
             let block_meta = block_writer.write(block, stats, None).await?;
             block_metas.push(Arc::new(block_meta));
         }

src/query/service/tests/it/storages/fuse/operations/mod.rs

@@ -24,5 +24,4 @@ mod purge_drop;
 mod purge_truncate;
 mod read_plan;
 mod table_analyze;
-mod table_statistics;
 mod truncate;

src/query/service/tests/it/storages/fuse/operations/optimize.rs

@@ -13,12 +13,13 @@
 //  limitations under the License.
 
 use common_base::base::tokio;
-use common_catalog::table_context::TableContext;
 use common_exception::Result;
 use common_sql::Planner;
+use common_storages_fuse::TableContext;
 use databend_query::interpreters::InterpreterFactory;
 use futures_util::TryStreamExt;
 
+use crate::storages::fuse::table_test_fixture::TestFixture;
 use crate::storages::fuse::utils::do_purge_test;
 use crate::storages::fuse::utils::TestTableOperation;