HAWQ-1775. update some univplan index function to new name

apache · Nov 24, 2020 · 6cb439a · 6cb439a
1 parent 6712e27
commit 6cb439a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/depends/univplan/src/univplan/cwrapper/univplan-c.cc b/depends/univplan/src/univplan/cwrapper/univplan-c.cc
@@ -31,7 +31,6 @@
 #include "dbcommon/log/logger.h"
 #include "dbcommon/utils/comp/lz4-compressor.h"
 #include "dbcommon/utils/macro.h"
-
 #include "univplan/common/plannode-util.h"
 #include "univplan/common/stagize.h"
 #include "univplan/common/var-util.h"
@@ -288,7 +287,7 @@ void univPlanExtScanSetRelId(UnivPlanC *up, uint32_t relId) {
 
 void univPlanExtScanSetIndex(UnivPlanC *up, bool index) {
   dynamic_cast<univplan::UnivPlanBuilderExtGSScan *>(up->curNode.get())
-      ->setScanIndex(index);
+      ->setIsIndexScan(index);
 }
 
 void univPlanExtScanSetScanType(UnivPlanC *up, int type) {
@@ -298,7 +297,7 @@ void univPlanExtScanSetScanType(UnivPlanC *up, int type) {
 
 void univPlanExtScanDirection(UnivPlanC *up, int direction) {
   dynamic_cast<univplan::UnivPlanBuilderExtGSScan *>(up->curNode.get())
-      ->setDirectionType(univplan::ExternalScanDirection(direction));
+      ->setIndexScanDirection(univplan::ExternalScanDirection(direction));
 }
 
 void univPlanExtScanSetIndexName(UnivPlanC *up, const char *indexName) {

diff --git a/depends/univplan/src/univplan/univplanbuilder/univplanbuilder-ext-gs-scan.cc b/depends/univplan/src/univplan/univplanbuilder/univplanbuilder-ext-gs-scan.cc
@@ -51,15 +51,15 @@ void UnivPlanBuilderExtGSScan::from(const UnivPlanPlanNodePoly &node) {
 
 void UnivPlanBuilderExtGSScan::setScanRelId(uint32_t id) { ref->set_relid(id); }
 
-void UnivPlanBuilderExtGSScan::setScanIndex(bool index = false) {
+void UnivPlanBuilderExtGSScan::setIsIndexScan(bool index = false) {
   ref->set_indexscan(index);
 }
 
 void UnivPlanBuilderExtGSScan::setIndexScanType(ExternalScanType type) {
   ref->set_type(univplan::ExternalScanType(type));
 }
 
-void UnivPlanBuilderExtGSScan::setDirectionType(
+void UnivPlanBuilderExtGSScan::setIndexScanDirection(
     ExternalScanDirection direction) {
   ref->set_direction(univplan::ExternalScanDirection(direction));
 }

diff --git a/depends/univplan/src/univplan/univplanbuilder/univplanbuilder-ext-gs-scan.h b/depends/univplan/src/univplan/univplanbuilder/univplanbuilder-ext-gs-scan.h
@@ -46,9 +46,9 @@ class UnivPlanBuilderExtGSScan : public UnivPlanBuilderNode {
   void setFilterExpr(UnivPlanBuilderExprTree::uptr expr);
   std::unique_ptr<UnivPlanBuilderScanTask> addScanTaskAndGetBuilder();
   // set magma index info
-  void setScanIndex(bool index);
+  void setIsIndexScan(bool index);
   void setIndexScanType(ExternalScanType type);
-  void setDirectionType(ExternalScanDirection direction);
+  void setIndexScanDirection(ExternalScanDirection direction);
   void setIndexName(const char *indexName);
   void addIndexQual(UnivPlanBuilderExprTree::uptr exprTree);