From 9c0f71ce383ad442fc7cd01e86ba569ebe9c72fe Mon Sep 17 00:00:00 2001 From: Wellington Chevreuil Date: Thu, 16 May 2019 19:58:42 +0100 Subject: [PATCH] HBASE-22393 --- hbase-oss/pom.xml | 90 ++++++++++++++++--- .../hbase/oss/HBaseObjectStoreSemantics.java | 2 +- .../hbase/oss/sync/TreeLockManager.java | 2 +- .../hbase/oss/sync/LocalTreeLockManager.java | 2 +- .../hbase/oss/sync/NullTreeLockManager.java | 2 +- 5 files changed, 81 insertions(+), 17 deletions(-) diff --git a/hbase-oss/pom.xml b/hbase-oss/pom.xml index aa4c475..3241e0b 100644 --- a/hbase-oss/pom.xml +++ b/hbase-oss/pom.xml @@ -35,6 +35,7 @@ org.apache.hadoop.hbase.oss.sync.ZKTreeLockManager 1.11.525 + org.apache.hadoop.hbase.oss.thirdparty @@ -70,21 +71,81 @@ + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + true + + + com.google.*:*:jar:* + org.apache.commons:commons-lang3:jar:* + org.apache.curator:curator-*:jar:* + org.apache.yetus:yetus-annotations:jar:* + org.apache.zookeeper:zookeeper:jar:* + org.slf4j:slf4j-api:jar:* + + + + + com.google + ${shading.prefix}.com.google + + + org.apache.commons + ${shading.prefix}.org.apache.commons + + + org.apache.curator + ${shading.prefix}.org.apache.curator + + + org.apache.jute + ${shading.prefix}.org.apache.jute + + + org.apache.yetus + ${shading.prefix}.org.apache.yetus + + + org.apache.zookeeper + ${shading.prefix}.org.apache.zookeeper + + + org.codehaus + ${shading.prefix}.org.codehaus + + + org.slf4j + ${shading.prefix}.org.slf4j + + + + + + - - org.apache.hadoop - hadoop-annotations - ${hadoop.version} - provided - org.apache.hadoop hadoop-common ${hadoop.version} provided + + + + com.google.code.findbugs + jsr305 + + org.apache.hbase @@ -96,30 +157,33 @@ org.apache.commons commons-lang3 ${commons-lang3.version} - compile - org.apache.hbase.thirdparty - hbase-shaded-miscellaneous - ${hbase-thirdparty.version} + com.google.guava + guava + ${guava.version} + + + + com.google.code.findbugs + jsr305 + + org.slf4j slf4j-api ${slf4j.version} - compile org.slf4j slf4j-log4j12 ${slf4j.version} - compile org.apache.yetus audience-annotations ${audience-annotations.version} - compile diff --git a/hbase-oss/src/main/java/org/apache/hadoop/hbase/oss/HBaseObjectStoreSemantics.java b/hbase-oss/src/main/java/org/apache/hadoop/hbase/oss/HBaseObjectStoreSemantics.java index bebc37c..11bf9b8 100644 --- a/hbase-oss/src/main/java/org/apache/hadoop/hbase/oss/HBaseObjectStoreSemantics.java +++ b/hbase-oss/src/main/java/org/apache/hadoop/hbase/oss/HBaseObjectStoreSemantics.java @@ -18,6 +18,7 @@ package org.apache.hadoop.hbase.oss; +import com.google.common.annotations.VisibleForTesting; import java.io.FileNotFoundException; import java.io.IOException; import java.net.URI; @@ -56,7 +57,6 @@ import org.apache.hadoop.hbase.oss.sync.TreeLockManager; import org.apache.hadoop.hbase.oss.sync.TreeLockManager.Depth; import org.apache.hadoop.security.AccessControlException; import org.apache.hadoop.util.Progressable; -import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting; import org.apache.yetus.audience.InterfaceAudience; import org.apache.yetus.audience.InterfaceStability; import org.slf4j.Logger; diff --git a/hbase-oss/src/main/java/org/apache/hadoop/hbase/oss/sync/TreeLockManager.java b/hbase-oss/src/main/java/org/apache/hadoop/hbase/oss/sync/TreeLockManager.java index 73be990..8ea06af 100644 --- a/hbase-oss/src/main/java/org/apache/hadoop/hbase/oss/sync/TreeLockManager.java +++ b/hbase-oss/src/main/java/org/apache/hadoop/hbase/oss/sync/TreeLockManager.java @@ -18,6 +18,7 @@ package org.apache.hadoop.hbase.oss.sync; +import com.google.common.annotations.VisibleForTesting; import java.io.IOException; import java.net.URI; import java.util.Arrays; @@ -30,7 +31,6 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.oss.Constants; -import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting; import org.apache.yetus.audience.InterfaceAudience; import org.apache.yetus.audience.InterfaceStability; import org.slf4j.Logger; diff --git a/hbase-oss/src/test/java/org/apache/hadoop/hbase/oss/sync/LocalTreeLockManager.java b/hbase-oss/src/test/java/org/apache/hadoop/hbase/oss/sync/LocalTreeLockManager.java index 372fa2e..97cba26 100644 --- a/hbase-oss/src/test/java/org/apache/hadoop/hbase/oss/sync/LocalTreeLockManager.java +++ b/hbase-oss/src/test/java/org/apache/hadoop/hbase/oss/sync/LocalTreeLockManager.java @@ -18,6 +18,7 @@ package org.apache.hadoop.hbase.oss.sync; +import com.google.common.annotations.VisibleForTesting; import java.io.IOException; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock; @@ -28,7 +29,6 @@ import java.util.Set; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/hbase-oss/src/test/java/org/apache/hadoop/hbase/oss/sync/NullTreeLockManager.java b/hbase-oss/src/test/java/org/apache/hadoop/hbase/oss/sync/NullTreeLockManager.java index c9f3fbb..b135de7 100644 --- a/hbase-oss/src/test/java/org/apache/hadoop/hbase/oss/sync/NullTreeLockManager.java +++ b/hbase-oss/src/test/java/org/apache/hadoop/hbase/oss/sync/NullTreeLockManager.java @@ -18,10 +18,10 @@ package org.apache.hadoop.hbase.oss.sync; +import com.google.common.annotations.VisibleForTesting; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting; /** * Bypasses all synchronization to effectively make HBOSS operations no-ops. -- 2.17.2 (Apple Git-113)