Skip to content

ci: clone proper repo for snapshot gen #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PsiACE merged 1 commit into from
Jun 25, 2026
+12 −18
Merged

ci: clone proper repo for snapshot gen #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions datasketches/tests/countmin_serialization_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,17 @@ fn assert_cpp_snapshot(

#[test]
fn test_deserialize_cpp_empty_snapshot() {
assert_cpp_snapshot("count_min-empty.bin", 9001, 1, 5, 0);
assert_cpp_snapshot("count_min_empty_cpp.sk", 9001, 1, 5, 0);
}

#[test]
fn test_deserialize_cpp_non_empty_snapshot() {
assert_cpp_snapshot("count_min-non-empty.bin", 9001, 3, 1024, 2850);
assert_cpp_snapshot("count_min_non_empty_cpp.sk", 9001, 3, 1024, 2850);
}

#[test]
fn test_deserialize_cpp_snapshot_with_wrong_seed() {
let path = serialization_test_data("cpp_generated_files", "count_min-non-empty.bin");
let path = serialization_test_data("cpp_generated_files", "count_min_non_empty_cpp.sk");
let bytes = fs::read(&path).unwrap();

let err = CountMinSketch::<u64>::deserialize_with_seed(&bytes, 9000).unwrap_err();
Expand Down
24 changes: 9 additions & 15 deletions tools/generate_serialization_test_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def generate_java_files(workspace_dir, project_dir):

# 4. Clone repository
repo_url = "https://github.com/apache/datasketches-java.git"
branch = "9.0.0" # FIXME: temporarily use fixed branch until mvn issue is resolved
branch = "9.0.0"
run_command([
"git", "clone",
"--depth", "1",
Expand Down Expand Up @@ -133,21 +133,15 @@ def generate_cpp_files(workspace_dir, project_root):

# 4. Clone repository
repo_url = "https://github.com/apache/datasketches-cpp.git"
branch = "master"
# Temporary e2e checkout for apache/datasketches-cpp#505. After that PR is
# merged, pin this to the merged master commit and remove the extra fetch.
commit = "af4436280bdab53e0063268e92ff29b3fdcb1b07"
fetch_ref = "refs/pull/505/head"
commit = "401423367055acdf7502e8ed3126730a08039d91"
run_command([
"git", "clone",
"--depth", "1",
"--branch", branch,
"--revision", commit,
"--single-branch",
repo_url,
str(temp_dir)
])
run_command(["git", "fetch", "--depth", "1", "origin", fetch_ref], cwd=temp_dir)
run_command(["git", "checkout", "--detach", commit], cwd=temp_dir)

# 5. Build and Run CMake
build_dir = temp_dir / "build"
Expand All @@ -173,14 +167,14 @@ def generate_cpp_files(workspace_dir, project_root):

files_copied = 0

for pattern in ("*_cpp.sk", "count_min-*.bin"):
for file_path in build_dir.rglob(pattern):
shutil.copy2(file_path, output_dir)
print(f"Copied: {file_path.name}")
files_copied += 1
for file_path in build_dir.rglob("*_cpp.sk"):
shutil.copy2(file_path, output_dir)
print(f"Copied: {file_path.name}")
files_copied += 1


if files_copied == 0:
print("Warning: No C++ serialization snapshots were found to copy.")
print("Warning: No *_cpp.sk files were found to copy.")
else:
print(f"Successfully copied {files_copied} files.")

Expand Down