From 92741c69566fd6c9df7a30d0bb58fb8d3d1244b5 Mon Sep 17 00:00:00 2001 From: Chong Gao Date: Mon, 4 Dec 2023 19:00:17 -0800 Subject: [PATCH] Add licence info; re-order imports --- .../src/main/python/time_zone_utils.py | 16 +++++++++++++++- .../com/nvidia/spark/rapids/RapidsMeta.scala | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/integration_tests/src/main/python/time_zone_utils.py b/integration_tests/src/main/python/time_zone_utils.py index 301c0f372b2..d15427c7bb7 100644 --- a/integration_tests/src/main/python/time_zone_utils.py +++ b/integration_tests/src/main/python/time_zone_utils.py @@ -1,3 +1,17 @@ +# Copyright (c) 2021-2022, NVIDIA CORPORATION. +# +# 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. + # get from Java: # ZoneId.getAvailableZoneIds # id.getRules.isFixedOffset || id.getRules.getTransitionRules.isEmpty @@ -613,4 +627,4 @@ "Europe/Monaco", ] -all_valid_time_zones = non_dst_time_zones + dst_time_zones \ No newline at end of file +all_valid_time_zones = non_dst_time_zones + dst_time_zones diff --git a/sql-plugin/src/main/scala/com/nvidia/spark/rapids/RapidsMeta.scala b/sql-plugin/src/main/scala/com/nvidia/spark/rapids/RapidsMeta.scala index 2c567506d6f..369209cc8fc 100644 --- a/sql-plugin/src/main/scala/com/nvidia/spark/rapids/RapidsMeta.scala +++ b/sql-plugin/src/main/scala/com/nvidia/spark/rapids/RapidsMeta.scala @@ -20,8 +20,8 @@ import java.time.ZoneId import scala.collection.mutable -import com.nvidia.spark.rapids.shims.{DistributionUtil, SparkShimImpl} import com.nvidia.spark.rapids.jni.GpuTimeZoneDB +import com.nvidia.spark.rapids.shims.{DistributionUtil, SparkShimImpl} import org.apache.spark.sql.catalyst.expressions.{Attribute, AttributeReference, BinaryExpression, Cast, ComplexTypeMergingExpression, Expression, QuaternaryExpression, String2TrimExpression, TernaryExpression, TimeZoneAwareExpression, UnaryExpression, UTCTimestamp, WindowExpression, WindowFunction} import org.apache.spark.sql.catalyst.expressions.aggregate.{AggregateExpression, AggregateFunction, ImperativeAggregate, TypedImperativeAggregate}