add null might contain test

facebookincubator · Mar 9, 2023 · 893edb1 · 893edb1
1 parent 372b1b4
commit 893edb1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/velox/functions/sparksql/MightContain.cpp b/velox/functions/sparksql/MightContain.cpp
@@ -39,20 +39,20 @@ class BloomFilterMightContainFunction final : public exec::VectorFunction {
     exec::DecodedArgs decodedArgs(rows, args, context);
     auto serialized = decodedArgs.at(0);
     auto value = decodedArgs.at(1);
-    if (serialized->isConstantMapping() && serialized->isNullAt(0)) {
-      rows.applyToSelected([&](int row) { result.setNull(row, true); });
-      return;
-    }
 
     HashStringAllocator allocator{context.pool()};
     if (serialized->isConstantMapping()) {
-      BloomFilter output{StlAllocator<uint64_t>(&allocator)};
-      output.merge(serialized->valueAt<StringView>(0).data());
-      rows.applyToSelected([&](int row) {
-        auto contain = output.mayContain(
-            folly::hasher<int64_t>()(value->valueAt<int64_t>(row)));
-        result.set(row, contain);
-      });
+      if (serialized->isNullAt(0)) {
+        rows.applyToSelected([&](int row) { result.set(row, false); });
+      } else {
+        BloomFilter output{StlAllocator<uint64_t>(&allocator)};
+        output.merge(serialized->valueAt<StringView>(0).data());
+        rows.applyToSelected([&](int row) {
+          auto contain = output.mayContain(
+              folly::hasher<int64_t>()(value->valueAt<int64_t>(row)));
+          result.set(row, contain);
+        });
+      }
       return;
     }
 

diff --git a/velox/functions/sparksql/tests/MightContainTest.cpp b/velox/functions/sparksql/tests/MightContainTest.cpp
@@ -52,5 +52,9 @@ TEST_F(MightContainTest, common) {
 
   EXPECT_FALSE(mightContain(serialized, kSize + 123451).value());
 }
+
+TEST_F(MightContainTest, null) {
+  EXPECT_FALSE(mightContain(std::nullopt, 12).value());
+}
 } // namespace
 } // namespace facebook::velox::functions::sparksql::test