This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.2
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.2 by this push:
new 655836bf83f branch-4.2: [chore](build) Update lance-c to the latest
upstream main revision #69332 (#69335)
655836bf83f is described below
commit 655836bf83f0b2f418ac95bd0ad402daa94dc581
Author: Gabriel <[email protected]>
AuthorDate: Wed Oct 21 10:00:25 2026 +0800
branch-4.2: [chore](build) Update lance-c to the latest upstream main
revision #69332 (#69335)
### What problem does this PR solve?
Backport #69332 to `branch-4.2` (source commit
`eeb54b230ddf7a7a5a06cbaab1bdbd6796d8ff22`).
Pin lance-c to `4fafcd64525b274b113208390bbcca86bbbc093b` and update the
archive checksum. This includes the upstream fix for cold-session vector
prewarm when an index name matches another schema column, plus the
row-address allowlist/blocklist prefilter APIs.
Refresh the existing Foyer patch's base revision and one C++ test
context. Its actual added/deleted code is unchanged. The target branch's
only cherry-pick conflict was the previous revision's descriptive
comment.
### Validation
- Passed `bash thirdparty/test/lance-prefilter-patch-test.sh
thirdparty/src` on this branch: platform definitions, fresh extraction,
idempotence, re-extraction, existing markers, stale-cache invalidation,
and patch-failure handling.
- Verified the pinned archive checksum through the downloader.
- Passed shell syntax checks and `git diff --cached --check`.
- Confirmed the patch payload is unchanged and the resulting patch
matches #69332 exactly.
- Full Doris build and runtime regressions were not run locally;
requested through `run buildall`.
### Release note
Fix Lance index prewarm failures when a vector index name matches a
different schema column.
### Check List (For Author)
- Test: dependency patch harness and manual checks above.
- Behavior changed: Yes, includes the upstream prewarm fix and new
prefilter APIs.
- Does this need documentation: No.
---
thirdparty/patches/lance-c-foyer.patch | 6 +++---
thirdparty/vars.sh | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/thirdparty/patches/lance-c-foyer.patch
b/thirdparty/patches/lance-c-foyer.patch
index 7c7fae2bffc..f44a2f8dd0c 100644
--- a/thirdparty/patches/lance-c-foyer.patch
+++ b/thirdparty/patches/lance-c-foyer.patch
@@ -1,5 +1,5 @@
# Foyer data-cache integration from lance-format/lance-c#73.
-# Base: 8e9e09ecc795c91ce7f97513db94c2d91eec799d (lance-c main, including #91
and #94).
+# Base: 4fafcd64525b274b113208390bbcca86bbbc093b (lance-c main, including #96
and #97).
# PR base: d214faaca89ad7654fb1d85d46cdbce6f3770c95; current PR head:
8a08f171b66a3e01e7ba634bcfc6168a955c7289.
# Current PR head includes revert c3857f085d3aa522c79ebc92b28b302e2eb8e865 of
cache-origin isolation.
# Rebased from https://github.com/lance-format/lance-c/pull/73.
@@ -8666,11 +8666,11 @@ index
3bc313ebecbb0de06badd9f8d75f531fc95809c9..298228f7dd68d28452e6436db5c58918
static void test_dataset_schema(const std::string& uri) {
TEST(test_dataset_schema);
-@@ -1365,6 +1387,7 @@ int main(int argc, char** argv) {
+@@ -1402,6 +1424,7 @@ int main(int argc, char** argv) {
test_dataset_open(uri);
test_shared_session(uri);
+ test_data_cache_session(uri, write_uri);
test_dataset_schema(uri);
test_scanner_fluent(uri);
- test_distance_range(uri);
+ test_scanner_row_addr_lists(uri);
diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh
index f0078fa2a89..39310f0a576 100644
--- a/thirdparty/vars.sh
+++ b/thirdparty/vars.sh
@@ -580,11 +580,11 @@ PUGIXML_SOURCE=pugixml-1.15
PUGIXML_MD5SUM="3b894c29455eb33a40b165c6e2de5895"
# lance-c
-# Includes lance-c #91/#93/#94: search filters and synchronous index prewarm.
-LANCE_C_DOWNLOAD="https://codeload.github.com/lance-format/lance-c/tar.gz/8e9e09ecc795c91ce7f97513db94c2d91eec799d";
-LANCE_C_NAME="lance-c-8e9e09ecc795c91ce7f97513db94c2d91eec799d.tar.gz"
-LANCE_C_SOURCE="lance-c-8e9e09ecc795c91ce7f97513db94c2d91eec799d"
-LANCE_C_MD5SUM="9e32aa626caf1cea3bfe62d12d60a2c8"
+# Includes lance-c #97: resolve index/column name collisions without
serializing prewarm.
+LANCE_C_DOWNLOAD="https://codeload.github.com/lance-format/lance-c/tar.gz/4fafcd64525b274b113208390bbcca86bbbc093b";
+LANCE_C_NAME="lance-c-4fafcd64525b274b113208390bbcca86bbbc093b.tar.gz"
+LANCE_C_SOURCE="lance-c-4fafcd64525b274b113208390bbcca86bbbc093b"
+LANCE_C_MD5SUM="65e924fb62137c5dd4d58af3fb33923a"
# paimon-rust
PAIMON_RUST_DOWNLOAD="https://github.com/apache/paimon-rust/archive/refs/tags/v0.4.0-rc1.tar.gz";
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
