[OPPRO-153] Fix int variant (facebookincubator#17)

rui-mo · Apr 20, 2023 · c7aba62 · c7aba62
1 parent 3499429
commit c7aba62
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 7 deletions.
diff --git a/velox/substrait/SubstraitToVeloxPlan.cpp b/velox/substrait/SubstraitToVeloxPlan.cpp
@@ -1380,26 +1380,26 @@ void SubstraitVeloxPlanConverter::createNotEqualFilter(
     variant notVariant,
     bool nullAllowed,
     std::vector<std::unique_ptr<FilterType>>& colFilters) {
-  using T = typename RangeTraits<KIND>::NativeType;
+  using NativeType = typename RangeTraits<KIND>::NativeType;
   using RangeType = typename RangeTraits<KIND>::RangeType;
 
   // Value > lower
   std::unique_ptr<FilterType> lowerFilter = std::make_unique<RangeType>(
-      notVariant.value<T>(), /*lower*/
+      notVariant.value<NativeType>(), /*lower*/
       false, /*lowerUnbounded*/
       true, /*lowerExclusive*/
-      getMax<T>(), /*upper*/
+      getMax<NativeType>(), /*upper*/
       true, /*upperUnbounded*/
       false, /*upperExclusive*/
       nullAllowed); /*nullAllowed*/
   colFilters.emplace_back(std::move(lowerFilter));
 
   // Value < upper
   std::unique_ptr<FilterType> upperFilter = std::make_unique<RangeType>(
-      getLowest<T>(), /*lower*/
+      getLowest<NativeType>(), /*lower*/
       true, /*lowerUnbounded*/
       false, /*lowerExclusive*/
-      notVariant.value<T>(), /*upper*/
+      notVariant.value<NativeType>(), /*upper*/
       false, /*upperUnbounded*/
       true, /*upperExclusive*/
       nullAllowed); /*nullAllowed*/
@@ -1445,6 +1445,24 @@ void SubstraitVeloxPlanConverter::setInFilter<TypeKind::BIGINT>(
       common::createBigintValues(values, nullAllowed);
 }
 
+template <>
+void SubstraitVeloxPlanConverter::setInFilter<TypeKind::INTEGER>(
+    const std::vector<variant>& variants,
+    bool nullAllowed,
+    const std::string& inputName,
+    connector::hive::SubfieldFilters& filters) {
+  // Use bigint values for int type.
+  std::vector<int64_t> values;
+  values.reserve(variants.size());
+  for (const auto& variant : variants) {
+    // Use the matched type to get value from variant.
+    int64_t value = variant.value<int32_t>();
+    values.emplace_back(value);
+  }
+  filters[common::Subfield(inputName)] =
+      common::createBigintValues(values, nullAllowed);
+}
+
 template <>
 void SubstraitVeloxPlanConverter::setInFilter<TypeKind::VARCHAR>(
     const std::vector<variant>& variants,
@@ -1640,7 +1658,7 @@ connector::hive::SubfieldFilters SubstraitVeloxPlanConverter::mapToFilters(
     auto inputType = inputTypeList[colIdx];
     switch (inputType->kind()) {
       case TypeKind::INTEGER:
-        constructSubfieldFilters<TypeKind::BIGINT, common::BigintRange>(
+        constructSubfieldFilters<TypeKind::INTEGER, common::BigintRange>(
             colIdx, inputNameList[colIdx], colInfoMap[colIdx], filters);
         break;
       case TypeKind::BIGINT:

diff --git a/velox/substrait/TypeUtils.h b/velox/substrait/TypeUtils.h
@@ -36,7 +36,7 @@ template <>
 struct RangeTraits<TypeKind::INTEGER> {
   using RangeType = common::BigintRange;
   using MultiRangeType = common::BigintMultiRange;
-  using NativeType = int64_t;
+  using NativeType = int32_t;
 };
 
 template <>