-
Notifications
You must be signed in to change notification settings - Fork 447
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[GLUTEN-5827][CH]support utc timestamp transfrom (#5828)
What changes were proposed in this pull request? (Please fill in changes proposed in this fix) (Fixes: #5827) support to_utc_timestamp/from_utc_timestamp function; convert timezone like '+08:00,-08:00' to GMT+8 , GMT-8 while this config set in spark.sql.session.timezone or in to_utc_timestamp / from_utc_timestamp's parameters How was this patch tested? spark ut
- Loading branch information
1 parent
d3bd3d7
commit b37a6e4
Showing
11 changed files
with
156 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
cpp-ch/local-engine/Parser/scalar_function_parser/fromUtcTimestamp.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You 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 <Parser/scalar_function_parser/utcTimestampTransform.h> | ||
|
||
namespace local_engine | ||
{ | ||
|
||
class FunctionParserFromUtcTimestamp : public FunctionParserUtcTimestampTransform | ||
{ | ||
public: | ||
explicit FunctionParserFromUtcTimestamp(SerializedPlanParser * plan_parser_) : FunctionParserUtcTimestampTransform(plan_parser_) { } | ||
~FunctionParserFromUtcTimestamp() = default; | ||
|
||
static constexpr auto name = "from_utc_timestamp"; | ||
String getCHFunctionName(const substrait::Expression_ScalarFunction &) const override { return "from_utc_timestamp"; } | ||
String getName() const override { return "from_utc_timestamp"; } | ||
}; | ||
|
||
static FunctionParserRegister<FunctionParserFromUtcTimestamp> fromUtcTimestamp; | ||
} |
35 changes: 35 additions & 0 deletions
35
cpp-ch/local-engine/Parser/scalar_function_parser/toUtcTimestamp.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You 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 <Parser/scalar_function_parser/utcTimestampTransform.h> | ||
|
||
namespace local_engine | ||
{ | ||
|
||
class FunctionParserToUtcTimestamp : public FunctionParserUtcTimestampTransform | ||
{ | ||
public: | ||
explicit FunctionParserToUtcTimestamp(SerializedPlanParser * plan_parser_) : FunctionParserUtcTimestampTransform(plan_parser_) { } | ||
~FunctionParserToUtcTimestamp() = default; | ||
|
||
static constexpr auto name = "to_utc_timestamp"; | ||
String getCHFunctionName(const substrait::Expression_ScalarFunction &) const override { return "to_utc_timestamp"; } | ||
String getName() const override { return "to_utc_timestamp"; } | ||
}; | ||
|
||
static FunctionParserRegister<FunctionParserToUtcTimestamp> toUtcTimestamp; | ||
} |
61 changes: 61 additions & 0 deletions
61
cpp-ch/local-engine/Parser/scalar_function_parser/utcTimestampTransform.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You 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 <DataTypes/DataTypeNullable.h> | ||
#include <DataTypes/DataTypesNumber.h> | ||
#include <Parser/FunctionParser.h> | ||
#include <Common/CHUtil.h> | ||
|
||
namespace DB | ||
{ | ||
|
||
namespace ErrorCodes | ||
{ | ||
extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH; | ||
extern const int ILLEGAL_TYPE_OF_ARGUMENT; | ||
} | ||
} | ||
|
||
namespace local_engine | ||
{ | ||
|
||
class FunctionParserUtcTimestampTransform : public FunctionParser | ||
{ | ||
public: | ||
explicit FunctionParserUtcTimestampTransform(SerializedPlanParser * plan_parser_) : FunctionParser(plan_parser_) { } | ||
~FunctionParserUtcTimestampTransform() override = default; | ||
|
||
const ActionsDAG::Node * parse(const substrait::Expression_ScalarFunction & substrait_func, ActionsDAGPtr & actions_dag) const override | ||
{ | ||
/// Convert timezone value to clickhouse backend supported, i.e. GMT+8 -> Etc/GMT-8, +08:00 -> Etc/GMT-8 | ||
if (substrait_func.arguments_size() != 2) | ||
throw DB::Exception(DB::ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Function {}'s must have 2 arguments", getName()); | ||
|
||
const substrait::Expression & arg1 = substrait_func.arguments()[1].value(); | ||
if (!arg1.has_literal() || !arg1.literal().has_string()) | ||
throw DB::Exception(DB::ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Function {}'s 2nd argument should be string literal", getName()); | ||
|
||
const String & arg1_literal = arg1.literal().string(); | ||
String time_zone_val = DateTimeUtil::convertTimeZone(arg1_literal); | ||
auto parsed_args = parseFunctionArguments(substrait_func, "", actions_dag); | ||
auto nullable_string_type = DB::makeNullable(std::make_shared<DB::DataTypeString>()); | ||
const auto * time_zone_node = addColumnToActionsDAG(actions_dag, nullable_string_type, time_zone_val); | ||
const auto * result_node = toFunctionNode(actions_dag, getCHFunctionName(substrait_func), {parsed_args[0], time_zone_node}); | ||
return convertNodeTypeIfNeeded(substrait_func, result_node, actions_dag); | ||
} | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters