1. fix indexWithTTLTest

2. fix LookupIndexTest 3. remove buildPlanWithFilter
vesoft-inc · Sep 8, 2021 · 694e7eb · 694e7eb
1 parent f7e60d3
commit 694e7eb
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 27 deletions.
diff --git a/src/storage/index/LookupBaseProcessor-inl.h b/src/storage/index/LookupBaseProcessor-inl.h
@@ -212,19 +212,12 @@ StatusOr<StoragePlan<IndexID>> LookupBaseProcessor<REQ, RESP>::buildPlan(
         needData = needFilter = true;
       }
     }
-
-    if (!needData && !needFilter) {
-      out = buildPlanBasic(result, ctx, plan, hasNullableCol, fields);
-    } else if (needData && !needFilter) {
-      out = buildPlanWithData(result, ctx, plan);
-    } else if (!needData && needFilter) {
-      auto expr = Expression::decode(pool, ctx.get_filter());
-      auto exprCtx = std::make_unique<StorageExpressionContext>(
-          context_->vIdLen(), context_->isIntId(), hasNullableCol, fields);
-      filterItem->emplace(filterId, std::make_pair(std::move(exprCtx), expr));
-      out = buildPlanWithFilter(
-          result, ctx, plan, (*filterItem)[filterId].first.get(), (*filterItem)[filterId].second);
-      filterId++;
+    if (!needFilter) {
+      if (needData) {
+        out = buildPlanWithData(result, ctx, plan);
+      } else {
+        out = buildPlanBasic(result, ctx, plan, hasNullableCol, fields);
+      }
     } else {
       auto expr = Expression::decode(pool, ctx.get_filter());
       // Need to get columns in data, expr ctx need to be aware of schema

diff --git a/src/storage/test/IndexWithTTLTest.cpp b/src/storage/test/IndexWithTTLTest.cpp
@@ -738,8 +738,9 @@ TEST(IndexWithTTLTest, LookupEdgeIndexWithTTL) {
   }
   req.set_parts(std::move(parts));
   std::vector<std::string> returnCols;
-  returnCols.emplace_back(kVid);
-  returnCols.emplace_back(kTag);
+  returnCols.emplace_back(kSrc);
+  returnCols.emplace_back(kRank);
+  returnCols.emplace_back(kDst);
   req.set_return_columns(std::move(returnCols));
   auto expr = RelationalExpression::makeNE(pool,
                                            TagPropertyExpression::make(pool, "2021001", "c1"),
@@ -783,7 +784,7 @@ TEST(IndexWithTTLTest, LookupTagIndexWithTTLExpired) {
   }
   req.set_parts(std::move(parts));
   std::vector<std::string> returnCols;
-  returnCols.emplace_back(kVid);
+  returnCols.emplace_back(kSrc);
   returnCols.emplace_back(kTag);
   req.set_return_columns(std::move(returnCols));
   auto expr = RelationalExpression::makeNE(pool,
@@ -828,8 +829,9 @@ TEST(IndexWithTTLTest, LookupEdgeIndexWithTTLExpired) {
   }
   req.set_parts(std::move(parts));
   std::vector<std::string> returnCols;
-  returnCols.emplace_back(kVid);
-  returnCols.emplace_back(kTag);
+  returnCols.emplace_back(kSrc);
+  returnCols.emplace_back(kRank);
+  returnCols.emplace_back(kDst);
   req.set_return_columns(std::move(returnCols));
   auto expr = RelationalExpression::makeNE(pool,
                                            TagPropertyExpression::make(pool, "2021001", "c1"),

diff --git a/src/storage/test/LookupIndexTest.cpp b/src/storage/test/LookupIndexTest.cpp
@@ -626,10 +626,9 @@ TEST_P(LookupIndexTest, TagIndexFilterTest) {
     columnHints.emplace_back(std::move(columnHint));
     cpp2::IndexQueryContext context1;
     context1.set_column_hints(std::move(columnHints));
-    const auto& expr =
-        *RelationalExpression::makeEQ(pool,
-                                      TagPropertyExpression::make(pool, "player", "age"),
-                                      ConstantExpression::make(pool, Value(34L)));
+    const auto& expr = *RelationalExpression::makeEQ(pool,
+                                                     TagPropertyExpression::make(pool, "1", "age"),
+                                                     ConstantExpression::make(pool, Value(34L)));
     context1.set_filter(expr.encode());
     context1.set_index_id(1);
     decltype(indices.contexts) contexts;
@@ -701,10 +700,9 @@ TEST_P(LookupIndexTest, TagIndexFilterTest) {
     columnHints.emplace_back(std::move(columnHint));
     cpp2::IndexQueryContext context1;
     context1.set_column_hints(std::move(columnHints));
-    const auto& expr =
-        *RelationalExpression::makeGT(pool,
-                                      TagPropertyExpression::make(pool, "player", "age"),
-                                      ConstantExpression::make(pool, Value(34L)));
+    const auto& expr = *RelationalExpression::makeGT(pool,
+                                                     TagPropertyExpression::make(pool, "1", "age"),
+                                                     ConstantExpression::make(pool, Value(34L)));
     context1.set_filter(expr.encode());
     context1.set_index_id(1);
     decltype(indices.contexts) contexts;
@@ -881,7 +879,7 @@ TEST_P(LookupIndexTest, EdgeIndexFilterTest) {
     context1.set_column_hints(std::move(columnHints));
     const auto& expr =
         *RelationalExpression::makeNE(pool,
-                                      EdgePropertyExpression::make(pool, "Teammate", "teamName"),
+                                      EdgePropertyExpression::make(pool, "102", "teamName"),
                                       ConstantExpression::make(pool, Value("Spurs")));
     context1.set_filter(expr.encode());
     context1.set_index_id(102);