Two flags was removed from registry and function

apache · May 11, 2022 · 6324122 · 6324122
1 parent 9eda39f
commit 6324122
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 38 deletions.
diff --git a/cpp/src/gandiva/function_registry_string.cc b/cpp/src/gandiva/function_registry_string.cc
@@ -440,12 +440,10 @@ std::vector<NativeFunction> GetStringFunctionRegistry() {
                      NativeFunction::kNeedsContext),
 
       NativeFunction("binary", {}, DataTypeVector{binary()}, binary(), kResultNullIfNull,
-                     "castBINARY_binary",
-                     NativeFunction::kNeedsContext | NativeFunction::kCanReturnErrors),
+                     "castBINARY_binary"),
 
       NativeFunction("binary", {}, DataTypeVector{utf8()}, binary(), kResultNullIfNull,
-                     "castBINARY_utf8",
-                     NativeFunction::kNeedsContext | NativeFunction::kCanReturnErrors),
+                     "castBINARY_utf8"),
 
       NativeFunction("castVARBINARY", {}, DataTypeVector{binary(), int64()}, binary(),
                      kResultNullIfNull, "castVARBINARY_binary_int64",

diff --git a/cpp/src/gandiva/precompiled/string_ops.cc b/cpp/src/gandiva/precompiled/string_ops.cc
@@ -705,12 +705,12 @@ CAST_VARCHAR_FROM_VARLEN_TYPE(binary)
 CAST_VARBINARY_FROM_STRING_AND_BINARY(utf8)
 CAST_VARBINARY_FROM_STRING_AND_BINARY(binary)
 
-#define CAST_BINARY_FROM_STRING_AND_BINARY(TYPE)                                         \
-  GANDIVA_EXPORT                                                                         \
-  const char* castBINARY_##TYPE(gdv_int64 context, const char* data, gdv_int32 data_len, \
-                                int32_t* out_length) {                                   \
-    *out_length = data_len;                                                              \
-    return data;                                                                         \
+#define CAST_BINARY_FROM_STRING_AND_BINARY(TYPE)                      \
+  GANDIVA_EXPORT                                                      \
+  const char* castBINARY_##TYPE(const char* data, gdv_int32 data_len, \
+                                int32_t* out_length) {                \
+    *out_length = data_len;                                           \
+    return data;                                                      \
   }
 
 CAST_BINARY_FROM_STRING_AND_BINARY(utf8)

diff --git a/cpp/src/gandiva/precompiled/string_ops_test.cc b/cpp/src/gandiva/precompiled/string_ops_test.cc
@@ -880,45 +880,33 @@ TEST(TestGdvFnStubs, TestCastVarbinaryBinary) {
 }
 
 TEST(TestGdvFnStubs, TestCastBinaryUtf8) {
-  gandiva::ExecutionContext ctx;
-
-  int64_t ctx_ptr = reinterpret_cast<int64_t>(&ctx);
   int32_t out_len = 0;
   const char* input = "abc";
   const char* out;
 
-  out = castBINARY_utf8(ctx_ptr, input, 3, &out_len);
+  out = castBINARY_utf8(input, 3, &out_len);
   EXPECT_EQ(std::string(out, out_len), input);
 
-  out = castBINARY_utf8(ctx_ptr, input, 1, &out_len);
+  out = castBINARY_utf8(input, 1, &out_len);
   EXPECT_EQ(std::string(out, out_len), "a");
 
-  out = castBINARY_utf8(ctx_ptr, input, -3, &out_len);
+  out = castBINARY_utf8(input, 0, &out_len);
   EXPECT_EQ(std::string(out, out_len), "");
-  EXPECT_THAT(ctx.get_error(),
-              ::testing::HasSubstr("Output buffer length can't be negative"));
-  ctx.Reset();
 }
 
 TEST(TestGdvFnStubs, TestCastBinaryBinary) {
-  gandiva::ExecutionContext ctx;
-
-  int64_t ctx_ptr = reinterpret_cast<int64_t>(&ctx);
   int32_t out_len = 0;
   const char* input = "\\x41\\x42\\x43";
   const char* out;
 
-  out = castBINARY_binary(ctx_ptr, input, 12, &out_len);
+  out = castBINARY_binary(input, 12, &out_len);
   EXPECT_EQ(std::string(out, out_len), input);
 
-  out = castBINARY_binary(ctx_ptr, input, 8, &out_len);
+  out = castBINARY_binary(input, 8, &out_len);
   EXPECT_EQ(std::string(out, out_len), "\\x41\\x42");
 
-  out = castBINARY_binary(ctx_ptr, input, -10, &out_len);
+  out = castBINARY_binary(input, 0, &out_len);
   EXPECT_EQ(std::string(out, out_len), "");
-  EXPECT_THAT(ctx.get_error(),
-              ::testing::HasSubstr("Output buffer length can't be negative"));
-  ctx.Reset();
 }
 
 TEST(TestStringOps, TestConcat) {

diff --git a/cpp/src/gandiva/precompiled/types.h b/cpp/src/gandiva/precompiled/types.h
@@ -573,11 +573,9 @@ const char* castVARBINARY_binary_int64(gdv_int64 context, const char* data,
                                        gdv_int32 data_len, int64_t out_len,
                                        int32_t* out_length);
 
-const char* castBINARY_utf8(gdv_int64 context, const char* data, gdv_int32 data_len,
-                            int32_t* out_length);
+const char* castBINARY_utf8(const char* data, gdv_int32 data_len, int32_t* out_length);
 
-const char* castBINARY_binary(gdv_int64 context, const char* data, gdv_int32 data_len,
-                              int32_t* out_length);
+const char* castBINARY_binary(const char* data, gdv_int32 data_len, int32_t* out_length);
 
 gdv_int32 levenshtein(int64_t context, const char* in1, int32_t in1_len, const char* in2,
                       int32_t in2_len);

diff --git a/cpp/src/gandiva/tests/projector_test.cc b/cpp/src/gandiva/tests/projector_test.cc
@@ -2729,13 +2729,13 @@ TEST_F(TestProjector, TestCastBinaryUTF) {
   EXPECT_TRUE(status.ok());
 
   // Create a row-batch with some sample data
-  int num_records = 2;
+  int num_records = 3;
 
-  auto array0 = MakeArrowArrayUtf8({"a", "abc"}, {true, true});
+  auto array0 = MakeArrowArrayUtf8({"a", "abc", ""}, {true, true, true});
 
   auto in_batch = arrow::RecordBatch::Make(schema, num_records, {array0});
 
-  auto out_1 = MakeArrowArrayBinary({"a", "abc"}, {true, true});
+  auto out_1 = MakeArrowArrayBinary({"a", "abc", ""}, {true, true, true});
 
   arrow::ArrayVector outputs;
 
@@ -2763,13 +2763,15 @@ TEST_F(TestProjector, TestCastBinaryBinary) {
   EXPECT_TRUE(status.ok());
 
   // Create a row-batch with some sample data
-  int num_records = 2;
+  int num_records = 3;
 
-  auto array0 = MakeArrowArrayUtf8({"\\x41\\x42\\x43", "\\x41\\x42"}, {true, true});
+  auto array0 =
+      MakeArrowArrayUtf8({"\\x41\\x42\\x43", "\\x41\\x42", ""}, {true, true, true});
 
   auto in_batch = arrow::RecordBatch::Make(schema, num_records, {array0});
 
-  auto out_1 = MakeArrowArrayBinary({"\\x41\\x42\\x43", "\\x41\\x42"}, {true, true});
+  auto out_1 =
+      MakeArrowArrayBinary({"\\x41\\x42\\x43", "\\x41\\x42", ""}, {true, true, true});
 
   arrow::ArrayVector outputs;