From 6f440a1e79818d5b00fb9d58112060ef84c35025 Mon Sep 17 00:00:00 2001 From: Yuming Wang Date: Fri, 21 Apr 2023 11:26:08 +0800 Subject: [PATCH] Change the scope of jackson-mapper-asl from compile to test --- core/pom.xml | 8 ------- dev/deps/spark-deps-hadoop-3-hive-2.3 | 2 -- pom.xml | 23 ++----------------- .../apache/hive/service/cli/CLIService.java | 2 +- .../service/cli/session/HiveSessionImpl.java | 4 ++-- .../cli/session/HiveSessionImplwithUGI.java | 4 ++-- 6 files changed, 7 insertions(+), 36 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 00ce0ef2bc041..d60938cd4bbae 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -505,14 +505,6 @@ commons-logging commons-logging - - org.codehaus.jackson - jackson-mapper-asl - - - org.codehaus.jackson - jackson-core-asl - com.fasterxml.jackson.core jackson-core diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3 index f30984f60eaa3..8b9f0c5756966 100644 --- a/dev/deps/spark-deps-hadoop-3-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-3-hive-2.3 @@ -98,13 +98,11 @@ ini4j/0.5.4//ini4j-0.5.4.jar istack-commons-runtime/3.0.8//istack-commons-runtime-3.0.8.jar ivy/2.5.1//ivy-2.5.1.jar jackson-annotations/2.14.2//jackson-annotations-2.14.2.jar -jackson-core-asl/1.9.13//jackson-core-asl-1.9.13.jar jackson-core/2.14.2//jackson-core-2.14.2.jar jackson-databind/2.14.2//jackson-databind-2.14.2.jar jackson-dataformat-cbor/2.14.2//jackson-dataformat-cbor-2.14.2.jar jackson-dataformat-yaml/2.14.2//jackson-dataformat-yaml-2.14.2.jar jackson-datatype-jsr310/2.14.2//jackson-datatype-jsr310-2.14.2.jar -jackson-mapper-asl/1.9.13//jackson-mapper-asl-1.9.13.jar jackson-module-scala_2.12/2.14.2//jackson-module-scala_2.12-2.14.2.jar jakarta.annotation-api/1.3.5//jakarta.annotation-api-1.3.5.jar jakarta.inject/2.6.1//jakarta.inject-2.6.1.jar diff --git a/pom.xml b/pom.xml index 9a4a7f0d3d6ff..2c5b396f7ceba 100644 --- a/pom.xml +++ b/pom.xml @@ -1314,10 +1314,6 @@ asm asm - - org.codehaus.jackson - jackson-mapper-asl - org.ow2.asm asm @@ -1818,27 +1814,12 @@ - - org.codehaus.jackson - jackson-core-asl - ${codehaus.jackson.version} - ${hadoop.deps.scope} - + org.codehaus.jackson jackson-mapper-asl ${codehaus.jackson.version} - ${hadoop.deps.scope} - - - org.codehaus.jackson - jackson-xc - ${codehaus.jackson.version} - - - org.codehaus.jackson - jackson-jaxrs - ${codehaus.jackson.version} + test ${hive.group} diff --git a/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/CLIService.java b/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/CLIService.java index 4f81de1b01d39..e761c0aa532c4 100644 --- a/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/CLIService.java +++ b/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/CLIService.java @@ -536,7 +536,7 @@ public synchronized String getDelegationTokenFromMetaStore(String owner) try { Hive.closeCurrent(); - return Hive.get(hiveConf).getDelegationToken(owner, owner); + return Hive.getWithoutRegisterFns(hiveConf).getDelegationToken(owner, owner); } catch (HiveException e) { if (e.getCause() instanceof UnsupportedOperationException) { throw (UnsupportedOperationException)e.getCause(); diff --git a/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/session/HiveSessionImpl.java b/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/session/HiveSessionImpl.java index 4ac3c1e588747..3f5da0646bd6d 100644 --- a/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/session/HiveSessionImpl.java +++ b/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/session/HiveSessionImpl.java @@ -252,7 +252,7 @@ public static int setVariable(String varname, String varvalue) throws Exception ss.getHiveVariables().put(propName, substitution.substitute(ss.getConf(),varvalue)); } else if (varname.startsWith(METACONF_PREFIX)) { String propName = varname.substring(METACONF_PREFIX.length()); - Hive hive = Hive.get(ss.getConf()); + Hive hive = Hive.getWithoutRegisterFns(ss.getConf()); hive.setMetaConf(propName, substitution.substitute(ss.getConf(), varvalue)); } else { setConf(varname, varname, varvalue, true); @@ -413,7 +413,7 @@ public HiveConf getHiveConf() { @Override public IMetaStoreClient getMetaStoreClient() throws HiveSQLException { try { - return Hive.get(getHiveConf()).getMSC(); + return Hive.getWithoutRegisterFns(getHiveConf()).getMSC(); } catch (HiveException e) { throw new HiveSQLException("Failed to get metastore connection", e); } catch (MetaException e) { diff --git a/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/session/HiveSessionImplwithUGI.java b/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/session/HiveSessionImplwithUGI.java index 6e153db6751d3..514b19eb7111a 100644 --- a/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/session/HiveSessionImplwithUGI.java +++ b/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/session/HiveSessionImplwithUGI.java @@ -54,7 +54,7 @@ public HiveSessionImplwithUGI(TProtocolVersion protocol, String username, String // create a new metastore connection for this particular user session Hive.set(null); try { - sessionHive = Hive.get(getHiveConf()); + sessionHive = Hive.getWithoutRegisterFns(getHiveConf()); } catch (HiveException e) { throw new HiveSQLException("Failed to setup metastore connection", e); } @@ -140,7 +140,7 @@ private void setDelegationToken(String delegationTokenStr) throws HiveSQLExcepti private void cancelDelegationToken() throws HiveSQLException { if (delegationTokenStr != null) { try { - Hive.get(getHiveConf()).cancelDelegationToken(delegationTokenStr); + Hive.getWithoutRegisterFns(getHiveConf()).cancelDelegationToken(delegationTokenStr); } catch (HiveException e) { throw new HiveSQLException("Couldn't cancel delegation token", e); }