Fix unnecessary functions

jvictorhuguenin · jvictorhuguenin · commit 07c75dd703f1 · 2021-07-16T10:07:09.000-03:00
diff --git a/cpp/src/gandiva/function_registry_string.cc b/cpp/src/gandiva/function_registry_string.cc
@@ -103,11 +103,19 @@ std::vector<NativeFunction> GetStringFunctionRegistry() {
                      NativeFunction::kNeedsContext | NativeFunction::kCanReturnErrors),
 
       NativeFunction("castINT", {}, DataTypeVector{binary()}, int32(), kResultNullIfNull,
-                     "castINT_varbinary",
+                     "gdv_fn_castINT_varbinary",
                      NativeFunction::kNeedsContext | NativeFunction::kCanReturnErrors),
 
       NativeFunction("castBIGINT", {}, DataTypeVector{binary()}, int64(),
-                     kResultNullIfNull, "castBIGINT_varbinary",
+                     kResultNullIfNull, "gdv_fn_castBIGINT_varbinary",
+                     NativeFunction::kNeedsContext | NativeFunction::kCanReturnErrors),
+
+      NativeFunction("castFLOAT4", {}, DataTypeVector{binary()}, float32(), kResultNullIfNull,
+                     "gdv_fn_castFLOAT4_varbinary",
+                     NativeFunction::kNeedsContext | NativeFunction::kCanReturnErrors),
+
+      NativeFunction("castFLOAT8", {}, DataTypeVector{binary()}, float64(),
+                     kResultNullIfNull, "gdv_fn_castFLOAT8_varbinary",
                      NativeFunction::kNeedsContext | NativeFunction::kCanReturnErrors),
 
       NativeFunction("castVARCHAR", {}, DataTypeVector{boolean(), int64()}, utf8(),
diff --git a/cpp/src/gandiva/precompiled/types.h b/cpp/src/gandiva/precompiled/types.h
@@ -543,8 +543,4 @@ float castFLOAT4_utf8(int64_t context, const char* data, int32_t len);
 
 double castFLOAT8_utf8(int64_t context, const char* data, int32_t len);
 
-int32_t castINT_varbinary(gdv_int64 context, const char* in, int32_t in_len);
-
-int64_t castBIGINT_varbinary(gdv_int64 context, const char* in, int32_t in_len);
-
 }  // extern "C"
diff --git a/cpp/src/gandiva/tests/projector_test.cc b/cpp/src/gandiva/tests/projector_test.cc
@@ -1139,15 +1139,19 @@ TEST_F(TestProjector, TestCastVarbinaryFunction) {
   // output fields
   auto res_int4 = field("res_int4", arrow::int32());
   auto res_int8 = field("res_int8", arrow::int64());
+  auto res_float4 = field("res_float4", arrow::float32());
+  auto res_float8 = field("res_float8", arrow::float64());
 
   // Build expression
   auto cast_expr_int4 = TreeExprBuilder::MakeExpression("castINT", {field0}, res_int4);
   auto cast_expr_int8 = TreeExprBuilder::MakeExpression("castBIGINT", {field0}, res_int8);
+  auto cast_expr_float4 = TreeExprBuilder::MakeExpression("castFLOAT4", {field0}, res_float4);
+  auto cast_expr_float8 = TreeExprBuilder::MakeExpression("castFLOAT8", {field0}, res_float8);
 
   std::shared_ptr<Projector> projector;
 
-  //  {cast_expr_int4, cast_expr_int8}
-  auto status = Projector::Make(schema, {cast_expr_int4, cast_expr_int8},
+  //  {cast_expr_float4, cast_expr_float8, cast_expr_int4, cast_expr_int8}
+  auto status = Projector::Make(schema, {cast_expr_int4, cast_expr_int8, cast_expr_float4, cast_expr_float8},
                                 TestConfiguration(), &projector);
   EXPECT_TRUE(status.ok());
 
@@ -1156,14 +1160,18 @@ TEST_F(TestProjector, TestCastVarbinaryFunction) {
 
   // Last validity is false and the cast functions throw error when input is empty. Should
   // not be evaluated due to addition of NativeFunction::kCanReturnErrors
-  auto array0 = MakeArrowArrayBinary({"25", "-7FFFFFFF", "7FFFFFFF", "4"},
+  auto array0 = MakeArrowArrayBinary({"37", "-99999", "99999", "4"},
                                      {true, true, true, false});
   auto in_batch = arrow::RecordBatch::Make(schema, num_records, {array0});
 
   auto out_int4 =
-      MakeArrowArrayInt32({37, INT32_MIN + 1, INT32_MAX, 0}, {true, true, true, false});
+      MakeArrowArrayInt32({37, -99999, 99999, 0}, {true, true, true, false});
   auto out_int8 =
-      MakeArrowArrayInt64({37, INT32_MIN + 1, INT32_MAX, 0}, {true, true, true, false});
+      MakeArrowArrayInt64({37, -99999, 99999, 0}, {true, true, true, false});
+  auto out_float4 =
+      MakeArrowArrayFloat32({37, -99999, 99999, 0}, {true, true, true, false});
+  auto out_float8 =
+      MakeArrowArrayFloat64({37, -99999, 99999, 0}, {true, true, true, false});
 
   arrow::ArrayVector outputs;
 
@@ -1173,6 +1181,8 @@ TEST_F(TestProjector, TestCastVarbinaryFunction) {
 
   EXPECT_ARROW_ARRAY_EQUALS(out_int4, outputs.at(0));
   EXPECT_ARROW_ARRAY_EQUALS(out_int8, outputs.at(1));
+  EXPECT_ARROW_ARRAY_EQUALS(out_float4, outputs.at(2));
+  EXPECT_ARROW_ARRAY_EQUALS(out_float8, outputs.at(3));
 }
 
 TEST_F(TestProjector, TestToDate) {
