Skip to content

Commit 832ff90

Browse files
authored
Merge pull request #315 from korpling/annatomic-improvements
Improvements in the APIs needed for Annatomic
2 parents 57a8a70 + 8c9e168 commit 832ff90

11 files changed

Lines changed: 407 additions & 212 deletions

File tree

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ env:
1111
jobs:
1212
test_linux:
1313
name: Execute automated tests on Ubuntu Linux
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-24.04
1515
steps:
1616
- uses: actions/checkout@v2
1717
- uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
@@ -46,7 +46,7 @@ jobs:
4646
RUST_LOG: debug
4747
long_running_tests:
4848
name: Execute search tests
49-
runs-on: ubuntu-20.04
49+
runs-on: ubuntu-24.04
5050
env:
5151
RUST_LOG: debug
5252
steps:

.github/workflows/verify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
merge-request-checks:
1111
name: Run verify.sh
12-
runs-on: ubuntu-latest
12+
runs-on: ubuntu-24.04
1313
steps:
1414
- uses: actions/checkout@v4
1515
with:

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1010
- Fix broken imports for existing corpora when they never have been added to the
1111
cache or have been evicted from it. (by https://github.com/matthias-stemmler)
1212

13+
### Deprecated
14+
15+
- `Graph::load_from` is replaced with the `open` and `import` methods.
16+
17+
### Added
18+
19+
- Allow to add updates to the annotation `Graph` without re-calculating the
20+
statistics with `apply_update_keep_statistics`. This is useful for scenarios
21+
were we assume the changes don't change the graph that much and we want to
22+
apply the updates as fast as possible.
23+
- Open an `Graph` from an external location with `open` or `import` the changes
24+
into the current graph.
25+
1326
## [3.6.0] - 2025-01-14
1427

1528
### Added

core/src/annostorage/ondisk.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ where
364364
let item_smaller_than_largest = self
365365
.largest_item
366366
.as_ref()
367-
.map_or(true, |largest_item| item <= *largest_item);
367+
.is_none_or(|largest_item| item <= *largest_item);
368368
let already_existed =
369369
item_smaller_than_largest && self.by_container.contains_key(&by_container_key)?;
370370
self.by_container

0 commit comments

Comments
 (0)