Merge pull request facebookincubator#12 from chaojun-zhang/WW43

[POAE7-2463] [M2] [Integration] [Velox To Substrait] Merge code from upstream velox
ZJie1 · Oct 21, 2022 · 62d9398 · 62d9398
2 parents 1db29ba + 2ecf1fc
commit 62d9398
Show file tree

Hide file tree

Showing 62 changed files with 285 additions and 7,770 deletions.
diff --git a/velox/substrait/CMakeLists.txt b/velox/substrait/CMakeLists.txt
@@ -52,14 +52,14 @@ set(SRCS
     VeloxToSubstraitPlan.cpp
     VeloxToSubstraitType.cpp
     VeloxSubstraitSignature.cpp
-    JoinUtils.cpp)
-
+    JoinUtils.cpp
+    VariantToVectorConverter.cpp)
 
 add_library(velox_substrait_plan_converter ${SRCS})
 target_include_directories(velox_substrait_plan_converter
                            PUBLIC ${PROTO_OUTPUT_DIR})
 target_link_libraries(velox_substrait_plan_converter velox_connector
-                      velox_dwio_dwrf_common yaml-cpp)
+                      velox_dwio_dwrf_common)
 
 if(${VELOX_BUILD_TESTING})
   add_subdirectory(tests)

diff --git a/velox/substrait/ExprUtils.cpp b/velox/substrait/ExprUtils.cpp
diff --git a/velox/substrait/JoinUtils.cpp b/velox/substrait/JoinUtils.cpp
@@ -32,7 +32,7 @@ ::substrait::JoinRel_JoinType toProto(core::JoinType joinType) {
       return ::substrait::JoinRel_JoinType_JOIN_TYPE_OUTER;
     case core::JoinType::kLeftSemi:
       return ::substrait::JoinRel_JoinType_JOIN_TYPE_SEMI;
-    case core::JoinType::kAnti:
+    case core::JoinType::kNullAwareAnti:
       return ::substrait::JoinRel_JoinType_JOIN_TYPE_ANTI;
     default:
       VELOX_UNSUPPORTED(
@@ -53,7 +53,7 @@ core::JoinType fromProto(::substrait::JoinRel_JoinType joinType) {
     case ::substrait::JoinRel_JoinType_JOIN_TYPE_SEMI:
       return core::JoinType::kLeftSemi;
     case ::substrait::JoinRel_JoinType_JOIN_TYPE_ANTI:
-      return core::JoinType::kAnti;
+      return core::JoinType::kNullAwareAnti;
     default:
       VELOX_UNSUPPORTED("Unsupported substrait join type, {}", joinType);
   }