Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
172 commits
Select commit Hold shift + click to select a range
84a4bdf
Code for locating triples in an existing index
Jun 9, 2023
d8781a4
Add test for the `locatedTriple` method + address some of the comment…
Jun 10, 2023
258231d
Improve the `locateTriple` test (three relations instead of just one)
Jun 10, 2023
34647fa
Merge current master and get everything to run again
Feb 10, 2024
59aae8e
A few minor improvements
Feb 13, 2024
0754933
Merge branch 'master' into located-triples
Qup42 Apr 29, 2024
a37f5c3
Delete some comment reformatting
Qup42 Apr 29, 2024
b394d89
Initial adaption of LocatedTriples
Qup42 Apr 29, 2024
524cc22
Update comments
Qup42 Apr 30, 2024
295961d
Use proper objects in tests
Qup42 Apr 30, 2024
70dc617
Simply triple location
Qup42 Apr 30, 2024
702fdc7
Upgrade LocatedTriples::numTriples to ScanSpecification
Qup42 May 13, 2024
8d11581
Upgrade LocatedTriples::mergeTriples to ScanSpecification
Qup42 May 13, 2024
dd32606
Some cleanup
Qup42 May 13, 2024
fd28fb1
Update docstrings for ScanSpecification
Qup42 May 13, 2024
f975039
Merge branch 'refs/heads/master' into located-triples-3
Qup42 May 17, 2024
f07251e
Extract SparqlTripleSimple to separate file
Qup42 May 18, 2024
61b01ed
Parse Update Queries provisionally into ParsedQuery
Qup42 May 18, 2024
2527cfe
Calculate triple sets for update queries
Qup42 May 18, 2024
f738b40
Start locating triples
Qup42 May 19, 2024
cfc581e
Add benchmarking code
Qup42 May 20, 2024
b0bcae7
format
Qup42 May 20, 2024
3f177ea
Merge branch 'master' into located-triples-3
Qup42 May 27, 2024
33a5f3e
Adapt for merged changes
Qup42 May 27, 2024
25656db
Merge branch 'master' into located-triples-3
Qup42 Jun 5, 2024
aa6e8a5
Update SparqlAntlrParser Tests
Qup42 Jun 5, 2024
5275304
Provide runtime information for updates
Qup42 Jun 6, 2024
b09872c
Remove obsolete cmake add_library entry
Qup42 Jun 6, 2024
80aa974
Add multiple LocatedTriples to LocatedTriplesPerBlock
Qup42 Jun 6, 2024
49b9226
Set ParsedQuery::_originalString on Updates
Qup42 Jun 6, 2024
ea328bf
First update POC
Qup42 Jun 10, 2024
68972ef
Merge branch 'master' into located-triples-3
Qup42 Jun 10, 2024
3aec517
Work
Qup42 Jun 11, 2024
21af4c2
Some more cleanup and fixes
Qup42 Jun 11, 2024
aa42c68
More simplification and cleanup
Qup42 Jun 12, 2024
252a627
Drop `ScanSpec` from `LocatedTriples::numTriples` and update tests
Qup42 Jun 12, 2024
69a9173
Use `LocalVocab` from `DeltaTriples`
Qup42 Jun 12, 2024
cc9ee22
Use `IdTriple` in `LocatedTriple`
Qup42 Jun 12, 2024
267eb87
Cleanup and a tiny bit refactoring
Qup42 Jun 12, 2024
1cdca25
Improve
Qup42 Jun 12, 2024
4d1b7b0
Improve tests
Qup42 Jun 12, 2024
55eab54
Merge all da triples
Qup42 Jun 12, 2024
75fce36
Move adding Update Triples out of `decompressBlock`
Qup42 Jun 13, 2024
28e62ea
Add Test that ensure that already existing triples are not added
Qup42 Jun 13, 2024
60e7ed2
Iron out another edge-case
Qup42 Jun 13, 2024
a3007c6
Move adding Update Triples out of `decompressBlockToExistingIdTable`
Qup42 Jun 13, 2024
e71d315
Use correct iterator
Qup42 Jun 13, 2024
c98c828
Add switch to disable/enable use of update triples
Qup42 Jun 13, 2024
cd9a969
Update comments
Qup42 Jun 14, 2024
ddcf2b3
Merge branch 'master' into located-triples-3
Qup42 Jun 14, 2024
17a4ced
Delete dead code
Qup42 Jun 14, 2024
86e46a7
Fix spelling errors
Qup42 Jun 14, 2024
1cd0c47
Remove endl from toString of PermutedTriple
Qup42 Jun 14, 2024
d04e6b6
Refactor blockBeginOffset
Qup42 Jun 14, 2024
a6f858d
Remove debug prints
Qup42 Jun 14, 2024
09125fe
Move printing function declarations to better place
Qup42 Jun 14, 2024
d6675ee
Mute warning in test
Qup42 Jun 14, 2024
ef7373b
Fix
Qup42 Jun 14, 2024
93f3284
Delete dead code from tests
Qup42 Jun 14, 2024
9a903db
Add all printing functions used in tests
Qup42 Jun 14, 2024
8a5176f
Improve server code
Qup42 Jun 14, 2024
ebb15b0
Fix some code style issues
Qup42 Jun 15, 2024
af18d38
Defeat index building for testing
Qup42 Jun 16, 2024
9048ed0
Little cleanup
Qup42 Jun 16, 2024
57df48d
Revert usage of std::format
Qup42 Jun 16, 2024
6292f07
Add missing explicit instantiations
Qup42 Jun 16, 2024
a4d4281
Add support for testing triple location in all permutations
Qup42 Jun 16, 2024
bea748d
sonarcloud
Qup42 Jun 16, 2024
900d9a2
Mute aggressive warnings
Qup42 Jun 17, 2024
9a7abc6
Convert some `LocatedTriples` tests to Matchers
Qup42 Jun 17, 2024
b2841c9
Fix a bug in triple counting of `LocatedTriplesPerBlock`
Qup42 Jun 17, 2024
84518fd
Extend `LocatedTriplesTest::numTriplesInBlock`
Qup42 Jun 17, 2024
e5f1f84
Extend `LocatedTriplesTest::mergeTriples`
Qup42 Jun 17, 2024
9641e15
Add field with all `Permutation::Enum` values to `Permutation`
Qup42 Jun 18, 2024
2060709
Work on DeltaTriples
Qup42 Jun 18, 2024
f4abf7f
Use the cancellationHandle more
Qup42 Jun 18, 2024
ff36919
Update copyright headers
Qup42 Jun 18, 2024
b39d3da
Rename `LocatedTripleHandles` fields to convention
Qup42 Jun 18, 2024
fbcb040
Work on LocatedTriples
Qup42 Jun 18, 2024
6dd7e19
Fix bug in LocatedTriples
Qup42 Jun 19, 2024
75b5cd6
Add explicit type for std::ranges::count_if result
Qup42 Jun 19, 2024
e9a4f7a
Change pretty printing functions to hidden friend
Qup42 Jun 19, 2024
acd0e07
Pass numberIndexColumns into merge triples
Qup42 Jun 19, 2024
57364ec
Negative tests
Qup42 Jun 19, 2024
1d4f50b
CodeReview
Qup42 Jun 20, 2024
fcdeb8c
Have printing function as class members in the header
Qup42 Jun 21, 2024
72a930b
Adapt to CodeReview changes
Qup42 Jun 21, 2024
5a5304d
Make `IdTriple` its own type
Qup42 Jun 21, 2024
940f52a
Remove no longer used pretty printer
Qup42 Jun 21, 2024
8e86de6
DeltaTriples
Qup42 Jun 21, 2024
10aacef
More concrete print function
Qup42 Jun 21, 2024
25166af
Simply tripleLocation test
Qup42 Jun 21, 2024
318b6af
Commit
Qup42 Jun 21, 2024
7b0ed64
Fix segfault
Qup42 Jun 21, 2024
0b5d903
Fix
Qup42 Jun 21, 2024
f7c3ca4
Code Review
Qup42 Jun 21, 2024
19a0266
Code Review
Qup42 Jun 24, 2024
9eb603b
Code Review
Qup42 Jun 24, 2024
6816deb
Template `numIndex` in `mergeTriples`
Qup42 Jun 24, 2024
237e7f3
Use implicit copy constructor
Qup42 Jun 24, 2024
fc7b8c4
Mark print function's purpose
Qup42 Jun 24, 2024
e7a1543
Improvements
Qup42 Jun 25, 2024
f466785
Improvements
Qup42 Jun 26, 2024
73da7ed
Fix bug in `getDistinctColIdsAndCountsImpl`
Qup42 Jun 26, 2024
8ef8a0d
Complete index columns when reading blocks to enable updates
Qup42 Jun 26, 2024
abb9941
Consider updated block borders
Qup42 Jun 27, 2024
3bcd238
Fix updated block borders
Qup42 Jun 29, 2024
3f7073a
Add sentinel block after last real block for updates
Qup42 Jun 29, 2024
dfae87b
Remove obsolete code
Qup42 Jun 29, 2024
a7a74df
Add some debug prints
Qup42 Jun 29, 2024
8202044
Eliminate duplicate triples
Qup42 Jun 29, 2024
29b572b
`LocatedTriple::locateTriplesInPermutation` takes the block metadata …
Qup42 Jul 1, 2024
0192896
Add additional check when writing remaining rows in block merge
Qup42 Jul 1, 2024
4c0743a
Some cleanup
Qup42 Jul 2, 2024
623c59a
Write correct number of columns to sentinel block
Qup42 Jul 2, 2024
528b8f5
Execute `LocatedTriplesTest` in parallel
Qup42 Jul 2, 2024
106c0ff
Remove `firstUpdateTriple` and `lastUpdateTriple`
Qup42 Jul 2, 2024
5d78c5e
Fix stuff
Qup42 Jul 2, 2024
cd470ba
Consolidate and test LocatedTriples interface
Qup42 Jul 3, 2024
84ba86e
Dummy test for printing function
Qup42 Jul 3, 2024
9371107
Update getFirstAndLastTriple a bit
Qup42 Jul 3, 2024
1453b12
Apply sonarlint suggestion
Qup42 Jul 3, 2024
70cc3b7
Add TODO
Qup42 Jul 3, 2024
ec7ce2a
Write block index into `CompressedBlockMetadata`
Qup42 Jul 4, 2024
7301074
Update some comments
Qup42 Jul 4, 2024
6c7ec05
Pass around awkward block offsets a bit more
Qup42 Jul 4, 2024
ac93709
Use the fact that blocks know their index
Qup42 Jul 4, 2024
0628c1d
Request all index columns to add updates
Qup42 Jul 5, 2024
b95de3c
Only load all index columns if required (=block has updates)
Qup42 Jul 5, 2024
6a9418b
Merge branch 'refs/heads/master' into located-triples-3
Qup42 Jul 5, 2024
08020f3
Add missing switch cases from 6a9418b2
Qup42 Jul 5, 2024
f649947
Merge branch 'refs/heads/master' into located-triples-3
Qup42 Jul 5, 2024
48ea315
Fix sonarcloud errors
Qup42 Jul 5, 2024
3046499
Display warning instead of misleading error for queries
Qup42 Jul 5, 2024
a726cce
Tune down debug prints
Qup42 Jul 5, 2024
a7415e1
Add DeltaTriplesTest
Qup42 Jul 5, 2024
783f15d
Fix use after free in tests
Qup42 Jul 5, 2024
2b99783
Merge branch 'refs/heads/master' into located-triples-3
Qup42 Jul 5, 2024
4c92d5e
Code Review
Qup42 Jul 6, 2024
7166f1f
Code Review
Qup42 Jul 7, 2024
80996cc
Code Review
Qup42 Jul 7, 2024
fc91182
Add cmd to reset updates
Qup42 Jul 7, 2024
624819e
Code Review
Qup42 Jul 8, 2024
7d20ea0
Code Review
Qup42 Jul 8, 2024
83a1e22
Respect response media type
Qup42 Jul 10, 2024
c4e9b0f
Fix for stdc++16
Qup42 Jul 11, 2024
5729454
Apply final suggestion
Qup42 Jul 16, 2024
373d2c3
Add another test
Qup42 Jul 16, 2024
d2edd00
Apply suggestion
Qup42 Jul 17, 2024
3e8fe14
Merge branch 'refs/heads/master' into located-triples-3
Qup42 Jul 20, 2024
fa8df6d
Cleanup in DeltaTriples
Qup42 Jul 23, 2024
643b7ce
Merge branch 'refs/heads/master' into located-triples-3
Qup42 Jul 23, 2024
940c602
Enable updates via CLI switch
Qup42 Jul 24, 2024
84b350b
Also accept update content type
Qup42 Jul 25, 2024
57f7311
Apply some suggestions
Qup42 Aug 17, 2024
2b3d62e
Less code duplication
Qup42 Sep 10, 2024
27f35c2
Merge branch 'master' into located-triples-3
Qup42 Sep 10, 2024
1e32634
Fix stuff but still broken
Qup42 Sep 10, 2024
3f836f5
Remove unused lambda capture
Qup42 Sep 12, 2024
bd43064
Remove extra code now that Blocks know their index
Qup42 Sep 15, 2024
f6455ae
Merge branch 'master' into located-triples-3
Qup42 Sep 15, 2024
f6286a9
Remove extra code from tests
Qup42 Sep 15, 2024
3bf6526
Code review changes
Qup42 Sep 15, 2024
1e16bc4
Make tests matchers more concise
Qup42 Sep 18, 2024
0a83cd8
Adapt to changes from 3bf65262
Qup42 Sep 18, 2024
3411435
Make mutable accessor private
Qup42 Sep 18, 2024
161b784
compile again
Qup42 Oct 2, 2024
15b67fb
Merge branch 'master' into located-triples-3
Qup42 Oct 2, 2024
c126f9c
Small changes
Qup42 Sep 18, 2024
c3e69ea
Some code review
Qup42 Sep 29, 2024
f9e1c8f
Code review
Qup42 Oct 2, 2024
64af806
compile again
Qup42 Oct 2, 2024
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
Prev Previous commit
Next Next commit
Make mutable accessor private
  • Loading branch information
Qup42 committed Oct 2, 2024
commit 3411435e51b51e1c74ebe0d22743d53afaf6a79e
6 changes: 6 additions & 0 deletions src/index/DeltaTriples.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
// NOTE: The delta triples currently do not go well together with CACHING. See
// the discussion at the end of this file.
class DeltaTriples {
FRIEND_TEST(DeltaTriplesTest, insertTriplesAndDeleteTriples);
FRIEND_TEST(DeltaTriplesTest, clear);

private:
// The index to which these triples are added.
const Index& index_;
Expand Down Expand Up @@ -73,7 +76,10 @@ class DeltaTriples {
explicit DeltaTriples(const Index& index) : index_(index) {}

// Get the common `LocalVocab` of the delta triples.
private:
LocalVocab& localVocab() { return localVocab_; }

public:
const LocalVocab& localVocab() const { return localVocab_; }

// Clear `triplesAdded_` and `triplesSubtracted_` and all associated data
Expand Down