hbase git commit: HBASE-21148 [Docs] Some errors in section#Security Configuration Example of hbase book
Repository: hbase Updated Branches: refs/heads/master bdc168713 -> 5a672b9da HBASE-21148 [Docs] Some errors in section#Security Configuration Example of hbase book Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5a672b9d Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5a672b9d Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5a672b9d Branch: refs/heads/master Commit: 5a672b9da9b67376e3fc3b88fdf88dca3004a38f Parents: bdc1687 Author: Reid Chan Authored: Wed Sep 5 12:25:07 2018 +0800 Committer: Reid Chan Committed: Thu Sep 6 10:37:08 2018 +0800 -- src/main/asciidoc/_chapters/security.adoc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/5a672b9d/src/main/asciidoc/_chapters/security.adoc -- diff --git a/src/main/asciidoc/_chapters/security.adoc b/src/main/asciidoc/_chapters/security.adoc index 53e8dbf..56f6566 100644 --- a/src/main/asciidoc/_chapters/security.adoc +++ b/src/main/asciidoc/_chapters/security.adoc @@ -1739,7 +1739,7 @@ All options have been discussed separately in the sections above. hbase.superuser - hbase, admin + hbase,admin @@ -1759,8 +1759,7 @@ All options have been discussed separately in the sections above. hbase.coprocessor.regionserver.classes - org.apache.hadoop/hbase.security.access.AccessController, - org.apache.hadoop.hbase.security.access.VisibilityController + org.apache.hadoop.hbase.security.access.AccessController
[3/3] hbase git commit: HBASE-21088 HStoreFile should be closed in HStore#hasReferences
HBASE-21088 HStoreFile should be closed in HStore#hasReferences
Conflicts:
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d07cab18
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d07cab18
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d07cab18
Branch: refs/heads/branch-1
Commit: d07cab18a620661f527dec542fb90eaffa71ef0b
Parents: dbb634a
Author: tedyu
Authored: Mon Aug 27 09:38:03 2018 -0700
Committer: Andrew Purtell
Committed: Wed Sep 5 15:13:06 2018 -0700
--
.../org/apache/hadoop/hbase/regionserver/HStore.java | 11 +++
1 file changed, 11 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/d07cab18/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
index 6ce41e3..f10d055 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
@@ -1645,6 +1645,17 @@ public class HStore implements Store {
LOG.error("Error trying to determine if store has referenes, " +
"assuming references exists",
ioe);
return true;
+} finally {
+ if (reloadedStoreFiles != null) {
+for (StoreFile storeFile : reloadedStoreFiles) {
+ try {
+storeFile.closeReader(false);
+ } catch (IOException ioe) {
+LOG.warn("Encountered exception closing " + storeFile + ": " +
ioe.getMessage());
+// continue with closing the remaining store files
+ }
+}
+ }
}
return StoreUtils.hasReferences(reloadedStoreFiles);
}
[2/3] hbase git commit: HBASE-21088 HStoreFile should be closed in HStore#hasReferences
HBASE-21088 HStoreFile should be closed in HStore#hasReferences
Conflicts:
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d0b0df02
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d0b0df02
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d0b0df02
Branch: refs/heads/branch-1.4
Commit: d0b0df020022930c981a36a4ba973fba2dbbf2cd
Parents: 15f1730
Author: tedyu
Authored: Mon Aug 27 09:38:03 2018 -0700
Committer: Andrew Purtell
Committed: Wed Sep 5 15:12:56 2018 -0700
--
.../org/apache/hadoop/hbase/regionserver/HStore.java | 11 +++
1 file changed, 11 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/d0b0df02/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
index e37baf8..af9a006 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
@@ -1634,6 +1634,17 @@ public class HStore implements Store {
LOG.error("Error trying to determine if store has referenes, " +
"assuming references exists",
ioe);
return true;
+} finally {
+ if (reloadedStoreFiles != null) {
+for (StoreFile storeFile : reloadedStoreFiles) {
+ try {
+storeFile.closeReader(false);
+ } catch (IOException ioe) {
+LOG.warn("Encountered exception closing " + storeFile + ": " +
ioe.getMessage());
+// continue with closing the remaining store files
+ }
+}
+ }
}
return StoreUtils.hasReferences(reloadedStoreFiles);
}
[1/3] hbase git commit: HBASE-21088 HStoreFile should be closed in HStore#hasReferences
Repository: hbase
Updated Branches:
refs/heads/branch-1 dbb634ad1 -> d07cab18a
refs/heads/branch-1.3 bc429d89c -> 36ef36ccc
refs/heads/branch-1.4 15f17302e -> d0b0df020
HBASE-21088 HStoreFile should be closed in HStore#hasReferences
Conflicts:
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/36ef36cc
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/36ef36cc
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/36ef36cc
Branch: refs/heads/branch-1.3
Commit: 36ef36ccc5babbf1e398097855ded3e2e1b9dc34
Parents: bc429d8
Author: tedyu
Authored: Mon Aug 27 09:38:03 2018 -0700
Committer: Andrew Purtell
Committed: Wed Sep 5 15:12:41 2018 -0700
--
.../org/apache/hadoop/hbase/regionserver/HStore.java | 11 +++
1 file changed, 11 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/36ef36cc/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
index 76073d0..0f6536f 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
@@ -1605,6 +1605,17 @@ public class HStore implements Store {
LOG.error("Error trying to determine if store has referenes, " +
"assuming references exists",
ioe);
return true;
+} finally {
+ if (reloadedStoreFiles != null) {
+for (StoreFile storeFile : reloadedStoreFiles) {
+ try {
+storeFile.closeReader(false);
+ } catch (IOException ioe) {
+LOG.warn("Encountered exception closing " + storeFile + ": " +
ioe.getMessage());
+// continue with closing the remaining store files
+ }
+}
+ }
}
return StoreUtils.hasReferences(reloadedStoreFiles);
}
[hbase] Git Push Summary
Repository: hbase Updated Tags: refs/tags/rel/1.4.7 [created] da44e5097
hbase git commit: HBASE-21107 add a metrics for netty direct memory
Repository: hbase
Updated Branches:
refs/heads/branch-2 bc3ab8172 -> 83c871add
HBASE-21107 add a metrics for netty direct memory
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/83c871ad
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/83c871ad
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/83c871ad
Branch: refs/heads/branch-2
Commit: 83c871add8eb1fc8359defe5779436169f57ca95
Parents: bc3ab81
Author: Huaxiang Sun
Authored: Wed Sep 5 16:03:07 2018 -0700
Committer: Huaxiang Sun
Committed: Wed Sep 5 16:10:17 2018 -0700
--
.../hadoop/hbase/ipc/MetricsHBaseServerSource.java| 5 +
.../hadoop/hbase/ipc/MetricsHBaseServerWrapper.java | 2 ++
.../hbase/ipc/MetricsHBaseServerSourceImpl.java | 4 +++-
.../hbase/ipc/MetricsHBaseServerWrapperImpl.java | 10 ++
.../apache/hadoop/hbase/util/DirectMemoryUtils.java | 14 ++
.../hbase/ipc/MetricsHBaseServerWrapperStub.java | 5 +
6 files changed, 39 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/83c871ad/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSource.java
--
diff --git
a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSource.java
b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSource.java
index d98837f..3877aae 100644
---
a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSource.java
+++
b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSource.java
@@ -95,6 +95,11 @@ public interface MetricsHBaseServerSource extends
ExceptionTrackingSource {
String NUM_LIFO_MODE_SWITCHES_NAME = "numLifoModeSwitches";
String NUM_LIFO_MODE_SWITCHES_DESC = "Total number of calls in general queue
which " +
"were served from the tail of the queue";
+ // Direct Memory Usage metrics
+ String NETTY_DM_USAGE_NAME = "nettyDirectMemoryUsage";
+
+ String NETTY_DM_USAGE_DESC = "Current Netty direct memory usage.";
+
void authorizationSuccess();
http://git-wip-us.apache.org/repos/asf/hbase/blob/83c871ad/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapper.java
--
diff --git
a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapper.java
b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapper.java
index c66ec59..9e5a549 100644
---
a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapper.java
+++
b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapper.java
@@ -56,4 +56,6 @@ public interface MetricsHBaseServerWrapper {
int getActiveReadRpcHandlerCount();
int getActiveScanRpcHandlerCount();
+
+ long getNettyDmUsage();
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/83c871ad/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceImpl.java
--
diff --git
a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceImpl.java
b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceImpl.java
index 45f60c4..88673ce 100644
---
a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceImpl.java
+++
b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceImpl.java
@@ -179,7 +179,9 @@ public class MetricsHBaseServerSourceImpl extends
ExceptionTrackingSourceImpl
.addGauge(Interns.info(NUM_ACTIVE_READ_HANDLER_NAME,
NUM_ACTIVE_READ_HANDLER_DESC),
wrapper.getActiveReadRpcHandlerCount())
.addGauge(Interns.info(NUM_ACTIVE_SCAN_HANDLER_NAME,
NUM_ACTIVE_SCAN_HANDLER_DESC),
-wrapper.getActiveScanRpcHandlerCount());
+wrapper.getActiveScanRpcHandlerCount())
+ .addGauge(Interns.info(NETTY_DM_USAGE_NAME, NETTY_DM_USAGE_DESC),
+wrapper.getNettyDmUsage());
}
metricsRegistry.snapshot(mrb, all);
http://git-wip-us.apache.org/repos/asf/hbase/blob/83c871ad/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapperImpl.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapperImpl.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapperImpl.java
index e7341c5..c855b94 100644
---
hbase git commit: HBASE-21107 add a metrics for netty direct memory
Repository: hbase
Updated Branches:
refs/heads/master b7cdfe3ab -> bdc168713
HBASE-21107 add a metrics for netty direct memory
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/bdc16871
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bdc16871
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bdc16871
Branch: refs/heads/master
Commit: bdc168713dc505d82812de12dd5855f0a06c2124
Parents: b7cdfe3
Author: Huaxiang Sun
Authored: Wed Sep 5 16:03:07 2018 -0700
Committer: Huaxiang Sun
Committed: Wed Sep 5 16:04:25 2018 -0700
--
.../hadoop/hbase/ipc/MetricsHBaseServerSource.java| 5 +
.../hadoop/hbase/ipc/MetricsHBaseServerWrapper.java | 2 ++
.../hbase/ipc/MetricsHBaseServerSourceImpl.java | 4 +++-
.../hbase/ipc/MetricsHBaseServerWrapperImpl.java | 10 ++
.../apache/hadoop/hbase/util/DirectMemoryUtils.java | 14 ++
.../hbase/ipc/MetricsHBaseServerWrapperStub.java | 5 +
6 files changed, 39 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/bdc16871/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSource.java
--
diff --git
a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSource.java
b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSource.java
index d98837f..3877aae 100644
---
a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSource.java
+++
b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSource.java
@@ -95,6 +95,11 @@ public interface MetricsHBaseServerSource extends
ExceptionTrackingSource {
String NUM_LIFO_MODE_SWITCHES_NAME = "numLifoModeSwitches";
String NUM_LIFO_MODE_SWITCHES_DESC = "Total number of calls in general queue
which " +
"were served from the tail of the queue";
+ // Direct Memory Usage metrics
+ String NETTY_DM_USAGE_NAME = "nettyDirectMemoryUsage";
+
+ String NETTY_DM_USAGE_DESC = "Current Netty direct memory usage.";
+
void authorizationSuccess();
http://git-wip-us.apache.org/repos/asf/hbase/blob/bdc16871/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapper.java
--
diff --git
a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapper.java
b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapper.java
index c66ec59..9e5a549 100644
---
a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapper.java
+++
b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapper.java
@@ -56,4 +56,6 @@ public interface MetricsHBaseServerWrapper {
int getActiveReadRpcHandlerCount();
int getActiveScanRpcHandlerCount();
+
+ long getNettyDmUsage();
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/bdc16871/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceImpl.java
--
diff --git
a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceImpl.java
b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceImpl.java
index 45f60c4..88673ce 100644
---
a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceImpl.java
+++
b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceImpl.java
@@ -179,7 +179,9 @@ public class MetricsHBaseServerSourceImpl extends
ExceptionTrackingSourceImpl
.addGauge(Interns.info(NUM_ACTIVE_READ_HANDLER_NAME,
NUM_ACTIVE_READ_HANDLER_DESC),
wrapper.getActiveReadRpcHandlerCount())
.addGauge(Interns.info(NUM_ACTIVE_SCAN_HANDLER_NAME,
NUM_ACTIVE_SCAN_HANDLER_DESC),
-wrapper.getActiveScanRpcHandlerCount());
+wrapper.getActiveScanRpcHandlerCount())
+ .addGauge(Interns.info(NETTY_DM_USAGE_NAME, NETTY_DM_USAGE_DESC),
+wrapper.getNettyDmUsage());
}
metricsRegistry.snapshot(mrb, all);
http://git-wip-us.apache.org/repos/asf/hbase/blob/bdc16871/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapperImpl.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapperImpl.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/MetricsHBaseServerWrapperImpl.java
index e7341c5..c855b94 100644
---
[2/3] hbase git commit: HBASE-21153 Shaded client jars should always build in relevant phase to avoid confusion
HBASE-21153 Shaded client jars should always build in relevant phase to avoid confusion Signed-off-by: Michael Stack Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/bc3ab817 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bc3ab817 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bc3ab817 Branch: refs/heads/branch-2 Commit: bc3ab81720e8f61c2615dfb2bd2116fb58501e19 Parents: d39be48 Author: Sean Busbey Authored: Wed Sep 5 14:15:06 2018 -0500 Committer: Sean Busbey Committed: Wed Sep 5 16:46:16 2018 -0500 -- .../hbase-shaded-client-byo-hadoop/pom.xml | 17 ++--- hbase-shaded/hbase-shaded-client/pom.xml| 65 +--- hbase-shaded/hbase-shaded-mapreduce/pom.xml | 15 ++--- 3 files changed, 36 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/bc3ab817/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml -- diff --git a/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml b/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml index 7d8712d..4c8830e 100644 --- a/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml +++ b/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml @@ -45,6 +45,10 @@ true + +org.apache.maven.plugins +maven-shade-plugin + @@ -54,17 +58,4 @@ - - -release - - - -org.apache.maven.plugins -maven-shade-plugin - - - - - http://git-wip-us.apache.org/repos/asf/hbase/blob/bc3ab817/hbase-shaded/hbase-shaded-client/pom.xml -- diff --git a/hbase-shaded/hbase-shaded-client/pom.xml b/hbase-shaded/hbase-shaded-client/pom.xml index f0d9059..41d0e78 100644 --- a/hbase-shaded/hbase-shaded-client/pom.xml +++ b/hbase-shaded/hbase-shaded-client/pom.xml @@ -45,6 +45,34 @@ true + +org.apache.maven.plugins +maven-shade-plugin + + + aggregate-into-a-jar-with-relocated-third-parties + + + + + + org.apache.hbase:hbase-resource-bundle +org.slf4j:* + com.google.code.findbugs:* + com.github.stephenc.findbugs:* +org.apache.htrace:* +org.apache.yetus:* +log4j:* +commons-logging:* + + + + + + @@ -55,41 +83,4 @@ - - -release - - - -org.apache.maven.plugins -maven-shade-plugin - - - aggregate-into-a-jar-with-relocated-third-parties - - - - - - org.apache.hbase:hbase-resource-bundle -org.slf4j:* - com.google.code.findbugs:* - com.github.stephenc.findbugs:* -org.apache.htrace:* -org.apache.yetus:* -log4j:* -commons-logging:* - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/hbase/blob/bc3ab817/hbase-shaded/hbase-shaded-mapreduce/pom.xml -- diff --git a/hbase-shaded/hbase-shaded-mapreduce/pom.xml b/hbase-shaded/hbase-shaded-mapreduce/pom.xml index cf02e06..9dd1570 100644 ---
[1/3] hbase git commit: HBASE-21153 Shaded client jars should always build in relevant phase to avoid confusion
Repository: hbase Updated Branches: refs/heads/branch-2 d39be48f0 -> bc3ab8172 refs/heads/branch-2.1 198aa5dab -> 4d7221a68 refs/heads/master cc414bdea -> b7cdfe3ab HBASE-21153 Shaded client jars should always build in relevant phase to avoid confusion Signed-off-by: Michael Stack Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b7cdfe3a Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b7cdfe3a Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b7cdfe3a Branch: refs/heads/master Commit: b7cdfe3ab07f38a54988b573ea7a2816c7cd6c60 Parents: cc414bd Author: Sean Busbey Authored: Wed Sep 5 14:15:06 2018 -0500 Committer: Sean Busbey Committed: Wed Sep 5 16:44:51 2018 -0500 -- .../hbase-shaded-client-byo-hadoop/pom.xml | 17 ++--- hbase-shaded/hbase-shaded-client/pom.xml| 65 +--- hbase-shaded/hbase-shaded-mapreduce/pom.xml | 15 ++--- 3 files changed, 36 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/b7cdfe3a/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml -- diff --git a/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml b/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml index c51a1af..953e0b8 100644 --- a/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml +++ b/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml @@ -45,6 +45,10 @@ true + +org.apache.maven.plugins +maven-shade-plugin + @@ -54,17 +58,4 @@ - - -release - - - -org.apache.maven.plugins -maven-shade-plugin - - - - - http://git-wip-us.apache.org/repos/asf/hbase/blob/b7cdfe3a/hbase-shaded/hbase-shaded-client/pom.xml -- diff --git a/hbase-shaded/hbase-shaded-client/pom.xml b/hbase-shaded/hbase-shaded-client/pom.xml index 6152aad..3f19305 100644 --- a/hbase-shaded/hbase-shaded-client/pom.xml +++ b/hbase-shaded/hbase-shaded-client/pom.xml @@ -45,6 +45,34 @@ true + +org.apache.maven.plugins +maven-shade-plugin + + + aggregate-into-a-jar-with-relocated-third-parties + + + + + + org.apache.hbase:hbase-resource-bundle +org.slf4j:* + com.google.code.findbugs:* + com.github.stephenc.findbugs:* +org.apache.htrace:* +org.apache.yetus:* +log4j:* +commons-logging:* + + + + + + @@ -55,41 +83,4 @@ - - -release - - - -org.apache.maven.plugins -maven-shade-plugin - - - aggregate-into-a-jar-with-relocated-third-parties - - - - - - org.apache.hbase:hbase-resource-bundle -org.slf4j:* - com.google.code.findbugs:* - com.github.stephenc.findbugs:* -org.apache.htrace:* -org.apache.yetus:* -log4j:* -commons-logging:* - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/hbase/blob/b7cdfe3a/hbase-shaded/hbase-shaded-mapreduce/pom.xml
[3/3] hbase git commit: HBASE-21153 Shaded client jars should always build in relevant phase to avoid confusion
HBASE-21153 Shaded client jars should always build in relevant phase to avoid confusion Signed-off-by: Michael Stack Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4d7221a6 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4d7221a6 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4d7221a6 Branch: refs/heads/branch-2.1 Commit: 4d7221a68fc155284340c67f836edc78f3be5fc4 Parents: 198aa5d Author: Sean Busbey Authored: Wed Sep 5 14:15:06 2018 -0500 Committer: Sean Busbey Committed: Wed Sep 5 16:53:47 2018 -0500 -- .../hbase-shaded-client-byo-hadoop/pom.xml | 17 ++--- hbase-shaded/hbase-shaded-client/pom.xml| 65 +--- hbase-shaded/hbase-shaded-mapreduce/pom.xml | 15 ++--- 3 files changed, 36 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/4d7221a6/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml -- diff --git a/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml b/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml index 94f42ef..e52798b 100644 --- a/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml +++ b/hbase-shaded/hbase-shaded-client-byo-hadoop/pom.xml @@ -45,6 +45,10 @@ true + +org.apache.maven.plugins +maven-shade-plugin + @@ -54,17 +58,4 @@ - - -release - - - -org.apache.maven.plugins -maven-shade-plugin - - - - - http://git-wip-us.apache.org/repos/asf/hbase/blob/4d7221a6/hbase-shaded/hbase-shaded-client/pom.xml -- diff --git a/hbase-shaded/hbase-shaded-client/pom.xml b/hbase-shaded/hbase-shaded-client/pom.xml index 1c19767..df881ba 100644 --- a/hbase-shaded/hbase-shaded-client/pom.xml +++ b/hbase-shaded/hbase-shaded-client/pom.xml @@ -45,6 +45,34 @@ true + +org.apache.maven.plugins +maven-shade-plugin + + + aggregate-into-a-jar-with-relocated-third-parties + + + + + + org.apache.hbase:hbase-resource-bundle +org.slf4j:* + com.google.code.findbugs:* + com.github.stephenc.findbugs:* +org.apache.htrace:* +org.apache.yetus:* +log4j:* +commons-logging:* + + + + + + @@ -55,41 +83,4 @@ - - -release - - - -org.apache.maven.plugins -maven-shade-plugin - - - aggregate-into-a-jar-with-relocated-third-parties - - - - - - org.apache.hbase:hbase-resource-bundle -org.slf4j:* - com.google.code.findbugs:* - com.github.stephenc.findbugs:* -org.apache.htrace:* -org.apache.yetus:* -log4j:* -commons-logging:* - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/hbase/blob/4d7221a6/hbase-shaded/hbase-shaded-mapreduce/pom.xml -- diff --git a/hbase-shaded/hbase-shaded-mapreduce/pom.xml b/hbase-shaded/hbase-shaded-mapreduce/pom.xml index 3f47e41..bd3076f 100644 ---
hbase git commit: HBASE-18974 flesh out guidance for contributors to ref guide.
Repository: hbase Updated Branches: refs/heads/master bb657c2d2 -> cc414bdea HBASE-18974 flesh out guidance for contributors to ref guide. * New "Becoming a committer" section * Clean up some related documentation around contributing. Co-authored-by: Misty Stanley-Jones Ammending-Author: Misty Stanley-Jones Signed-off-by: Sean Busbey Signed-off-by: Michael Stack Signed-off-by: Chia-Ping Tsai Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/cc414bde Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/cc414bde Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/cc414bde Branch: refs/heads/master Commit: cc414bdeab87577fc1d10e4e7fa897e71ff2648b Parents: bb657c2 Author: Mike Drob Authored: Wed Oct 11 14:57:16 2017 -0500 Committer: Sean Busbey Committed: Wed Sep 5 15:14:52 2018 -0500 -- src/main/asciidoc/_chapters/developer.adoc | 162 ++-- 1 file changed, 120 insertions(+), 42 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/cc414bde/src/main/asciidoc/_chapters/developer.adoc -- diff --git a/src/main/asciidoc/_chapters/developer.adoc b/src/main/asciidoc/_chapters/developer.adoc index 935d6e6..51ed461 100644 --- a/src/main/asciidoc/_chapters/developer.adoc +++ b/src/main/asciidoc/_chapters/developer.adoc @@ -2040,30 +2040,97 @@ For more information on how to use ReviewBoard, see link:http://www.reviewboard. Guide for HBase Committers += Becoming a committer + +Committers are responsible for reviewing and integrating code changes, testing +and voting on release candidates, weighing in on design discussions, as well as +other types of project contributions. The PMC votes to make a contributor a +committer based on an assessment of their contributions to the project. It is +expected that committers demonstrate a sustained history of high-quality +contributions to the project and community involvement. + +Contributions can be made in many ways. There is no single path to becoming a +committer, nor any expected timeline. Submitting features, improvements, and bug +fixes is the most common avenue, but other methods are both recognized and +encouraged (and may be even more important to the health of HBase as a project and a +community). A non-exhaustive list of potential contributions (in no particular +order): + +* <> for new + changes, best practices, recipes, and other improvements. +* Keep the website up to date. +* Perform testing and report the results. For instance, scale testing and + testing non-standard configurations is always appreciated. +* Maintain the shared Jenkins testing environment and other testing + infrastructure. +* <> after performing validation, even if non-binding. + A non-binding vote is a vote by a non-committer. +* Provide input for discussion threads on the link:/mail-lists.html[mailing lists] (which usually have + `[DISCUSS]` in the subject line). +* Answer questions questions on the user or developer mailing lists and on + Slack. +* Make sure the HBase community is a welcoming one and that we adhere to our + link:/coc.html[Code of conduct]. Alert the PMC if you + have concerns. +* Review other people's work (both code and non-code) and provide public + feedback. +* Report bugs that are found, or file new feature requests. +* Triage issues and keep JIRA organized. This includes closing stale issues, + labeling new issues, updating metadata, and other tasks as needed. +* Mentor new contributors of all sorts. +* Give talks and write blogs about HBase. Add these to the link:/[News] section + of the website. +* Provide UX feedback about HBase, the web UI, the CLI, APIs, and the website. +* Write demo applications and scripts. +* Help attract and retain a diverse community. +* Interact with other projects in ways that benefit HBase and those other + projects. + +Not every individual is able to do all (or even any) of the items on this list. +If you think of other ways to contribute, go for it (and add them to the list). +A pleasant demeanor and willingness to contribute are all you need to make a +positive impact on the HBase project. Invitations to become a committer are the +result of steady interaction with the community over the long term, which builds +trust and recognition. + = New committers -New committers are encouraged to first read Apache's generic committer documentation: +New committers are encouraged to first read Apache's generic committer +documentation: * link:https://www.apache.org/dev/new-committers-guide.html[Apache New Committer Guide] * link:https://www.apache.org/dev/committers.html[Apache Committer FAQ] = Review -HBase committers should, as often as possible, attempt to review
hbase-site git commit: INFRA-10751 Empty commit
Repository: hbase-site Updated Branches: refs/heads/asf-site 623d40b7e -> ea4e4edcd INFRA-10751 Empty commit Project: http://git-wip-us.apache.org/repos/asf/hbase-site/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase-site/commit/ea4e4edc Tree: http://git-wip-us.apache.org/repos/asf/hbase-site/tree/ea4e4edc Diff: http://git-wip-us.apache.org/repos/asf/hbase-site/diff/ea4e4edc Branch: refs/heads/asf-site Commit: ea4e4edcdb408563eb6e57b0ebfbbc1cbb7c1098 Parents: 623d40b Author: jenkins Authored: Wed Sep 5 14:51:19 2018 + Committer: jenkins Committed: Wed Sep 5 14:51:19 2018 + -- --
[1/3] hbase-site git commit: Published site at bb657c2d2e824bd32f1df1fc8a8051bf875b2ff7.
Repository: hbase-site
Updated Branches:
refs/heads/asf-site 3b1c91eb8 -> 623d40b7e
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/623d40b7/testdevapidocs/org/apache/hadoop/hbase/mapreduce/TestTableRecordReader.html
--
diff --git
a/testdevapidocs/org/apache/hadoop/hbase/mapreduce/TestTableRecordReader.html
b/testdevapidocs/org/apache/hadoop/hbase/mapreduce/TestTableRecordReader.html
new file mode 100644
index 000..ba1e76d
--- /dev/null
+++
b/testdevapidocs/org/apache/hadoop/hbase/mapreduce/TestTableRecordReader.html
@@ -0,0 +1,585 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+
+
+
+TestTableRecordReader (Apache HBase 3.0.0-SNAPSHOT Test API)
+
+
+
+
+
+var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":10};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static
Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+Skip navigation links
+
+
+
+
+Overview
+Package
+Class
+Use
+Tree
+Deprecated
+Index
+Help
+
+
+
+
+PrevClass
+NextClass
+
+
+Frames
+NoFrames
+
+
+AllClasses
+
+
+
+
+
+
+
+Summary:
+Nested|
+Field|
+Constr|
+Method
+
+
+Detail:
+Field|
+Constr|
+Method
+
+
+
+
+
+
+
+
+org.apache.hadoop.hbase.mapreduce
+Class
TestTableRecordReader
+
+
+
+https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true;
title="class or interface in java.lang">java.lang.Object
+
+
+org.apache.hadoop.hbase.mapreduce.TestTableRecordReader
+
+
+
+
+
+
+
+
+public class TestTableRecordReader
+extends https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true;
title="class or interface in java.lang">Object
+
+
+
+
+
+
+
+
+
+
+
+Field Summary
+
+Fields
+
+Modifier and Type
+Field and Description
+
+
+static HBaseClassTestRule
+CLASS_RULE
+
+
+private static byte[][]
+FAMILIES
+
+
+private static byte[]
+FAMILY
+
+
+private static int
+NUM_FAMILIES
+
+
+private static int
+NUM_QUALIFIERS
+
+
+private static int
+NUM_ROWS
+
+
+private static byte[]
+QUALIFIER
+
+
+private static byte[][]
+QUALIFIERS
+
+
+private static byte[]
+ROW
+
+
+private static byte[][]
+ROWS
+
+
+private static
org.apache.hadoop.hbase.TableName
+TABLE_NAME
+
+
+private static HBaseTestingUtility
+TEST_UTIL
+
+
+private static int
+TIMEOUT
+
+
+private static byte[]
+VALUE
+
+
+private static int
+VALUE_SIZE
+
+
+
+
+
+
+
+
+
+Constructor Summary
+
+Constructors
+
+Constructor and Description
+
+
+TestTableRecordReader()
+
+
+
+
+
+
+
+
+
+Method Summary
+
+All MethodsStatic MethodsInstance MethodsConcrete Methods
+
+Modifier and Type
+Method and Description
+
+
+private static https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true;
title="class or interface in
java.util">Listorg.apache.hadoop.hbase.client.Put
+createPuts(byte[][]rows,
+ byte[][]families,
+ byte[][]qualifiers,
+ byte[]value)
+
+
+private static void
+createTestTable(org.apache.hadoop.hbase.TableNamename,
+ byte[][]rows,
+ byte[][]families,
+ byte[][]qualifiers,
+ byte[]cellValue)
+
+
+static void
+setUpBeforeClass()
+
+
+static void
+tearDownAfterClass()
+
+
+void
+test()
+
+
+
+
+
+
+Methods inherited from classjava.lang.https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true;
title="class or interface in java.lang">Object
+https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--;
title="class or interface in java.lang">clone, https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-;
title="class or interface in java.lang">equals, https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--;
title="class or interface in java.lang">finalize, https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--;
title="class or interface in java.lang">getClass, https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--;
title="class or interface in java.lang">hashCode, https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#notify--;
title="class or interface in java.lang">notify, https://docs.oracle.com/javase/8/docs/api/ja
va/lang/Object.html?is-external=true#notifyAll--" title="class or interface
[2/3] hbase-site git commit: Published site at bb657c2d2e824bd32f1df1fc8a8051bf875b2ff7.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/623d40b7/testdevapidocs/index-all.html -- diff --git a/testdevapidocs/index-all.html b/testdevapidocs/index-all.html index 2af4335..71f6954 100644 --- a/testdevapidocs/index-all.html +++ b/testdevapidocs/index-all.html @@ -4985,6 +4985,8 @@ CLASS_RULE - Static variable in class org.apache.hadoop.hbase.mapreduce.TestTableMapReduceUtil +CLASS_RULE - Static variable in class org.apache.hadoop.hbase.mapreduce.TestTableRecordReader + CLASS_RULE - Static variable in class org.apache.hadoop.hbase.mapreduce.TestTableSnapshotInputFormat CLASS_RULE - Static variable in class org.apache.hadoop.hbase.mapreduce.TestTableSplit @@ -9942,6 +9944,8 @@ createPuts(byte[][], byte[][], byte[][], byte[]) - Static method in class org.apache.hadoop.hbase.filter.TestFilterFromRegionSide +createPuts(byte[][], byte[][], byte[][], byte[]) - Static method in class org.apache.hadoop.hbase.mapreduce.TestTableRecordReader + createPuts(byte[][], byte[][], byte[][], byte[]) - Static method in class org.apache.hadoop.hbase.regionserver.TestScannerHeartbeatMessages Make puts to put the input value into each combination of row, family, and qualifier @@ -10644,6 +10648,8 @@ createTestTable(TableName, byte[][], byte[][], byte[][], byte[]) - Static method in class org.apache.hadoop.hbase.client.AbstractTestScanCursor +createTestTable(TableName, byte[][], byte[][], byte[][], byte[]) - Static method in class org.apache.hadoop.hbase.mapreduce.TestTableRecordReader + createTestTable(TableName, byte[][], byte[][], byte[][], byte[]) - Static method in class org.apache.hadoop.hbase.regionserver.TestScannerHeartbeatMessages createTestTable(String) - Method in class org.apache.hadoop.hbase.regionserver.wal.AbstractTestLogRolling @@ -13839,6 +13845,8 @@ FAMILIES - Static variable in class org.apache.hadoop.hbase.mapreduce.TestHFileOutputFormat2 +FAMILIES - Static variable in class org.apache.hadoop.hbase.mapreduce.TestTableRecordReader + FAMILIES - Static variable in class org.apache.hadoop.hbase.master.procedure.TestDeleteColumnFamilyProcedureFromClient families - Variable in class org.apache.hadoop.hbase.master.TestGetLastFlushedSequenceId @@ -14037,6 +14045,8 @@ FAMILY - Static variable in class org.apache.hadoop.hbase.mapreduce.TestTableInputFormat +FAMILY - Static variable in class org.apache.hadoop.hbase.mapreduce.TestTableRecordReader + family - Static variable in class org.apache.hadoop.hbase.mapreduce.TestWALRecordReader FAMILY - Static variable in class org.apache.hadoop.hbase.master.assignment.TestAssignmentOnRSCrash @@ -27702,6 +27712,8 @@ NUM_FAMILIES - Static variable in class org.apache.hadoop.hbase.filter.TestFilterFromRegionSide +NUM_FAMILIES - Static variable in class org.apache.hadoop.hbase.mapreduce.TestTableRecordReader + NUM_FAMILIES - Static variable in class org.apache.hadoop.hbase.regionserver.TestScannerHeartbeatMessages NUM_FAMILIES - Static variable in class org.apache.hadoop.hbase.TestPartialResultsFromClientSide @@ -27786,6 +27798,8 @@ NUM_QUALIFIERS - Static variable in class org.apache.hadoop.hbase.filter.TestFilterFromRegionSide +NUM_QUALIFIERS - Static variable in class org.apache.hadoop.hbase.mapreduce.TestTableRecordReader + NUM_QUALIFIERS - Static variable in class org.apache.hadoop.hbase.regionserver.TestScannerHeartbeatMessages NUM_QUALIFIERS - Static variable in class org.apache.hadoop.hbase.TestPartialResultsFromClientSide @@ -27850,6 +27864,8 @@ NUM_ROWS - Static variable in class org.apache.hadoop.hbase.io.hfile.TestScannerSelectionUsingTTL +NUM_ROWS - Static variable in class org.apache.hadoop.hbase.mapreduce.TestTableRecordReader + NUM_ROWS - Static variable in class org.apache.hadoop.hbase.regionserver.TestMultiColumnScanner NUM_ROWS - Static variable in class org.apache.hadoop.hbase.regionserver.TestScannerHeartbeatMessages @@ -31810,6 +31826,8 @@ QUALIFIER - Static variable in class org.apache.hadoop.hbase.mapreduce.TestHFileOutputFormat2.RandomPutGeneratingMapper +QUALIFIER - Static variable in class org.apache.hadoop.hbase.mapreduce.TestTableRecordReader + QUALIFIER - Static variable in class org.apache.hadoop.hbase.master.TestCatalogJanitorInMemoryStates QUALIFIER - Static variable in class org.apache.hadoop.hbase.master.TestWarmupRegion @@ -31916,6 +31934,8 @@ QUALIFIERS - Static variable in class org.apache.hadoop.hbase.filter.TestFilterFromRegionSide +QUALIFIERS - Static variable in class org.apache.hadoop.hbase.mapreduce.TestTableRecordReader + qualifiers - Variable in class org.apache.hadoop.hbase.regionserver.TestHMobStore qualifiers - Variable in class org.apache.hadoop.hbase.regionserver.TestHRegion.PutThread @@ -34001,6 +34021,8 @@ ROW - Static variable in class org.apache.hadoop.hbase.io.TestTagCompressionContext +ROW - Static
[3/3] hbase-site git commit: Published site at bb657c2d2e824bd32f1df1fc8a8051bf875b2ff7.
Published site at bb657c2d2e824bd32f1df1fc8a8051bf875b2ff7. Project: http://git-wip-us.apache.org/repos/asf/hbase-site/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase-site/commit/623d40b7 Tree: http://git-wip-us.apache.org/repos/asf/hbase-site/tree/623d40b7 Diff: http://git-wip-us.apache.org/repos/asf/hbase-site/diff/623d40b7 Branch: refs/heads/asf-site Commit: 623d40b7ee4a25f6451c5a43d3252c09712ef649 Parents: 3b1c91e Author: jenkins Authored: Wed Sep 5 14:51:05 2018 + Committer: jenkins Committed: Wed Sep 5 14:51:05 2018 + -- acid-semantics.html | 4 +- apache_hbase_reference_guide.pdf| 4 +- .../hbase/mapreduce/TableRecordReaderImpl.html | 4 +- .../hbase/mapreduce/TableRecordReaderImpl.html | 152 ++--- book.html | 2 +- bulk-loads.html | 4 +- checkstyle-aggregate.html | 8 +- checkstyle.rss | 16 +- coc.html| 4 +- dependencies.html | 4 +- dependency-convergence.html | 4 +- dependency-info.html| 4 +- dependency-management.html | 4 +- devapidocs/constant-values.html | 6 +- .../hbase/mapreduce/TableRecordReaderImpl.html | 6 +- .../org/apache/hadoop/hbase/Version.html| 6 +- .../hbase/mapreduce/TableRecordReaderImpl.html | 152 ++--- downloads.html | 4 +- export_control.html | 4 +- index.html | 4 +- integration.html| 4 +- issue-tracking.html | 4 +- license.html| 4 +- mail-lists.html | 4 +- metrics.html| 4 +- old_news.html | 4 +- plugin-management.html | 4 +- plugins.html| 4 +- poweredbyhbase.html | 4 +- project-info.html | 4 +- project-reports.html| 4 +- project-summary.html| 4 +- pseudo-distributed.html | 4 +- replication.html| 4 +- resources.html | 4 +- source-repository.html | 4 +- sponsors.html | 4 +- supportingprojects.html | 4 +- team-list.html | 4 +- testdevapidocs/allclasses-frame.html| 1 + testdevapidocs/allclasses-noframe.html | 1 + testdevapidocs/constant-values.html | 19 + testdevapidocs/index-all.html | 44 ++ .../hbase/class-use/HBaseClassTestRule.html | 56 +- .../hbase/class-use/HBaseTestingUtility.html| 48 +- .../hbase/mapreduce/TestTableMapReduceUtil.html | 4 +- .../hbase/mapreduce/TestTableRecordReader.html | 585 +++ .../mapreduce/TestTableSnapshotInputFormat.html | 4 +- .../class-use/TestTableRecordReader.html| 125 .../hadoop/hbase/mapreduce/package-frame.html | 1 + .../hadoop/hbase/mapreduce/package-summary.html | 22 +- .../hadoop/hbase/mapreduce/package-tree.html| 1 + .../org/apache/hadoop/hbase/package-tree.html | 10 +- .../hadoop/hbase/procedure2/package-tree.html | 2 +- .../hadoop/hbase/regionserver/package-tree.html | 4 +- .../apache/hadoop/hbase/test/package-tree.html | 4 +- .../apache/hadoop/hbase/wal/package-tree.html | 2 +- testdevapidocs/overview-tree.html | 1 + .../hbase/mapreduce/TestTableRecordReader.html | 204 +++ 59 files changed, 1317 insertions(+), 293 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase-site/blob/623d40b7/acid-semantics.html -- diff --git a/acid-semantics.html b/acid-semantics.html index f590ad2..d3105bf 100644 --- a/acid-semantics.html +++ b/acid-semantics.html @@ -7,7 +7,7 @@ - + Apache HBase Apache HBase (TM) ACID Properties @@ -601,7 +601,7 @@ under the License. --> https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2018-09-04 + Last Published: 2018-09-05
hbase git commit: HBASE-21127 TableRecordReader need to handle cursor result too
Repository: hbase
Updated Branches:
refs/heads/branch-2.0 4bf313439 -> a8da63c74
HBASE-21127 TableRecordReader need to handle cursor result too
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a8da63c7
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a8da63c7
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a8da63c7
Branch: refs/heads/branch-2.0
Commit: a8da63c742b151d445795b828fd6bed9013d41b6
Parents: 4bf3134
Author: Guanghao Zhang
Authored: Fri Aug 31 11:25:09 2018 +0800
Committer: Guanghao Zhang
Committed: Wed Sep 5 14:56:52 2018 +0800
--
.../hbase/mapreduce/TableRecordReaderImpl.java | 8 ++
.../hbase/mapreduce/TestTableRecordReader.java | 132 +++
2 files changed, 140 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/a8da63c7/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java
--
diff --git
a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java
b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java
index f8d13bd..20c7b94 100644
---
a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java
+++
b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java
@@ -240,12 +240,20 @@ public class TableRecordReaderImpl {
if (value != null && value.isStale()) numStale++;
numRestarts++;
}
+
if (value != null && value.size() > 0) {
key.set(value.getRow());
lastSuccessfulRow = key.get();
return true;
}
+ // Need handle cursor result
+ if (value != null && value.isCursor()) {
+key.set(value.getCursor().getRow());
+lastSuccessfulRow = key.get();
+return true;
+ }
+
updateCounters();
return false;
} catch (IOException ioe) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/a8da63c7/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableRecordReader.java
--
diff --git
a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableRecordReader.java
b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableRecordReader.java
new file mode 100644
index 000..88e40a7
--- /dev/null
+++
b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableRecordReader.java
@@ -0,0 +1,132 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.hadoop.hbase.mapreduce;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.HTestConst;
+import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.client.Connection;
+import org.apache.hadoop.hbase.client.ConnectionFactory;
+import org.apache.hadoop.hbase.client.Put;
+import org.apache.hadoop.hbase.client.Scan;
+import org.apache.hadoop.hbase.client.Table;
+import org.apache.hadoop.hbase.regionserver.StoreScanner;
+import org.apache.hadoop.hbase.testclassification.MediumTests;
+import org.apache.hadoop.hbase.util.Bytes;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(MediumTests.class)
+public class TestTableRecordReader {
+ private final static HBaseTestingUtility TEST_UTIL = new
HBaseTestingUtility();
+
+ @ClassRule
+ public static final HBaseClassTestRule CLASS_RULE =
+ HBaseClassTestRule.forClass(TestTableRecordReader.class);
+
+ private static
hbase git commit: HBASE-21127 TableRecordReader need to handle cursor result too
Repository: hbase
Updated Branches:
refs/heads/branch-1.4 e88436798 -> 15f17302e
HBASE-21127 TableRecordReader need to handle cursor result too
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/15f17302
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/15f17302
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/15f17302
Branch: refs/heads/branch-1.4
Commit: 15f17302e47bbc3aeed3b84699a2859c30df8a84
Parents: e884367
Author: Guanghao Zhang
Authored: Wed Sep 5 11:58:45 2018 +0800
Committer: Guanghao Zhang
Committed: Wed Sep 5 14:49:30 2018 +0800
--
.../hbase/mapreduce/TableRecordReaderImpl.java | 8 ++
.../hbase/mapreduce/TestTableRecordReader.java | 126 +++
2 files changed, 134 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/15f17302/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java
index a8ed5f1..cd9877a 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java
@@ -243,12 +243,20 @@ public class TableRecordReaderImpl {
if (value != null && value.isStale()) numStale++;
numRestarts++;
}
+
if (value != null && value.size() > 0) {
key.set(value.getRow());
lastSuccessfulRow = key.get();
return true;
}
+ // Need handle cursor result
+ if (value != null && value.isCursor()) {
+key.set(value.getCursor().getRow());
+lastSuccessfulRow = key.get();
+return true;
+ }
+
updateCounters();
return false;
} catch (IOException ioe) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/15f17302/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableRecordReader.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableRecordReader.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableRecordReader.java
new file mode 100644
index 000..c500405
--- /dev/null
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableRecordReader.java
@@ -0,0 +1,126 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.hadoop.hbase.mapreduce;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.HTestConst;
+import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.client.Connection;
+import org.apache.hadoop.hbase.client.ConnectionFactory;
+import org.apache.hadoop.hbase.client.Put;
+import org.apache.hadoop.hbase.client.Scan;
+import org.apache.hadoop.hbase.client.Table;
+import org.apache.hadoop.hbase.regionserver.StoreScanner;
+import org.apache.hadoop.hbase.testclassification.MediumTests;
+import org.apache.hadoop.hbase.util.Bytes;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(MediumTests.class)
+public class TestTableRecordReader {
+ private final static HBaseTestingUtility TEST_UTIL = new
HBaseTestingUtility();
+
+ private static TableName TABLE_NAME =
TableName.valueOf("TestTableRecordReader");
+
+ private static int NUM_ROWS = 5;
+ private static byte[] ROW = Bytes.toBytes("testRow");
+ private static byte[][] ROWS = HTestConst.makeNAscii(ROW, NUM_ROWS);
+
+
hbase git commit: HBASE-21127 TableRecordReader need to handle cursor result too
Repository: hbase
Updated Branches:
refs/heads/branch-1 cf198a65e -> dbb634ad1
HBASE-21127 TableRecordReader need to handle cursor result too
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/dbb634ad
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/dbb634ad
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/dbb634ad
Branch: refs/heads/branch-1
Commit: dbb634ad1b82226993c844f41f39edb90382dcc7
Parents: cf198a6
Author: Guanghao Zhang
Authored: Wed Sep 5 11:58:45 2018 +0800
Committer: Guanghao Zhang
Committed: Wed Sep 5 14:46:59 2018 +0800
--
.../hbase/mapreduce/TableRecordReaderImpl.java | 8 ++
.../hbase/mapreduce/TestTableRecordReader.java | 126 +++
2 files changed, 134 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/dbb634ad/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java
index a8ed5f1..cd9877a 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java
@@ -243,12 +243,20 @@ public class TableRecordReaderImpl {
if (value != null && value.isStale()) numStale++;
numRestarts++;
}
+
if (value != null && value.size() > 0) {
key.set(value.getRow());
lastSuccessfulRow = key.get();
return true;
}
+ // Need handle cursor result
+ if (value != null && value.isCursor()) {
+key.set(value.getCursor().getRow());
+lastSuccessfulRow = key.get();
+return true;
+ }
+
updateCounters();
return false;
} catch (IOException ioe) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/dbb634ad/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableRecordReader.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableRecordReader.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableRecordReader.java
new file mode 100644
index 000..c500405
--- /dev/null
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableRecordReader.java
@@ -0,0 +1,126 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.hadoop.hbase.mapreduce;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.HTestConst;
+import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.client.Connection;
+import org.apache.hadoop.hbase.client.ConnectionFactory;
+import org.apache.hadoop.hbase.client.Put;
+import org.apache.hadoop.hbase.client.Scan;
+import org.apache.hadoop.hbase.client.Table;
+import org.apache.hadoop.hbase.regionserver.StoreScanner;
+import org.apache.hadoop.hbase.testclassification.MediumTests;
+import org.apache.hadoop.hbase.util.Bytes;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(MediumTests.class)
+public class TestTableRecordReader {
+ private final static HBaseTestingUtility TEST_UTIL = new
HBaseTestingUtility();
+
+ private static TableName TABLE_NAME =
TableName.valueOf("TestTableRecordReader");
+
+ private static int NUM_ROWS = 5;
+ private static byte[] ROW = Bytes.toBytes("testRow");
+ private static byte[][] ROWS = HTestConst.makeNAscii(ROW, NUM_ROWS);
+
+ private
