I think I've got it.

But we still have to clean up a lot of stuff.
ad-freiburg · Jan 12, 2024 · c79d25f · c79d25f
1 parent a2e0265
commit c79d25f
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/src/engine/idTable/CompressedExternalIdTable.h b/src/engine/idTable/CompressedExternalIdTable.h
@@ -333,7 +333,7 @@ class CompressedExternalIdTableBase {
     AD_CONTRACT_CHECK(NumStaticCols == 0 || NumStaticCols == numCols);
   }
   // TODO<joka921> Shouldn't be public.
-    std::atomic<bool> isFirstMerge = true;
+  std::atomic<bool> isFirstMerge = true;
   // Add a single row to the input. The type of `row` needs to be something that
   // can be `push_back`ed to a `IdTable`.
   void push(const auto& row) requires requires { currentBlock_.push_back(row); }
@@ -417,7 +417,7 @@ class CompressedExternalIdTableBase {
     if (numBlocksPushed_ == 0) {
       AD_CORRECTNESS_CHECK(this->numElementsPushed_ ==
                            this->currentBlock_.size());
-        blockTransformation_(this->currentBlock_);
+      blockTransformation_(this->currentBlock_);
       return false;
     }
     pushBlock(std::move(this->currentBlock_));
@@ -645,10 +645,12 @@ class CompressedExternalIdTableSorter
       const auto& block = this->currentBlock_;
       const auto blocksizeOutput = blocksize.value_or(block.numRows());
       if (block.numRows() <= blocksizeOutput) {
-        // TODO<joka921> We don't need the copy if we only want to iterate once, make this configurable.
-        auto blockAsStatic = IdTableStatic<N>(this->currentBlock_.clone().template toStatic<N>());
+        // TODO<joka921> We don't need the copy if we only want to iterate once,
+        // make this configurable.
+        auto blockAsStatic = IdTableStatic<N>(
+            this->currentBlock_.clone().template toStatic<N>());
         co_yield blockAsStatic;
-        //co_yield std::move(this->currentBlock_).template toStatic<N>();
+        // co_yield std::move(this->currentBlock_).template toStatic<N>();
       } else {
         for (size_t i = 0; i < block.numRows(); i += blocksizeOutput) {
           size_t upper = std::min(i + blocksizeOutput, block.numRows());
@@ -764,4 +766,4 @@ class CompressedExternalIdTableSorter
 };
 }  // namespace ad_utility
 
-#endif  // QLEVER_COMPRESSEDEXTERNALIDTABLE_H
+#endif  // QLEVER_COMPRESSEDEXTERNALIDTABLE_H
diff --git a/src/index/IndexImpl.cpp b/src/index/IndexImpl.cpp
@@ -757,8 +757,8 @@ void IndexImpl::createFromOnDiskIndex(const string& onDiskBase) {
   totalVocabularySize_ = vocab_.size() + vocab_.getExternalVocab().size();
   LOG(DEBUG) << "Number of words in internal and external vocabulary: "
              << totalVocabularySize_ << std::endl;
-  pso_.loadFromDisk(onDiskBase_, false, usePatterns());
-  pos_.loadFromDisk(onDiskBase_, false, usePatterns());
+  pso_.loadFromDisk(onDiskBase_, false, !usePatterns());
+  pos_.loadFromDisk(onDiskBase_, false, !usePatterns());
 
   if (loadAllPermutations_) {
     ops_.loadFromDisk(onDiskBase_);

diff --git a/src/index/Permutation.cpp b/src/index/Permutation.cpp
@@ -22,7 +22,8 @@ Permutation::Permutation(Enum permutation, Allocator allocator,
 
 // _____________________________________________________________________
 void Permutation::loadFromDisk(const std::string& onDiskBase,
-                               bool onlyLoadAdditional, bool dontLoadAdditional) {
+                               bool onlyLoadAdditional,
+                               bool dontLoadAdditional) {
   if (!onlyLoadAdditional) {
     if constexpr (MetaData::_isMmapBased) {
       meta_.setup(onDiskBase + ".index" + fileSuffix_ + MMAP_FILE_SUFFIX,

diff --git a/src/index/Permutation.h b/src/index/Permutation.h
@@ -59,7 +59,8 @@ class Permutation {
   // everything that has to be done when reading an index from disk
   // TODO<joka921> Why do we need the second argument.
   void loadFromDisk(const std::string& onDiskBase,
-                    bool onlyLoadAdditional = false, bool dontLoadAdditional = false);
+                    bool onlyLoadAdditional = false,
+                    bool dontLoadAdditional = false);
 
   // For a given ID for the col0, retrieve all IDs of the col1 and col2.
   // If `col1Id` is specified, only the col2 is returned for triples that

diff --git a/test/HasPredicateScanTest.cpp b/test/HasPredicateScanTest.cpp
@@ -363,4 +363,4 @@ TEST(CountAvailablePredicates, patternTrickTest) {
   ASSERT_EQ(Int(3u), result[4][1]);
 }
 
-#endif
+#endif
diff --git a/test/IndexTest.cpp b/test/IndexTest.cpp
@@ -194,7 +194,7 @@ TEST(CreatePatterns, createPatterns) {
         "<a2> <d>  <c2> .";
 
     const Index& indexNoImpl = getQec(kb)->getIndex();
-    //const IndexImpl& index = indexNoImpl.getImpl();
+    // const IndexImpl& index = indexNoImpl.getImpl();
 
     auto getId = ad_utility::testing::makeGetId(indexNoImpl);
     // Pattern p0 (for subject <a>) consists of <b> and <b2)
-Original file line number
+Diff line change
@@ Expand Up / @@ -363,4 +363,4 @@ TEST(CountAvailablePredicates, patternTrickTest) { @@
       ASSERT_EQ(Int(3u), result[4][1]);
     }
-    #endif
+    #endif