wip

arangodb · Dronplane · Aug 14, 2023 · Apr 25, 2023 · Apr 26, 2023 · Jul 18, 2023
commit 3227d21d9a2ab543c0bcee6d281c194ca0b2443a
diff --git a/arangod/Aql/IResearchViewExecutor.h b/arangod/Aql/IResearchViewExecutor.h
@@ -345,10 +345,10 @@ class IndexReadBuffer {
     auto res =
         maxSize * sizeof(typename decltype(_keyBuffer)::value_type) +
         scores * maxSize * sizeof(typename decltype(_scoreBuffer)::value_type) +
-        maxSize * sizeof(typename decltype(_searchDocs)::value_type) +
-        stored * maxSize *
-            sizeof(typename decltype(_storedValuesBuffer)::value_type);
+        maxSize * sizeof(typename decltype(_searchDocs)::value_type);
     if (!_heapSort.empty()) {
+      res += stored * maxSize *
+             sizeof(typename decltype(_storedValuesBuffer)::value_type);
       res += maxSize * sizeof(typename decltype(_rows)::value_type);
       res += _heapOnlyColumnsCount * maxSize *
              sizeof(typename decltype(_heapOnlyStoredValuesBuffer)::value_type);
@@ -372,11 +372,13 @@ class IndexReadBuffer {
       _keyBuffer.reserve(atMost);
       _searchDocs.reserve(atMost);
       _scoreBuffer.reserve(atMost * scores);
-      _storedValuesBuffer.resize(atMost * stored);
       if (!_heapSort.empty()) {
         _rows.reserve(atMost);
-        _heapOnlyStoredValuesBuffer.resize(_heapOnlyColumnsCount * atMost);
         _currentDocumentBuffer.reserve(_heapOnlyColumnsCount);
+        // resize is important here as we want
+        // indexed access for setting values
+        _storedValuesBuffer.resize(atMost * stored);
+        _heapOnlyStoredValuesBuffer.resize(_heapOnlyColumnsCount * atMost);
       }
     }
     _maxSize = atMost;

diff --git a/arangod/Aql/IResearchViewNode.h b/arangod/Aql/IResearchViewNode.h
@@ -81,6 +81,10 @@ struct HeapSortElement {
     return fieldNumber == std::numeric_limits<size_t>::max();
   }
 
+#ifdef ARANGODB_USE_GOOGLE_TESTS
+  auto operator<=>(HeapSortElement const&) const noexcept = default;
+#endif
+
   std::string postfix;
   ptrdiff_t source{0};
   size_t fieldNumber{std::numeric_limits<size_t>::max()};

diff --git a/tests/IResearch/IResearchViewCountApproximateTest.cpp b/tests/IResearch/IResearchViewCountApproximateTest.cpp
@@ -50,6 +50,9 @@ static char const* collectionName1 = "collection_1";
 static char const* collectionName2 = "collection_2";
 static char const* viewName = "view";
 
+static std::vector<arangodb::iresearch::SearchFunc> emptyScorers;
+static std::vector<arangodb::iresearch::HeapSortElement> emptyScorersSort;
+
 static constexpr frozen::map<std::string_view,
                              arangodb::iresearch::CountApproximate, 2>
     countApproximationTypeMap = {
@@ -547,8 +550,6 @@ TEST_F(IResearchViewCountApproximateTest, directSkipAllForMergeExecutorExact) {
       arangodb::iresearch::ViewSnapshotPtr{}, snapshot};
   arangodb::iresearch::IResearchViewSort sort;
   sort.emplace_back({{std::string_view("value"), false}}, true);
-  std::vector<arangodb::iresearch::SearchFunc> emptyScorers;
-  std::vector<std::pair<size_t, bool>> emptyScorersSort;
   arangodb::aql::IResearchViewExecutorInfos executorInfos(
       reader, arangodb::aql::RegisterId::makeInvalid(),
       arangodb::aql::RegisterId::makeInvalid(), {}, *query,
@@ -630,8 +631,6 @@ TEST_F(IResearchViewCountApproximateTest,
       arangodb::iresearch::ViewSnapshotPtr{}, snapshot};
   arangodb::iresearch::IResearchViewSort sort;
   sort.emplace_back({{std::string_view("value"), false}}, true);
-  std::vector<arangodb::iresearch::SearchFunc> emptyScorers;
-  std::vector<std::pair<size_t, bool>> emptyScorersSort;
   arangodb::aql::IResearchViewExecutorInfos executorInfos(
       reader, arangodb::aql::RegisterId::makeInvalid(),
       arangodb::aql::RegisterId::makeInvalid(), {}, *query,
@@ -715,8 +714,6 @@ TEST_F(IResearchViewCountApproximateTest, directSkipAllForMergeExecutorCost) {
       arangodb::iresearch::ViewSnapshotPtr{}, snapshot};
   arangodb::iresearch::IResearchViewSort sort;
   sort.emplace_back({{std::string_view("value"), false}}, true);
-  std::vector<arangodb::iresearch::SearchFunc> emptyScorers;
-  std::vector<std::pair<size_t, bool>> emptyScorersSort;
   arangodb::aql::IResearchViewExecutorInfos executorInfos(
       reader, arangodb::aql::RegisterId::makeInvalid(),
       arangodb::aql::RegisterId::makeInvalid(), {}, *query,

diff --git a/tests/IResearch/IResearchViewNodeTest.cpp b/tests/IResearch/IResearchViewNodeTest.cpp
@@ -880,13 +880,14 @@ TEST_F(IResearchViewNodeTest, construct) {
     EXPECT_EQ(0, node.getScorersSortLimit());
     EXPECT_TRUE(node.getScorersSort().empty());
 
-    std::vector<std::pair<size_t, bool>> scorersSort{
-        {1, true}, {2, false}, {4, true}};
+    std::vector<arangodb::iresearch::HeapSortElement> scorersSort{
+        {"", 1, std::numeric_limits<size_t>::max(), true},
+        {"foo", 2, 1, false},
+        {"", -1, 0, true}};
     auto expectedScorersSort = scorersSort;
    <
8000
span class='blob-code-inner blob-code-marker ' data-code-marker=" ">    node.setScorersSort(std::move(scorersSort), 42);
     EXPECT_EQ(42, node.getScorersSortLimit());
     auto actualScorersSort = node.getScorersSort();
-    EXPECT_EQ(expectedScorersSort.size(), actualScorersSort.size());
     EXPECT_TRUE(std::equal(expectedScorersSort.begin(),
                            expectedScorersSort.end(), actualScorersSort.begin(),
                            actualScorersSort.end()));
@@ -1282,10 +1283,12 @@ TEST_F(IResearchViewNodeTest, constructFromVPackSingleServer) {
     EXPECT_EQ(42, node.getScorersSortLimit());
     auto actualScorersSort = node.getScorersSort();
     EXPECT_EQ(2, actualScorersSort.size());
-    EXPECT_EQ(0, actualScorersSort[0].first);
-    EXPECT_TRUE(actualScorersSort[0].second);
-    EXPECT_EQ(1, actualScorersSort[1].first);
-    EXPECT_FALSE(actualScorersSort[1].second);
+    EXPECT_EQ(0, actualScorersSort[0].source);
+    EXPECT_TRUE(actualScorersSort[0].ascending);
+    EXPECT_TRUE(actualScorersSort[0].isScore());
+    EXPECT_EQ(1, actualScorersSort[1].source);
+    EXPECT_FALSE(actualScorersSort[1].ascending);
+    EXPECT_TRUE(actualScorersSort[1].isScore());
   }
 
   // no options with invalid index scorersSort
@@ -2441,7 +2444,8 @@ TEST_F(IResearchViewNodeTest, clone) {
                                               resourceMonitor);
     arangodb::aql::Variable const outNmDocId("variable101", 101, false,
                                              resourceMonitor);
-    std::vector<std::pair<size_t, bool>> scorersSort{{0, true}};
+    std::vector<arangodb::iresearch::HeapSortElement> scorersSort{
+        {"", 0, 0, true}};
     node.setScorersSort(std::move(scorersSort), 42);
     auto varsSetOriginal = node.getVariablesSetHere();
     // clone without properties into the same plan