diff --git a/contrib/cloud-storage-engine b/contrib/cloud-storage-engine
index b49d94ae594..36128849380 160000
--- a/contrib/cloud-storage-engine
+++ b/contrib/cloud-storage-engine
@@ -1 +1 @@
-Subproject commit b49d94ae594914225390e3914f92025f1486d95b
+Subproject commit 36128849380c771f03e5337f71a41386d0a6859e
diff --git a/contrib/tiflash-columnar-hub/Cargo.lock b/contrib/tiflash-columnar-hub/Cargo.lock
index 94e8c7f1a3b..15b56305990 100644
--- a/contrib/tiflash-columnar-hub/Cargo.lock
+++ b/contrib/tiflash-columnar-hub/Cargo.lock
@@ -1467,17 +1467,22 @@ name = "clara_fts"
 version = "0.0.1"
 dependencies = [
  "anyhow",
+ "base64 0.13.1",
  "charabia",
  "fastrand 2.4.1",
+ "kvenginepb",
  "lazy_static",
  "memmap2 0.9.10",
  "once_cell",
  "ordered-float 5.3.0",
  "prost 0.13.5",
  "prost-build",
+ "serde",
+ "serde_json",
  "stable_deref_trait",
  "tantivy",
  "tempfile",
+ "tidb_query_datatype",
  "tipb",
  "workspace-hack",
 ]
@@ -3693,6 +3698,7 @@ dependencies = [
  "aliyun",
  "anyhow",
  "api_version",
+ "arc-swap 1.9.1",
  "arrow-buffer",
  "async-once-cell",
  "async-recursion 1.1.1",
@@ -3718,6 +3724,7 @@ dependencies = [
  "crc32fast",
  "crossbeam",
  "crossbeam-queue",
+ "crossbeam-skiplist",
  "dashmap 5.5.3",
  "dyn-clone",
  "engine_traits",
@@ -3763,6 +3770,7 @@ dependencies = [
  "rusoto_s3",
  "schema",
  "security",
+ "seize",
  "serde",
  "serde_derive",
  "serde_json",
@@ -4716,7 +4724,7 @@ checksum = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e"
 [[package]]
 name = "ownedbytes"
 version = "0.7.0"
-source = "git+https://github.com/breezewish/tikv-tantivy.git?branch=patch-0.22.1#efa7643d27289c1ed680fe7ead8c8fffc72b20a2"
+source = "git+https://github.com/pingcap/tantivy.git?branch=cse-0.22.1#392142b1eefa9258731b1c8483632c4a70bc32d8"
 dependencies = [
  "stable_deref_trait",
 ]
@@ -6856,7 +6864,7 @@ checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
 [[package]]
 name = "tantivy"
 version = "0.22.1"
-source = "git+https://github.com/breezewish/tikv-tantivy.git?branch=patch-0.22.1#efa7643d27289c1ed680fe7ead8c8fffc72b20a2"
+source = "git+https://github.com/pingcap/tantivy.git?branch=cse-0.22.1#392142b1eefa9258731b1c8483632c4a70bc32d8"
 dependencies = [
  "aho-corasick",
  "arc-swap 1.9.1",
@@ -6906,7 +6914,7 @@ dependencies = [
 [[package]]
 name = "tantivy-bitpacker"
 version = "0.6.0"
-source = "git+https://github.com/breezewish/tikv-tantivy.git?branch=patch-0.22.1#efa7643d27289c1ed680fe7ead8c8fffc72b20a2"
+source = "git+https://github.com/pingcap/tantivy.git?branch=cse-0.22.1#392142b1eefa9258731b1c8483632c4a70bc32d8"
 dependencies = [
  "bitpacking",
 ]
@@ -6914,7 +6922,7 @@ dependencies = [
 [[package]]
 name = "tantivy-columnar"
 version = "0.3.0"
-source = "git+https://github.com/breezewish/tikv-tantivy.git?branch=patch-0.22.1#efa7643d27289c1ed680fe7ead8c8fffc72b20a2"
+source = "git+https://github.com/pingcap/tantivy.git?branch=cse-0.22.1#392142b1eefa9258731b1c8483632c4a70bc32d8"
 dependencies = [
  "downcast-rs",
  "fastdivide",
@@ -6929,7 +6937,7 @@ dependencies = [
 [[package]]
 name = "tantivy-common"
 version = "0.7.0"
-source = "git+https://github.com/breezewish/tikv-tantivy.git?branch=patch-0.22.1#efa7643d27289c1ed680fe7ead8c8fffc72b20a2"
+source = "git+https://github.com/pingcap/tantivy.git?branch=cse-0.22.1#392142b1eefa9258731b1c8483632c4a70bc32d8"
 dependencies = [
  "async-trait",
  "byteorder",
@@ -6952,7 +6960,7 @@ dependencies = [
 [[package]]
 name = "tantivy-query-grammar"
 version = "0.22.0"
-source = "git+https://github.com/breezewish/tikv-tantivy.git?branch=patch-0.22.1#efa7643d27289c1ed680fe7ead8c8fffc72b20a2"
+source = "git+https://github.com/pingcap/tantivy.git?branch=cse-0.22.1#392142b1eefa9258731b1c8483632c4a70bc32d8"
 dependencies = [
  "nom 7.1.3",
 ]
@@ -6960,7 +6968,7 @@ dependencies = [
 [[package]]
 name = "tantivy-sstable"
 version = "0.3.0"
-source = "git+https://github.com/breezewish/tikv-tantivy.git?branch=patch-0.22.1#efa7643d27289c1ed680fe7ead8c8fffc72b20a2"
+source = "git+https://github.com/pingcap/tantivy.git?branch=cse-0.22.1#392142b1eefa9258731b1c8483632c4a70bc32d8"
 dependencies = [
  "tantivy-bitpacker",
  "tantivy-common",
@@ -6971,7 +6979,7 @@ dependencies = [
 [[package]]
 name = "tantivy-stacker"
 version = "0.3.0"
-source = "git+https://github.com/breezewish/tikv-tantivy.git?branch=patch-0.22.1#efa7643d27289c1ed680fe7ead8c8fffc72b20a2"
+source = "git+https://github.com/pingcap/tantivy.git?branch=cse-0.22.1#392142b1eefa9258731b1c8483632c4a70bc32d8"
 dependencies = [
  "murmurhash32",
  "rand_distr",
@@ -6981,7 +6989,7 @@ dependencies = [
 [[package]]
 name = "tantivy-tokenizer-api"
 version = "0.3.0"
-source = "git+https://github.com/breezewish/tikv-tantivy.git?branch=patch-0.22.1#efa7643d27289c1ed680fe7ead8c8fffc72b20a2"
+source = "git+https://github.com/pingcap/tantivy.git?branch=cse-0.22.1#392142b1eefa9258731b1c8483632c4a70bc32d8"
 dependencies = [
  "serde",
 ]
@@ -7028,7 +7036,10 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2 0.10.9",
+ "slog",
+ "slog-global",
  "thiserror 1.0.69",
+ "tokio",
  "workspace-hack",
 ]
 
@@ -8598,7 +8609,6 @@ dependencies = [
  "proc-macro2",
  "prost 0.11.9",
  "protobuf 2.8.0",
- "protobuf-build",
  "rand 0.8.6",
  "rand_core 0.6.4",
  "regex",
diff --git a/contrib/tiflash-columnar-hub/Cargo.toml b/contrib/tiflash-columnar-hub/Cargo.toml
index 6db56db4e6f..d12f4a12e56 100644
--- a/contrib/tiflash-columnar-hub/Cargo.toml
+++ b/contrib/tiflash-columnar-hub/Cargo.toml
@@ -26,7 +26,7 @@ fs2 = { git = "https://github.com/tikv/fs2-rs", branch = "tikv" }
 sysinfo = { git = "https://github.com/tikv/sysinfo", branch = "0.26-fix-cpu" }
 tokio-executor = { git = "https://github.com/tikv/tokio", branch = "tokio-timer-hotfix" }
 lindera = { git = "https://github.com/breezewish/lindera", branch = "v0.43.1-tokio-1.24" }
-tantivy = { git = "https://github.com/breezewish/tikv-tantivy.git", branch = "patch-0.22.1" }
+tantivy = { git = "https://github.com/pingcap/tantivy.git", branch = "cse-0.22.1" }
 pprof = { git = "https://github.com/tikv/pprof-rs.git", rev = "01cff82dbe6fe110a707bf2b38d8ebb1d14a18f8" }
 prometheus = { git = "https://github.com/solotzg/rust-prometheus.git", rev = "b4fe98a06a58d29f9b9987a0d7186f6ed5230193", features = ["nightly", "push"], default-features = true }
 tipb = { git = "https://github.com/pingcap/tipb.git" }