Update tck tests

vesoft-inc · May 16, 2023 · e860a25 · e860a25
1 parent 783cfda
commit e860a25
Show file tree

Hide file tree

Showing 4 changed files with 525 additions and 47 deletions.
diff --git a/src/graph/executor/query/IndexScanExecutor.cpp b/src/graph/executor/query/IndexScanExecutor.cpp
@@ -30,13 +30,16 @@ folly::Future<Status> IndexScanExecutor::indexScan() {
     auto filterStr = lookup->queryContext().front().get_filter();
     Expression *filter = Expression::decode(qctx()->objPool(), filterStr);
     if (filter->kind() != Expression::Kind::kRelEQ && filter->kind() != Expression::Kind::kRelIn) {
-      return Status::Error("The kind of filter expression is invalid.");
+      return Status::Error("The kind of filter expression is invalid: %s",
+                           filter->toString().c_str());
     }
     auto relFilter = static_cast<const RelationalExpression *>(filter);
-    if (relFilter->right()->kind() != Expression::Kind::kLabel) {
-      return Status::Error("The kind of expression is not label expression.");
+    auto right = DCHECK_NOTNULL(relFilter->right());
+    if (right->kind() != Expression::Kind::kLabel) {
+      return Status::Error("The kind of expression is not label expression: %s",
+                           right->toString().c_str());
     }
-    const auto &colName = static_cast<const LabelExpression *>(relFilter->right())->name();
+    const auto &colName = static_cast<const LabelExpression *>(right)->name();
     const auto &result = ectx_->getResult(lookup->inputVar());
     std::vector<Expression *> ops;
     std::unordered_set<Value> unique;

diff --git a/src/graph/planner/PlannersRegister.cpp b/src/graph/planner/PlannersRegister.cpp
@@ -13,8 +13,8 @@
 #include "graph/planner/match/PropIndexSeek.h"
 #include "graph/planner/match/ScanSeek.h"
 #include "graph/planner/match/StartVidFinder.h"
-#include "graph/planner/match/VariableVertexIdSeek.h"
 #include "graph/planner/match/VariablePropIndexSeek.h"
+#include "graph/planner/match/VariableVertexIdSeek.h"
 #include "graph/planner/match/VertexIdSeek.h"
 #include "graph/planner/ngql/FetchEdgesPlanner.h"
 #include "graph/planner/ngql/FetchVerticesPlanner.h"

diff --git a/src/graph/util/OptimizerUtils.cpp b/src/graph/util/OptimizerUtils.cpp
@@ -914,7 +914,7 @@ Status OptimizerUtils::createIndexQueryCtx(Expression* filter,
   if (!filter) {
     // Only filter is nullptr when lookup on tagname
     // Degenerate back to tag lookup
-    NG_RETURN_IF_ERROR(createIndexQueryCtx(iqctx, qctx, node));
+    return createIndexQueryCtx(iqctx, qctx, node);
   }
 
   // items used for optimal index fetch and index scan context optimize.
@@ -926,7 +926,11 @@ Status OptimizerUtils::createIndexQueryCtx(Expression* filter,
   // TODO: refactor index selector logic to avoid this rewriting
   auto* newFilter = ExpressionUtils::rewriteParameter(filter, qctx);
   NG_RETURN_IF_ERROR(analyzeExpression(newFilter, &items, &kind, node->isEdge(), qctx));
-  return createIndexQueryCtx(iqctx, kind, items, qctx, node);
+  auto status = createIndexQueryCtx(iqctx, kind, items, qctx, node);
+  if (!status.ok()) {
+    return createIndexQueryCtx(iqctx, qctx, node);
+  }
+  return Status::OK();
 }
 
 Status OptimizerUtils::createIndexQueryCtx(std::vector<IndexQueryContext>& iqctx,