[KYUUBI #4316] Fix returned Timestamp values may lose precision #4318
Conversation
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
github-actions
bot
added
module:common
module:ctl
module:hive
module:server
module:spark
labels
pan3793
requested review from
cfmcgrady and
cxzl25
and removed request for
cfmcgrady
cfmcgrady
reviewed
Feb 13, 2023
| } | ||
| values.add(value) | ||
| values.add( | ||
| HiveResult.toHiveString((row.get(ordinal), typ), false, getTimeFormatters(timeZone))) |
There was a problem hiding this comment.
Why? It's a top-level value.
There was a problem hiding this comment.
refer to org.apache.spark.sql.hive.thriftserver.RowSetUtils#toTColumn()
There was a problem hiding this comment.
As offline discussed, nested should be false here, but it does not affect the output.
cfmcgrady
reviewed
Feb 13, 2023
| import org.apache.kyuubi.util.RowSetUtils._ | ||
|
|
||
| object RowSet { | ||
|
|
||
| def getTimeFormatters(timeZone: ZoneId): TimeFormatters = { |
There was a problem hiding this comment.
why not call HiveResult.getTimeFormatters directly?
There was a problem hiding this comment.
Because SQLConf#get does not work properly in this case.
There was a problem hiding this comment.
Wrapped SQLConf.withExistingConf to see if it works
ulysses-you
reviewed
Feb 14, 2023
| @@ -21,8 +21,9 @@ import java.time.ZoneId | |||
|
|
|||
| import org.apache.spark.rdd.RDD | |||
| import org.apache.spark.sql.{DataFrame, Dataset, Row} | |||
| import org.apache.spark.sql.execution.HiveResult | |||
There was a problem hiding this comment.
is there any compatibility issue for different Spark version ?
There was a problem hiding this comment.
The signature is stable since 3.1, and the current implementation is compatible w/ Spark 3.1 and above.
Codecov Report
@@ Coverage Diff @@
## master #4318 +/- ##
============================================
- Coverage 53.59% 53.55% -0.05%
Complexity 13 13
============================================
Files 562 562
Lines 30731 30689 -42
Branches 4159 4142 -17
============================================
- Hits 16470 16434 -36
- Misses 12701 12709 +8
+ Partials 1560 1546 -14
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
cfmcgrady
approved these changes
Feb 14, 2023
pan3793
added a commit
that referenced
this pull request
Feb 14, 2023
### _Why are the changes needed?_ This PR proposes to use `org.apache.spark.sql.execution#toHiveString` to replace `org.apache.kyuubi.engine.spark.schema#toHiveString` to get consistent result w/ `spark-sql` and `STS`. Because of [SPARK-32006](https://issues.apache.org/jira/browse/SPARK-32006), it only works w/ Spark 3.1 and above. The patch takes effects on both thrift and arrow result format. ### _How was this patch tested?_ - [x] Add some test cases that check the changes thoroughly including negative and positive cases if possible - [x] Add screenshots for manual tests if appropriate ``` ➜ ~ beeline -u 'jdbc:hive2://0.0.0.0:10009/default' Connecting to jdbc:hive2://0.0.0.0:10009/default Connected to: Spark SQL (version 3.3.1) Driver: Hive JDBC (version 2.3.9) Transaction isolation: TRANSACTION_REPEATABLE_READ Beeline version 2.3.9 by Apache Hive 0: jdbc:hive2://0.0.0.0:10009/default> select to_timestamp('2023-02-08 22:17:33.123456789'); +----------------------------------------------+ | to_timestamp(2023-02-08 22:17:33.123456789) | +----------------------------------------------+ | 2023-02-08 22:17:33.123456 | +----------------------------------------------+ 1 row selected (0.415 seconds) ``` - [x] [Run test](https://kyuubi.readthedocs.io/en/master/develop_tools/testing.html#running-tests) locally before make a pull request Closes #4318 from pan3793/hive-string. Closes #4316 ba9016f [Cheng Pan] nit 8be774b [Cheng Pan] nit bd696fe [Cheng Pan] nit b5cf051 [Cheng Pan] fix dd6b702 [Cheng Pan] test 63edd34 [Cheng Pan] nit 37cc70a [Cheng Pan] Fix python ut c66ad22 [Cheng Pan] [KYUUBI #4316] Fix returned Timestamp values may lose precision 41d9444 [Cheng Pan] Revert "[KYUUBI #3958] Fix Spark session timezone format" Authored-by: Cheng Pan <chengpan@apache.org> Signed-off-by: Cheng Pan <chengpan@apache.org> (cherry picked from commit 8fe7947) Signed-off-by: Cheng Pan <chengpan@apache.org>
|
Thanks, merged to master/1.7 |
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Why are the changes needed?
This PR proposes to use
org.apache.spark.sql.execution#toHiveStringto replaceorg.apache.kyuubi.engine.spark.schema#toHiveStringto get consistent result w/spark-sqlandSTS.Because of SPARK-32006, it only works w/ Spark 3.1 and above.
The patch takes effects on both thrift and arrow result format.
How was this patch tested?
Add some test cases that check the changes thoroughly including negative and positive cases if possible
Add screenshots for manual tests if appropriate