Skip to content

Commit

Permalink
fix: tests
Browse files Browse the repository at this point in the history
  • Loading branch information
aceforeverd committed Aug 18, 2023
1 parent cbfcc95 commit ff0062f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 37 deletions.
11 changes: 1 addition & 10 deletions hybridse/src/codegen/udf_ir_builder_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1188,16 +1188,6 @@ TEST_F(UdfIRBuilderTest, ReplaceNullable) {
}


TEST_F(UdfIRBuilderTest, JsonArrayLength) {
CheckUdf<Nullable<int32_t>, Nullable<StringRef>>("json_array_length", 0, "[]");
CheckUdf<Nullable<int32_t>, Nullable<StringRef>>("json_array_length", 3, "[1,2,3]");
CheckUdf<Nullable<int32_t>, Nullable<StringRef>>("json_array_length", 5, R"([1,2,3,{"f1":1,"f2":[5,6]},4])");

CheckUdf<Nullable<int32_t>, Nullable<StringRef>>("json_array_length", nullptr, R"({})");
CheckUdf<Nullable<int32_t>, Nullable<StringRef>>("json_array_length", nullptr, "[1,2,3");
CheckUdf<Nullable<int32_t>, Nullable<StringRef>>("json_array_length", nullptr, nullptr);
}

TEST_F(UdfIRBuilderTest, CustUdfs) {
CheckUdf<Nullable<StringRef>, Nullable<StringRef>, int32_t, Nullable<StringRef>>("list_at", "a", "a,b,c", 0, ",");

Expand All @@ -1209,6 +1199,7 @@ TEST_F(UdfIRBuilderTest, CustUdfs) {
false);
}

}
} // namespace codegen

int main(int argc, char **argv) {
Expand Down
8 changes: 6 additions & 2 deletions hybridse/src/udf/default_defs/feature_zero_def.cc
Original file line number Diff line number Diff line change
Expand Up @@ -789,10 +789,14 @@ void DefaultUdfLibrary::InitFeatureZero() {
RegisterAlias("fz_topn_frequency", "topn_frequency");

RegisterExternal("list_at")
.args<StringRef, int32_t, StringRef>(list_at);
.returns<StringRef>()
.return_by_arg(true)
.args<StringRef, int32_t, StringRef>(reinterpret_cast<void*>(list_at));

RegisterExternal("json_array_sort")
.args<StringRef, StringRef, StringRef, int32_t, bool>(json_array_sort);
.returns<StringRef>()
.return_by_arg(true)
.args<StringRef, StringRef, StringRef, int32_t, bool>(reinterpret_cast<void*>(json_array_sort));
}

} // namespace udf
Expand Down
26 changes: 1 addition & 25 deletions hybridse/src/udf/default_defs/json_defs.cc
Original file line number Diff line number Diff line change
Expand Up @@ -47,31 +47,7 @@ void json_array_length(openmldb::base::StringRef* in, int32_t* sz, bool* is_null
*sz = static_cast<int32_t>(arr_sz);
}

void DefaultUdfLibrary::InitJsonUdfs() {
RegisterExternal("json_array_length")
.args<openmldb::base::StringRef>(json_array_length)
.doc(R"(
@brief Returns the number of elements in the outermost JSON array.
Null returned if input is not valid JSON array string.
@param jsonArray JSON arry in string
Example:
@code{.sql}
select json_array_length('[1, 2]')
-- 2
SELECT json_array_length('[1,2,3,{"f1":1,"f2":[5,6]},4]');
-- 5
select json_array_length('[1, 2')
-- NULL
@endcode
@since 0.9.0)");
}
void DefaultUdfLibrary::InitJsonUdfs() {}

} // namespace udf
} // namespace hybridse

0 comments on commit ff0062f

Please sign in to comment.