From fda295865e6949c42f37cd0d6b3338baf91ae6b3 Mon Sep 17 00:00:00 2001 From: ulysses-you Date: Fri, 19 Nov 2021 22:58:43 +0800 Subject: [PATCH] [KYUUBI #1421] Improve beeline print ### _Why are the changes needed?_ We don't support isolation, so it's unnecessary to print isolation level. before this PR ``` Connected to: Spark SQL (version 1.4.0-SNAPSHOT) Driver: Kyuubi Project Hive JDBC Shaded Client (version 1.4.0-SNAPSHOT) Transaction isolation: TRANSACTION_REPEATABLE_READ Beeline version 1.4.0-SNAPSHOT by Apache Kyuubi ``` After: ``` Connected to: Apache Kyuubi (Incubating) (version 1.4.0-SNAPSHOT) Driver: Kyuubi Project Hive JDBC Shaded Client (version 1.4.0-SNAPSHOT) Beeline version 1.4.0-SNAPSHOT by Apache Kyuubi (Incubating) ``` ### _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 - [x] [Run test](https://kyuubi.readthedocs.io/en/latest/develop_tools/testing.html#running-tests) locally before make a pull request Closes #1421 from ulysses-you/improve-log. Closes #1421 2e0e168e [ulysses-you] improve Authored-by: ulysses-you Signed-off-by: fwang12 --- .../spark/operation/SparkOperationSuite.scala | 2 +- .../apache/kyuubi/session/AbstractSession.scala | 4 ++-- .../service/ThriftFrontendServiceSuite.scala | 4 ++-- .../org/apache/hive/beeline/KyuubiBeeLine.java | 2 +- .../hive/beeline/KyuubiDatabaseConnection.java | 14 -------------- .../server/api/v1/SessionsResourceSuite.scala | 3 ++- 6 files changed, 8 insertions(+), 21 deletions(-) diff --git a/externals/kyuubi-spark-sql-engine/src/test/scala/org/apache/kyuubi/engine/spark/operation/SparkOperationSuite.scala b/externals/kyuubi-spark-sql-engine/src/test/scala/org/apache/kyuubi/engine/spark/operation/SparkOperationSuite.scala index ede5ac688..8eb3c6471 100644 --- a/externals/kyuubi-spark-sql-engine/src/test/scala/org/apache/kyuubi/engine/spark/operation/SparkOperationSuite.scala +++ b/externals/kyuubi-spark-sql-engine/src/test/scala/org/apache/kyuubi/engine/spark/operation/SparkOperationSuite.scala @@ -402,7 +402,7 @@ class SparkOperationSuite extends WithSparkSQLEngine with HiveMetadataTests with import org.apache.kyuubi.KYUUBI_VERSION assert(metaData.allTablesAreSelectable) - assert(metaData.getDatabaseProductName === "Spark SQL") + assert(metaData.getDatabaseProductName === "Apache Kyuubi (Incubating)") assert(metaData.getDatabaseProductVersion === KYUUBI_VERSION) assert(metaData.getDriverName === "Kyuubi Project Hive JDBC Shaded Client") assert(metaData.getDriverVersion === KYUUBI_VERSION) diff --git a/kyuubi-common/src/main/scala/org/apache/kyuubi/session/AbstractSession.scala b/kyuubi-common/src/main/scala/org/apache/kyuubi/session/AbstractSession.scala index 687c79fbe..f8e9c4c21 100644 --- a/kyuubi-common/src/main/scala/org/apache/kyuubi/session/AbstractSession.scala +++ b/kyuubi-common/src/main/scala/org/apache/kyuubi/session/AbstractSession.scala @@ -101,8 +101,8 @@ abstract class AbstractSession( override def getInfo(infoType: TGetInfoType): TGetInfoValue = withAcquireRelease() { infoType match { - case TGetInfoType.CLI_SERVER_NAME => TGetInfoValue.stringValue("Kyuubi") - case TGetInfoType.CLI_DBMS_NAME => TGetInfoValue.stringValue("Spark SQL") + case TGetInfoType.CLI_SERVER_NAME => TGetInfoValue.stringValue("Apache Kyuubi (Incubating)") + case TGetInfoType.CLI_DBMS_NAME => TGetInfoValue.stringValue("Apache Kyuubi (Incubating)") case TGetInfoType.CLI_DBMS_VER => TGetInfoValue.stringValue(org.apache.kyuubi.KYUUBI_VERSION) case TGetInfoType.CLI_MAX_COLUMN_NAME_LEN | TGetInfoType.CLI_MAX_SCHEMA_NAME_LEN | diff --git a/kyuubi-common/src/test/scala/org/apache/kyuubi/service/ThriftFrontendServiceSuite.scala b/kyuubi-common/src/test/scala/org/apache/kyuubi/service/ThriftFrontendServiceSuite.scala index f9186976f..8090bd7d9 100644 --- a/kyuubi-common/src/test/scala/org/apache/kyuubi/service/ThriftFrontendServiceSuite.scala +++ b/kyuubi-common/src/test/scala/org/apache/kyuubi/service/ThriftFrontendServiceSuite.scala @@ -169,9 +169,9 @@ class ThriftFrontendServiceSuite extends KyuubiFunSuite { val resp = client.GetInfo(req) assert(resp.getInfoValue.getStringValue === org.apache.kyuubi.KYUUBI_VERSION) req.setInfoType(TGetInfoType.CLI_SERVER_NAME) - assert(client.GetInfo(req).getInfoValue.getStringValue === "Kyuubi") + assert(client.GetInfo(req).getInfoValue.getStringValue === "Apache Kyuubi (Incubating)") req.setInfoType(TGetInfoType.CLI_DBMS_NAME) - assert(client.GetInfo(req).getInfoValue.getStringValue === "Spark SQL") + assert(client.GetInfo(req).getInfoValue.getStringValue === "Apache Kyuubi (Incubating)") req.setInfoType(TGetInfoType.CLI_MAX_COLUMN_NAME_LEN) assert(client.GetInfo(req).getInfoValue.getLenValue === 128) req.setInfoType(TGetInfoType.CLI_MAX_SCHEMA_NAME_LEN) diff --git a/kyuubi-hive-beeline/src/main/java/org/apache/hive/beeline/KyuubiBeeLine.java b/kyuubi-hive-beeline/src/main/java/org/apache/hive/beeline/KyuubiBeeLine.java index e3c2c2959..60c1e9d30 100644 --- a/kyuubi-hive-beeline/src/main/java/org/apache/hive/beeline/KyuubiBeeLine.java +++ b/kyuubi-hive-beeline/src/main/java/org/apache/hive/beeline/KyuubiBeeLine.java @@ -94,7 +94,7 @@ public class KyuubiBeeLine extends BeeLine { new Object[] { "Beeline", pack.getImplementationVersion() == null ? "???" : pack.getImplementationVersion(), - "Apache Kyuubi", + "Apache Kyuubi (Incubating)", }); } } diff --git a/kyuubi-hive-beeline/src/main/java/org/apache/hive/beeline/KyuubiDatabaseConnection.java b/kyuubi-hive-beeline/src/main/java/org/apache/hive/beeline/KyuubiDatabaseConnection.java index fff75cf8a..7aa4cf99b 100644 --- a/kyuubi-hive-beeline/src/main/java/org/apache/hive/beeline/KyuubiDatabaseConnection.java +++ b/kyuubi-hive-beeline/src/main/java/org/apache/hive/beeline/KyuubiDatabaseConnection.java @@ -123,20 +123,6 @@ public class KyuubiDatabaseConnection extends DatabaseConnection { beeLine.handleException(e); } - try { - getConnection().setAutoCommit(beeLine.getOpts().getAutoCommit()); - // TODO: Setting autocommit should not generate an exception as long as it is set to false - // beeLine.autocommitStatus(getConnection()); - } catch (Exception e) { - beeLine.handleException(e); - } - - try { - beeLine.getCommands().isolation("isolation: " + beeLine.getOpts().getIsolation()); - } catch (Exception e) { - beeLine.handleException(e); - } - return true; } diff --git a/kyuubi-server/src/test/scala/org/apache/kyuubi/server/api/v1/SessionsResourceSuite.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/server/api/v1/SessionsResourceSuite.scala index 18d9e66a0..51edf3731 100644 --- a/kyuubi-server/src/test/scala/org/apache/kyuubi/server/api/v1/SessionsResourceSuite.scala +++ b/kyuubi-server/src/test/scala/org/apache/kyuubi/server/api/v1/SessionsResourceSuite.scala @@ -182,7 +182,8 @@ class SessionsResourceSuite extends KyuubiFunSuite with RestFrontendTestHelper { .request().get() assert(200 == response.getStatus) val sessions = response.readEntity(classOf[InfoDetail]) - assert(sessions.infoType.equals("CLI_SERVER_NAME") && sessions.infoValue.equals("Kyuubi")) + assert(sessions.infoType.equals("CLI_SERVER_NAME") && + sessions.infoValue.equals("Apache Kyuubi (Incubating)")) // Invalid sessionHandleStr val handle = "b88d6b56-d200-4bb6-bf0a-5da0ea572e11|0c4aad4e-ccf7-4abd-9305-943d4bfd2d9a|0" response = webTarget.path(s"api/v1/sessions/$handle/info/13").request().get()