-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Patch phoenix5 client to work with JDK17
- Loading branch information
Showing
5 changed files
with
325 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- TODO(https://github.com/trinodb/trino/issues/13051): Remove whole module when Phoenix5 is released --> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <parent> | ||
| <groupId>io.trino</groupId> | ||
| <artifactId>trino-root</artifactId> | ||
| <version>389-SNAPSHOT</version> | ||
| <relativePath>../../pom.xml</relativePath> | ||
| </parent> | ||
|
|
||
| <artifactId>trino-phoenix5-patched</artifactId> | ||
| <name>trino-phoenix5-patched</name> | ||
| <description>Trino - patched Phoenix5 client to work with JDK17</description> | ||
|
|
||
| <properties> | ||
| <air.main.basedir>${project.parent.basedir}</air.main.basedir> | ||
| </properties> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.apache.phoenix</groupId> | ||
| <artifactId>phoenix-client-embedded-hbase-2.2</artifactId> | ||
| <version>5.1.2</version> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>org.testng</groupId> | ||
| <artifactId>testng</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-shade-plugin</artifactId> | ||
| <version>3.3.0</version> | ||
| <executions> | ||
| <execution> | ||
| <phase>package</phase> | ||
| <goals> | ||
| <goal>shade</goal> | ||
| </goals> | ||
| <configuration> | ||
| <createDependencyReducedPom>true</createDependencyReducedPom> | ||
| <createSourcesJar>false</createSourcesJar> | ||
| <shadeSourcesContent>false</shadeSourcesContent> | ||
| <dependencyReducedPomLocation>${project.build.directory}/pom.xml</dependencyReducedPomLocation> | ||
| <promoteTransitiveDependencies>false</promoteTransitiveDependencies> | ||
| <artifactSet> | ||
| <excludes> | ||
| </excludes> | ||
| </artifactSet> | ||
| <relocations> | ||
| <relocation> | ||
| <pattern>org.apache.zookeeper</pattern> | ||
| <shadedPattern>org.apache.phoenix.shaded.org.apache.zookeeper</shadedPattern> | ||
| </relocation> | ||
| </relocations> | ||
| <filters> | ||
| <filter> | ||
| <artifact>org.apache.phoenix:phoenix-client-embedded-hbase-2.2</artifact> | ||
| <excludes> | ||
| <exclude>org/apache/phoenix/shaded/org/apache/zookeeper/client/StaticHostProvider.class</exclude> | ||
| <exclude>org/apache/phoenix/shaded/org/apache/zookeeper/client/StaticHostProvider$*.class</exclude> | ||
| </excludes> | ||
| </filter> | ||
| </filters> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.basepom.maven</groupId> | ||
| <artifactId>duplicate-finder-maven-plugin</artifactId> | ||
| <configuration> | ||
| <ignoredDependencies> | ||
| <dependency> | ||
| <groupId>org.apache.phoenix</groupId> | ||
| <artifactId>phoenix-client-embedded-hbase-2.2</artifactId> | ||
| </dependency> | ||
| </ignoredDependencies> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> |
167 changes: 167 additions & 0 deletions
167
...c/main/java/org/apache/phoenix/shaded/org/apache/zookeeper/client/StaticHostProvider.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,167 @@ | ||
| /* | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.phoenix.shaded.org.apache.zookeeper.client; | ||
|
|
||
| import java.net.InetAddress; | ||
| import java.net.InetSocketAddress; | ||
| import java.net.UnknownHostException; | ||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.Collection; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
| // TODO(https://github.com/trinodb/trino/issues/13051): Remove when Phoenix 5.2 is release | ||
| public final class StaticHostProvider | ||
| implements HostProvider | ||
| { | ||
| public interface Resolver | ||
| { | ||
| InetAddress[] getAllByName(String name) throws UnknownHostException; | ||
| } | ||
|
|
||
| private final List<InetSocketAddress> serverAddresses = new ArrayList<InetSocketAddress>(5); | ||
|
|
||
| private int lastIndex = -1; | ||
|
|
||
| private int currentIndex = -1; | ||
|
|
||
| private Resolver resolver; | ||
|
|
||
| /** | ||
| * Constructs a SimpleHostSet. | ||
| * | ||
| * @param serverAddresses | ||
| * possibly unresolved ZooKeeper server addresses | ||
| * @throws IllegalArgumentException | ||
| * if serverAddresses is empty or resolves to an empty list | ||
| */ | ||
| public StaticHostProvider(Collection<InetSocketAddress> serverAddresses) | ||
| { | ||
| this.resolver = name -> InetAddress.getAllByName(name); | ||
| init(serverAddresses); | ||
| } | ||
|
|
||
| /** | ||
| * Introduced for testing purposes. getAllByName() is a static method of InetAddress, therefore cannot be easily mocked. | ||
| * By abstraction of Resolver interface we can easily inject a mocked implementation in tests. | ||
| * | ||
| * @param serverAddresses | ||
| * possibly unresolved ZooKeeper server addresses | ||
| * @param resolver | ||
| * custom resolver implementation | ||
| * @throws IllegalArgumentException | ||
| * if serverAddresses is empty or resolves to an empty list | ||
| */ | ||
| public StaticHostProvider(Collection<InetSocketAddress> serverAddresses, Resolver resolver) | ||
| { | ||
| this.resolver = resolver; | ||
| init(serverAddresses); | ||
| } | ||
|
|
||
| /** | ||
| * Common init method for all constructors. | ||
| * Resolve all unresolved server addresses, put them in a list and shuffle. | ||
| */ | ||
| private void init(Collection<InetSocketAddress> serverAddresses) | ||
| { | ||
| if (serverAddresses.isEmpty()) { | ||
| throw new IllegalArgumentException( | ||
| "A HostProvider may not be empty!"); | ||
| } | ||
|
|
||
| this.serverAddresses.addAll(serverAddresses); | ||
| Collections.shuffle(this.serverAddresses); | ||
| } | ||
|
|
||
| /** | ||
| * Evaluate to a hostname if one is available and otherwise it returns the | ||
| * string representation of the IP address. | ||
| * | ||
| * In Java 7, we have a method getHostString, but earlier versions do not support it. | ||
| * This method is to provide a replacement for InetSocketAddress.getHostString(). | ||
| * | ||
| * @param addr | ||
| * @return Hostname string of address parameter | ||
| */ | ||
| private String getHostString(InetSocketAddress addr) | ||
| { | ||
| String hostString = ""; | ||
|
|
||
| if (addr == null) { | ||
| return hostString; | ||
| } | ||
| if (!addr.isUnresolved()) { | ||
| InetAddress ia = addr.getAddress(); | ||
|
|
||
| // If the string starts with '/', then it has no hostname | ||
| // and we want to avoid the reverse lookup, so we return | ||
| // the string representation of the address. | ||
| if (ia.toString().startsWith("/")) { | ||
| hostString = ia.getHostAddress(); | ||
| } | ||
| else { | ||
| hostString = addr.getHostName(); | ||
| } | ||
| } | ||
| else { | ||
| hostString = addr.getHostString(); | ||
| } | ||
|
|
||
| return hostString; | ||
| } | ||
|
|
||
| @Override | ||
| public int size() | ||
| { | ||
| return serverAddresses.size(); | ||
| } | ||
|
|
||
| @Override | ||
| public InetSocketAddress next(long spinDelay) | ||
| { | ||
| currentIndex = ++currentIndex % serverAddresses.size(); | ||
| if (currentIndex == lastIndex && spinDelay > 0) { | ||
| try { | ||
| Thread.sleep(spinDelay); | ||
| } | ||
| catch (InterruptedException e) { | ||
| } | ||
| } | ||
| else if (lastIndex == -1) { | ||
| // We don't want to sleep on the first ever connect attempt. | ||
| lastIndex = 0; | ||
| } | ||
|
|
||
| InetSocketAddress curAddr = serverAddresses.get(currentIndex); | ||
| try { | ||
| String curHostString = getHostString(curAddr); | ||
| List<InetAddress> resolvedAddresses = new ArrayList<InetAddress>(Arrays.asList(this.resolver.getAllByName(curHostString))); | ||
| if (resolvedAddresses.isEmpty()) { | ||
| return curAddr; | ||
| } | ||
| Collections.shuffle(resolvedAddresses); | ||
| return new InetSocketAddress(resolvedAddresses.get(0), curAddr.getPort()); | ||
| } | ||
| catch (UnknownHostException e) { | ||
| return curAddr; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void onConnected() | ||
| { | ||
| lastIndex = currentIndex; | ||
| } | ||
| } |
22 changes: 22 additions & 0 deletions
22
lib/trino-phoenix5-patched/src/test/java/org.apache.phoenix/TestDummy.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| /* | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.phoenix; | ||
|
|
||
| import org.testng.annotations.Test; | ||
|
|
||
| public class TestDummy | ||
| { | ||
| @Test | ||
| public void buildRequiresTestToExist() {} | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters