You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by el...@apache.org on 2017/12/22 18:54:47 UTC
[1/4] phoenix git commit: PHOENIX-4466 Relocate Avatica and
hadoop-common in thin-client jar (Toshihiro Suzuki)
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-0.98 4f51c0fed -> 5d413a677
refs/heads/4.x-HBase-1.2 84b4efbb8 -> cbbc684cc
refs/heads/5.x-HBase-2.0 91bfaf0e7 -> 4da5c80ad
refs/heads/master 412329a74 -> 34693843a
PHOENIX-4466 Relocate Avatica and hadoop-common in thin-client jar (Toshihiro Suzuki)
When using the thin-client in Spark, we encounter problems in that Spark
is placing its own version of avatica on the classpath as well. We can
relocate most of Avatica (all but the protobuf generated messages as
their classnames are required to be 'org.apache.calcite.avatica.proto'
presently) and hadoop-common to avoid future problems.
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/34693843
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/34693843
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/34693843
Branch: refs/heads/master
Commit: 34693843abe4490b54fbd30512bf7d98d0f59c0d
Parents: 412329a
Author: Josh Elser <el...@apache.org>
Authored: Fri Dec 22 13:28:12 2017 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Fri Dec 22 13:28:12 2017 -0500
----------------------------------------------------------------------
phoenix-queryserver-client/pom.xml | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/34693843/phoenix-queryserver-client/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-queryserver-client/pom.xml b/phoenix-queryserver-client/pom.xml
index 6c21cc7..486d89b 100644
--- a/phoenix-queryserver-client/pom.xml
+++ b/phoenix-queryserver-client/pom.xml
@@ -123,9 +123,19 @@
<shadedPattern>${shaded.package}.com.google.protobuf</shadedPattern>
</relocation>
<!-- ORG relocation -->
- <!-- Calcite/Avatica is not relocated because the wire API (as of <=1.8.0) expects
- consistent class names on client and server. Relocating these would break
- backwards compatibility. -->
+ <relocation>
+ <pattern>org.apache.calcite.avatica</pattern>
+ <shadedPattern>${shaded.package}.org.apache.calcite.avatica</shadedPattern>
+ <!-- The protobuf messages can't be relocated due to a limitation
+ in the Avatica protocol. -->
+ <excludes>
+ <exclude>org.apache.calcite.avatica.proto.*</exclude>
+ </excludes>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.hadoop</pattern>
+ <shadedPattern>${shaded.package}.org.apache.hadoop</shadedPattern>
+ </relocation>
<relocation>
<pattern>org.apache.commons</pattern>
<shadedPattern>${shaded.package}.org.apache.commons</shadedPattern>
[3/4] phoenix git commit: PHOENIX-4466 Relocate Avatica and
hadoop-common in thin-client jar (Toshihiro Suzuki)
Posted by el...@apache.org.
PHOENIX-4466 Relocate Avatica and hadoop-common in thin-client jar (Toshihiro Suzuki)
When using the thin-client in Spark, we encounter problems in that Spark
is placing its own version of avatica on the classpath as well. We can
relocate most of Avatica (all but the protobuf generated messages as
their classnames are required to be 'org.apache.calcite.avatica.proto'
presently) and hadoop-common to avoid future problems.
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/5d413a67
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/5d413a67
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/5d413a67
Branch: refs/heads/4.x-HBase-0.98
Commit: 5d413a677efbb8b9fcf17d89eb6f157bcf2dd7b3
Parents: 4f51c0f
Author: Josh Elser <el...@apache.org>
Authored: Fri Dec 22 13:28:12 2017 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Fri Dec 22 13:36:23 2017 -0500
----------------------------------------------------------------------
phoenix-queryserver-client/pom.xml | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/5d413a67/phoenix-queryserver-client/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-queryserver-client/pom.xml b/phoenix-queryserver-client/pom.xml
index 1d90abb..c0671a9 100644
--- a/phoenix-queryserver-client/pom.xml
+++ b/phoenix-queryserver-client/pom.xml
@@ -123,9 +123,19 @@
<shadedPattern>${shaded.package}.com.google.protobuf</shadedPattern>
</relocation>
<!-- ORG relocation -->
- <!-- Calcite/Avatica is not relocated because the wire API (as of <=1.8.0) expects
- consistent class names on client and server. Relocating these would break
- backwards compatibility. -->
+ <relocation>
+ <pattern>org.apache.calcite.avatica</pattern>
+ <shadedPattern>${shaded.package}.org.apache.calcite.avatica</shadedPattern>
+ <!-- The protobuf messages can't be relocated due to a limitation
+ in the Avatica protocol. -->
+ <excludes>
+ <exclude>org.apache.calcite.avatica.proto.*</exclude>
+ </excludes>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.hadoop</pattern>
+ <shadedPattern>${shaded.package}.org.apache.hadoop</shadedPattern>
+ </relocation>
<relocation>
<pattern>org.apache.commons</pattern>
<shadedPattern>${shaded.package}.org.apache.commons</shadedPattern>
[2/4] phoenix git commit: PHOENIX-4466 Relocate Avatica and
hadoop-common in thin-client jar (Toshihiro Suzuki)
Posted by el...@apache.org.
PHOENIX-4466 Relocate Avatica and hadoop-common in thin-client jar (Toshihiro Suzuki)
When using the thin-client in Spark, we encounter problems in that Spark
is placing its own version of avatica on the classpath as well. We can
relocate most of Avatica (all but the protobuf generated messages as
their classnames are required to be 'org.apache.calcite.avatica.proto'
presently) and hadoop-common to avoid future problems.
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/cbbc684c
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/cbbc684c
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/cbbc684c
Branch: refs/heads/4.x-HBase-1.2
Commit: cbbc684cc523258a2caea217845de41161de806a
Parents: 84b4efb
Author: Josh Elser <el...@apache.org>
Authored: Fri Dec 22 13:28:12 2017 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Fri Dec 22 13:30:35 2017 -0500
----------------------------------------------------------------------
phoenix-queryserver-client/pom.xml | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/cbbc684c/phoenix-queryserver-client/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-queryserver-client/pom.xml b/phoenix-queryserver-client/pom.xml
index 3448c58..ffc310c 100644
--- a/phoenix-queryserver-client/pom.xml
+++ b/phoenix-queryserver-client/pom.xml
@@ -123,9 +123,19 @@
<shadedPattern>${shaded.package}.com.google.protobuf</shadedPattern>
</relocation>
<!-- ORG relocation -->
- <!-- Calcite/Avatica is not relocated because the wire API (as of <=1.8.0) expects
- consistent class names on client and server. Relocating these would break
- backwards compatibility. -->
+ <relocation>
+ <pattern>org.apache.calcite.avatica</pattern>
+ <shadedPattern>${shaded.package}.org.apache.calcite.avatica</shadedPattern>
+ <!-- The protobuf messages can't be relocated due to a limitation
+ in the Avatica protocol. -->
+ <excludes>
+ <exclude>org.apache.calcite.avatica.proto.*</exclude>
+ </excludes>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.hadoop</pattern>
+ <shadedPattern>${shaded.package}.org.apache.hadoop</shadedPattern>
+ </relocation>
<relocation>
<pattern>org.apache.commons</pattern>
<shadedPattern>${shaded.package}.org.apache.commons</shadedPattern>
[4/4] phoenix git commit: PHOENIX-4466 Relocate Avatica and
hadoop-common in thin-client jar (Toshihiro Suzuki)
Posted by el...@apache.org.
PHOENIX-4466 Relocate Avatica and hadoop-common in thin-client jar (Toshihiro Suzuki)
When using the thin-client in Spark, we encounter problems in that Spark
is placing its own version of avatica on the classpath as well. We can
relocate most of Avatica (all but the protobuf generated messages as
their classnames are required to be 'org.apache.calcite.avatica.proto'
presently) and hadoop-common to avoid future problems.
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/4da5c80a
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/4da5c80a
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/4da5c80a
Branch: refs/heads/5.x-HBase-2.0
Commit: 4da5c80ad26f7671a7f80a6e34b35988082bbee2
Parents: 91bfaf0
Author: Josh Elser <el...@apache.org>
Authored: Fri Dec 22 13:28:12 2017 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Fri Dec 22 13:42:58 2017 -0500
----------------------------------------------------------------------
phoenix-queryserver-client/pom.xml | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/4da5c80a/phoenix-queryserver-client/pom.xml
----------------------------------------------------------------------
diff --git a/phoenix-queryserver-client/pom.xml b/phoenix-queryserver-client/pom.xml
index a485b50..5c72b41 100644
--- a/phoenix-queryserver-client/pom.xml
+++ b/phoenix-queryserver-client/pom.xml
@@ -123,9 +123,19 @@
<shadedPattern>${shaded.package}.com.google.protobuf</shadedPattern>
</relocation>
<!-- ORG relocation -->
- <!-- Calcite/Avatica is not relocated because the wire API (as of <=1.8.0) expects
- consistent class names on client and server. Relocating these would break
- backwards compatibility. -->
+ <relocation>
+ <pattern>org.apache.calcite.avatica</pattern>
+ <shadedPattern>${shaded.package}.org.apache.calcite.avatica</shadedPattern>
+ <!-- The protobuf messages can't be relocated due to a limitation
+ in the Avatica protocol. -->
+ <excludes>
+ <exclude>org.apache.calcite.avatica.proto.*</exclude>
+ </excludes>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.hadoop</pattern>
+ <shadedPattern>${shaded.package}.org.apache.hadoop</shadedPattern>
+ </relocation>
<relocation>
<pattern>org.apache.commons</pattern>
<shadedPattern>${shaded.package}.org.apache.commons</shadedPattern>