Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .asf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ github:
contexts:
- Required
required_pull_request_reviews:
required_approving_review_count: 1
required_approving_review_count: 0

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A committer can already leverage a contributor's PR to merge everything he/she wants.

As @gstein suggested, since we have VCS to hold the full history, we may prefer CTR. Releases still go under a vote.


dependabot_alerts: true
dependabot_updates: false
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@
name: CI
on:
pull_request:
branches: [main]
push:
branches: [main]
Comment on lines -22 to -23

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now all commits go through PR - need not to rerun CI in push.

branches: [ main ]

# Concurrency strategy:
# github.workflow: distinguish this workflow from others
Expand Down Expand Up @@ -77,7 +75,7 @@ jobs:
needs: msrv
strategy:
matrix:
os: [ubuntu-24.04, macos-14, windows-2022]
os: [ ubuntu-24.04, macos-14, windows-2022 ]
rust-version: ${{ fromJson(needs.msrv.outputs.rust-versions) }}
runs-on: ${{ matrix.os }}
steps:
Expand Down
5 changes: 1 addition & 4 deletions datasketches/src/cpc/sketch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -555,10 +555,7 @@ impl CpcSketch {
.map_err(insufficient_data("seed_hash"))?;
let is_compressed = flags & (1 << FLAG_COMPRESSED) != 0;
if !is_compressed {
return Err(Error::new(
ErrorKind::InvalidData,
"only compressed sketches are supported",
));
return Err(Error::deserial("only compressed sketches are supported"));
}
let has_hip = flags & (1 << FLAG_HAS_HIP) != 0;
let has_table = flags & (1 << FLAG_HAS_TABLE) != 0;
Expand Down
6 changes: 1 addition & 5 deletions datasketches/src/cpc/wrapper.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ use crate::cpc::serialization::FLAG_HAS_WINDOW;
use crate::cpc::serialization::SERIAL_VERSION;
use crate::cpc::serialization::make_preamble_ints;
use crate::error::Error;
use crate::error::ErrorKind;

/// A read-only view of a serialized image of a CpcSketch.
#[derive(Debug, Clone)]
Expand Down Expand Up @@ -78,10 +77,7 @@ impl CpcWrapper {
let flags = cursor.read_u8().map_err(insufficient_data("flags"))?;
let is_compressed = flags & (1 << FLAG_COMPRESSED) != 0;
if !is_compressed {
return Err(Error::new(
ErrorKind::InvalidData,
"only compressed sketches are supported",
));
return Err(Error::deserial("only compressed sketches are supported"));
}
let has_hip = flags & (1 << FLAG_HAS_HIP) != 0;
let has_table = flags & (1 << FLAG_HAS_TABLE) != 0;
Expand Down