[6/6] hbase-site git commit: Published site at dc79029966c72f6c46add8c382e118308609cc81.
Published site at dc79029966c72f6c46add8c382e118308609cc81. Project: http://git-wip-us.apache.org/repos/asf/hbase-site/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase-site/commit/de749194 Tree: http://git-wip-us.apache.org/repos/asf/hbase-site/tree/de749194 Diff: http://git-wip-us.apache.org/repos/asf/hbase-site/diff/de749194 Branch: refs/heads/asf-site Commit: de749194e52c93b7c0a276506dff4f293e5d6a64 Parents: 2d9f5d7 Author: jenkins Authored: Sun Sep 2 14:46:15 2018 + Committer: jenkins Committed: Sun Sep 2 14:46:15 2018 + -- acid-semantics.html | 4 +- apache_hbase_reference_guide.pdf| 4 +- book.html | 2 +- bulk-loads.html | 4 +- checkstyle-aggregate.html | 23858 - checkstyle.rss | 4 +- coc.html| 4 +- dependencies.html | 4 +- dependency-convergence.html | 4 +- dependency-info.html| 4 +- dependency-management.html | 4 +- devapidocs/constant-values.html | 6 +- .../MetricsTableAggregateSourceImpl.html| 6 +- .../regionserver/MetricsTableSourceImpl.html| 108 +- .../org/apache/hadoop/hbase/Version.html| 6 +- .../MetricsTableAggregateSourceImpl.html| 120 +- .../regionserver/MetricsTableSourceImpl.html| 807 +- .../hadoop/hbase/rest/MultiRowResource.html | 2 +- downloads.html |44 +- 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/index-all.html | 8 + .../hadoop/hbase/backup/package-tree.html | 2 +- .../hadoop/hbase/io/hfile/package-tree.html | 2 +- .../org/apache/hadoop/hbase/package-tree.html | 8 +- .../hadoop/hbase/procedure/package-tree.html| 8 +- .../hadoop/hbase/procedure2/package-tree.html | 2 +- .../regionserver/TestMetricsTableAggregate.html | 102 +- .../hadoop/hbase/regionserver/package-tree.html | 6 +- .../hadoop/hbase/rest/TestMultiRowResource.html |26 +- .../test/class-use/MetricsAssertHelper.html | 2 +- .../apache/hadoop/hbase/test/package-tree.html | 2 +- .../apache/hadoop/hbase/wal/package-tree.html | 4 +- .../regionserver/TestMetricsTableAggregate.html | 284 +- .../hadoop/hbase/rest/TestMultiRowResource.html |36 +- 54 files changed, 12824 insertions(+), 12747 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase-site/blob/de749194/acid-semantics.html -- diff --git a/acid-semantics.html b/acid-semantics.html index dede3fd..23c122e 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-01 + Last Published: 2018-09-02 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/de749194/apache_hbase_reference_guide.pdf -- diff --git a/apache_hbase_reference_guide.pdf b/apache_hbase_reference_guide.pdf index
[4/6] hbase-site git commit: Published site at dc79029966c72f6c46add8c382e118308609cc81.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/de749194/checkstyle.rss -- diff --git a/checkstyle.rss b/checkstyle.rss index a1dc3f0..80c1c69 100644 --- a/checkstyle.rss +++ b/checkstyle.rss @@ -26,7 +26,7 @@ under the License. 2007 - 2018 The Apache Software Foundation File: 3720, - Errors: 15328, + Errors: 15326, Warnings: 0, Infos: 0 @@ -47333,7 +47333,7 @@ under the License. 0 - 2 + 0 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/de749194/coc.html -- diff --git a/coc.html b/coc.html index 2534a44..9747291 100644 --- a/coc.html +++ b/coc.html @@ -7,7 +7,7 @@ - + Apache HBase Code of Conduct Policy @@ -375,7 +375,7 @@ email to mailto:priv...@hbase.apache.org;>the priv https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2018-09-01 + Last Published: 2018-09-02 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/de749194/dependencies.html -- diff --git a/dependencies.html b/dependencies.html index b90b37a..3cc2193 100644 --- a/dependencies.html +++ b/dependencies.html @@ -7,7 +7,7 @@ - + Apache HBase Project Dependencies @@ -440,7 +440,7 @@ https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2018-09-01 + Last Published: 2018-09-02 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/de749194/dependency-convergence.html -- diff --git a/dependency-convergence.html b/dependency-convergence.html index 07fe350..506724b 100644 --- a/dependency-convergence.html +++ b/dependency-convergence.html @@ -7,7 +7,7 @@ - + Apache HBase Reactor Dependency Convergence @@ -879,7 +879,7 @@ https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2018-09-01 + Last Published: 2018-09-02 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/de749194/dependency-info.html -- diff --git a/dependency-info.html b/dependency-info.html index 27ef6c4..0ecfb1d 100644 --- a/dependency-info.html +++ b/dependency-info.html @@ -7,7 +7,7 @@ - + Apache HBase Dependency Information @@ -313,7 +313,7 @@ https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2018-09-01 + Last Published: 2018-09-02 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/de749194/dependency-management.html -- diff --git a/dependency-management.html b/dependency-management.html index 8a31620..5c07e3d 100644 --- a/dependency-management.html +++ b/dependency-management.html @@ -7,7 +7,7 @@ - + Apache HBase Project Dependency Management @@ -1005,7 +1005,7 @@ https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2018-09-01 + Last Published: 2018-09-02 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/de749194/devapidocs/constant-values.html -- diff --git a/devapidocs/constant-values.html b/devapidocs/constant-values.html index 12afc2d..bed5c11 100644 --- a/devapidocs/constant-values.html +++ b/devapidocs/constant-values.html @@ -3824,21 +3824,21 @@ publicstaticfinalhttps://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String date -"Sat Sep 1 14:38:49 UTC 2018" +"Sun Sep 2 14:38:19 UTC 2018" publicstaticfinalhttps://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String revision
[3/6] hbase-site git commit: Published site at dc79029966c72f6c46add8c382e118308609cc81.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/de749194/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/MetricsTableSourceImpl.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/MetricsTableSourceImpl.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/MetricsTableSourceImpl.html index 70ff91e..f52bd60 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/MetricsTableSourceImpl.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/MetricsTableSourceImpl.html @@ -23,422 +23,413 @@ 015 * See the License for the specific language governing permissions and 016 * limitations under the License. 017 */ -018 -019package org.apache.hadoop.hbase.regionserver; -020 -021import java.util.concurrent.atomic.AtomicBoolean; -022 -023import org.apache.hadoop.hbase.TableName; -024import org.apache.hadoop.hbase.metrics.Interns; -025import org.apache.hadoop.metrics2.MetricsRecordBuilder; -026import org.apache.hadoop.metrics2.MetricHistogram; -027import org.apache.hadoop.metrics2.lib.DynamicMetricsRegistry; -028import org.apache.hadoop.metrics2.lib.MutableFastCounter; -029import org.apache.yetus.audience.InterfaceAudience; -030import org.slf4j.Logger; -031import org.slf4j.LoggerFactory; -032 -033import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.COMPACTED_INPUT_BYTES; -034import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.COMPACTED_INPUT_BYTES_DESC; -035import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.COMPACTED_OUTPUT_BYTES; -036import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.COMPACTED_OUTPUT_BYTES_DESC; -037import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.COMPACTION_INPUT_FILE_COUNT; -038import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.COMPACTION_INPUT_FILE_COUNT_DESC; -039import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.COMPACTION_INPUT_SIZE; -040import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.COMPACTION_INPUT_SIZE_DESC; -041import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.COMPACTION_OUTPUT_FILE_COUNT; -042import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.COMPACTION_OUTPUT_FILE_COUNT_DESC; -043import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.COMPACTION_OUTPUT_SIZE; -044import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.COMPACTION_OUTPUT_SIZE_DESC; -045import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.COMPACTION_TIME; -046import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.COMPACTION_TIME_DESC; -047import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.FLUSHED_MEMSTORE_BYTES; -048import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.FLUSHED_MEMSTORE_BYTES_DESC; -049import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.FLUSHED_OUTPUT_BYTES; -050import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.FLUSHED_OUTPUT_BYTES_DESC; -051import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.FLUSH_MEMSTORE_SIZE; -052import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.FLUSH_MEMSTORE_SIZE_DESC; -053import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.FLUSH_OUTPUT_SIZE; -054import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.FLUSH_OUTPUT_SIZE_DESC; -055import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.FLUSH_TIME; -056import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.FLUSH_TIME_DESC; -057import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.MAJOR_COMPACTED_INPUT_BYTES; -058import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.MAJOR_COMPACTED_INPUT_BYTES_DESC; -059import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.MAJOR_COMPACTED_OUTPUT_BYTES; -060import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.MAJOR_COMPACTED_OUTPUT_BYTES_DESC; -061import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.MAJOR_COMPACTION_INPUT_FILE_COUNT; -062import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.MAJOR_COMPACTION_INPUT_FILE_COUNT_DESC; -063import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.MAJOR_COMPACTION_INPUT_SIZE; -064import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.MAJOR_COMPACTION_INPUT_SIZE_DESC; -065import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.MAJOR_COMPACTION_OUTPUT_FILE_COUNT; -066import static
hbase-site git commit: INFRA-10751 Empty commit
Repository: hbase-site Updated Branches: refs/heads/asf-site de749194e -> a37e85afa 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/a37e85af Tree: http://git-wip-us.apache.org/repos/asf/hbase-site/tree/a37e85af Diff: http://git-wip-us.apache.org/repos/asf/hbase-site/diff/a37e85af Branch: refs/heads/asf-site Commit: a37e85afa401b80bedaa7cd97e92e9954806ea6a Parents: de74919 Author: jenkins Authored: Sun Sep 2 14:46:30 2018 + Committer: jenkins Committed: Sun Sep 2 14:46:30 2018 + -- --
[5/6] hbase-site git commit: Published site at dc79029966c72f6c46add8c382e118308609cc81.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/de749194/checkstyle-aggregate.html -- diff --git a/checkstyle-aggregate.html b/checkstyle-aggregate.html index 65b7956..264e107 100644 --- a/checkstyle-aggregate.html +++ b/checkstyle-aggregate.html @@ -7,7 +7,7 @@ - + Apache HBase Checkstyle Results @@ -284,7 +284,7 @@ 3720 0 0 -15328 +15326 Files @@ -6399,3321 +6399,3316 @@ 0 1 -org/apache/hadoop/hbase/regionserver/MetricsTableSourceImpl.java -0 -0 -2 - org/apache/hadoop/hbase/regionserver/MetricsTableWrapperAggregateImpl.java 0 0 3 - + org/apache/hadoop/hbase/regionserver/MetricsTableWrapperStub.java 0 0 1 - + org/apache/hadoop/hbase/regionserver/MiniBatchOperationInProgress.java 0 0 10 - + org/apache/hadoop/hbase/regionserver/MobReferenceOnlyFilter.java 0 0 1 - + org/apache/hadoop/hbase/regionserver/MultiVersionConcurrencyControl.java 0 0 4 - + org/apache/hadoop/hbase/regionserver/MutableOnlineRegions.java 0 0 1 - + org/apache/hadoop/hbase/regionserver/MutableSegment.java 0 0 3 - + org/apache/hadoop/hbase/regionserver/NoTagByteBufferChunkKeyValue.java 0 0 1 - + org/apache/hadoop/hbase/regionserver/NonLazyKeyValueScanner.java 0 0 1 - + org/apache/hadoop/hbase/regionserver/NonReversedNonLazyKeyValueScanner.java 0 0 1 - + org/apache/hadoop/hbase/regionserver/OOMERegionServer.java 0 0 2 - + org/apache/hadoop/hbase/regionserver/OnlineRegions.java 0 0 6 - + org/apache/hadoop/hbase/regionserver/OperationStatus.java 0 0 1 - + org/apache/hadoop/hbase/regionserver/RSDumpServlet.java 0 0 2 - + org/apache/hadoop/hbase/regionserver/RSRpcServices.java 0 0 65 - + org/apache/hadoop/hbase/regionserver/RSStatusServlet.java 0 0 6 - + org/apache/hadoop/hbase/regionserver/Region.java 0 0 25 - + org/apache/hadoop/hbase/regionserver/RegionAsTable.java 0 0 41 - + org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java 0 0 79 - + org/apache/hadoop/hbase/regionserver/RegionScanner.java 0 0 1 - + org/apache/hadoop/hbase/regionserver/RegionServerAccounting.java 0 0 1 - + org/apache/hadoop/hbase/regionserver/RegionServerCoprocessorHost.java 0 0 8 - + org/apache/hadoop/hbase/regionserver/RegionServerServices.java 0 0 6 - + org/apache/hadoop/hbase/regionserver/RegionServicesForStores.java 0 0 6 - + org/apache/hadoop/hbase/regionserver/RegionSplitPolicy.java 0 0 5 - + org/apache/hadoop/hbase/regionserver/ReplicationSinkService.java 0 0 2 - + org/apache/hadoop/hbase/regionserver/ReversedKeyValueHeap.java 0 0 7 - + org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.java 0 0 4 - + org/apache/hadoop/hbase/regionserver/ReversedStoreScanner.java 0 0 2 - + org/apache/hadoop/hbase/regionserver/RowProcessor.java 0 0 7 - + org/apache/hadoop/hbase/regionserver/RpcSchedulerFactory.java 0 0 2 - + org/apache/hadoop/hbase/regionserver/ScanInfo.java 0 0 4 - + org/apache/hadoop/hbase/regionserver/ScanOptions.java 0 0 3 - + org/apache/hadoop/hbase/regionserver/ScannerContext.java 0 0 9 - + org/apache/hadoop/hbase/regionserver/ScannerIdGenerator.java 0 0 7 - + org/apache/hadoop/hbase/regionserver/SecureBulkLoadManager.java 0 0 3 - + org/apache/hadoop/hbase/regionserver/Segment.java 0 0 2 - + org/apache/hadoop/hbase/regionserver/SegmentFactory.java 0 0 10 - + org/apache/hadoop/hbase/regionserver/SegmentScanner.java 0 0 2 - + org/apache/hadoop/hbase/regionserver/ServerNonceManager.java 0 0 8 - + org/apache/hadoop/hbase/regionserver/ShipperListener.java 0 0 1 - + org/apache/hadoop/hbase/regionserver/ShutdownHook.java 0 0 7 - + org/apache/hadoop/hbase/regionserver/SimpleRpcSchedulerFactory.java 0 0 4 - + org/apache/hadoop/hbase/regionserver/SplitRequest.java 0 0 1 - + org/apache/hadoop/hbase/regionserver/SteppingSplitPolicy.java 0 0 3 - + org/apache/hadoop/hbase/regionserver/Store.java 0 0 4 - + org/apache/hadoop/hbase/regionserver/StoreFileComparators.java 0 0 2 - + org/apache/hadoop/hbase/regionserver/StoreFileInfo.java 0 0 18 - + org/apache/hadoop/hbase/regionserver/StoreFileManager.java 0 0 2 - + org/apache/hadoop/hbase/regionserver/StoreFileReader.java 0 0 4 - + org/apache/hadoop/hbase/regionserver/StoreFileScanner.java 0 0 12 - + org/apache/hadoop/hbase/regionserver/StoreFileWriter.java 0 0 13 - + org/apache/hadoop/hbase/regionserver/StoreFlushContext.java 0 0 3 - + org/apache/hadoop/hbase/regionserver/StoreFlusher.java 0 0 4 - + org/apache/hadoop/hbase/regionserver/StoreScanner.java 0 0 21 - + org/apache/hadoop/hbase/regionserver/StoreUtils.java 0 0 1 - + org/apache/hadoop/hbase/regionserver/StorefileRefresherChore.java 0 0 3 - + org/apache/hadoop/hbase/regionserver/StripeMultiFileWriter.java 0 0 2 - + org/apache/hadoop/hbase/regionserver/StripeStoreConfig.java 0 0 1 - +
[1/6] hbase-site git commit: Published site at dc79029966c72f6c46add8c382e118308609cc81.
Repository: hbase-site
Updated Branches:
refs/heads/asf-site 2d9f5d734 -> de749194e
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/de749194/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestMetricsTableAggregate.html
--
diff --git
a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestMetricsTableAggregate.html
b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestMetricsTableAggregate.html
index 711a53a..012cfe2 100644
---
a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestMetricsTableAggregate.html
+++
b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestMetricsTableAggregate.html
@@ -25,129 +25,169 @@
017 */
018package
org.apache.hadoop.hbase.regionserver;
019
-020import java.io.IOException;
-021import
org.apache.hadoop.conf.Configuration;
-022import
org.apache.hadoop.hbase.CompatibilityFactory;
-023import
org.apache.hadoop.hbase.HBaseClassTestRule;
-024import
org.apache.hadoop.hbase.test.MetricsAssertHelper;
-025import
org.apache.hadoop.hbase.testclassification.RegionServerTests;
-026import
org.apache.hadoop.hbase.testclassification.SmallTests;
-027import org.junit.Before;
-028import org.junit.BeforeClass;
-029import org.junit.ClassRule;
-030import org.junit.Test;
-031import
org.junit.experimental.categories.Category;
-032
-033@Category({RegionServerTests.class,
SmallTests.class})
-034public class TestMetricsTableAggregate
{
-035
-036 @ClassRule
-037 public static final HBaseClassTestRule
CLASS_RULE =
-038
HBaseClassTestRule.forClass(TestMetricsTableAggregate.class);
-039
-040 public static MetricsAssertHelper
HELPER =
-041
CompatibilityFactory.getInstance(MetricsAssertHelper.class);
-042
-043 private String tableName =
"testTableMetrics";
-044 private String pre =
"Namespace_default_table_" + tableName + "_metric_";
-045
-046 private MetricsTableWrapperStub
tableWrapper;
-047 private MetricsTable mt;
-048 private MetricsRegionServerWrapper
rsWrapper;
-049 private MetricsRegionServer rsm;
-050 private MetricsTableAggregateSource
agg;
-051
-052 @BeforeClass
-053 public static void classSetUp() {
-054HELPER.init();
-055 }
+020import static
org.junit.Assert.assertTrue;
+021
+022import java.io.IOException;
+023import
java.util.concurrent.CyclicBarrier;
+024import java.util.concurrent.TimeUnit;
+025import
java.util.concurrent.atomic.AtomicBoolean;
+026import java.util.stream.IntStream;
+027import java.util.stream.Stream;
+028import
org.apache.hadoop.conf.Configuration;
+029import
org.apache.hadoop.hbase.CompatibilityFactory;
+030import
org.apache.hadoop.hbase.HBaseClassTestRule;
+031import
org.apache.hadoop.hbase.test.MetricsAssertHelper;
+032import
org.apache.hadoop.hbase.testclassification.RegionServerTests;
+033import
org.apache.hadoop.hbase.testclassification.SmallTests;
+034import org.junit.Before;
+035import org.junit.BeforeClass;
+036import org.junit.ClassRule;
+037import org.junit.Test;
+038import
org.junit.experimental.categories.Category;
+039import org.slf4j.Logger;
+040import org.slf4j.LoggerFactory;
+041
+042@Category({ RegionServerTests.class,
SmallTests.class })
+043public class TestMetricsTableAggregate
{
+044
+045 @ClassRule
+046 public static final HBaseClassTestRule
CLASS_RULE =
+047
HBaseClassTestRule.forClass(TestMetricsTableAggregate.class);
+048
+049 private static final Logger LOG =
LoggerFactory.getLogger(TestMetricsTableAggregate.class);
+050
+051 private static MetricsAssertHelper
HELPER =
+052
CompatibilityFactory.getInstance(MetricsAssertHelper.class);
+053
+054 private String tableName =
"testTableMetrics";
+055 private String pre =
"Namespace_default_table_" + tableName + "_metric_";
056
-057 @Before
-058 public void setUp() {
-059tableWrapper = new
MetricsTableWrapperStub(tableName);
-060mt = new
MetricsTable(tableWrapper);
-061rsWrapper = new
MetricsRegionServerWrapperStub();
-062Configuration conf = new
Configuration();
-063rsm = new
MetricsRegionServer(rsWrapper, conf, mt);
-064agg = mt.getTableSourceAgg();
-065 }
-066
-067 @Test
-068 public void testRequestMetrics() throws
IOException {
-069HELPER.assertCounter(pre +
"readRequestCount", 10, agg);
-070HELPER.assertCounter(pre +
"writeRequestCount", 20, agg);
-071HELPER.assertCounter(pre +
"totalRequestCount", 30, agg);
-072 }
-073
-074 @Test
-075 public void testRegionAndStoreMetrics()
throws IOException {
-076HELPER.assertGauge(pre +
"memstoreSize", 1000, agg);
-077HELPER.assertGauge(pre +
"storeFileSize", 2000, agg);
-078HELPER.assertGauge(pre + "tableSize",
3000, agg);
-079
-080HELPER.assertGauge(pre +
"regionCount", 11, agg);
-081HELPER.assertGauge(pre +
"storeCount", 22, agg);
-082HELPER.assertGauge(pre +
"storeFileCount", 33, agg);
-083HELPER.assertGauge(pre +
"maxStoreFileAge", 44, agg);
-084
[2/6] hbase-site git commit: Published site at dc79029966c72f6c46add8c382e118308609cc81.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/de749194/devapidocs/src-html/org/apache/hadoop/hbase/rest/MultiRowResource.html
--
diff --git
a/devapidocs/src-html/org/apache/hadoop/hbase/rest/MultiRowResource.html
b/devapidocs/src-html/org/apache/hadoop/hbase/rest/MultiRowResource.html
index 60a1376..a1775aa 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/rest/MultiRowResource.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/rest/MultiRowResource.html
@@ -100,7 +100,7 @@
092
ResultGenerator.fromRowSpec(this.tableResource.getName(), rowSpec, null,
093
!params.containsKey(NOCACHE_PARAM_NAME));
094Cell value = null;
-095RowModel rowModel = new
RowModel(rk);
+095RowModel rowModel = new
RowModel(rowSpec.getRow());
096if (generator.hasNext()) {
097 while ((value =
generator.next()) != null) {
098rowModel.addCell(new
CellModel(CellUtil.cloneFamily(value), CellUtil
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/de749194/downloads.html
--
diff --git a/downloads.html b/downloads.html
index d7e65ed..25d9940 100644
--- a/downloads.html
+++ b/downloads.html
@@ -7,7 +7,7 @@
-
+
Apache HBase Apache HBase Downloads
@@ -348,7 +348,7 @@ under the License. -->
-2.0.1
+2.0.2
@@ -356,48 +356,20 @@ under the License. -->
-https://apache.org/dist/hbase/2.0.1/compatibility_report_2.0.0vs2.0.1.html;>2.0.0
vs 2.0.1
+https://apache.org/dist/hbase/2.0.2/compatibility_report_2.0.1_2.0.2.html;>2.0.1
vs 2.0.2
-https://apache.org/dist/hbase/2.0.1/CHANGES.md;>Changes
+https://apache.org/dist/hbase/2.0.2/CHANGES.md;>Changes
-https://apache.org/dist/hbase/2.0.1/RELEASENOTES.md;>Release Notes
+https://apache.org/dist/hbase/2.0.2/RELEASENOTES.md;>Release Notes
-https://www.apache.org/dyn/closer.lua/hbase/2.0.1/hbase-2.0.1-src.tar.gz;>src
(https://apache.org/dist/hbase/2.0.1/hbase-2.0.1-src.tar.gz.sha512;>sha512
https://apache.org/dist/hbase/2.0.1/hbase-2.0.1-src.tar.gz.asc;>asc)
-https://www.apache.org/dyn/closer.lua/hbase/2.0.1/hbase-2.0.1-bin.tar.gz;>bin
(https://apache.org/dist/hbase/2.0.1/hbase-2.0.1-bin.tar.gz.sha512;>sha512
https://apache.org/dist/hbase/2.0.1/hbase-2.0.1-bin.tar.gz.asc;>asc)
-
-
-
-
-
-
-2.0.0
-
-
-
-2018/04/29
-
-
-
-https://apache.org/dist/hbase/2.0.0/compatibiliity_report_1.2.6vs2.0.0.html;>1.2.6
vs 2.0.0
-
-
-
-https://apache.org/dist/hbase/2.0.0/CHANGES.md;>Changes
-
-
-
-https://apache.org/dist/hbase/2.0.0/RELEASENOTES.md;>Release Notes
-
-
-
-https://www.apache.org/dyn/closer.lua/hbase/2.0.0/hbase-2.0.0-src.tar.gz;>src
(https://apache.org/dist/hbase/2.0.0/hbase-2.0.0-src.tar.gz.sha512;>sha512
https://apache.org/dist/hbase/2.0.0/hbase-2.0.0-src.tar.gz.asc;>asc)
-https://www.apache.org/dyn/closer.lua/hbase/2.0.0/hbase-2.0.0-bin.tar.gz;>bin
(https://apache.org/dist/hbase/2.0.0/hbase-2.0.0-bin.tar.gz.sha512;>sha512
https://apache.org/dist/hbase/2.0.0/hbase-2.0.0-bin.tar.gz.asc;>asc)
+https://www.apache.org/dyn/closer.lua/hbase/2.0.2/hbase-2.0.2-src.tar.gz;>src
(https://apache.org/dist/hbase/2.0.2/hbase-2.0.2-src.tar.gz.sha512;>sha512
https://apache.org/dist/hbase/2.0.2/hbase-2.0.2-src.tar.gz.asc;>asc)
+https://www.apache.org/dyn/closer.lua/hbase/2.0.2/hbase-2.0.2-bin.tar.gz;>bin
(https://apache.org/dist/hbase/2.0.2/hbase-2.0.2-bin.tar.gz.sha512;>sha512
https://apache.org/dist/hbase/2.0.2/hbase-2.0.2-bin.tar.gz.asc;>asc)
@@ -423,7 +395,7 @@ under the License. -->
https://www.apache.org/;>The Apache Software
Foundation.
All rights reserved.
- Last Published:
2018-09-01
+ Last Published:
2018-09-02
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/de749194/export_control.html
--
diff --git a/export_control.html b/export_control.html
index 970aa6e..fa2f49b 100644
--- a/export_control.html
+++ b/export_control.html
@@ -7,7 +7,7 @@
-
+
Apache HBase
Export Control
@@ -331,7 +331,7 @@ for more details.
https://www.apache.org/;>The Apache Software
Foundation.
All rights reserved.
- Last Published:
2018-09-01
+ Last Published:
2018-09-02
hbase git commit: HBASE-21132 Addendum fix compile error
Repository: hbase Updated Branches: refs/heads/branch-1 1eea44c80 -> 329a7176f HBASE-21132 Addendum fix compile error Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/329a7176 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/329a7176 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/329a7176 Branch: refs/heads/branch-1 Commit: 329a7176fa5ec610b02fbbc2d8a4df8924281563 Parents: 1eea44c Author: zhangduo Authored: Sun Sep 2 20:36:51 2018 +0800 Committer: zhangduo Committed: Sun Sep 2 20:37:21 2018 +0800 -- .../hadoop/hbase/rest/TestMultiRowResource.java | 25 +++- 1 file changed, 14 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/329a7176/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java -- diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java index 7c44e4b..4a72afc 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java @@ -19,9 +19,21 @@ package org.apache.hadoop.hbase.rest; +import static org.junit.Assert.assertEquals; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import javax.ws.rs.core.MediaType; +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; import org.apache.commons.httpclient.Header; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.*; +import org.apache.hadoop.hbase.HBaseTestingUtility; +import org.apache.hadoop.hbase.HColumnDescriptor; +import org.apache.hadoop.hbase.HTableDescriptor; +import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.rest.client.Client; import org.apache.hadoop.hbase.rest.client.Cluster; @@ -32,6 +44,7 @@ import org.apache.hadoop.hbase.rest.model.RowModel; import org.apache.hadoop.hbase.rest.provider.JacksonProvider; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; +import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider; import org.codehaus.jackson.map.ObjectMapper; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -40,16 +53,6 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import javax.ws.rs.core.MediaType; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import static org.junit.Assert.assertEquals; - @Category(MediumTests.class) @RunWith(Parameterized.class)
hbase git commit: HBASE-21136 NPE in MetricsTableSourceImpl.updateFlushTime
Repository: hbase
Updated Branches:
refs/heads/branch-2 1a324e3a7 -> 68c5313ca
HBASE-21136 NPE in MetricsTableSourceImpl.updateFlushTime
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/68c5313c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/68c5313c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/68c5313c
Branch: refs/heads/branch-2
Commit: 68c5313ca43ecd1fc27873da3cd3a1bbb8510e88
Parents: 1a324e3
Author: zhangduo
Authored: Sat Sep 1 20:00:35 2018 +0800
Committer: zhangduo
Committed: Sun Sep 2 18:32:24 2018 +0800
--
.../MetricsTableAggregateSourceImpl.java| 28 +
.../regionserver/MetricsTableSourceImpl.java| 33 ++-
.../regionserver/TestMetricsTableAggregate.java | 44 +++-
3 files changed, 64 insertions(+), 41 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/68c5313c/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableAggregateSourceImpl.java
--
diff --git
a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableAggregateSourceImpl.java
b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableAggregateSourceImpl.java
index 363ddd2..5133a96 100644
---
a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableAggregateSourceImpl.java
+++
b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableAggregateSourceImpl.java
@@ -48,19 +48,15 @@ public class MetricsTableAggregateSourceImpl extends
BaseSourceImpl
}
private void register(MetricsTableSource source) {
-synchronized (this) {
- source.registerMetrics();
-}
+source.registerMetrics();
}
@Override
public void deleteTableSource(String table) {
try {
- synchronized (this) {
-MetricsTableSource source = tableSources.remove(table);
-if (source != null) {
- source.close();
-}
+ MetricsTableSource source = tableSources.remove(table);
+ if (source != null) {
+source.close();
}
} catch (Exception e) {
// Ignored. If this errors out it means that someone is double
@@ -76,17 +72,13 @@ public class MetricsTableAggregateSourceImpl extends
BaseSourceImpl
if (source != null) {
return source;
}
-source =
CompatibilitySingletonFactory.getInstance(MetricsRegionServerSourceFactory.class)
- .createTable(table, wrapper);
-MetricsTableSource prev = tableSources.putIfAbsent(table, source);
-
-if (prev != null) {
- return prev;
-} else {
+MetricsTableSource newSource = CompatibilitySingletonFactory
+ .getInstance(MetricsRegionServerSourceFactory.class).createTable(table,
wrapper);
+return tableSources.computeIfAbsent(table, k -> {
// register the new metrics now
- register(source);
-}
-return source;
+ newSource.registerMetrics();
+ return newSource;
+});
}
/**
http://git-wip-us.apache.org/repos/asf/hbase/blob/68c5313c/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableSourceImpl.java
--
diff --git
a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableSourceImpl.java
b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableSourceImpl.java
index da78a2c..0807479 100644
---
a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableSourceImpl.java
+++
b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableSourceImpl.java
@@ -15,21 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.hadoop.hbase.regionserver;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.metrics.Interns;
-import org.apache.hadoop.metrics2.MetricsRecordBuilder;
-import org.apache.hadoop.metrics2.MetricHistogram;
-import org.apache.hadoop.metrics2.lib.DynamicMetricsRegistry;
-import org.apache.hadoop.metrics2.lib.MutableFastCounter;
-import org.apache.yetus.audience.InterfaceAudience;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import static
org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.COMPACTED_INPUT_BYTES;
import static
org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.COMPACTED_INPUT_BYTES_DESC;
import static
org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.COMPACTED_OUTPUT_BYTES;
@@ -74,6 +61,17 @@ import static
hbase git commit: HBASE-21136 NPE in MetricsTableSourceImpl.updateFlushTime
Repository: hbase
Updated Branches:
refs/heads/master 9c09efc0d -> dc7902996
HBASE-21136 NPE in MetricsTableSourceImpl.updateFlushTime
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/dc790299
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/dc790299
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/dc790299
Branch: refs/heads/master
Commit: dc79029966c72f6c46add8c382e118308609cc81
Parents: 9c09efc
Author: zhangduo
Authored: Sat Sep 1 20:00:35 2018 +0800
Committer: zhangduo
Committed: Sun Sep 2 18:35:45 2018 +0800
--
.../MetricsTableAggregateSourceImpl.java| 28 +
.../regionserver/MetricsTableSourceImpl.java| 33 ++-
.../regionserver/TestMetricsTableAggregate.java | 44 +++-
3 files changed, 64 insertions(+), 41 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/dc790299/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableAggregateSourceImpl.java
--
diff --git
a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableAggregateSourceImpl.java
b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableAggregateSourceImpl.java
index 363ddd2..5133a96 100644
---
a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableAggregateSourceImpl.java
+++
b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableAggregateSourceImpl.java
@@ -48,19 +48,15 @@ public class MetricsTableAggregateSourceImpl extends
BaseSourceImpl
}
private void register(MetricsTableSource source) {
-synchronized (this) {
- source.registerMetrics();
-}
+source.registerMetrics();
}
@Override
public void deleteTableSource(String table) {
try {
- synchronized (this) {
-MetricsTableSource source = tableSources.remove(table);
-if (source != null) {
- source.close();
-}
+ MetricsTableSource source = tableSources.remove(table);
+ if (source != null) {
+source.close();
}
} catch (Exception e) {
// Ignored. If this errors out it means that someone is double
@@ -76,17 +72,13 @@ public class MetricsTableAggregateSourceImpl extends
BaseSourceImpl
if (source != null) {
return source;
}
-source =
CompatibilitySingletonFactory.getInstance(MetricsRegionServerSourceFactory.class)
- .createTable(table, wrapper);
-MetricsTableSource prev = tableSources.putIfAbsent(table, source);
-
-if (prev != null) {
- return prev;
-} else {
+MetricsTableSource newSource = CompatibilitySingletonFactory
+ .getInstance(MetricsRegionServerSourceFactory.class).createTable(table,
wrapper);
+return tableSources.computeIfAbsent(table, k -> {
// register the new metrics now
- register(source);
-}
-return source;
+ newSource.registerMetrics();
+ return newSource;
+});
}
/**
http://git-wip-us.apache.org/repos/asf/hbase/blob/dc790299/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableSourceImpl.java
--
diff --git
a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableSourceImpl.java
b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableSourceImpl.java
index 9ac62cd..3da16b8 100644
---
a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableSourceImpl.java
+++
b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsTableSourceImpl.java
@@ -15,21 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.hadoop.hbase.regionserver;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.metrics.Interns;
-import org.apache.hadoop.metrics2.MetricsRecordBuilder;
-import org.apache.hadoop.metrics2.MetricHistogram;
-import org.apache.hadoop.metrics2.lib.DynamicMetricsRegistry;
-import org.apache.hadoop.metrics2.lib.MutableFastCounter;
-import org.apache.yetus.audience.InterfaceAudience;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import static
org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.COMPACTED_INPUT_BYTES;
import static
org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.COMPACTED_INPUT_BYTES_DESC;
import static
org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.COMPACTED_OUTPUT_BYTES;
@@ -74,6 +61,17 @@ import static
[5/5] hbase git commit: HBASE-21132 return wrong result in rest multiget
HBASE-21132 return wrong result in rest multiget
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1eea44c8
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1eea44c8
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1eea44c8
Branch: refs/heads/branch-1
Commit: 1eea44c804e09576a97760b5a6906be8a4401237
Parents: fb74f21
Author: Guangxu Cheng
Authored: Thu Aug 30 20:51:41 2018 +0800
Committer: Guangxu Cheng
Committed: Sun Sep 2 14:33:56 2018 +0800
--
.../hadoop/hbase/rest/MultiRowResource.java | 2 +-
.../hadoop/hbase/rest/TestMultiRowResource.java | 32
2 files changed, 33 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/1eea44c8/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java
--
diff --git
a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java
b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java
index b82cd70..6e0e701 100644
---
a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java
+++
b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java
@@ -92,7 +92,7 @@ public class MultiRowResource extends ResourceBase implements
Constants {
ResultGenerator.fromRowSpec(this.tableResource.getName(), rowSpec,
null,
!params.containsKey(NOCACHE_PARAM_NAME));
Cell value = null;
-RowModel rowModel = new RowModel(rk);
+RowModel rowModel = new RowModel(rowSpec.getRow());
if (generator.hasNext()) {
while ((value = generator.next()) != null) {
rowModel.addCell(new CellModel(CellUtil.cloneFamily(value),
CellUtil
http://git-wip-us.apache.org/repos/asf/hbase/blob/1eea44c8/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
--
diff --git
a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
index e58be13..7c44e4b 100644
---
a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
+++
b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
@@ -236,5 +236,37 @@ public class TestMultiRowResource {
client.delete(row_5_url, extraHdr);
}
+ @Test
+ public void testMultiCellGetWithColsInQueryPathJSON() throws IOException,
JAXBException {
+String row_5_url = "/" + TABLE + "/" + ROW_1 + "/" + COLUMN_1;
+String row_6_url = "/" + TABLE + "/" + ROW_2 + "/" + COLUMN_2;
+
+StringBuilder path = new StringBuilder();
+path.append("/");
+path.append(TABLE);
+path.append("/multiget/?row=");
+path.append(ROW_1);
+path.append("/");
+path.append(COLUMN_1);
+path.append("=");
+path.append(ROW_2);
+path.append("/");
+path.append(COLUMN_1);
+
+client.post(row_5_url, Constants.MIMETYPE_BINARY, Bytes.toBytes(VALUE_1),
extraHdr);
+client.post(row_6_url, Constants.MIMETYPE_BINARY, Bytes.toBytes(VALUE_2),
extraHdr);
+
+Response response = client.get(path.toString(), Constants.MIMETYPE_JSON);
+assertEquals(200, response.getCode());
+ObjectMapper mapper = new JacksonJaxbJsonProvider().locateMapper(
+CellSetModel.class, MediaType.APPLICATION_JSON_TYPE);
+CellSetModel cellSet = mapper.readValue(response.getBody(),
CellSetModel.class);
+assertEquals(1, cellSet.getRows().size());
+assertEquals(ROW_1, Bytes.toString(cellSet.getRows().get(0).getKey()));
+assertEquals(VALUE_1,
Bytes.toString(cellSet.getRows().get(0).getCells().get(0).getValue()));
+
+client.delete(row_5_url, extraHdr);
+client.delete(row_6_url, extraHdr);
+ }
}
[2/5] hbase git commit: HBASE-21132 return wrong result in rest multiget
HBASE-21132 return wrong result in rest multiget
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5410b985
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5410b985
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5410b985
Branch: refs/heads/branch-2.1
Commit: 5410b9858a39e2b9771cad8140e51766495dd069
Parents: 6e0c627
Author: Guangxu Cheng
Authored: Thu Aug 30 20:51:41 2018 +0800
Committer: Guangxu Cheng
Committed: Sun Sep 2 14:26:06 2018 +0800
--
.../hadoop/hbase/rest/MultiRowResource.java | 2 +-
.../hadoop/hbase/rest/TestMultiRowResource.java | 32
2 files changed, 33 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/5410b985/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java
--
diff --git
a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java
b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java
index 1b8cdf5..503f8e9 100644
---
a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java
+++
b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java
@@ -92,7 +92,7 @@ public class MultiRowResource extends ResourceBase implements
Constants {
ResultGenerator.fromRowSpec(this.tableResource.getName(), rowSpec,
null,
!params.containsKey(NOCACHE_PARAM_NAME));
Cell value = null;
-RowModel rowModel = new RowModel(rk);
+RowModel rowModel = new RowModel(rowSpec.getRow());
if (generator.hasNext()) {
while ((value = generator.next()) != null) {
rowModel.addCell(new CellModel(CellUtil.cloneFamily(value),
CellUtil
http://git-wip-us.apache.org/repos/asf/hbase/blob/5410b985/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
--
diff --git
a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
index 928abfd..a8af6c4 100644
---
a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
+++
b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
@@ -244,5 +244,37 @@ public class TestMultiRowResource {
client.delete(row_5_url, extraHdr);
}
+ @Test
+ public void testMultiCellGetWithColsInQueryPathJSON() throws IOException,
JAXBException {
+String row_5_url = "/" + TABLE + "/" + ROW_1 + "/" + COLUMN_1;
+String row_6_url = "/" + TABLE + "/" + ROW_2 + "/" + COLUMN_2;
+
+StringBuilder path = new StringBuilder();
+path.append("/");
+path.append(TABLE);
+path.append("/multiget/?row=");
+path.append(ROW_1);
+path.append("/");
+path.append(COLUMN_1);
+path.append("=");
+path.append(ROW_2);
+path.append("/");
+path.append(COLUMN_1);
+
+client.post(row_5_url, Constants.MIMETYPE_BINARY, Bytes.toBytes(VALUE_1),
extraHdr);
+client.post(row_6_url, Constants.MIMETYPE_BINARY, Bytes.toBytes(VALUE_2),
extraHdr);
+
+Response response = client.get(path.toString(), Constants.MIMETYPE_JSON);
+assertEquals(200, response.getCode());
+ObjectMapper mapper = new JacksonJaxbJsonProvider().locateMapper(
+CellSetModel.class, MediaType.APPLICATION_JSON_TYPE);
+CellSetModel cellSet = mapper.readValue(response.getBody(),
CellSetModel.class);
+assertEquals(1, cellSet.getRows().size());
+assertEquals(ROW_1, Bytes.toString(cellSet.getRows().get(0).getKey()));
+assertEquals(VALUE_1,
Bytes.toString(cellSet.getRows().get(0).getCells().get(0).getValue()));
+
+client.delete(row_5_url, extraHdr);
+client.delete(row_6_url, extraHdr);
+ }
}
[1/5] hbase git commit: HBASE-21132 return wrong result in rest multiget
Repository: hbase
Updated Branches:
refs/heads/branch-1 fb74f215b -> 1eea44c80
refs/heads/branch-2 1cc62e928 -> 1a324e3a7
refs/heads/branch-2.0 383e5cbba -> 99d62d07d
refs/heads/branch-2.1 6e0c6271f -> 5410b9858
refs/heads/master 0992a7c1f -> 9c09efc0d
HBASE-21132 return wrong result in rest multiget
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/99d62d07
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/99d62d07
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/99d62d07
Branch: refs/heads/branch-2.0
Commit: 99d62d07d0e5cc19d5068bc748e49fa405898ee3
Parents: 383e5cb
Author: Guangxu Cheng
Authored: Thu Aug 30 20:51:41 2018 +0800
Committer: Guangxu Cheng
Committed: Sun Sep 2 14:21:38 2018 +0800
--
.../hadoop/hbase/rest/MultiRowResource.java | 2 +-
.../hadoop/hbase/rest/TestMultiRowResource.java | 32
2 files changed, 33 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/99d62d07/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java
--
diff --git
a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java
b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java
index 1b8cdf5..503f8e9 100644
---
a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java
+++
b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java
@@ -92,7 +92,7 @@ public class MultiRowResource extends ResourceBase implements
Constants {
ResultGenerator.fromRowSpec(this.tableResource.getName(), rowSpec,
null,
!params.containsKey(NOCACHE_PARAM_NAME));
Cell value = null;
-RowModel rowModel = new RowModel(rk);
+RowModel rowModel = new RowModel(rowSpec.getRow());
if (generator.hasNext()) {
while ((value = generator.next()) != null) {
rowModel.addCell(new CellModel(CellUtil.cloneFamily(value),
CellUtil
http://git-wip-us.apache.org/repos/asf/hbase/blob/99d62d07/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
--
diff --git
a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
index 928abfd..a8af6c4 100644
---
a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
+++
b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
@@ -244,5 +244,37 @@ public class TestMultiRowResource {
client.delete(row_5_url, extraHdr);
}
+ @Test
+ public void testMultiCellGetWithColsInQueryPathJSON() throws IOException,
JAXBException {
+String row_5_url = "/" + TABLE + "/" + ROW_1 + "/" + COLUMN_1;
+String row_6_url = "/" + TABLE + "/" + ROW_2 + "/" + COLUMN_2;
+
+StringBuilder path = new StringBuilder();
+path.append("/");
+path.append(TABLE);
+path.append("/multiget/?row=");
+path.append(ROW_1);
+path.append("/");
+path.append(COLUMN_1);
+path.append("=");
+path.append(ROW_2);
+path.append("/");
+path.append(COLUMN_1);
+
+client.post(row_5_url, Constants.MIMETYPE_BINARY, Bytes.toBytes(VALUE_1),
extraHdr);
+client.post(row_6_url, Constants.MIMETYPE_BINARY, Bytes.toBytes(VALUE_2),
extraHdr);
+
+Response response = client.get(path.toString(), Constants.MIMETYPE_JSON);
+assertEquals(200, response.getCode());
+ObjectMapper mapper = new JacksonJaxbJsonProvider().locateMapper(
+CellSetModel.class, MediaType.APPLICATION_JSON_TYPE);
+CellSetModel cellSet = mapper.readValue(response.getBody(),
CellSetModel.class);
+assertEquals(1, cellSet.getRows().size());
+assertEquals(ROW_1, Bytes.toString(cellSet.getRows().get(0).getKey()));
+assertEquals(VALUE_1,
Bytes.toString(cellSet.getRows().get(0).getCells().get(0).getValue()));
+
+client.delete(row_5_url, extraHdr);
+client.delete(row_6_url, extraHdr);
+ }
}
[4/5] hbase git commit: HBASE-21132 return wrong result in rest multiget
HBASE-21132 return wrong result in rest multiget
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9c09efc0
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9c09efc0
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9c09efc0
Branch: refs/heads/master
Commit: 9c09efc0df4b2f60b359bad00fed27e7980cf92e
Parents: 0992a7c
Author: Guangxu Cheng
Authored: Thu Aug 30 20:51:41 2018 +0800
Committer: Guangxu Cheng
Committed: Sun Sep 2 14:32:47 2018 +0800
--
.../hadoop/hbase/rest/MultiRowResource.java | 2 +-
.../hadoop/hbase/rest/TestMultiRowResource.java | 32
2 files changed, 33 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/9c09efc0/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java
--
diff --git
a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java
b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java
index 1b8cdf5..503f8e9 100644
---
a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java
+++
b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java
@@ -92,7 +92,7 @@ public class MultiRowResource extends ResourceBase implements
Constants {
ResultGenerator.fromRowSpec(this.tableResource.getName(), rowSpec,
null,
!params.containsKey(NOCACHE_PARAM_NAME));
Cell value = null;
-RowModel rowModel = new RowModel(rk);
+RowModel rowModel = new RowModel(rowSpec.getRow());
if (generator.hasNext()) {
while ((value = generator.next()) != null) {
rowModel.addCell(new CellModel(CellUtil.cloneFamily(value),
CellUtil
http://git-wip-us.apache.org/repos/asf/hbase/blob/9c09efc0/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
--
diff --git
a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
index 928abfd..a8af6c4 100644
---
a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
+++
b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
@@ -244,5 +244,37 @@ public class TestMultiRowResource {
client.delete(row_5_url, extraHdr);
}
+ @Test
+ public void testMultiCellGetWithColsInQueryPathJSON() throws IOException,
JAXBException {
+String row_5_url = "/" + TABLE + "/" + ROW_1 + "/" + COLUMN_1;
+String row_6_url = "/" + TABLE + "/" + ROW_2 + "/" + COLUMN_2;
+
+StringBuilder path = new StringBuilder();
+path.append("/");
+path.append(TABLE);
+path.append("/multiget/?row=");
+path.append(ROW_1);
+path.append("/");
+path.append(COLUMN_1);
+path.append("=");
+path.append(ROW_2);
+path.append("/");
+path.append(COLUMN_1);
+
+client.post(row_5_url, Constants.MIMETYPE_BINARY, Bytes.toBytes(VALUE_1),
extraHdr);
+client.post(row_6_url, Constants.MIMETYPE_BINARY, Bytes.toBytes(VALUE_2),
extraHdr);
+
+Response response = client.get(path.toString(), Constants.MIMETYPE_JSON);
+assertEquals(200, response.getCode());
+ObjectMapper mapper = new JacksonJaxbJsonProvider().locateMapper(
+CellSetModel.class, MediaType.APPLICATION_JSON_TYPE);
+CellSetModel cellSet = mapper.readValue(response.getBody(),
CellSetModel.class);
+assertEquals(1, cellSet.getRows().size());
+assertEquals(ROW_1, Bytes.toString(cellSet.getRows().get(0).getKey()));
+assertEquals(VALUE_1,
Bytes.toString(cellSet.getRows().get(0).getCells().get(0).getValue()));
+
+client.delete(row_5_url, extraHdr);
+client.delete(row_6_url, extraHdr);
+ }
}
[3/5] hbase git commit: HBASE-21132 return wrong result in rest multiget
HBASE-21132 return wrong result in rest multiget
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1a324e3a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1a324e3a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1a324e3a
Branch: refs/heads/branch-2
Commit: 1a324e3a71258d1a61a4f453391a9c31b7b95f49
Parents: 1cc62e9
Author: Guangxu Cheng
Authored: Thu Aug 30 20:51:41 2018 +0800
Committer: Guangxu Cheng
Committed: Sun Sep 2 14:27:50 2018 +0800
--
.../hadoop/hbase/rest/MultiRowResource.java | 2 +-
.../hadoop/hbase/rest/TestMultiRowResource.java | 32
2 files changed, 33 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/1a324e3a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java
--
diff --git
a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java
b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java
index 1b8cdf5..503f8e9 100644
---
a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java
+++
b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java
@@ -92,7 +92,7 @@ public class MultiRowResource extends ResourceBase implements
Constants {
ResultGenerator.fromRowSpec(this.tableResource.getName(), rowSpec,
null,
!params.containsKey(NOCACHE_PARAM_NAME));
Cell value = null;
-RowModel rowModel = new RowModel(rk);
+RowModel rowModel = new RowModel(rowSpec.getRow());
if (generator.hasNext()) {
while ((value = generator.next()) != null) {
rowModel.addCell(new CellModel(CellUtil.cloneFamily(value),
CellUtil
http://git-wip-us.apache.org/repos/asf/hbase/blob/1a324e3a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
--
diff --git
a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
index 928abfd..a8af6c4 100644
---
a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
+++
b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
@@ -244,5 +244,37 @@ public class TestMultiRowResource {
client.delete(row_5_url, extraHdr);
}
+ @Test
+ public void testMultiCellGetWithColsInQueryPathJSON() throws IOException,
JAXBException {
+String row_5_url = "/" + TABLE + "/" + ROW_1 + "/" + COLUMN_1;
+String row_6_url = "/" + TABLE + "/" + ROW_2 + "/" + COLUMN_2;
+
+StringBuilder path = new StringBuilder();
+path.append("/");
+path.append(TABLE);
+path.append("/multiget/?row=");
+path.append(ROW_1);
+path.append("/");
+path.append(COLUMN_1);
+path.append("=");
+path.append(ROW_2);
+path.append("/");
+path.append(COLUMN_1);
+
+client.post(row_5_url, Constants.MIMETYPE_BINARY, Bytes.toBytes(VALUE_1),
extraHdr);
+client.post(row_6_url, Constants.MIMETYPE_BINARY, Bytes.toBytes(VALUE_2),
extraHdr);
+
+Response response = client.get(path.toString(), Constants.MIMETYPE_JSON);
+assertEquals(200, response.getCode());
+ObjectMapper mapper = new JacksonJaxbJsonProvider().locateMapper(
+CellSetModel.class, MediaType.APPLICATION_JSON_TYPE);
+CellSetModel cellSet = mapper.readValue(response.getBody(),
CellSetModel.class);
+assertEquals(1, cellSet.getRows().size());
+assertEquals(ROW_1, Bytes.toString(cellSet.getRows().get(0).getKey()));
+assertEquals(VALUE_1,
Bytes.toString(cellSet.getRows().get(0).getCells().get(0).getValue()));
+
+client.delete(row_5_url, extraHdr);
+client.delete(row_6_url, extraHdr);
+ }
}
