Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MINOR UPDATE] upgrade Phoenix to 5.2.1 #2972

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[MINOR UPDATE] upgrade Phoenix to 5.2.1 #2972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f8fd741
[MINOR UPDATE] upgrade Phoenix to 5.2.1
pjfanning Jan 3, 2025
e6ca0f4
Update pom.xml
pjfanning Jan 3, 2025
32bfc4e
compile issue
pjfanning Jan 3, 2025
57ad9a1
npe
pjfanning Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion common/src/main/java/org/apache/drill/common/exceptions/UserExceptionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ private static String decorateHint(final String text) {
return String.format("[Hint: %s]", text);
}
public static String getUserHint(final Throwable ex) {
if (ex.getMessage().startsWith("Error getting user info for current user")) {
final String message = ex.getMessage();
if (message != null && message.startsWith("Error getting user info for current user")) {
//User does not exist hint
return decorateHint(USER_DOES_NOT_EXIST);
} else {
Expand Down
19 changes: 10 additions & 9 deletions contrib/storage-phoenix/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
<name>Drill : Contrib : Storage : Phoenix</name>

<properties>
<phoenix.version>5.1.3</phoenix.version>
<!-- Limit the HBase minicluster version to 2.4.x to avoid a dependency conflict. -->
<hbase.minicluster.version>2.4.17</hbase.minicluster.version>
<phoenix.version>5.2.1</phoenix.version>
<!-- Limit the HBase minicluster version to 2.5.x to avoid a dependency conflict. -->
<hbase.minicluster.version>2.5.10</hbase.minicluster.version>
<skipTests>false</skipTests>
</properties>

Expand Down Expand Up @@ -120,11 +120,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-hbase-compat-2.4.1</artifactId>
<version>${phoenix.version}</version>
</dependency>
<dependency>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-core</artifactId>
Expand Down Expand Up @@ -198,7 +193,7 @@
</dependency>
<dependency>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-hbase-compat-2.4.0</artifactId>
<artifactId>phoenix-hbase-compat-2.4.1</artifactId>
<version>${phoenix.version}</version>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -335,6 +330,12 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apiguardian</groupId>
<artifactId>apiguardian-api</artifactId>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
4 changes: 2 additions & 2 deletions ...orage-phoenix/src/main/java/org/apache/drill/exec/store/phoenix/PhoenixStoragePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@
import org.apache.drill.exec.store.phoenix.rules.PhoenixConvention;

import com.fasterxml.jackson.core.type.TypeReference;
import org.apache.drill.exec.util.ImpersonationUtil;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import com.google.common.collect.ImmutableSet;
import org.apache.drill.exec.util.ImpersonationUtil;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.tephra.shaded.com.google.common.collect.ImmutableSet;

public class PhoenixStoragePlugin extends AbstractStoragePlugin {

Expand Down
Loading