update velox version

intel · Mar 22, 2023 · b84f09a · b84f09a
1 parent aedf4e3
commit b84f09a
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 7 deletions.
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -77,6 +77,7 @@ option(CIDER_ENABLE_BENCHMARK "Build benchmark for Cider." OFF)
 option(CIDER_ENABLE_AVX512 "Enable avx512 instructions." OFF)
 
 if(BDTK_ENABLE_CIDER)
+  include_directories(${PROJECT_BINARY_DIR})
   if(CIDER_ENABLE_VELOX)
     # Disable components when enable velox build
     set(CIDER_ENABLE_GOOGLETEST OFF)

diff --git a/cpp/src/cider-velox/src/CiderHashJoinBuild.cpp b/cpp/src/cider-velox/src/CiderHashJoinBuild.cpp
@@ -148,7 +148,8 @@ bool CiderHashJoinBuild::finishHashBuild() {
 void CiderHashJoinBuild::postHashBuildProcess() {
   // Release the unused memory reservation since we have finished the table
   // build.
-  operatorCtx_->mappedMemory()->tracker()->release();
+  // FIXME!!
+  // operatorCtx_->mappedMemory()->tracker()->release();
 }
 
 }  // namespace facebook::velox::plugin
diff --git a/cpp/src/cider-velox/src/substrait/VeloxPlanFragmentToSubstraitPlan.cpp b/cpp/src/cider-velox/src/substrait/VeloxPlanFragmentToSubstraitPlan.cpp
@@ -152,6 +152,7 @@ void VeloxPlanFragmentToSubstraitPlan::reconstructVeloxPlan(
         planBuilder_->addNode([&](std::string id, core::PlanNodePtr input) {
           return std::make_shared<core::HashJoinNode>(joinNode->id(),
                                                       joinNode->joinType(),
+                                                      false, // FIXME
                                                       joinNode->leftKeys(),
                                                       joinNode->rightKeys(),
                                                       joinNode->filter(),

diff --git a/cpp/src/cider-velox/src/substrait/VeloxPlanFragmentToSubstraitPlan.h b/cpp/src/cider-velox/src/substrait/VeloxPlanFragmentToSubstraitPlan.h
@@ -64,7 +64,7 @@ class VeloxPlanFragmentToSubstraitPlan {
 
   memory::MemoryPool* pool() const { return pool_.get(); }
 
-  std::unique_ptr<memory::MemoryPool> pool_{memory::getDefaultScopedMemoryPool()};
+  std::shared_ptr<memory::MemoryPool> pool_{memory::getDefaultMemoryPool()};
   google::protobuf::Arena arena_;
 };
 

diff --git a/cpp/src/cider-velox/test/ArrowUtilsTest.cpp b/cpp/src/cider-velox/test/ArrowUtilsTest.cpp
@@ -28,8 +28,8 @@ using namespace facebook::velox::plugin;
 
 class ArrowUtilsTest : public testing::Test {
  public:
-  std::unique_ptr<facebook::velox::memory::ScopedMemoryPool> pool_{
-      facebook::velox::memory::getDefaultScopedMemoryPool()};
+  std::shared_ptr<facebook::velox::memory::MemoryPool> pool_{
+      facebook::velox::memory::getDefaultMemoryPool()};
 
   template <typename T>
   void testCiderResult(const int8_t* data_buffer,

diff --git a/cpp/src/cider-velox/test/planTransformerTest/utils/PlanTransformerTestBase.h b/cpp/src/cider-velox/test/planTransformerTest/utils/PlanTransformerTestBase.h
@@ -37,7 +37,7 @@ class PlanTransformerTestBase : public CiderOperatorTestBase {
   void setTransformerFactory(PlanTransformerFactory& transformerFactory) {
     transformerFactory_ = transformerFactory;
   }
-  std::unique_ptr<memory::MemoryPool> pool_{memory::getDefaultScopedMemoryPool()};
+  std::shared_ptr<memory::MemoryPool> pool_{memory::getDefaultMemoryPool()};
 
   VeloxPlanNodePtr getCiderExpectedPtr(RowTypePtr rowType,
                                        VeloxPlanNodeVec joinSrcVec = {});

diff --git a/cpp/src/cider/exec/plan/parser/ConverterHelper.cpp b/cpp/src/cider/exec/plan/parser/ConverterHelper.cpp
@@ -438,7 +438,7 @@ JoinType getCiderJoinType(const substrait::JoinRel_JoinType& s_join_type) {
       return JoinType::INNER;
     case substrait::JoinRel_JoinType_JOIN_TYPE_LEFT:
       return JoinType::LEFT;
-    case substrait::JoinRel_JoinType_JOIN_TYPE_SEMI:
+    case substrait::JoinRel_JoinType_JOIN_TYPE_LEFT_SEMI:
       return JoinType::SEMI;
     default:
       return JoinType::INVALID;

diff --git a/cpp/thirdparty/velox b/cpp/thirdparty/velox