Skip to content

Rebase main onto alibaba/main#3

Merged
kdy1 merged 8 commits intomainfrom
kdy1/rebase-main-on-alibaba-main-20260317
Mar 16, 2026
Merged

Rebase main onto alibaba/main#3
kdy1 merged 8 commits intomainfrom
kdy1/rebase-main-on-alibaba-main-20260317

Conversation

@kdy1
Copy link
Copy Markdown

@kdy1 kdy1 commented Mar 16, 2026

Summary

Rebase ZephyrCloudIO/zvec main onto alibaba/main (3c1241f), then re-apply Zephyr-only commits on top.

Upstream commits included (from alibaba/main)

Zephyr commits re-applied

Commit mapping (same patch, new SHA)

  • 5d6ff10 => 7c1d9a0
  • b8ef57d => 0a4f67e

Safety / rollback

  • Backup branch: backup/kdy1-main-before-rebase-20260317
  • Previous main tip: 01a57ba

Reviewer notes

This PR primarily aligns history with upstream and brings in upstream changes. Please focus review on integration points and CI stability.

zhourrr and others added 8 commits March 16, 2026 10:55
…libaba#223)

* fix: id mismatch

* fix: remove debug string

* fix: use protected

* chore(comment): add comments

* feat: more ut

* Update vector_recall_test.cc

* fix: resolve comments
* fix: fix mips euclidean
## Summary
- set close-on-exec for file open/create paths to prevent lock FD
inheritance across exec
- add `zvec_open_read_only(const char* path, zvec_collection_t* out)` C
API and open collection with `read_only_=true`
- add regression tests for CLOEXEC behavior and lock FD inheritance
across fork+exec
- fix the lock-inheritance regression test to move ownership from the
create result and avoid shared ownership false negatives

## Testing
- `./build-1349/bin/file_test
--gtest_filter=File.CreateAndOpen_SetsCloseOnExecFlag`
- `./build-1349/bin/collection_test
--gtest_filter=CollectionTest.Feature_LockFdIsNotInheritedAcrossExec`
@kdy1 kdy1 enabled auto-merge (squash) March 16, 2026 23:07
@kdy1 kdy1 merged commit 430f46d into main Mar 16, 2026
8 checks passed
@kdy1 kdy1 deleted the kdy1/rebase-main-on-alibaba-main-20260317 branch March 16, 2026 23:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants