addressed comments

vesoft-inc · Sep 13, 2021 · 3b3e5c8 · 3b3e5c8
1 parent d3a071d
commit 3b3e5c8
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 330 deletions.
diff --git a/src/interface/storage.thrift b/src/interface/storage.thrift
@@ -537,7 +537,7 @@ struct LookupIndexRequest {
     4: optional list<binary>                return_columns,
     5: optional RequestCommon               common,
     // max row count of each partition in this response, 0 means no limit.
-    6: i64                                  limit = 0,
+    6: optional i64                         limit,
 }
 
 

diff --git a/src/storage/exec/IndexEdgeNode.h b/src/storage/exec/IndexEdgeNode.h
@@ -22,7 +22,7 @@ class IndexEdgeNode final : public RelNode<T> {
                 IndexScanNode<T>* indexScanNode,
                 const std::vector<std::shared_ptr<const meta::NebulaSchemaProvider>>& schemas,
                 const std::string& schemaName,
-                int64_t limit = 0)
+                int64_t limit)
       : context_(context),
         indexScanNode_(indexScanNode),
         schemas_(schemas),
@@ -60,7 +60,7 @@ class IndexEdgeNode final : public RelNode<T> {
       edge.set_dst(iter->dstId());
       edges.emplace_back(std::move(edge));
       iter->next();
-      if (limit_ > 0 && ++count == limit_) {
+      if (limit_ > -1 && ++count == limit_) {
         break;
       }
     }

diff --git a/src/storage/exec/IndexScanNode.h b/src/storage/exec/IndexScanNode.h
@@ -21,7 +21,7 @@ class IndexScanNode : public RelNode<T> {
   IndexScanNode(RuntimeContext* context,
                 IndexID indexId,
                 std::vector<cpp2::IndexColumnHint> columnHints,
-                int64_t limit = 0)
+                int64_t limit)
       : context_(context), indexId_(indexId), columnHints_(std::move(columnHints)), limit_(limit) {
     /**
      * columnHints's elements are {scanType = PREFIX|RANGE; beginStr; endStr},
@@ -86,7 +86,7 @@ class IndexScanNode : public RelNode<T> {
       }
       data_.emplace_back(iter_->key(), "");
       iter_->next();
-      if (limit_ > 0 && ++count == limit_) {
+      if (limit_ > -1 && ++count == limit_) {
         break;
       }
     }

diff --git a/src/storage/exec/IndexVertexNode.h b/src/storage/exec/IndexVertexNode.h
@@ -22,7 +22,7 @@ class IndexVertexNode final : public RelNode<T> {
                   IndexScanNode<T>* indexScanNode,
                   const std::vector<std::shared_ptr<const meta::NebulaSchemaProvider>>& schemas,
                   const std::string& schemaName,
-                  int64_t limit = 0)
+                  int64_t limit)
       : context_(context),
         indexScanNode_(indexScanNode),
         schemas_(schemas),
@@ -55,7 +55,7 @@ class IndexVertexNode final : public RelNode<T> {
       }
       vids.emplace_back(iter->vId());
       iter->next();
-      if (limit_ > 0 && ++count == limit_) {
+      if (limit_ > -1 && ++count == limit_) {
         break;
       }
     }

diff --git a/src/storage/index/LookupBaseProcessor-inl.h b/src/storage/index/LookupBaseProcessor-inl.h
@@ -77,7 +77,9 @@ nebula::cpp2::ErrorCode LookupBaseProcessor<REQ, RESP>::requestCheck(
   }
 
   // limit
-  limit_ = req.get_limit();
+  if (req.limit_ref().has_value()) {
+    limit_ = *req.limit_ref();
+  }
 
   return nebula::cpp2::ErrorCode::SUCCEEDED;
 }

diff --git a/src/storage/index/LookupBaseProcessor.h b/src/storage/index/LookupBaseProcessor.h
@@ -81,7 +81,7 @@ class LookupBaseProcessor : public BaseProcessor<RESP> {
   // Save schemas when column is out of index, need to read from data
   std::vector<std::shared_ptr<const meta::NebulaSchemaProvider>> schemas_;
   std::vector<size_t> deDupColPos_;
-  int64_t limit_ = 0;
+  int64_t limit_ = -1;
 };
 
 }  // namespace storage

diff --git a/src/storage/test/CMakeLists.txt b/src/storage/test/CMakeLists.txt
@@ -642,7 +642,7 @@ nebula_add_test(
     NAME
         sample_limit_query_test
     SOURCES
-        SampleLimitForQueryTest.cpp
+        IndexScanLimitTest.cpp
     OBJECTS
         $<TARGET_OBJECTS:storage_common_obj>
         $<TARGET_OBJECTS:meta_service_handler>