Skip to content
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

Jump to bottom

F.compressed relations #420

Merged
merged 7 commits into from
Sep 16, 2021
Merged

F.compressed relations #420

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a1812e3
Added compression of the permutations on disk.
joka921 Sep 4, 2021
a7bc6a8
Added correct threadsafe caching.
joka921 Sep 15, 2021
699bf31
Second round of Hannah's review.
joka921 Sep 15, 2021
1d43bd1
Fixed the test.
joka921 Sep 15, 2021
2201f7e
The sorting of the blocks was wrong and unneeded.
joka921 Sep 16, 2021
493ff64
If this compiles, it is the final version.
joka921 Sep 16, 2021
ded3452
Last clang format...
joka921 Sep 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/engine/IndexScan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ void IndexScan::computePSOboundS(ResultTable* result) const {
result->_resultTypes.push_back(ResultTable::ResultType::KB);
result->_sortedBy = {0};
const auto& idx = _executionContext->getIndex();
idx.scan(_predicate, _subject, &result->_data, idx._PSO);
idx.scan(_predicate, _subject, &result->_data, idx._PSO, _timeoutTimer);
}

// _____________________________________________________________________________
Expand All @@ -290,7 +290,7 @@ void IndexScan::computePOSboundO(ResultTable* result) const {
result->_resultTypes.push_back(ResultTable::ResultType::KB);
result->_sortedBy = {0};
const auto& idx = _executionContext->getIndex();
idx.scan(_predicate, _object, &result->_data, idx._POS);
idx.scan(_predicate, _object, &result->_data, idx._POS, _timeoutTimer);
}

// _____________________________________________________________________________
Expand Down Expand Up @@ -348,7 +348,7 @@ void IndexScan::computeSOPboundO(ResultTable* result) const {
result->_resultTypes.push_back(ResultTable::ResultType::KB);
result->_sortedBy = {0};
const auto& idx = _executionContext->getIndex();
idx.scan(_subject, _object, &result->_data, idx._SOP);
idx.scan(_subject, _object, &result->_data, idx._SOP, _timeoutTimer);
}

// _____________________________________________________________________________
Expand All @@ -368,7 +368,7 @@ void IndexScan::computeOPSfreeP(ResultTable* result) const {
result->_resultTypes.push_back(ResultTable::ResultType::KB);
result->_sortedBy = {0, 1};
const auto& idx = _executionContext->getIndex();
idx.scan(_object, &result->_data, idx._OPS);
idx.scan(_object, &result->_data, idx._OPS, _timeoutTimer);
}

// _____________________________________________________________________________
Expand Down
8 changes: 3 additions & 5 deletions src/index/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,12 @@ add_library(index
ConstantsIndexBuilding.h
ExternalVocabulary.h ExternalVocabulary.cpp
IndexMetaData.h IndexMetaDataImpl.h
MetaDataTypes.h MetaDataTypes.cpp
MetaDataHandler.h
StxxlSortFunctors.h
TextMetaData.cpp TextMetaData.h
DocsDB.cpp DocsDB.h
FTSAlgorithms.cpp FTSAlgorithms.h
PrefixHeuristic.cpp PrefixHeuristic.h)
PrefixHeuristic.cpp PrefixHeuristic.h
CompressedRelation.h CompressedRelation.cpp)

target_link_libraries(index parser ${STXXL_LIBRARIES} ${ICU_LIBRARIES} absl::flat_hash_map absl::flat_hash_set)

target_link_libraries(index)
target_link_libraries(index parser ${STXXL_LIBRARIES} ${ICU_LIBRARIES} absl::flat_hash_map absl::flat_hash_set zstd)