You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "yaooqinn (via GitHub)" <gi...@apache.org> on 2023/02/15 10:29:10 UTC
[GitHub] [spark] yaooqinn opened a new pull request, #40036: [SPARK-42448][SQL] Fix spark sql shell prompt for current db
yaooqinn opened a new pull request, #40036:
URL: https://github.com/apache/spark/pull/40036
<!--
Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://spark.apache.org/contributing.html
2. Ensure you have added or run the appropriate tests for your PR: https://spark.apache.org/developer-tools.html
3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][SPARK-XXXX] Your PR title ...'.
4. Be sure to keep the PR description updated to reflect all changes.
5. Please write your PR title to summarize what this PR proposes.
6. If possible, provide a concise example to reproduce the issue for a faster review.
7. If you want to add a new configuration, please read the guideline first for naming configurations in
'core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala'.
8. If you want to add or modify an error type or message, please read the guideline first in
'core/src/main/resources/error/README.md'.
-->
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
2. If you fix some SQL features, you can provide some references of other DBMSes.
3. If there is design documentation, please add the link.
4. If there is a discussion in the mailing list, please add the link.
-->
The CliSessionState does not contain the current database info, we shall use spark's `catalog.currentDatabase`
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
bugfix
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as the documentation fix.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Spark versions or within the unreleased branches such as master.
If no, write 'No'.
-->
yes, when users use spark-sql and switch database, the prompt now show the correct one instead of `default`
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why it was difficult to add.
If benchmark tests were added, please run the benchmarks in GitHub Actions for the consistent environment, and the instructions could accord to: https://spark.apache.org/developer-tools.html#github-workflow-benchmarks.
-->
locally tested
```textmate
spark-sql (default)> create database abc;
Time taken: 0.24 seconds
spark-sql (default)> use abc;
Time taken: 0.027 seconds
spark-sql (ABC)>
````
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] yaooqinn commented on a diff in pull request #40036: [SPARK-42448][SQL] Fix spark sql shell prompt for current db
Posted by "yaooqinn (via GitHub)" <gi...@apache.org>.
yaooqinn commented on code in PR #40036:
URL: https://github.com/apache/spark/pull/40036#discussion_r1111766216
##########
sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala:
##########
@@ -278,8 +278,16 @@ private[hive] object SparkSQLCLIDriver extends Logging {
var ret = 0
var prefix = ""
- val currentDB = ReflectionUtils.invokeStatic(classOf[CliDriver], "getFormattedDb",
- classOf[HiveConf] -> conf, classOf[CliSessionState] -> sessionState)
+
+ def currentDB: String = {
+ val printCurrentDb = conf.getBoolVar(HiveConf.ConfVars.CLIPRINTCURRENTDB) ||
+ SparkSQLEnv.sqlContext.conf.cliPrintCurrentDb
+ if (printCurrentDb) {
+ s" (${SparkSQLEnv.sqlContext.sparkSession.catalog.currentDatabase})"
+ } else {
+ ""
Review Comment:
then, if spark disables and hive enables, then the current db will always be `default` which is a wrong answer mostly
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] yaooqinn closed pull request #40036: [SPARK-42448][SQL] Fix spark sql shell prompt for current db
Posted by "yaooqinn (via GitHub)" <gi...@apache.org>.
yaooqinn closed pull request #40036: [SPARK-42448][SQL] Fix spark sql shell prompt for current db
URL: https://github.com/apache/spark/pull/40036
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] yaooqinn commented on a diff in pull request #40036: [SPARK-42448][SQL] Fix spark sql shell prompt for current db
Posted by "yaooqinn (via GitHub)" <gi...@apache.org>.
yaooqinn commented on code in PR #40036:
URL: https://github.com/apache/spark/pull/40036#discussion_r1108064121
##########
sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala:
##########
@@ -278,8 +278,16 @@ private[hive] object SparkSQLCLIDriver extends Logging {
var ret = 0
var prefix = ""
- val currentDB = ReflectionUtils.invokeStatic(classOf[CliDriver], "getFormattedDb",
- classOf[HiveConf] -> conf, classOf[CliSessionState] -> sessionState)
+
+ def currentDB: String = {
+ val printCurrentDb = conf.getBoolVar(HiveConf.ConfVars.CLIPRINTCURRENTDB) ||
+ SparkSQLEnv.sqlContext.conf.cliPrintCurrentDb
+ if (printCurrentDb) {
+ s" (${SparkSQLEnv.sqlContext.sparkSession.catalog.currentDatabase})"
+ } else {
+ ""
Review Comment:
Hive disables showing the current database for `hive-cli`, but enables it for hive `beeline` by default. As the former is a deprecated use case of hive, I would like to respect the latter for our SQL shell.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a diff in pull request #40036: [SPARK-42448][SQL] Fix spark sql shell prompt for current db
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #40036:
URL: https://github.com/apache/spark/pull/40036#discussion_r1107177853
##########
sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala:
##########
@@ -278,8 +278,16 @@ private[hive] object SparkSQLCLIDriver extends Logging {
var ret = 0
var prefix = ""
- val currentDB = ReflectionUtils.invokeStatic(classOf[CliDriver], "getFormattedDb",
- classOf[HiveConf] -> conf, classOf[CliSessionState] -> sessionState)
+
+ def currentDB: String = {
+ val printCurrentDb = conf.getBoolVar(HiveConf.ConfVars.CLIPRINTCURRENTDB) ||
Review Comment:
so there is already a hive conf to control this behavior?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a diff in pull request #40036: [SPARK-42448][SQL] Fix spark sql shell prompt for current db
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #40036:
URL: https://github.com/apache/spark/pull/40036#discussion_r1107178628
##########
sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala:
##########
@@ -278,8 +278,16 @@ private[hive] object SparkSQLCLIDriver extends Logging {
var ret = 0
var prefix = ""
- val currentDB = ReflectionUtils.invokeStatic(classOf[CliDriver], "getFormattedDb",
Review Comment:
the old code itself looks fine, why `CliDriver.getFormattedDb` returns wrong result?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] yaooqinn commented on a diff in pull request #40036: [SPARK-42448][SQL] Fix spark sql shell prompt for current db
Posted by "yaooqinn (via GitHub)" <gi...@apache.org>.
yaooqinn commented on code in PR #40036:
URL: https://github.com/apache/spark/pull/40036#discussion_r1111674186
##########
sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala:
##########
@@ -278,8 +278,16 @@ private[hive] object SparkSQLCLIDriver extends Logging {
var ret = 0
var prefix = ""
- val currentDB = ReflectionUtils.invokeStatic(classOf[CliDriver], "getFormattedDb",
- classOf[HiveConf] -> conf, classOf[CliSessionState] -> sessionState)
+
+ def currentDB: String = {
+ val printCurrentDb = conf.getBoolVar(HiveConf.ConfVars.CLIPRINTCURRENTDB) ||
+ SparkSQLEnv.sqlContext.conf.cliPrintCurrentDb
+ if (printCurrentDb) {
+ s" (${SparkSQLEnv.sqlContext.sparkSession.catalog.currentDatabase})"
+ } else {
+ ""
Review Comment:
do you mean
```scala
if (SparkSQLEnv.sqlContext.conf.cliPrintCurrentDb) {
s" (${SparkSQLEnv.sqlContext.sparkSession.catalog.currentDatabase})"
} else {
ReflectionUtils.invokeStatic(classOf[CliDriver], "getFormattedDb",...
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] yaooqinn commented on pull request #40036: [SPARK-42448][SQL] Fix spark sql shell prompt for current db
Posted by "yaooqinn (via GitHub)" <gi...@apache.org>.
yaooqinn commented on PR #40036:
URL: https://github.com/apache/spark/pull/40036#issuecomment-1441387689
thanks, merged to master and 3.4
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a diff in pull request #40036: [SPARK-42448][SQL] Fix spark sql shell prompt for current db
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #40036:
URL: https://github.com/apache/spark/pull/40036#discussion_r1111687924
##########
sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala:
##########
@@ -278,8 +278,16 @@ private[hive] object SparkSQLCLIDriver extends Logging {
var ret = 0
var prefix = ""
- val currentDB = ReflectionUtils.invokeStatic(classOf[CliDriver], "getFormattedDb",
- classOf[HiveConf] -> conf, classOf[CliSessionState] -> sessionState)
+
+ def currentDB: String = {
+ val printCurrentDb = conf.getBoolVar(HiveConf.ConfVars.CLIPRINTCURRENTDB) ||
+ SparkSQLEnv.sqlContext.conf.cliPrintCurrentDb
+ if (printCurrentDb) {
+ s" (${SparkSQLEnv.sqlContext.sparkSession.catalog.currentDatabase})"
+ } else {
+ ""
Review Comment:
yup
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a diff in pull request #40036: [SPARK-42448][SQL] Fix spark sql shell prompt for current db
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #40036:
URL: https://github.com/apache/spark/pull/40036#discussion_r1107964119
##########
sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala:
##########
@@ -278,8 +278,16 @@ private[hive] object SparkSQLCLIDriver extends Logging {
var ret = 0
var prefix = ""
- val currentDB = ReflectionUtils.invokeStatic(classOf[CliDriver], "getFormattedDb",
Review Comment:
it's not spark's `SessionState`, right? For spark cli, Spark's own `SessionState` is the source of truth. Are there other places trying to get state from Hive `SessionState`?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a diff in pull request #40036: [SPARK-42448][SQL] Fix spark sql shell prompt for current db
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #40036:
URL: https://github.com/apache/spark/pull/40036#discussion_r1108009658
##########
sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala:
##########
@@ -278,8 +278,16 @@ private[hive] object SparkSQLCLIDriver extends Logging {
var ret = 0
var prefix = ""
- val currentDB = ReflectionUtils.invokeStatic(classOf[CliDriver], "getFormattedDb",
- classOf[HiveConf] -> conf, classOf[CliSessionState] -> sessionState)
+
+ def currentDB: String = {
+ val printCurrentDb = conf.getBoolVar(HiveConf.ConfVars.CLIPRINTCURRENTDB) ||
+ SparkSQLEnv.sqlContext.conf.cliPrintCurrentDb
+ if (printCurrentDb) {
+ s" (${SparkSQLEnv.sqlContext.sparkSession.catalog.currentDatabase})"
+ } else {
+ ""
Review Comment:
I'm not sure when users don't want to see the current db. If the hive config is true by default, it seems OK to not add a new conf in Spark but just respect that hive conf.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a diff in pull request #40036: [SPARK-42448][SQL] Fix spark sql shell prompt for current db
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #40036:
URL: https://github.com/apache/spark/pull/40036#discussion_r1108423341
##########
sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala:
##########
@@ -278,8 +278,16 @@ private[hive] object SparkSQLCLIDriver extends Logging {
var ret = 0
var prefix = ""
- val currentDB = ReflectionUtils.invokeStatic(classOf[CliDriver], "getFormattedDb",
- classOf[HiveConf] -> conf, classOf[CliSessionState] -> sessionState)
+
+ def currentDB: String = {
+ val printCurrentDb = conf.getBoolVar(HiveConf.ConfVars.CLIPRINTCURRENTDB) ||
+ SparkSQLEnv.sqlContext.conf.cliPrintCurrentDb
+ if (printCurrentDb) {
+ s" (${SparkSQLEnv.sqlContext.sparkSession.catalog.currentDatabase})"
+ } else {
+ ""
Review Comment:
to be safe, shall we use the old code if the config is false?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] yaooqinn commented on pull request #40036: [SPARK-42448][SQL] Fix spark sql shell prompt for current db
Posted by "yaooqinn (via GitHub)" <gi...@apache.org>.
yaooqinn commented on PR #40036:
URL: https://github.com/apache/spark/pull/40036#issuecomment-1436361416
kindly ping @HyukjinKwon @HyukjinKwon
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] yaooqinn commented on a diff in pull request #40036: [SPARK-42448][SQL] Fix spark sql shell prompt for current db
Posted by "yaooqinn (via GitHub)" <gi...@apache.org>.
yaooqinn commented on code in PR #40036:
URL: https://github.com/apache/spark/pull/40036#discussion_r1109188151
##########
sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala:
##########
@@ -278,8 +278,16 @@ private[hive] object SparkSQLCLIDriver extends Logging {
var ret = 0
var prefix = ""
- val currentDB = ReflectionUtils.invokeStatic(classOf[CliDriver], "getFormattedDb",
- classOf[HiveConf] -> conf, classOf[CliSessionState] -> sessionState)
+
+ def currentDB: String = {
+ val printCurrentDb = conf.getBoolVar(HiveConf.ConfVars.CLIPRINTCURRENTDB) ||
+ SparkSQLEnv.sqlContext.conf.cliPrintCurrentDb
+ if (printCurrentDb) {
+ s" (${SparkSQLEnv.sqlContext.sparkSession.catalog.currentDatabase})"
+ } else {
+ ""
Review Comment:
OK
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] HyukjinKwon commented on a diff in pull request #40036: [SPARK-42448][SQL] Fix spark sql shell prompt for current db
Posted by "HyukjinKwon (via GitHub)" <gi...@apache.org>.
HyukjinKwon commented on code in PR #40036:
URL: https://github.com/apache/spark/pull/40036#discussion_r1107008617
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala:
##########
@@ -4033,6 +4033,13 @@ object SQLConf {
.booleanConf
.createWithDefault(false)
+ val CLI_PRINT_CURRENT_DB =
+ buildConf("spark.sql.cli.print.currentDb")
+ .doc("When set to true, spark-sql CLI prints the the current database in prompt")
+ .version("3.44.0")
Review Comment:
typo
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala:
##########
@@ -4033,6 +4033,13 @@ object SQLConf {
.booleanConf
.createWithDefault(false)
+ val CLI_PRINT_CURRENT_DB =
+ buildConf("spark.sql.cli.print.currentDb")
+ .doc("When set to true, spark-sql CLI prints the the current database in prompt")
+ .version("3.44.0")
+ .booleanConf
+ .createWithDefault(false)
Review Comment:
I think we can turn it on by default.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] yaooqinn commented on a diff in pull request #40036: [SPARK-42448][SQL] Fix spark sql shell prompt for current db
Posted by "yaooqinn (via GitHub)" <gi...@apache.org>.
yaooqinn commented on code in PR #40036:
URL: https://github.com/apache/spark/pull/40036#discussion_r1107922058
##########
sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala:
##########
@@ -278,8 +278,16 @@ private[hive] object SparkSQLCLIDriver extends Logging {
var ret = 0
var prefix = ""
- val currentDB = ReflectionUtils.invokeStatic(classOf[CliDriver], "getFormattedDb",
- classOf[HiveConf] -> conf, classOf[CliSessionState] -> sessionState)
+
+ def currentDB: String = {
+ val printCurrentDb = conf.getBoolVar(HiveConf.ConfVars.CLIPRINTCURRENTDB) ||
Review Comment:
Inherit the behavior from `spark.sql.cli.print.header/hive.cli.print.header`. A dynamic sql conf may be convenient for using set syntax together.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a diff in pull request #40036: [SPARK-42448][SQL] Fix spark sql shell prompt for current db
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #40036:
URL: https://github.com/apache/spark/pull/40036#discussion_r1111643425
##########
sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala:
##########
@@ -278,8 +278,16 @@ private[hive] object SparkSQLCLIDriver extends Logging {
var ret = 0
var prefix = ""
- val currentDB = ReflectionUtils.invokeStatic(classOf[CliDriver], "getFormattedDb",
- classOf[HiveConf] -> conf, classOf[CliSessionState] -> sessionState)
+
+ def currentDB: String = {
+ val printCurrentDb = conf.getBoolVar(HiveConf.ConfVars.CLIPRINTCURRENTDB) ||
+ SparkSQLEnv.sqlContext.conf.cliPrintCurrentDb
+ if (printCurrentDb) {
+ s" (${SparkSQLEnv.sqlContext.sparkSession.catalog.currentDatabase})"
+ } else {
+ ""
Review Comment:
for old code, I mean `ReflectionUtils.invokeStatic(classOf[CliDriver], "getFormattedDb", ...`, sorry for the confusion.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] yaooqinn commented on a diff in pull request #40036: [SPARK-42448][SQL] Fix spark sql shell prompt for current db
Posted by "yaooqinn (via GitHub)" <gi...@apache.org>.
yaooqinn commented on code in PR #40036:
URL: https://github.com/apache/spark/pull/40036#discussion_r1107920770
##########
sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala:
##########
@@ -278,8 +278,16 @@ private[hive] object SparkSQLCLIDriver extends Logging {
var ret = 0
var prefix = ""
- val currentDB = ReflectionUtils.invokeStatic(classOf[CliDriver], "getFormattedDb",
Review Comment:
Yes, it will call SessionState.get().getCurrentDatabase and always return `default`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] yaooqinn commented on a diff in pull request #40036: [SPARK-42448][SQL] Fix spark sql shell prompt for current db
Posted by "yaooqinn (via GitHub)" <gi...@apache.org>.
yaooqinn commented on code in PR #40036:
URL: https://github.com/apache/spark/pull/40036#discussion_r1107973189
##########
sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala:
##########
@@ -278,8 +278,16 @@ private[hive] object SparkSQLCLIDriver extends Logging {
var ret = 0
var prefix = ""
- val currentDB = ReflectionUtils.invokeStatic(classOf[CliDriver], "getFormattedDb",
Review Comment:
Yes, it's hive's sessionState.
> Are there other places trying to get state from Hive SessionState?
The hive‘s sessionState created here is used for option parsing and will be used in `org.apache.spark.sql.hive.client.HiveClientImpl`, which is OK.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] HyukjinKwon commented on pull request #40036: [SPARK-42448][SQL] Fix spark sql shell prompt for current db
Posted by "HyukjinKwon (via GitHub)" <gi...@apache.org>.
HyukjinKwon commented on PR #40036:
URL: https://github.com/apache/spark/pull/40036#issuecomment-1431227079
cc @juliuszsompolski @cloud-fan FYI
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a diff in pull request #40036: [SPARK-42448][SQL] Fix spark sql shell prompt for current db
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #40036:
URL: https://github.com/apache/spark/pull/40036#discussion_r1111881481
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala:
##########
@@ -4956,6 +4963,8 @@ class SQLConf extends Serializable with Logging {
def cliPrintHeader: Boolean = getConf(SQLConf.CLI_PRINT_HEADER)
+ def cliPrintCurrentDb: Boolean = getConf(SQLConf.CLI_PRINT_CURRENT_DB)
Review Comment:
We don't need to add this method if it's only called once.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] cloud-fan commented on a diff in pull request #40036: [SPARK-42448][SQL] Fix spark sql shell prompt for current db
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #40036:
URL: https://github.com/apache/spark/pull/40036#discussion_r1111879845
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala:
##########
@@ -4033,6 +4033,13 @@ object SQLConf {
.booleanConf
.createWithDefault(false)
+ val CLI_PRINT_CURRENT_DB =
+ buildConf("spark.sql.cli.print.currentDb")
Review Comment:
if this is a bug fix, then should this be a legacy config? `spark.sql.legacy.emptyCurrentDBInCli`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org