This is an automated email from the ASF dual-hosted git repository.
richardantal pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git
The following commit(s) were added to refs/heads/master by this push:
new 0b11a1e PHOENIX-6750 Bump Avatica version to 1.21.0 in queryserver
(#104)
0b11a1e is described below
commit 0b11a1e46df5aaa2f7fe79d721530dc986153267
Author: richardantal <[email protected]>
AuthorDate: Tue Sep 6 10:32:44 2022 +0200
PHOENIX-6750 Bump Avatica version to 1.21.0 in queryserver (#104)
---
.../org/apache/phoenix/queryserver/server/QueryServer.java | 10 ++++++++++
pom.xml | 4 ++--
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git
a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
index d39427a..45ead51 100644
---
a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
+++
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
@@ -595,6 +595,16 @@ public final class QueryServer extends Configured
implements Tool, Runnable {
// Proxy this user on top of the server's user (the real user). Get a
cached instance, the
// LoadingCache will create a new instance for us if one isn't cached.
+
+ // realm got removed from remoteUserName in CALCITE-4152
+ // so we remove the instance name to avoid geting
KerberosName$NoMatchingRule exception
+
+ int atSignIndex = remoteUserName.indexOf('@');
+ int separatorIndex = remoteUserName.indexOf('/');
+ if (atSignIndex == -1 && separatorIndex > 0) {
+ remoteUserName = remoteUserName.substring(0, separatorIndex);
+ }
+
UserGroupInformation proxyUser = createProxyUser(remoteUserName);
// Execute the actual call as this proxy user
diff --git a/pom.xml b/pom.xml
index a82c89a..091511b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,13 +80,13 @@
<curator.version>2.12.0</curator.version>
<gson.version>2.2.4</gson.version>
- <jetty.version>9.4.43.v20210629</jetty.version>
+ <jetty.version>9.4.46.v20220331</jetty.version>
<commons-io.version>2.11.0</commons-io.version>
<commons-collections.version>3.2.2</commons-collections.version>
<sqlline.version>1.9.0</sqlline.version>
<slf4j.version>1.7.36</slf4j.version>
<reload4j.version>1.2.19</reload4j.version>
- <avatica.version>1.19.0</avatica.version>
+ <avatica.version>1.21.0</avatica.version>
<servlet.api.version>3.1.0</servlet.api.version>
<jsr305.version>3.0.0</jsr305.version>
