address comments

facebookincubator · Dec 25, 2024 · 93b9831 · 93b9831
1 parent 3703527
commit 93b9831
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 21 deletions.
diff --git a/velox/functions/sparksql/In.cpp b/velox/functions/sparksql/In.cpp
@@ -130,15 +130,12 @@ void registerInFn(const std::string& prefix) {
       {prefix + "in"});
 }
 
-void registerInFnForShortDecimal(const std::string& prefix) {
+void registerInFnForDecimal(const std::string& prefix) {
   registerFunction<
       InFunctionOuter<ShortDecimal<P1, S1>>::template Inner,
       bool,
       ShortDecimal<P1, S1>,
       Array<ShortDecimal<P1, S1>>>({prefix + "in"});
-}
-
-void registerInFnForLongDecimal(const std::string& prefix) {
   registerFunction<
       InFunctionOuter<LongDecimal<P1, S1>>::template Inner,
       bool,
@@ -159,8 +156,7 @@ void registerIn(const std::string& prefix) {
   registerInFn<Varchar>(prefix);
   registerInFn<Timestamp>(prefix);
   registerInFn<Date>(prefix);
-  registerInFnForShortDecimal(prefix);
-  registerInFnForLongDecimal(prefix);
+  registerInFnForDecimal(prefix);
 }
 
 } // namespace facebook::velox::functions::sparksql
diff --git a/velox/functions/sparksql/tests/InTest.cpp b/velox/functions/sparksql/tests/InTest.cpp
@@ -198,13 +198,6 @@ TEST_F(InTest, shortDecimal) {
   EXPECT_EQ(in<int64_t>(1, {1, 2}, DECIMAL(2, 1)), true);
   EXPECT_EQ(in<int64_t>(2, {1, 2}, DECIMAL(10, 5)), true);
   EXPECT_EQ(in<int64_t>(3, {1, 2}, DECIMAL(17, 11)), false);
-  EXPECT_EQ(in<int64_t>(std::nullopt, {1, 2}, DECIMAL(3, 2)), std::nullopt);
-  EXPECT_EQ(in<int64_t>(1, {1, std::nullopt, 2}, DECIMAL(3, 2)), true);
-  EXPECT_EQ(in<int64_t>(2, {1, std::nullopt, 2}, DECIMAL(3, 2)), true);
-  EXPECT_EQ(in<int64_t>(3, {1, std::nullopt, 2}, DECIMAL(3, 2)), std::nullopt);
-  EXPECT_EQ(
-      in<int64_t>(std::nullopt, {1, std::nullopt, 2}, DECIMAL(3, 2)),
-      std::nullopt);
   EXPECT_EQ(
       in<int64_t>(
           DecimalUtil::kShortDecimalMin,
@@ -223,14 +216,6 @@ TEST_F(InTest, longDecimal) {
   EXPECT_EQ(in<int128_t>(1, {1, 2}, DECIMAL(21, 2)), true);
   EXPECT_EQ(in<int128_t>(2, {1, 2}, DECIMAL(29, 10)), true);
   EXPECT_EQ(in<int128_t>(3, {1, 2}, DECIMAL(35, 20)), false);
-  EXPECT_EQ(in<int128_t>(std::nullopt, {1, 2}, DECIMAL(23, 2)), std::nullopt);
-  EXPECT_EQ(in<int128_t>(1, {1, std::nullopt, 2}, DECIMAL(23, 2)), true);
-  EXPECT_EQ(in<int128_t>(2, {1, std::nullopt, 2}, DECIMAL(23, 2)), true);
-  EXPECT_EQ(
-      in<int128_t>(3, {1, std::nullopt, 2}, DECIMAL(23, 2)), std::nullopt);
-  EXPECT_EQ(
-      in<int128_t>(std::nullopt, {1, std::nullopt, 2}, DECIMAL(23, 2)),
-      std::nullopt);
   EXPECT_EQ(
       in<int128_t>(
           DecimalUtil::kLongDecimalMin,