-
Notifications
You must be signed in to change notification settings - Fork 1.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: Add json_array_length Spark function #11946
base: main
Are you sure you want to change the base?
Changes from 2 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
/* | ||
* Copyright (c) Facebook, Inc. and its affiliates. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
#pragma once | ||
|
||
#include "velox/functions/Macros.h" | ||
#include "velox/functions/prestosql/types/JsonType.h" | ||
|
||
namespace facebook::velox::functions::sparksql { | ||
|
||
template <typename T> | ||
struct JsonArrayLengthFunction { | ||
VELOX_DEFINE_FUNCTION_TYPES(T); | ||
|
||
FOLLY_ALWAYS_INLINE bool call(int32_t& len, const arg_type<Json>& json) { | ||
simdjson::ondemand::document jsonDoc; | ||
|
||
simdjson::padded_string paddedJson(json.data(), json.size()); | ||
if (simdjsonParse(paddedJson).get(jsonDoc)) { | ||
return false; | ||
} | ||
if (jsonDoc.type().error()) { | ||
return false; | ||
} | ||
|
||
if (jsonDoc.type() != simdjson::ondemand::json_type::array) { | ||
return false; | ||
} | ||
|
||
size_t numElements; | ||
if (jsonDoc.count_elements().get(numElements)) { | ||
return false; | ||
} | ||
|
||
len = numElements; | ||
return true; | ||
} | ||
}; | ||
} // namespace facebook::velox::functions::sparksql | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,6 +15,7 @@ | |
*/ | ||
#include "velox/functions/lib/RegistrationHelpers.h" | ||
#include "velox/functions/sparksql/GetJsonObject.h" | ||
#include "velox/functions/sparksql/JsonArrayLength.h" | ||
#include "velox/functions/sparksql/JsonObjectKeys.h" | ||
|
||
namespace facebook::velox::functions::sparksql { | ||
|
@@ -24,6 +25,8 @@ void registerJsonFunctions(const std::string& prefix) { | |
{prefix + "get_json_object"}); | ||
registerFunction<JsonObjectKeysFunction, Array<Varchar>, Varchar>( | ||
{prefix + "json_object_keys"}); | ||
registerFunction<JsonArrayLengthFunction, int32_t, Varchar>( | ||
{prefix + "json_array_length"}); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. To avoid duplicating code, we would recommend extracting the implementation to the 'velox/functions/lib/' and registering it with corresponding return types for Presto and Spark if the semantics are the same (corner cases may need to be verified). There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @rui-mo The input type is a bit different, one is There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @rui-mo removed duplicated code. Please take a look again |
||
} | ||
|
||
} // namespace facebook::velox::functions::sparksql |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
/* | ||
* Copyright (c) Facebook, Inc. and its affiliates. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
#include "velox/functions/sparksql/tests/SparkFunctionBaseTest.h" | ||
|
||
using namespace facebook::velox::test; | ||
|
||
namespace facebook::velox::functions::sparksql::test { | ||
namespace { | ||
|
||
class JsonArrayLengthTest : public SparkFunctionBaseTest { | ||
protected: | ||
VectorPtr jsonArrayLength(const std::string& json) { | ||
auto varcharVector = makeFlatVector<std::string>({json}); | ||
return evaluate("json_array_length(c0)", makeRowVector({varcharVector})); | ||
} | ||
}; | ||
|
||
TEST_F(JsonArrayLengthTest, basic) { | ||
auto expected = makeConstant<int32_t>(4, 1); | ||
assertEqualVectors(expected, jsonArrayLength(R"([1,2,3,4])")); | ||
|
||
expected = makeConstant<int32_t>(5, 1); | ||
assertEqualVectors(expected, jsonArrayLength(R"([1,2,3,{"f1":1,"f2":[5,6]},4])")); | ||
|
||
expected = makeNullConstant(TypeKind::INTEGER, 1); | ||
assertEqualVectors(expected, jsonArrayLength(R"([1,2)")); | ||
} | ||
|
||
} // namespace | ||
} // namespace facebook::velox::functions::sparksql::test |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggestion:
Change
const arg_type<Json>&
toconst arg_type<Varchar>&
and remove the above corresponding header.I think JsonType is just for presto.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, fixed