Fix merge conflicts.

Signed-off-by: Johannes Kalmbach <[email protected]>
ad-freiburg · Nov 7, 2024 · 15edb4d · 15edb4d
1 parent 1b4c7cd
commit 15edb4d
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 21 deletions.
diff --git a/src/index/DeltaTriples.cpp b/src/index/DeltaTriples.cpp
@@ -40,7 +40,8 @@ DeltaTriples::locateAndAddTriples(CancellationHandle cancellationHandle,
         cancellationHandle);
     cancellationHandle->throwIfCancelled();
     intermediateHandles[static_cast<size_t>(permutation)] =
-        locatedTriples()[static_cast<size_t>(permutation)].add(locatedTriples);
+        this->locatedTriples()[static_cast<size_t>(permutation)].add(
+            locatedTriples);
     cancellationHandle->throwIfCancelled();
   }
   std::vector<DeltaTriples::LocatedTripleHandles> handles{idTriples.size()};

diff --git a/test/DeltaTriplesTestHelpers.h b/test/DeltaTriplesTestHelpers.h
@@ -25,7 +25,7 @@ inline auto InAllPermutations =
             absl::StrCat(".getLocatedTriplesPerBlock(",
                          Permutation::toString(perm), ")"),
             [perm](const DeltaTriples& deltaTriples) {
-              return deltaTriples.getLocatedTriplesPerBlock(perm);
+              return deltaTriples.getLocatedTriplesForPermutation(perm);
             },
             InnerMatcher);
       }));

diff --git a/test/IndexTest.cpp b/test/IndexTest.cpp
@@ -92,7 +92,7 @@ TEST(IndexTest, createFromTurtleTest) {
         return;
       }
       const auto& [index, qec] = getIndex();
-      const auto& deltaTriples = qec.locatedTriplesSnapshot_();
+      const auto& locatedTriplesSnapshot = qec.locatedTriplesSnapshot();
 
       auto getId = makeGetId(getQec(kb)->getIndex());
       Id a = getId("<a>");
@@ -103,33 +103,49 @@ TEST(IndexTest, createFromTurtleTest) {
       Id c2 = getId("<c2>");
 
       // TODO<joka921> We could also test the multiplicities here.
-      ASSERT_TRUE(index.PSO().getMetadata(b, deltaTriples).has_value());
-      ASSERT_TRUE(index.PSO().getMetadata(b2, deltaTriples).has_value());
-      ASSERT_FALSE(index.PSO().getMetadata(a2, deltaTriples).has_value());
-      ASSERT_FALSE(index.PSO().getMetadata(c, deltaTriples).has_value());
+      ASSERT_TRUE(
+          index.PSO().getMetadata(b, locatedTriplesSnapshot).has_value());
+      ASSERT_TRUE(
+          index.PSO().getMetadata(b2, locatedTriplesSnapshot).has_value());
+      ASSERT_FALSE(
+          index.PSO().getMetadata(a2, locatedTriplesSnapshot).has_value());
+      ASSERT_FALSE(
+          index.PSO().getMetadata(c, locatedTriplesSnapshot).has_value());
       ASSERT_FALSE(
           index.PSO()
               .getMetadata(Id::makeFromVocabIndex(VocabIndex::make(735)),
-                           deltaTriples)
+                           locatedTriplesSnapshot)
               .has_value());
-      ASSERT_FALSE(
-          index.PSO().getMetadata(b, deltaTriples).value().isFunctional());
-      ASSERT_TRUE(
-          index.PSO().getMetadata(b2, deltaTriples).value().isFunctional());
+      ASSERT_FALSE(index.PSO()
+                       .getMetadata(b, locatedTriplesSnapshot)
+                       .value()
+                       .isFunctional());
+      ASSERT_TRUE(index.PSO()
+                      .getMetadata(b2, locatedTriplesSnapshot)
+                      .value()
+                      .isFunctional());
 
-      ASSERT_TRUE(index.POS().getMetadata(b, deltaTriples).has_value());
-      ASSERT_TRUE(index.POS().getMetadata(b2, deltaTriples).has_value());
-      ASSERT_FALSE(index.POS().getMetadata(a2, deltaTriples).has_value());
-      ASSERT_FALSE(index.POS().getMetadata(c, deltaTriples).has_value());
+      ASSERT_TRUE(
+          index.POS().getMetadata(b, locatedTriplesSnapshot).has_value());
+      ASSERT_TRUE(
+          index.POS().getMetadata(b2, locatedTriplesSnapshot).has_value());
+      ASSERT_FALSE(
+          index.POS().getMetadata(a2, locatedTriplesSnapshot).has_value());
+      ASSERT_FALSE(
+          index.POS().getMetadata(c, locatedTriplesSnapshot).has_value());
       ASSERT_FALSE(
           index.POS()
               .getMetadata(Id::makeFromVocabIndex(VocabIndex::make(735)),
-                           deltaTriples)
+                           locatedTriplesSnapshot)
               .has_value());
-      ASSERT_TRUE(
-          index.POS().getMetadata(b, deltaTriples).value().isFunctional());
-      ASSERT_TRUE(
-          index.POS().getMetadata(b2, deltaTriples).value().isFunctional());
+      ASSERT_TRUE(index.POS()
+                      .getMetadata(b, locatedTriplesSnapshot)
+                      .value()
+                      .isFunctional());
+      ASSERT_TRUE(index.POS()
+                      .getMetadata(b2, locatedTriplesSnapshot)
+                      .value()
+                      .isFunctional());
 
       // Relation b
       // Pair index