Skip to content

Commit b96dfc7

Browse files
jpedroantunesjpedroantunes
committed
Fix lint problems on string ops and test files
1 parent 8f9a4bd commit b96dfc7

4 files changed

Lines changed: 24 additions & 32 deletions

File tree

‎cpp/src/gandiva/precompiled/string_ops.cc‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1247,12 +1247,9 @@ const char* convert_fromUTF8_binary(gdv_int64 context, const char* bin_in, gdv_i
12471247
}
12481248

12491249
FORCE_INLINE
1250-
const char* convert_replace_invalid_fromUTF8_binary(gdv_int64 context,
1251-
const char* text_in,
1252-
gdv_int32 text_len,
1253-
const char* char_to_replace,
1254-
gdv_int32 /*char_to_replace_len*/,
1255-
gdv_int32* out_len) {
1250+
const char* convert_replace_invalid_fromUTF8_binary(
1251+
gdv_int64 context, const char* text_in, gdv_int32 text_len,
1252+
const char* char_to_replace, gdv_int32 /*char_to_replace_len*/, gdv_int32* out_len) {
12561253
*out_len = text_len;
12571254
char* ret = reinterpret_cast<char*>(gdv_fn_context_arena_malloc(context, *out_len));
12581255
if (ret == nullptr) {

‎cpp/src/gandiva/precompiled/string_ops_test.cc‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -120,29 +120,28 @@ TEST(TestStringOps, TestConvertReplaceInvalidUtf8Char) {
120120
uint64_t ctx_ptr = reinterpret_cast<gdv_int64>(&ctx);
121121

122122
// invalid utf8 (xf8 is invalid but x28 is not - x28 = '(')
123-
std::string a("ok-\xf8\x28""-a");
123+
std::string a(
124+
"ok-\xf8\x28"
125+
"-a");
124126
gdv_int32 a_in_out_len = a.length();
125-
const char* a_str = convert_replace_invalid_fromUTF8_binary(ctx_ptr, a.data(),
126-
a_in_out_len, "a", 1,
127-
&a_in_out_len);
127+
const char* a_str = convert_replace_invalid_fromUTF8_binary(
128+
ctx_ptr, a.data(), a_in_out_len, "a", 1, &a_in_out_len);
128129
EXPECT_EQ(std::string(a_str, a.length()), "ok-a(-a");
129130
EXPECT_FALSE(ctx.has_error());
130131

131132
// invalid utf8 (xa0 and xa1 are invalid)
132133
std::string b("ok-\xa0\xa1-valid");
133134
gdv_int32 b_in_out_len = b.length();
134-
const char* b_str = convert_replace_invalid_fromUTF8_binary(ctx_ptr, b.data(),
135-
b_in_out_len, "b", 1,
136-
&b_in_out_len);
135+
const char* b_str = convert_replace_invalid_fromUTF8_binary(
136+
ctx_ptr, b.data(), b_in_out_len, "b", 1, &b_in_out_len);
137137
EXPECT_EQ(std::string(b_str, b.length()), "ok-bb-valid");
138138
EXPECT_FALSE(ctx.has_error());
139139

140140
// full valid utf8
141141
std::string c("all-valid");
142142
gdv_int32 c_in_out_len = c.length();
143-
const char* c_str = convert_replace_invalid_fromUTF8_binary(ctx_ptr, c.data(),
144-
c_in_out_len, "c", 1,
145-
&c_in_out_len);
143+
const char* c_str = convert_replace_invalid_fromUTF8_binary(
144+
ctx_ptr, c.data(), c_in_out_len, "c", 1, &c_in_out_len);
146145
EXPECT_EQ(std::string(c_str, c.length()), "all-valid");
147146
EXPECT_FALSE(ctx.has_error());
148147

‎cpp/src/gandiva/precompiled/types.h‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -417,12 +417,9 @@ const char* replace_utf8_utf8_utf8(gdv_int64 context, const char* text,
417417
gdv_int32 from_str_len, const char* to_str,
418418
gdv_int32 to_str_len, gdv_int32* out_len);
419419

420-
const char* convert_replace_invalid_fromUTF8_binary(gdv_int64 context,
421-
const char* text_in,
422-
gdv_int32 text_len,
423-
const char* char_to_replace,
424-
gdv_int32 char_to_replace_len,
425-
gdv_int32* out_len);
420+
const char* convert_replace_invalid_fromUTF8_binary(
421+
gdv_int64 context, const char* text_in, gdv_int32 text_len,
422+
const char* char_to_replace, gdv_int32 char_to_replace_len, gdv_int32* out_len);
426423

427424
const char* split_part(gdv_int64 context, const char* text, gdv_int32 text_len,
428425
const char* splitter, gdv_int32 split_len, gdv_int32 index,

‎cpp/src/gandiva/tests/utf8_test.cc‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -557,8 +557,8 @@ TEST_F(TestUtf8, TestConvertUtf8) {
557557

558558
auto convert_replace_utf8 =
559559
TreeExprBuilder::MakeFunction("convert_fromUTF8", {node_a, node_b}, utf8());
560-
auto equals = TreeExprBuilder::MakeFunction("equal",
561-
{convert_replace_utf8, node_c}, boolean());
560+
auto equals =
561+
TreeExprBuilder::MakeFunction("equal", {convert_replace_utf8, node_c}, boolean());
562562
auto expr = TreeExprBuilder::MakeExpression(equals, res);
563563

564564
// Build a projector for the expressions.
@@ -567,14 +567,14 @@ TEST_F(TestUtf8, TestConvertUtf8) {
567567
EXPECT_TRUE(status.ok()) << status.message();
568568

569569
// Create a row-batch with some sample data
570-
int num_records = 1;
571-
auto array_a = MakeArrowArrayUtf8(
572-
{"ok-\xf8\x28""-a", "all-valid", "ok-\xa0\xa1-valid"},
573-
{true, true, true});
570+
int num_records = 3;
571+
auto array_a = MakeArrowArrayUtf8({"ok-\xf8\x28"
572+
"-a",
573+
"all-valid", "ok-\xa0\xa1-valid"},
574+
{true, true, true});
574575

575576
auto array_b =
576-
MakeArrowArrayUtf8({"ok-z(-a", "all-valid", "ok-zz-valid"},
577-
{true, true, true});
577+
MakeArrowArrayUtf8({"ok-z(-a", "all-valid", "ok-zz-valid"}, {true, true, true});
578578

579579
// prepare input record batch
580580
auto in_batch = arrow::RecordBatch::Make(schema, num_records, {array_a, array_b});
@@ -584,8 +584,7 @@ TEST_F(TestUtf8, TestConvertUtf8) {
584584
status = projector->Evaluate(*in_batch, pool_, &outputs);
585585
EXPECT_TRUE(status.ok()) << status.message();
586586

587-
auto exp = MakeArrowArrayBool({true},
588-
{true});
587+
auto exp = MakeArrowArrayBool({true, true, true}, {true, true, true});
589588
// Validate results
590589
EXPECT_ARROW_ARRAY_EQUALS(exp, outputs[0]);
591590
}

0 commit comments

Comments
 (0)