Skip to content

Commit 71e92eb

Browse files
committed
[fix](lance) Refresh v11 prefilter metrics dependency
### What problem does this PR solve? Related PR: #68375, #68408 Refresh the pinned Lance v11 dependency with the FTS metric wiring and full-snapshot test coverage backported from the main-branch review. Apply the follow-up pin independently because existing source caches already carry the original prefilter patch marker. ### Release note Include FTS row-ID prefilter metrics in the Lance dependency and upgrade previously patched source caches to the same revision as fresh builds. ### Check List (For Author) - Test: v11 prefilter and FTS tests, Rust formatting and workspace Clippy, archive checksum, fresh/cached patch application, idempotence, rejection without a success marker, locked dependency metadata, shell syntax. - Behavior changed: FTS loader metrics are recorded; cached dependencies receive the updated pin. PQ scoring is unchanged. - Does this need documentation: Dependency scope and validation are recorded in the pull request description.
1 parent d231182 commit 71e92eb

2 files changed

Lines changed: 154 additions & 0 deletions

File tree

‎thirdparty/download-thirdparty.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -737,6 +737,12 @@ if [[ " ${TP_ARCHIVES[*]} " =~ " LANCE_C " ]]; then
737737
done
738738
touch "${PATCHED_MARK}" "${LANCE_C_PATCHED_MARK}"
739739
fi
740+
# Cached sources may carry the earlier prefilter pin; upgrade FTS metrics independently.
741+
if [[ ! -f "${PATCHED_MARK}_prefilter_fts" ]]; then
742+
patch --batch --forward --reject-file=- --fuzz=0 --no-backup-if-mismatch -s \
743+
-p1 <"${TP_PATCH_DIR}/${LANCE_C_SOURCE}-prefilter-fts.patch"
744+
touch "${PATCHED_MARK}_prefilter_fts"
745+
fi
740746
cd -
741747
echo "Finished patching ${LANCE_C_SOURCE}"
742748
fi
Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
Subject: [PATCH] Include FTS prefilter metrics and full-snapshot test coverage
2+
3+
Upstream: https://github.com/lance-format/lance/pull/9460
4+
Commit: f202fe41ac18323ca0cd7bc6efd8fd30b8722116
5+
6+
Backport the applicable review updates from Lance PR #9471 to v11.
7+
Keep the C API and other dependencies unchanged, and upgrade previously
8+
patched source caches with the same revision as fresh builds.
9+
10+
diff --git a/Cargo.toml b/Cargo.toml
11+
--- a/Cargo.toml
12+
+++ b/Cargo.toml
13+
@@ -20,10 +20,10 @@
14+
[dependencies]
15+
-lance = { git = "https://github.com/lance-format/lance.git", rev = "f75f3343b5e125c42da1bd7acc8d8217cd5660a6", features = ["substrait"] }
16+
-lance-core = { git = "https://github.com/lance-format/lance.git", rev = "f75f3343b5e125c42da1bd7acc8d8217cd5660a6" }
17+
-lance-file = { git = "https://github.com/lance-format/lance.git", rev = "f75f3343b5e125c42da1bd7acc8d8217cd5660a6" }
18+
-lance-index = { git = "https://github.com/lance-format/lance.git", rev = "f75f3343b5e125c42da1bd7acc8d8217cd5660a6" }
19+
-lance-io = { git = "https://github.com/lance-format/lance.git", rev = "f75f3343b5e125c42da1bd7acc8d8217cd5660a6" }
20+
-lance-linalg = { git = "https://github.com/lance-format/lance.git", rev = "f75f3343b5e125c42da1bd7acc8d8217cd5660a6" }
21+
-lance-table = { git = "https://github.com/lance-format/lance.git", rev = "f75f3343b5e125c42da1bd7acc8d8217cd5660a6" }
22+
-lance-datafusion = { git = "https://github.com/lance-format/lance.git", rev = "f75f3343b5e125c42da1bd7acc8d8217cd5660a6", features = ["substrait"] }
23+
+lance = { git = "https://github.com/lance-format/lance.git", rev = "f202fe41ac18323ca0cd7bc6efd8fd30b8722116", features = ["substrait"] }
24+
+lance-core = { git = "https://github.com/lance-format/lance.git", rev = "f202fe41ac18323ca0cd7bc6efd8fd30b8722116" }
25+
+lance-file = { git = "https://github.com/lance-format/lance.git", rev = "f202fe41ac18323ca0cd7bc6efd8fd30b8722116" }
26+
+lance-index = { git = "https://github.com/lance-format/lance.git", rev = "f202fe41ac18323ca0cd7bc6efd8fd30b8722116" }
27+
+lance-io = { git = "https://github.com/lance-format/lance.git", rev = "f202fe41ac18323ca0cd7bc6efd8fd30b8722116" }
28+
+lance-linalg = { git = "https://github.com/lance-format/lance.git", rev = "f202fe41ac18323ca0cd7bc6efd8fd30b8722116" }
29+
+lance-table = { git = "https://github.com/lance-format/lance.git", rev = "f202fe41ac18323ca0cd7bc6efd8fd30b8722116" }
30+
+lance-datafusion = { git = "https://github.com/lance-format/lance.git", rev = "f202fe41ac18323ca0cd7bc6efd8fd30b8722116", features = ["substrait"] }
31+
datafusion = { version = "54.0.0", default-features = false }
32+
@@ -53,5 +53,5 @@
33+
[dev-dependencies]
34+
-lance = { git = "https://github.com/lance-format/lance.git", rev = "f75f3343b5e125c42da1bd7acc8d8217cd5660a6", features = ["substrait"] }
35+
-lance-datagen = { git = "https://github.com/lance-format/lance.git", rev = "f75f3343b5e125c42da1bd7acc8d8217cd5660a6" }
36+
-lance-file = { git = "https://github.com/lance-format/lance.git", rev = "f75f3343b5e125c42da1bd7acc8d8217cd5660a6" }
37+
+lance = { git = "https://github.com/lance-format/lance.git", rev = "f202fe41ac18323ca0cd7bc6efd8fd30b8722116", features = ["substrait"] }
38+
+lance-datagen = { git = "https://github.com/lance-format/lance.git", rev = "f202fe41ac18323ca0cd7bc6efd8fd30b8722116" }
39+
+lance-file = { git = "https://github.com/lance-format/lance.git", rev = "f202fe41ac18323ca0cd7bc6efd8fd30b8722116" }
40+
tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
41+
diff --git a/Cargo.lock b/Cargo.lock
42+
--- a/Cargo.lock
43+
+++ b/Cargo.lock
44+
@@ -2608,3 +2608,3 @@
45+
version = "11.0.0"
46+
-source = "git+https://github.com/lance-format/lance.git?rev=f75f3343b5e125c42da1bd7acc8d8217cd5660a6#f75f3343b5e125c42da1bd7acc8d8217cd5660a6"
47+
+source = "git+https://github.com/lance-format/lance.git?rev=f202fe41ac18323ca0cd7bc6efd8fd30b8722116#f202fe41ac18323ca0cd7bc6efd8fd30b8722116"
48+
dependencies = [
49+
@@ -3820,3 +3820,3 @@
50+
version = "11.0.0"
51+
-source = "git+https://github.com/lance-format/lance.git?rev=f75f3343b5e125c42da1bd7acc8d8217cd5660a6#f75f3343b5e125c42da1bd7acc8d8217cd5660a6"
52+
+source = "git+https://github.com/lance-format/lance.git?rev=f202fe41ac18323ca0cd7bc6efd8fd30b8722116#f202fe41ac18323ca0cd7bc6efd8fd30b8722116"
53+
dependencies = [
54+
@@ -3892,3 +3892,3 @@
55+
version = "11.0.0"
56+
-source = "git+https://github.com/lance-format/lance.git?rev=f75f3343b5e125c42da1bd7acc8d8217cd5660a6#f75f3343b5e125c42da1bd7acc8d8217cd5660a6"
57+
+source = "git+https://github.com/lance-format/lance.git?rev=f202fe41ac18323ca0cd7bc6efd8fd30b8722116#f202fe41ac18323ca0cd7bc6efd8fd30b8722116"
58+
dependencies = [
59+
@@ -3914,3 +3914,3 @@
60+
version = "58.0.0"
61+
-source = "git+https://github.com/lance-format/lance.git?rev=f75f3343b5e125c42da1bd7acc8d8217cd5660a6#f75f3343b5e125c42da1bd7acc8d8217cd5660a6"
62+
+source = "git+https://github.com/lance-format/lance.git?rev=f202fe41ac18323ca0cd7bc6efd8fd30b8722116#f202fe41ac18323ca0cd7bc6efd8fd30b8722116"
63+
dependencies = [
64+
@@ -3928,3 +3928,3 @@
65+
version = "58.0.0"
66+
-source = "git+https://github.com/lance-format/lance.git?rev=f75f3343b5e125c42da1bd7acc8d8217cd5660a6#f75f3343b5e125c42da1bd7acc8d8217cd5660a6"
67+
+source = "git+https://github.com/lance-format/lance.git?rev=f202fe41ac18323ca0cd7bc6efd8fd30b8722116#f202fe41ac18323ca0cd7bc6efd8fd30b8722116"
68+
dependencies = [
69+
@@ -3938,3 +3938,3 @@
70+
version = "11.0.0"
71+
-source = "git+https://github.com/lance-format/lance.git?rev=f75f3343b5e125c42da1bd7acc8d8217cd5660a6#f75f3343b5e125c42da1bd7acc8d8217cd5660a6"
72+
+source = "git+https://github.com/lance-format/lance.git?rev=f202fe41ac18323ca0cd7bc6efd8fd30b8722116#f202fe41ac18323ca0cd7bc6efd8fd30b8722116"
73+
dependencies = [
74+
@@ -3984,3 +3984,3 @@
75+
version = "11.0.0"
76+
-source = "git+https://github.com/lance-format/lance.git?rev=f75f3343b5e125c42da1bd7acc8d8217cd5660a6#f75f3343b5e125c42da1bd7acc8d8217cd5660a6"
77+
+source = "git+https://github.com/lance-format/lance.git?rev=f202fe41ac18323ca0cd7bc6efd8fd30b8722116#f202fe41ac18323ca0cd7bc6efd8fd30b8722116"
78+
dependencies = [
79+
@@ -4022,3 +4022,3 @@
80+
version = "11.0.0"
81+
-source = "git+https://github.com/lance-format/lance.git?rev=f75f3343b5e125c42da1bd7acc8d8217cd5660a6#f75f3343b5e125c42da1bd7acc8d8217cd5660a6"
82+
+source = "git+https://github.com/lance-format/lance.git?rev=f202fe41ac18323ca0cd7bc6efd8fd30b8722116#f202fe41ac18323ca0cd7bc6efd8fd30b8722116"
83+
dependencies = [
84+
@@ -4054,3 +4054,3 @@
85+
version = "11.0.0"
86+
-source = "git+https://github.com/lance-format/lance.git?rev=f75f3343b5e125c42da1bd7acc8d8217cd5660a6#f75f3343b5e125c42da1bd7acc8d8217cd5660a6"
87+
+source = "git+https://github.com/lance-format/lance.git?rev=f202fe41ac18323ca0cd7bc6efd8fd30b8722116#f202fe41ac18323ca0cd7bc6efd8fd30b8722116"
88+
dependencies = [
89+
@@ -4072,3 +4072,3 @@
90+
version = "11.0.0"
91+
-source = "git+https://github.com/lance-format/lance.git?rev=f75f3343b5e125c42da1bd7acc8d8217cd5660a6#f75f3343b5e125c42da1bd7acc8d8217cd5660a6"
92+
+source = "git+https://github.com/lance-format/lance.git?rev=f202fe41ac18323ca0cd7bc6efd8fd30b8722116#f202fe41ac18323ca0cd7bc6efd8fd30b8722116"
93+
dependencies = [
94+
@@ -4082,3 +4082,3 @@
95+
version = "11.0.0"
96+
-source = "git+https://github.com/lance-format/lance.git?rev=f75f3343b5e125c42da1bd7acc8d8217cd5660a6#f75f3343b5e125c42da1bd7acc8d8217cd5660a6"
97+
+source = "git+https://github.com/lance-format/lance.git?rev=f202fe41ac18323ca0cd7bc6efd8fd30b8722116#f202fe41ac18323ca0cd7bc6efd8fd30b8722116"
98+
dependencies = [
99+
@@ -4116,3 +4116,3 @@
100+
version = "11.0.0"
101+
-source = "git+https://github.com/lance-format/lance.git?rev=f75f3343b5e125c42da1bd7acc8d8217cd5660a6#f75f3343b5e125c42da1bd7acc8d8217cd5660a6"
102+
+source = "git+https://github.com/lance-format/lance.git?rev=f202fe41ac18323ca0cd7bc6efd8fd30b8722116#f202fe41ac18323ca0cd7bc6efd8fd30b8722116"
103+
dependencies = [
104+
@@ -4148,3 +4148,3 @@
105+
version = "11.0.0"
106+
-source = "git+https://github.com/lance-format/lance.git?rev=f75f3343b5e125c42da1bd7acc8d8217cd5660a6#f75f3343b5e125c42da1bd7acc8d8217cd5660a6"
107+
+source = "git+https://github.com/lance-format/lance.git?rev=f202fe41ac18323ca0cd7bc6efd8fd30b8722116#f202fe41ac18323ca0cd7bc6efd8fd30b8722116"
108+
dependencies = [
109+
@@ -4163,3 +4163,3 @@
110+
version = "11.0.0"
111+
-source = "git+https://github.com/lance-format/lance.git?rev=f75f3343b5e125c42da1bd7acc8d8217cd5660a6#f75f3343b5e125c42da1bd7acc8d8217cd5660a6"
112+
+source = "git+https://github.com/lance-format/lance.git?rev=f202fe41ac18323ca0cd7bc6efd8fd30b8722116#f202fe41ac18323ca0cd7bc6efd8fd30b8722116"
113+
dependencies = [
114+
@@ -4231,3 +4231,3 @@
115+
version = "11.0.0"
116+
-source = "git+https://github.com/lance-format/lance.git?rev=f75f3343b5e125c42da1bd7acc8d8217cd5660a6#f75f3343b5e125c42da1bd7acc8d8217cd5660a6"
117+
+source = "git+https://github.com/lance-format/lance.git?rev=f202fe41ac18323ca0cd7bc6efd8fd30b8722116#f202fe41ac18323ca0cd7bc6efd8fd30b8722116"
118+
dependencies = [
119+
@@ -4254,3 +4254,3 @@
120+
version = "11.0.0"
121+
-source = "git+https://github.com/lance-format/lance.git?rev=f75f3343b5e125c42da1bd7acc8d8217cd5660a6#f75f3343b5e125c42da1bd7acc8d8217cd5660a6"
122+
+source = "git+https://github.com/lance-format/lance.git?rev=f202fe41ac18323ca0cd7bc6efd8fd30b8722116#f202fe41ac18323ca0cd7bc6efd8fd30b8722116"
123+
dependencies = [
124+
@@ -4294,3 +4294,3 @@
125+
version = "11.0.0"
126+
-source = "git+https://github.com/lance-format/lance.git?rev=f75f3343b5e125c42da1bd7acc8d8217cd5660a6#f75f3343b5e125c42da1bd7acc8d8217cd5660a6"
127+
+source = "git+https://github.com/lance-format/lance.git?rev=f202fe41ac18323ca0cd7bc6efd8fd30b8722116#f202fe41ac18323ca0cd7bc6efd8fd30b8722116"
128+
dependencies = [
129+
@@ -4309,3 +4309,3 @@
130+
version = "11.0.0"
131+
-source = "git+https://github.com/lance-format/lance.git?rev=f75f3343b5e125c42da1bd7acc8d8217cd5660a6#f75f3343b5e125c42da1bd7acc8d8217cd5660a6"
132+
+source = "git+https://github.com/lance-format/lance.git?rev=f202fe41ac18323ca0cd7bc6efd8fd30b8722116#f202fe41ac18323ca0cd7bc6efd8fd30b8722116"
133+
dependencies = [
134+
@@ -4336,3 +4336,3 @@
135+
version = "11.0.0"
136+
-source = "git+https://github.com/lance-format/lance.git?rev=f75f3343b5e125c42da1bd7acc8d8217cd5660a6#f75f3343b5e125c42da1bd7acc8d8217cd5660a6"
137+
+source = "git+https://github.com/lance-format/lance.git?rev=f202fe41ac18323ca0cd7bc6efd8fd30b8722116#f202fe41ac18323ca0cd7bc6efd8fd30b8722116"
138+
dependencies = [
139+
@@ -4351,3 +4351,3 @@
140+
version = "11.0.0"
141+
-source = "git+https://github.com/lance-format/lance.git?rev=f75f3343b5e125c42da1bd7acc8d8217cd5660a6#f75f3343b5e125c42da1bd7acc8d8217cd5660a6"
142+
+source = "git+https://github.com/lance-format/lance.git?rev=f202fe41ac18323ca0cd7bc6efd8fd30b8722116#f202fe41ac18323ca0cd7bc6efd8fd30b8722116"
143+
dependencies = [
144+
@@ -4390,3 +4390,3 @@
145+
version = "11.0.0"
146+
-source = "git+https://github.com/lance-format/lance.git?rev=f75f3343b5e125c42da1bd7acc8d8217cd5660a6#f75f3343b5e125c42da1bd7acc8d8217cd5660a6"
147+
+source = "git+https://github.com/lance-format/lance.git?rev=f202fe41ac18323ca0cd7bc6efd8fd30b8722116#f202fe41ac18323ca0cd7bc6efd8fd30b8722116"
148+
dependencies = [

0 commit comments

Comments
 (0)