hbase git commit: HBASE-18723 [pom cleanup] Do a pass with dependency:analyze; remove unused and explicity list the dependencies we exploit; ADDENDUM2
Repository: hbase Updated Branches: refs/heads/branch-2 e778fbc05 -> 48bc132e1 HBASE-18723 [pom cleanup] Do a pass with dependency:analyze; remove unused and explicity list the dependencies we exploit; ADDENDUM2 Plug more holes. REST can't find JspC when it runs its antrun task. hbase-it didn't include reference to hbase-protocol-shaded Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/48bc132e Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/48bc132e Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/48bc132e Branch: refs/heads/branch-2 Commit: 48bc132e12431e0369275c2d6a578e46bfd60464 Parents: e778fbc Author: Michael StackAuthored: Mon Sep 4 13:10:20 2017 -0700 Committer: Michael Stack Committed: Mon Sep 4 21:14:21 2017 -0700 -- hbase-it/pom.xml | 9 + hbase-rest/pom.xml | 5 + hbase-server/pom.xml | 5 + hbase-thrift/pom.xml | 5 + pom.xml | 7 +++ 5 files changed, 31 insertions(+) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/48bc132e/hbase-it/pom.xml -- diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml index 2cd0f7b..af1e1d8 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -196,6 +196,10 @@ org.apache.hbase + hbase-protocol-shaded + + + org.apache.hbase hbase-client @@ -296,6 +300,11 @@ junit test + + org.glassfish.jersey.core + jersey-client + 2.25.1 + http://git-wip-us.apache.org/repos/asf/hbase/blob/48bc132e/hbase-rest/pom.xml -- diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index 8659c8f..f9b3e4a 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -338,6 +338,11 @@ jersey-media-json-jackson1 + + org.glassfish.web + javax.servlet.jsp + + junit junit test http://git-wip-us.apache.org/repos/asf/hbase/blob/48bc132e/hbase-server/pom.xml -- diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 693f0c8..71d7835 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -489,6 +489,11 @@ jersey-media-json-jackson1 + + org.glassfish.web + javax.servlet.jsp + + org.codehaus.jackson jackson-core-asl http://git-wip-us.apache.org/repos/asf/hbase/blob/48bc132e/hbase-thrift/pom.xml -- diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml index 1a84a15..ccf1db3 100644 --- a/hbase-thrift/pom.xml +++ b/hbase-thrift/pom.xml @@ -294,6 +294,11 @@ org.eclipse.jetty jetty-util + + + org.glassfish.web + javax.servlet.jsp + http://git-wip-us.apache.org/repos/asf/hbase/blob/48bc132e/pom.xml -- diff --git a/pom.xml b/pom.xml index b3b1d34..0219960 100644 --- a/pom.xml +++ b/pom.xml @@ -1367,6 +1367,7 @@ 3.1.0 2.0.1 2.25.1 +2.3.2 6.1.14 9.1.10.0 4.12 @@ -1936,6 +1937,12 @@ ${jackson.version} + +org.glassfish.web +javax.servlet.jsp +${glassfish.jsp.version} + + javax.xml.bind jaxb-api ${jaxb-api.version}
hbase git commit: HBASE-18723 [pom cleanup] Do a pass with dependency:analyze; remove unused and explicity list the dependencies we exploit; ADDENDUM2
Repository: hbase Updated Branches: refs/heads/master 8ec5d59a0 -> 52d4b2575 HBASE-18723 [pom cleanup] Do a pass with dependency:analyze; remove unused and explicity list the dependencies we exploit; ADDENDUM2 Plug more holes. REST can't find JspC when it runs its antrun task. hbase-it didn't include reference to hbase-protocol-shaded Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/52d4b257 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/52d4b257 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/52d4b257 Branch: refs/heads/master Commit: 52d4b25754a227983170bdbadc477756a639ea8e Parents: 8ec5d59 Author: Michael StackAuthored: Mon Sep 4 13:10:20 2017 -0700 Committer: Michael Stack Committed: Mon Sep 4 21:13:36 2017 -0700 -- hbase-it/pom.xml | 9 + hbase-rest/pom.xml | 5 + hbase-server/pom.xml | 5 + hbase-thrift/pom.xml | 5 + pom.xml | 7 +++ 5 files changed, 31 insertions(+) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/52d4b257/hbase-it/pom.xml -- diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml index 61db4dc..1899711 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -196,6 +196,10 @@ org.apache.hbase + hbase-protocol-shaded + + + org.apache.hbase hbase-client @@ -296,6 +300,11 @@ junit test + + org.glassfish.jersey.core + jersey-client + 2.25.1 + http://git-wip-us.apache.org/repos/asf/hbase/blob/52d4b257/hbase-rest/pom.xml -- diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index 226a99e..36d39b6 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -338,6 +338,11 @@ jersey-media-json-jackson1 + + org.glassfish.web + javax.servlet.jsp + + junit junit test http://git-wip-us.apache.org/repos/asf/hbase/blob/52d4b257/hbase-server/pom.xml -- diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 0277894..3d5ecf7 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -489,6 +489,11 @@ jersey-media-json-jackson1 + + org.glassfish.web + javax.servlet.jsp + + org.codehaus.jackson jackson-core-asl http://git-wip-us.apache.org/repos/asf/hbase/blob/52d4b257/hbase-thrift/pom.xml -- diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml index aca8baa..a0a0b5a 100644 --- a/hbase-thrift/pom.xml +++ b/hbase-thrift/pom.xml @@ -294,6 +294,11 @@ org.eclipse.jetty jetty-util + + + org.glassfish.web + javax.servlet.jsp + http://git-wip-us.apache.org/repos/asf/hbase/blob/52d4b257/pom.xml -- diff --git a/pom.xml b/pom.xml index ae7aec5..6ea87d1 100755 --- a/pom.xml +++ b/pom.xml @@ -1405,6 +1405,7 @@ 3.1.0 2.0.1 2.25.1 +2.3.2 6.1.14 9.1.10.0 4.12 @@ -1981,6 +1982,12 @@ ${jackson.version} + +org.glassfish.web +javax.servlet.jsp +${glassfish.jsp.version} + + javax.xml.bind jaxb-api ${jaxb-api.version}
hbase git commit: HBASE-18736 Cleanup the HTD/HCD for Admin; ADDENDUM
Repository: hbase Updated Branches: refs/heads/branch-2 27db1298f -> e778fbc05 HBASE-18736 Cleanup the HTD/HCD for Admin; ADDENDUM Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e778fbc0 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e778fbc0 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e778fbc0 Branch: refs/heads/branch-2 Commit: e778fbc059fbe99222aef8e578090c8092fa1bda Parents: 27db129 Author: Michael StackAuthored: Mon Sep 4 21:09:04 2017 -0700 Committer: Michael Stack Committed: Mon Sep 4 21:11:10 2017 -0700 -- .../java/org/apache/hadoop/hbase/tool/TestCanaryTool.java | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/e778fbc0/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java -- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java index 8c07a54..bf20646 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java @@ -19,6 +19,7 @@ package org.apache.hadoop.hbase.tool; import org.apache.hadoop.hbase.*; +import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.testclassification.MediumTests; @@ -113,7 +114,8 @@ public class TestCanaryTool { ToolRunner.run(testingUtility.getConfiguration(), canary, args); assertEquals("verify no read error count", 0, canary.getReadFailures().size()); assertEquals("verify no write error count", 0, canary.getWriteFailures().size()); -verify(sink, atLeastOnce()).publishReadTiming(isA(ServerName.class), isA(HRegionInfo.class), isA(HColumnDescriptor.class), anyLong()); +verify(sink, atLeastOnce()).publishReadTiming(isA(ServerName.class), isA(HRegionInfo.class), + isA(ColumnFamilyDescriptor.class), anyLong()); } @Test @@ -217,11 +219,13 @@ public class TestCanaryTool { Canary.RegionStdOutSink sink = spy(new Canary.RegionStdOutSink()); Canary canary = new Canary(executor, sink); String[] args = { "-t", "1", name.getMethodName() }; -org.apache.hadoop.conf.Configuration conf = new org.apache.hadoop.conf.Configuration(testingUtility.getConfiguration()); +org.apache.hadoop.conf.Configuration conf = + new org.apache.hadoop.conf.Configuration(testingUtility.getConfiguration()); conf.setBoolean(HConstants.HBASE_CANARY_READ_RAW_SCAN_KEY, true); ToolRunner.run(conf, canary, args); verify(sink, atLeastOnce()) -.publishReadTiming(isA(ServerName.class), isA(HRegionInfo.class), isA(HColumnDescriptor.class), anyLong()); +.publishReadTiming(isA(ServerName.class), isA(HRegionInfo.class), +isA(ColumnFamilyDescriptor.class), anyLong()); assertEquals("verify no read error count", 0, canary.getReadFailures().size()); }
hbase git commit: HBASE-18736 Cleanup the HTD/HCD for Admin; ADDENDUM
Repository: hbase Updated Branches: refs/heads/master bea5de02b -> 8ec5d59a0 HBASE-18736 Cleanup the HTD/HCD for Admin; ADDENDUM Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8ec5d59a Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8ec5d59a Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8ec5d59a Branch: refs/heads/master Commit: 8ec5d59a081a6bc70692241b373cbbf2aacaf1f5 Parents: bea5de0 Author: Michael StackAuthored: Mon Sep 4 21:09:04 2017 -0700 Committer: Michael Stack Committed: Mon Sep 4 21:09:04 2017 -0700 -- .../java/org/apache/hadoop/hbase/tool/TestCanaryTool.java | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/8ec5d59a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java -- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java index 8c07a54..bf20646 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java @@ -19,6 +19,7 @@ package org.apache.hadoop.hbase.tool; import org.apache.hadoop.hbase.*; +import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.testclassification.MediumTests; @@ -113,7 +114,8 @@ public class TestCanaryTool { ToolRunner.run(testingUtility.getConfiguration(), canary, args); assertEquals("verify no read error count", 0, canary.getReadFailures().size()); assertEquals("verify no write error count", 0, canary.getWriteFailures().size()); -verify(sink, atLeastOnce()).publishReadTiming(isA(ServerName.class), isA(HRegionInfo.class), isA(HColumnDescriptor.class), anyLong()); +verify(sink, atLeastOnce()).publishReadTiming(isA(ServerName.class), isA(HRegionInfo.class), + isA(ColumnFamilyDescriptor.class), anyLong()); } @Test @@ -217,11 +219,13 @@ public class TestCanaryTool { Canary.RegionStdOutSink sink = spy(new Canary.RegionStdOutSink()); Canary canary = new Canary(executor, sink); String[] args = { "-t", "1", name.getMethodName() }; -org.apache.hadoop.conf.Configuration conf = new org.apache.hadoop.conf.Configuration(testingUtility.getConfiguration()); +org.apache.hadoop.conf.Configuration conf = + new org.apache.hadoop.conf.Configuration(testingUtility.getConfiguration()); conf.setBoolean(HConstants.HBASE_CANARY_READ_RAW_SCAN_KEY, true); ToolRunner.run(conf, canary, args); verify(sink, atLeastOnce()) -.publishReadTiming(isA(ServerName.class), isA(HRegionInfo.class), isA(HColumnDescriptor.class), anyLong()); +.publishReadTiming(isA(ServerName.class), isA(HRegionInfo.class), +isA(ColumnFamilyDescriptor.class), anyLong()); assertEquals("verify no read error count", 0, canary.getReadFailures().size()); }
hbase git commit: HBASE-18746 Throw exception with job.getStatus().getFailureInfo() when ExportSnapshot fails
Repository: hbase Updated Branches: refs/heads/branch-1.2 9b0f2fa3e -> 11c175978 HBASE-18746 Throw exception with job.getStatus().getFailureInfo() when ExportSnapshot fails Signed-off-by: Chia-Ping TsaiProject: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/11c17597 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/11c17597 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/11c17597 Branch: refs/heads/branch-1.2 Commit: 11c17597801435840a4097d5ab0ed4de617b52dc Parents: 9b0f2fa Author: Chun-Hao Tang Authored: Tue Sep 5 02:02:59 2017 +0800 Committer: Chia-Ping Tsai Committed: Tue Sep 5 02:13:49 2017 +0800 -- .../java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java| 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/11c17597/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java index ff5632d..5e65c36 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java @@ -809,9 +809,7 @@ public class ExportSnapshot extends Configured implements Tool { // Run the MR Job if (!job.waitForCompletion(true)) { - // TODO: Replace the fixed string with job.getStatus().getFailureInfo() - // when it will be available on all the supported versions. - throw new ExportSnapshotException("Copy Files Map-Reduce Job failed"); + throw new ExportSnapshotException(job.getStatus().getFailureInfo()); } }
hbase git commit: HBASE-18746 Throw exception with job.getStatus().getFailureInfo() when ExportSnapshot fails
Repository: hbase Updated Branches: refs/heads/branch-1.4 c97f0f2f2 -> 5ab41d069 HBASE-18746 Throw exception with job.getStatus().getFailureInfo() when ExportSnapshot fails Signed-off-by: Chia-Ping TsaiProject: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5ab41d06 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5ab41d06 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5ab41d06 Branch: refs/heads/branch-1.4 Commit: 5ab41d06963a68484f0eacd7dbc01ff36fb153f8 Parents: c97f0f2 Author: Chun-Hao Tang Authored: Tue Sep 5 02:02:59 2017 +0800 Committer: Chia-Ping Tsai Committed: Tue Sep 5 02:09:34 2017 +0800 -- .../java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java| 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/5ab41d06/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java index 97d0603..37a02bd 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java @@ -795,9 +795,7 @@ public class ExportSnapshot extends Configured implements Tool { // Run the MR Job if (!job.waitForCompletion(true)) { - // TODO: Replace the fixed string with job.getStatus().getFailureInfo() - // when it will be available on all the supported versions. - throw new ExportSnapshotException("Copy Files Map-Reduce Job failed"); + throw new ExportSnapshotException(job.getStatus().getFailureInfo()); } }
hbase git commit: HBASE-18746 Throw exception with job.getStatus().getFailureInfo() when ExportSnapshot fails
Repository: hbase Updated Branches: refs/heads/branch-1.3 d59ca6323 -> e43857d87 HBASE-18746 Throw exception with job.getStatus().getFailureInfo() when ExportSnapshot fails Signed-off-by: Chia-Ping TsaiProject: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e43857d8 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e43857d8 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e43857d8 Branch: refs/heads/branch-1.3 Commit: e43857d87752a683ba94a9bbcac5b548053c6070 Parents: d59ca63 Author: Chun-Hao Tang Authored: Tue Sep 5 02:02:59 2017 +0800 Committer: Chia-Ping Tsai Committed: Tue Sep 5 02:13:32 2017 +0800 -- .../java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java| 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/e43857d8/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java index 35ce2d7..f4b52c8 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java @@ -795,9 +795,7 @@ public class ExportSnapshot extends Configured implements Tool { // Run the MR Job if (!job.waitForCompletion(true)) { - // TODO: Replace the fixed string with job.getStatus().getFailureInfo() - // when it will be available on all the supported versions. - throw new ExportSnapshotException("Copy Files Map-Reduce Job failed"); + throw new ExportSnapshotException(job.getStatus().getFailureInfo()); } }
hbase git commit: HBASE-18746 Throw exception with job.getStatus().getFailureInfo() when ExportSnapshot fails
Repository: hbase Updated Branches: refs/heads/branch-1 d5033fd35 -> 8eacd32be HBASE-18746 Throw exception with job.getStatus().getFailureInfo() when ExportSnapshot fails Signed-off-by: Chia-Ping TsaiProject: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8eacd32b Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8eacd32b Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8eacd32b Branch: refs/heads/branch-1 Commit: 8eacd32bebd5ee3af173d6667ea8d7d025362f03 Parents: d5033fd Author: Chun-Hao Tang Authored: Tue Sep 5 02:02:59 2017 +0800 Committer: Chia-Ping Tsai Committed: Tue Sep 5 02:04:09 2017 +0800 -- .../java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java| 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/8eacd32b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java index 97d0603..37a02bd 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java @@ -795,9 +795,7 @@ public class ExportSnapshot extends Configured implements Tool { // Run the MR Job if (!job.waitForCompletion(true)) { - // TODO: Replace the fixed string with job.getStatus().getFailureInfo() - // when it will be available on all the supported versions. - throw new ExportSnapshotException("Copy Files Map-Reduce Job failed"); + throw new ExportSnapshotException(job.getStatus().getFailureInfo()); } }
hbase git commit: HBASE-18746 Throw exception with job.getStatus().getFailureInfo() when ExportSnapshot fails
Repository: hbase Updated Branches: refs/heads/master 32ddb1f60 -> bea5de02b HBASE-18746 Throw exception with job.getStatus().getFailureInfo() when ExportSnapshot fails Signed-off-by: Chia-Ping TsaiProject: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/bea5de02 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bea5de02 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bea5de02 Branch: refs/heads/master Commit: bea5de02b3c353913b6a3de2d5ec0507b901dbdf Parents: 32ddb1f Author: Chun-Hao Tang Authored: Mon Sep 4 02:58:34 2017 +0800 Committer: Chia-Ping Tsai Committed: Tue Sep 5 01:54:29 2017 +0800 -- .../java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java| 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/bea5de02/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java -- diff --git a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java index e80410f..8b5af2b 100644 --- a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java +++ b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java @@ -826,9 +826,7 @@ public class ExportSnapshot extends AbstractHBaseTool implements Tool { // Run the MR Job if (!job.waitForCompletion(true)) { - // TODO: Replace the fixed string with job.getStatus().getFailureInfo() - // when it will be available on all the supported versions. - throw new ExportSnapshotException("Copy Files Map-Reduce Job failed"); + throw new ExportSnapshotException(job.getStatus().getFailureInfo()); } }
hbase git commit: HBASE-18746 Throw exception with job.getStatus().getFailureInfo() when ExportSnapshot fails
Repository: hbase Updated Branches: refs/heads/branch-2 0e0154483 -> 27db1298f HBASE-18746 Throw exception with job.getStatus().getFailureInfo() when ExportSnapshot fails Signed-off-by: Chia-Ping TsaiProject: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/27db1298 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/27db1298 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/27db1298 Branch: refs/heads/branch-2 Commit: 27db1298f740b5efedf2d9a4fe5c6d4a648187f7 Parents: 0e01544 Author: Chun-Hao Tang Authored: Mon Sep 4 02:58:34 2017 +0800 Committer: Chia-Ping Tsai Committed: Tue Sep 5 02:05:11 2017 +0800 -- .../java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java| 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/27db1298/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java -- diff --git a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java index e80410f..8b5af2b 100644 --- a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java +++ b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java @@ -826,9 +826,7 @@ public class ExportSnapshot extends AbstractHBaseTool implements Tool { // Run the MR Job if (!job.waitForCompletion(true)) { - // TODO: Replace the fixed string with job.getStatus().getFailureInfo() - // when it will be available on all the supported versions. - throw new ExportSnapshotException("Copy Files Map-Reduce Job failed"); + throw new ExportSnapshotException(job.getStatus().getFailureInfo()); } }
[34/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.RestoreSnapshotFuture.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.RestoreSnapshotFuture.html b/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.RestoreSnapshotFuture.html index 628d275..e568f3a 100644 --- a/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.RestoreSnapshotFuture.html +++ b/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.RestoreSnapshotFuture.html @@ -127,7 +127,7 @@ var activeTableTab = "activeTableTab"; -private static class HBaseAdmin.RestoreSnapshotFuture +private static class HBaseAdmin.RestoreSnapshotFuture extends HBaseAdmin.TableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Void.html?is-external=true; title="class or interface in java.lang">Void @@ -240,7 +240,7 @@ extends RestoreSnapshotFuture -publicRestoreSnapshotFuture(HBaseAdminadmin, +publicRestoreSnapshotFuture(HBaseAdminadmin, org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos.SnapshotDescriptionsnapshot, TableNametableName, org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.RestoreSnapshotResponseresponse) @@ -252,7 +252,7 @@ extends RestoreSnapshotFuture -publicRestoreSnapshotFuture(HBaseAdminadmin, +publicRestoreSnapshotFuture(HBaseAdminadmin, TableNametableName, http://docs.oracle.com/javase/8/docs/api/java/lang/Long.html?is-external=true; title="class or interface in java.lang">LongprocId) @@ -271,7 +271,7 @@ extends getOperationType -publichttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringgetOperationType() +publichttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringgetOperationType() Specified by: getOperationTypein classHBaseAdmin.TableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Void.html?is-external=true; title="class or interface in java.lang">Void http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.SplitTableRegionFuture.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.SplitTableRegionFuture.html b/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.SplitTableRegionFuture.html index 1da9dbd..749bb8c 100644 --- a/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.SplitTableRegionFuture.html +++ b/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.SplitTableRegionFuture.html @@ -127,7 +127,7 @@ var activeTableTab = "activeTableTab"; -private static class HBaseAdmin.SplitTableRegionFuture +private static class HBaseAdmin.SplitTableRegionFuture extends HBaseAdmin.TableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Void.html?is-external=true; title="class or interface in java.lang">Void @@ -239,7 +239,7 @@ extends SplitTableRegionFuture -publicSplitTableRegionFuture(HBaseAdminadmin, +publicSplitTableRegionFuture(HBaseAdminadmin, TableNametableName, org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SplitTableRegionResponseresponse) @@ -250,7 +250,7 @@ extends SplitTableRegionFuture -publicSplitTableRegionFuture(HBaseAdminadmin, +publicSplitTableRegionFuture(HBaseAdminadmin, TableNametableName, http://docs.oracle.com/javase/8/docs/api/java/lang/Long.html?is-external=true; title="class or interface in java.lang">LongprocId) @@ -269,7 +269,7 @@ extends getOperationType -publichttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringgetOperationType() +publichttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">StringgetOperationType() Specified by: getOperationTypein classHBaseAdmin.TableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Void.html?is-external=true; title="class or interface in java.lang">Void http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.TableWaitForStateCallable.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.TableWaitForStateCallable.html b/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.TableWaitForStateCallable.html index 54550e4..4187971 100644 ---
[21/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.EnableTableFuture.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.EnableTableFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.EnableTableFuture.html index 08c80d4..868c46e 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.EnableTableFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.EnableTableFuture.html @@ -1002,3395 +1002,3361 @@ 994return getAlterStatus(TableName.valueOf(tableName)); 995 } 996 -997 /** -998 * {@inheritDoc} -999 * @deprecated Since 2.0. Will be removed in 3.0. Use -1000 * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead. -1001 */ -1002 @Override -1003 @Deprecated -1004 public void addColumn(final TableName tableName, final HColumnDescriptor columnFamily) -1005 throws IOException { -1006addColumnFamily(tableName, columnFamily); -1007 } -1008 -1009 @Override -1010 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) -1011 throws IOException { -1012get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); -1013 } -1014 -1015 @Override -1016 public FutureVoid addColumnFamilyAsync(final TableName tableName, -1017 final ColumnFamilyDescriptor columnFamily) throws IOException { -1018AddColumnResponse response = -1019executeCallable(new MasterCallableAddColumnResponse(getConnection(), -1020getRpcControllerFactory()) { -1021 @Override -1022 protected AddColumnResponse rpcCall() throws Exception { -1023setPriority(tableName); -1024AddColumnRequest req = -1025 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), -1026 ng.newNonce()); -1027return master.addColumn(getRpcController(), req); -1028 } -1029}); -1030return new AddColumnFamilyFuture(this, tableName, response); -1031 } -1032 -1033 private static class AddColumnFamilyFuture extends ModifyTableFuture { -1034public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, -1035final AddColumnResponse response) { -1036 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() -1037 : null); -1038} -1039 -1040@Override -1041public String getOperationType() { -1042 return "ADD_COLUMN_FAMILY"; -1043} +997 @Override +998 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) +999 throws IOException { +1000get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); +1001 } +1002 +1003 @Override +1004 public FutureVoid addColumnFamilyAsync(final TableName tableName, +1005 final ColumnFamilyDescriptor columnFamily) throws IOException { +1006AddColumnResponse response = +1007executeCallable(new MasterCallableAddColumnResponse(getConnection(), +1008getRpcControllerFactory()) { +1009 @Override +1010 protected AddColumnResponse rpcCall() throws Exception { +1011setPriority(tableName); +1012AddColumnRequest req = +1013 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), +1014 ng.newNonce()); +1015return master.addColumn(getRpcController(), req); +1016 } +1017}); +1018return new AddColumnFamilyFuture(this, tableName, response); +1019 } +1020 +1021 private static class AddColumnFamilyFuture extends ModifyTableFuture { +1022public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, +1023final AddColumnResponse response) { +1024 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() +1025 : null); +1026} +1027 +1028@Override +1029public String getOperationType() { +1030 return "ADD_COLUMN_FAMILY"; +1031} +1032 } +1033 +1034 /** +1035 * {@inheritDoc} +1036 * @deprecated Since 2.0. Will be removed in 3.0. Use +1037 * {@link #deleteColumnFamily(TableName, byte[])} instead. +1038 */ +1039 @Override +1040 @Deprecated +1041 public void deleteColumn(final TableName tableName, final byte[] columnFamily) +1042 throws IOException { +1043deleteColumnFamily(tableName, columnFamily); 1044 } 1045 -1046 /** -1047 * {@inheritDoc} -1048 * @deprecated Since 2.0. Will be removed in 3.0. Use -1049 * {@link #deleteColumnFamily(TableName, byte[])} instead. -1050 */ -1051 @Override -1052 @Deprecated -1053 public void deleteColumn(final
[26/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.AddColumnFamilyFuture.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.AddColumnFamilyFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.AddColumnFamilyFuture.html index 08c80d4..868c46e 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.AddColumnFamilyFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.AddColumnFamilyFuture.html @@ -1002,3395 +1002,3361 @@ 994return getAlterStatus(TableName.valueOf(tableName)); 995 } 996 -997 /** -998 * {@inheritDoc} -999 * @deprecated Since 2.0. Will be removed in 3.0. Use -1000 * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead. -1001 */ -1002 @Override -1003 @Deprecated -1004 public void addColumn(final TableName tableName, final HColumnDescriptor columnFamily) -1005 throws IOException { -1006addColumnFamily(tableName, columnFamily); -1007 } -1008 -1009 @Override -1010 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) -1011 throws IOException { -1012get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); -1013 } -1014 -1015 @Override -1016 public FutureVoid addColumnFamilyAsync(final TableName tableName, -1017 final ColumnFamilyDescriptor columnFamily) throws IOException { -1018AddColumnResponse response = -1019executeCallable(new MasterCallableAddColumnResponse(getConnection(), -1020getRpcControllerFactory()) { -1021 @Override -1022 protected AddColumnResponse rpcCall() throws Exception { -1023setPriority(tableName); -1024AddColumnRequest req = -1025 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), -1026 ng.newNonce()); -1027return master.addColumn(getRpcController(), req); -1028 } -1029}); -1030return new AddColumnFamilyFuture(this, tableName, response); -1031 } -1032 -1033 private static class AddColumnFamilyFuture extends ModifyTableFuture { -1034public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, -1035final AddColumnResponse response) { -1036 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() -1037 : null); -1038} -1039 -1040@Override -1041public String getOperationType() { -1042 return "ADD_COLUMN_FAMILY"; -1043} +997 @Override +998 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) +999 throws IOException { +1000get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); +1001 } +1002 +1003 @Override +1004 public FutureVoid addColumnFamilyAsync(final TableName tableName, +1005 final ColumnFamilyDescriptor columnFamily) throws IOException { +1006AddColumnResponse response = +1007executeCallable(new MasterCallableAddColumnResponse(getConnection(), +1008getRpcControllerFactory()) { +1009 @Override +1010 protected AddColumnResponse rpcCall() throws Exception { +1011setPriority(tableName); +1012AddColumnRequest req = +1013 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), +1014 ng.newNonce()); +1015return master.addColumn(getRpcController(), req); +1016 } +1017}); +1018return new AddColumnFamilyFuture(this, tableName, response); +1019 } +1020 +1021 private static class AddColumnFamilyFuture extends ModifyTableFuture { +1022public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, +1023final AddColumnResponse response) { +1024 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() +1025 : null); +1026} +1027 +1028@Override +1029public String getOperationType() { +1030 return "ADD_COLUMN_FAMILY"; +1031} +1032 } +1033 +1034 /** +1035 * {@inheritDoc} +1036 * @deprecated Since 2.0. Will be removed in 3.0. Use +1037 * {@link #deleteColumnFamily(TableName, byte[])} instead. +1038 */ +1039 @Override +1040 @Deprecated +1041 public void deleteColumn(final TableName tableName, final byte[] columnFamily) +1042 throws IOException { +1043deleteColumnFamily(tableName, columnFamily); 1044 } 1045 -1046 /** -1047 * {@inheritDoc} -1048 * @deprecated Since 2.0. Will be removed in 3.0. Use -1049 * {@link #deleteColumnFamily(TableName, byte[])} instead. -1050 */ -1051 @Override -1052 @Deprecated -1053 public void
[50/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/apache_hbase_reference_guide.pdf -- diff --git a/apache_hbase_reference_guide.pdf b/apache_hbase_reference_guide.pdf index 363df9b..7c18738 100644 --- a/apache_hbase_reference_guide.pdf +++ b/apache_hbase_reference_guide.pdf @@ -5,16 +5,16 @@ /Author (Apache HBase Team) /Creator (Asciidoctor PDF 1.5.0.alpha.15, based on Prawn 2.2.2) /Producer (Apache HBase Team) -/ModDate (D:20170903144635+00'00') -/CreationDate (D:20170903144635+00'00') +/ModDate (D:20170904144632+00'00') +/CreationDate (D:20170904144632+00'00') >> endobj 2 0 obj << /Type /Catalog /Pages 3 0 R /Names 26 0 R -/Outlines 4312 0 R -/PageLabels 4520 0 R +/Outlines 4310 0 R +/PageLabels 4518 0 R /PageMode /UseOutlines /OpenAction [7 0 R /FitH 842.89] /ViewerPreferences << /DisplayDocTitle true @@ -24,7 +24,7 @@ endobj 3 0 obj << /Type /Pages /Count 663 -/Kids [7 0 R 12 0 R 14 0 R 16 0 R 18 0 R 20 0 R 22 0 R 24 0 R 44 0 R 47 0 R 50 0 R 54 0 R 63 0 R 66 0 R 69 0 R 71 0 R 76 0 R 80 0 R 83 0 R 89 0 R 91 0 R 94 0 R 96 0 R 103 0 R 109 0 R 114 0 R 116 0 R 130 0 R 133 0 R 142 0 R 150 0 R 160 0 R 169 0 R 180 0 R 184 0 R 186 0 R 190 0 R 201 0 R 208 0 R 217 0 R 225 0 R 231 0 R 239 0 R 248 0 R 261 0 R 270 0 R 277 0 R 286 0 R 295 0 R 302 0 R 309 0 R 317 0 R 323 0 R 331 0 R 338 0 R 347 0 R 356 0 R 367 0 R 378 0 R 386 0 R 393 0 R 401 0 R 408 0 R 416 0 R 425 0 R 434 0 R 441 0 R 449 0 R 462 0 R 469 0 R 477 0 R 484 0 R 493 0 R 501 0 R 508 0 R 513 0 R 518 0 R 523 0 R 539 0 R 549 0 R 554 0 R 568 0 R 574 0 R 579 0 R 581 0 R 583 0 R 588 0 R 596 0 R 602 0 R 607 0 R 613 0 R 624 0 R 637 0 R 656 0 R 671 0 R 682 0 R 684 0 R 686 0 R 694 0 R 706 0 R 715 0 R 725 0 R 731 0 R 734 0 R 738 0 R 743 0 R 746 0 R 749 0 R 751 0 R 754 0 R 758 0 R 760 0 R 765 0 R 769 0 R 774 0 R 779 0 R 782 0 R 788 0 R 790 0 R 794 0 R 803 0 R 805 0 R 808 0 R 811 0 R 814 0 R 817 0 R 831 0 R 838 0 R 847 0 R 858 0 R 864 0 R 876 0 R 880 0 R 883 0 R 887 0 R 890 0 R 895 0 R 904 0 R 912 0 R 916 0 R 920 0 R 925 0 R 929 0 R 931 0 R 946 0 R 957 0 R 963 0 R 969 0 R 972 0 R 980 0 R 988 0 R 992 0 R 998 0 R 1003 0 R 1005 0 R 1007 0 R 1009 0 R 1020 0 R 1028 0 R 1032 0 R 1039 0 R 1047 0 R 1055 0 R 1059 0 R 1065 0 R 1070 0 R 1078 0 R 1083 0 R 1088 0 R 1090 0 R 1096 0 R 1102 0 R 1104 0 R 0 R 1121 0 R 1125 0 R 1127 0 R 1129 0 R 1133 0 R 1136 0 R 1141 0 R 1144 0 R 1156 0 R 1160 0 R 1166 0 R 1173 0 R 1178 0 R 1182 0 R 1186 0 R 1188 0 R 1191 0 R 1194 0 R 1197 0 R 1201 0 R 1205 0 R 1209 0 R 1214 0 R 1218 0 R 1221 0 R 1223 0 R 1235 0 R 1238 0 R 1246 0 R 1255 0 R 1261 0 R 1265 0 R 1267 0 R 1277 0 R 1280 0 R 1286 0 R 1294 0 R 1297 0 R 1304 0 R 1313 0 R 1315 0 R 1317 0 R 1327 0 R 1329 0 R 1331 0 R 1334 0 R 1336 0 R 1338 0 R 1340 0 R 1342 0 R 1345 0 R 1349 0 R 1354 0 R 1356 0 R 1358 0 R 1360 0 R 1365 0 R 1372 0 R 1377 0 R 1380 0 R 1382 0 R 1385 0 R 1389 0 R 1391 0 R 1394 0 R 1396 0 R 1398 0 R 1401 0 R 1406 0 R 1411 0 R 1420 0 R 1434 0 R 1446 0 R 1449 0 R 1453 0 R 1467 0 R 1476 0 R 1490 0 R 1496 0 R 1504 0 R 1519 0 R 1533 0 R 1545 0 R 1550 0 R 1556 0 R 1567 0 R 1573 0 R 1579 0 R 1587 0 R 1590 0 R 1599 0 R 1606 0 R 1610 0 R 1623 0 R 1625 0 R 1631 0 R 1637 0 R 1641 0 R 1649 0 R 1658 0 R 1662 0 R 1664 0 R 1666 0 R 1679 0 R 1685 0 R 1693 0 R 1700 0 R 1714 0 R 1719 0 R 1728 0 R 1736 0 R 1742 0 R 1749 0 R 1753 0 R 1756 0 R 1758 0 R 1764 0 R 1770 0 R 1776 0 R 1780 0 R 1788 0 R 1793 0 R 1799 0 R 1804 0 R 1806 0 R 1814 0 R 1822 0 R 1828 0 R 1833 0 R 1837 0 R 1840 0 R 1845 0 R 1850 0 R 1857 0 R 1859 0 R 1861 0 R 1864 0 R 1872 0 R 1875 0 R 1882 0 R 1892 0 R 1895 0 R 1900 0 R 1902 0 R 1907 0 R 1910 0 R 1912 0 R 1917 0 R 1927 0 R 1929 0 R 1931 0 R 1933 0 R 1935 0 R 1938 0 R 1940 0 R 1942 0 R 1945 0 R 1947 0 R 1949 0 R 1953 0 R 1957 0 R 1966 0 R 1968 0 R 1970 0 R 1976 0 R 1978 0 R 1983 0 R 1985 0 R 1987 0 R 1994 0 R 1999 0 R 2003 0 R 2007 0 R 2011 0 R 2013 0 R 2015 0 R 2019 0 R 20 22 0 R 2024 0 R 2026 0 R 2030 0 R 2032 0 R 2035 0 R 2037 0 R 2039 0 R 2041 0 R 2048 0 R 2051 0 R 2056 0 R 2058 0 R 2060 0 R 2062 0 R 2064 0 R 2072 0 R 2083 0 R 2097 0 R 2108 0 R 2112 0 R 2117 0 R 2121 0 R 2124 0 R 2129 0 R 2135 0 R 2137 0 R 2141 0 R 2143 0 R 2145 0 R 2147 0 R 2151 0 R 2153 0 R 2166 0 R 2169 0 R 2177 0 R 2183 0 R 2195 0 R 2209 0 R 2223 0 R 2240 0 R 2244 0 R 2246 0 R 2250 0 R 2268 0 R 2274 0 R 2286 0 R 2290 0 R 2294 0 R 2303 0 R 2315 0 R 2321 0 R 2331 0 R 2344 0 R 2363 0 R 2372 0 R 2375 0 R 2384 0 R 2402 0 R 2409 0 R 2412 0 R 2417 0 R 2421 0 R 2424 0 R 2433 0 R 2442 0 R 2445 0 R 2447 0 R 2451 0 R 2466 0 R 2474 0 R 2479 0 R 2483 0 R 2487 0 R 2489 0 R 2491 0 R 2493 0 R 2498 0 R 2511 0 R 2521 0 R 2530 0 R 2539 0 R 2545 0 R 2556 0 R 2563 0 R 2569 0 R 2571 0 R 2581 0 R 2589 0 R 2599 0 R 2603 0 R 2614 0 R 2618 0 R 2628 0 R 2636 0 R 2644 0 R 2650 0 R 2654 0 R 2658 0 R 2662 0 R 2664 0 R 2670 0 R 2674 0 R 2678 0 R 2684 0 R 2690 0 R 2693 0 R 2699 0 R 2703 0 R
[38/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/org/apache/hadoop/hbase/class-use/TableName.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/class-use/TableName.html b/devapidocs/org/apache/hadoop/hbase/class-use/TableName.html index 0317756..ab29cfd 100644 --- a/devapidocs/org/apache/hadoop/hbase/class-use/TableName.html +++ b/devapidocs/org/apache/hadoop/hbase/class-use/TableName.html @@ -2375,9 +2375,9 @@ service. -void -Admin.addColumn(TableNametableName, - HColumnDescriptorcolumnFamily) +default void +Admin.addColumn(TableNametableName, + ColumnFamilyDescriptorcolumnFamily) Deprecated. As of release 2.0.0. (https://issues.apache.org/jira/browse/HBASE-1989;>HBASE-1989). @@ -2387,76 +2387,66 @@ service. -void -HBaseAdmin.addColumn(TableNametableName, - HColumnDescriptorcolumnFamily) -Deprecated. -Since 2.0. Will be removed in 3.0. Use - HBaseAdmin.addColumnFamily(TableName, ColumnFamilyDescriptor) instead. - - - - http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true; title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Void.html?is-external=true; title="class or interface in java.lang">Void AsyncHBaseAdmin.addColumnFamily(TableNametableName, ColumnFamilyDescriptorcolumnFamily) - + void Admin.addColumnFamily(TableNametableName, ColumnFamilyDescriptorcolumnFamily) Add a column family to an existing table. - + void HBaseAdmin.addColumnFamily(TableNametableName, ColumnFamilyDescriptorcolumnFamily) - + http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true; title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Void.html?is-external=true; title="class or interface in java.lang">Void AsyncAdmin.addColumnFamily(TableNametableName, ColumnFamilyDescriptorcolumnFamily) Add a column family to an existing table. - + http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true; title="class or interface in java.util.concurrent">CompletableFuturehttp://docs.oracle.com/javase/8/docs/api/java/lang/Void.html?is-external=true; title="class or interface in java.lang">Void RawAsyncHBaseAdmin.addColumnFamily(TableNametableName, ColumnFamilyDescriptorcolumnFamily) - + http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/Future.html?is-external=true; title="class or interface in java.util.concurrent">Futurehttp://docs.oracle.com/javase/8/docs/api/java/lang/Void.html?is-external=true; title="class or interface in java.lang">Void Admin.addColumnFamilyAsync(TableNametableName, ColumnFamilyDescriptorcolumnFamily) Add a column family to an existing table. - + http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/Future.html?is-external=true; title="class or interface in java.util.concurrent">Futurehttp://docs.oracle.com/javase/8/docs/api/java/lang/Void.html?is-external=true; title="class or interface in java.lang">Void HBaseAdmin.addColumnFamilyAsync(TableNametableName, ColumnFamilyDescriptorcolumnFamily) - + void MetaCache.cacheLocation(TableNametableName, RegionLocationslocations) Put a newly discovered HRegionLocation into the cache. - + void ConnectionImplementation.cacheLocation(TableNametableName, RegionLocationslocation) Put a newly discovered HRegionLocation into the cache. - + void ClusterConnection.cacheLocation(TableNametableName, RegionLocationslocation) - + void MetaCache.cacheLocation(TableNametableName, ServerNamesource, @@ -2464,7 +2454,7 @@ service. Put a newly discovered HRegionLocation into the cache. - + private void ConnectionImplementation.cacheLocation(TableNametableName, ServerNamesource, @@ -2472,7 +2462,7 @@ service. Put a newly discovered HRegionLocation into the cache. - + private void HBaseAdmin.checkAndSyncTableDescToPeers(TableNametableName, byte[][]splits) @@ -2485,34 +2475,34 @@ service. - + private TableName HBaseAdmin.checkTableExists(TableNametableName) Check if table exists or not - + void MetaCache.clearCache(TableNametableName) Delete all cached entries of a table. - + (package private) void AsyncNonMetaRegionLocator.clearCache(TableNametableName) - + (package private) void AsyncRegionLocator.clearCache(TableNametableName) - + void MetaCache.clearCache(TableNametableName, byte[]row) Delete a cached location, no matter what it is. - + void MetaCache.clearCache(TableNametableName, byte[]row, @@ -2520,7
[40/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/dependency-info.html -- diff --git a/dependency-info.html b/dependency-info.html index 3211a30..c0e2b56 100644 --- a/dependency-info.html +++ b/dependency-info.html @@ -7,7 +7,7 @@ - + Apache HBase Dependency Information @@ -318,7 +318,7 @@ https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2017-09-03 + Last Published: 2017-09-04 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/dependency-management.html -- diff --git a/dependency-management.html b/dependency-management.html index df0ace0..ffaed33 100644 --- a/dependency-management.html +++ b/dependency-management.html @@ -7,7 +7,7 @@ - + Apache HBase Project Dependency Management @@ -649,7 +649,7 @@ org.apache.zookeeper zookeeper -3.4.9 +3.4.10 jar http://www.apache.org/licenses/LICENSE-2.0.txt;>The Apache Software License, Version 2.0 @@ -930,7 +930,7 @@ https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2017-09-03 + Last Published: 2017-09-04 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/constant-values.html -- diff --git a/devapidocs/constant-values.html b/devapidocs/constant-values.html index 9cf2825..2ce2fd2 100644 --- a/devapidocs/constant-values.html +++ b/devapidocs/constant-values.html @@ -3766,21 +3766,21 @@ publicstaticfinalhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String date -"Sun Sep 3 14:41:48 UTC 2017" +"Mon Sep 4 14:41:48 UTC 2017" publicstaticfinalhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String revision -"83175fdf8375527fb893debfa441e3862d5093b9" +"32ddb1f604666e020e04a02c6fc213b22e5badef" publicstaticfinalhttp://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String srcChecksum -"0990b1a4c31d4b2b7ed3da9a51850aed" +"f231378f667917848a623d01c6e57499" http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/deprecated-list.html -- diff --git a/devapidocs/deprecated-list.html b/devapidocs/deprecated-list.html index fcd7ec3..bd6e670 100644 --- a/devapidocs/deprecated-list.html +++ b/devapidocs/deprecated-list.html @@ -358,7 +358,7 @@ -org.apache.hadoop.hbase.client.Admin.addColumn(TableName, HColumnDescriptor) +org.apache.hadoop.hbase.client.Admin.addColumn(TableName, ColumnFamilyDescriptor) As of release 2.0.0. (https://issues.apache.org/jira/browse/HBASE-1989;>HBASE-1989). This will be removed in HBase 3.0.0. @@ -366,235 +366,205 @@ -org.apache.hadoop.hbase.client.HBaseAdmin.addColumn(TableName, HColumnDescriptor) -Since 2.0. Will be removed in 3.0. Use - HBaseAdmin.addColumnFamily(TableName, ColumnFamilyDescriptor) instead. - - - org.apache.hadoop.hbase.client.Delete.addDeleteMarker(Cell) As of release 2.0.0, this will be removed in HBase 3.0.0. Use Delete.add(Cell) instead - + org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil.addDependencyJars(Configuration, Class?...) rely on TableMapReduceUtil.addDependencyJars(Job) instead. - + org.apache.hadoop.hbase.security.visibility.VisibilityClient.addLabel(Configuration, String) Use VisibilityClient.addLabel(Connection,String) instead. - + org.apache.hadoop.hbase.security.visibility.VisibilityClient.addLabels(Configuration, String[]) Use VisibilityClient.addLabels(Connection,String[]) instead. - + org.apache.hadoop.hbase.client.replication.ReplicationAdmin.addPeer(String, ReplicationPeerConfig) use Admin.addReplicationPeer(String, ReplicationPeerConfig) instead - + org.apache.hadoop.hbase.client.replication.ReplicationAdmin.addPeer(String, ReplicationPeerConfig, MapTableName, ? extends CollectionString) as release of 2.0.0, and it will be removed in 3.0.0, use ReplicationAdmin.addPeer(String, ReplicationPeerConfig) instead. - + org.apache.hadoop.hbase.MetaTableAccessor.allTableRegions(Connection, TableName) use MetaTableAccessor.getTableRegionsAndLocations(org.apache.hadoop.hbase.client.Connection, org.apache.hadoop.hbase.TableName), region can have
[16/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.WaitForStateCallable.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.WaitForStateCallable.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.WaitForStateCallable.html index 08c80d4..868c46e 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.WaitForStateCallable.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.WaitForStateCallable.html @@ -1002,3395 +1002,3361 @@ 994return getAlterStatus(TableName.valueOf(tableName)); 995 } 996 -997 /** -998 * {@inheritDoc} -999 * @deprecated Since 2.0. Will be removed in 3.0. Use -1000 * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead. -1001 */ -1002 @Override -1003 @Deprecated -1004 public void addColumn(final TableName tableName, final HColumnDescriptor columnFamily) -1005 throws IOException { -1006addColumnFamily(tableName, columnFamily); -1007 } -1008 -1009 @Override -1010 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) -1011 throws IOException { -1012get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); -1013 } -1014 -1015 @Override -1016 public FutureVoid addColumnFamilyAsync(final TableName tableName, -1017 final ColumnFamilyDescriptor columnFamily) throws IOException { -1018AddColumnResponse response = -1019executeCallable(new MasterCallableAddColumnResponse(getConnection(), -1020getRpcControllerFactory()) { -1021 @Override -1022 protected AddColumnResponse rpcCall() throws Exception { -1023setPriority(tableName); -1024AddColumnRequest req = -1025 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), -1026 ng.newNonce()); -1027return master.addColumn(getRpcController(), req); -1028 } -1029}); -1030return new AddColumnFamilyFuture(this, tableName, response); -1031 } -1032 -1033 private static class AddColumnFamilyFuture extends ModifyTableFuture { -1034public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, -1035final AddColumnResponse response) { -1036 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() -1037 : null); -1038} -1039 -1040@Override -1041public String getOperationType() { -1042 return "ADD_COLUMN_FAMILY"; -1043} +997 @Override +998 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) +999 throws IOException { +1000get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); +1001 } +1002 +1003 @Override +1004 public FutureVoid addColumnFamilyAsync(final TableName tableName, +1005 final ColumnFamilyDescriptor columnFamily) throws IOException { +1006AddColumnResponse response = +1007executeCallable(new MasterCallableAddColumnResponse(getConnection(), +1008getRpcControllerFactory()) { +1009 @Override +1010 protected AddColumnResponse rpcCall() throws Exception { +1011setPriority(tableName); +1012AddColumnRequest req = +1013 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), +1014 ng.newNonce()); +1015return master.addColumn(getRpcController(), req); +1016 } +1017}); +1018return new AddColumnFamilyFuture(this, tableName, response); +1019 } +1020 +1021 private static class AddColumnFamilyFuture extends ModifyTableFuture { +1022public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, +1023final AddColumnResponse response) { +1024 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() +1025 : null); +1026} +1027 +1028@Override +1029public String getOperationType() { +1030 return "ADD_COLUMN_FAMILY"; +1031} +1032 } +1033 +1034 /** +1035 * {@inheritDoc} +1036 * @deprecated Since 2.0. Will be removed in 3.0. Use +1037 * {@link #deleteColumnFamily(TableName, byte[])} instead. +1038 */ +1039 @Override +1040 @Deprecated +1041 public void deleteColumn(final TableName tableName, final byte[] columnFamily) +1042 throws IOException { +1043deleteColumnFamily(tableName, columnFamily); 1044 } 1045 -1046 /** -1047 * {@inheritDoc} -1048 * @deprecated Since 2.0. Will be removed in 3.0. Use -1049 * {@link #deleteColumnFamily(TableName, byte[])}
[46/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/apidocs/org/apache/hadoop/hbase/package-use.html -- diff --git a/apidocs/org/apache/hadoop/hbase/package-use.html b/apidocs/org/apache/hadoop/hbase/package-use.html index aaa8fba..b8b6512 100644 --- a/apidocs/org/apache/hadoop/hbase/package-use.html +++ b/apidocs/org/apache/hadoop/hbase/package-use.html @@ -321,22 +321,17 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods. -HColumnDescriptor -Deprecated. - - - HRegionInfo Information about a region. - + HRegionLocation Data structure to hold HRegionInfo and the address for the hosting HRegionServer. - + HTableDescriptor Deprecated. As of release 2.0.0, this will be removed in HBase 3.0.0. @@ -344,57 +339,57 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods. - + KeepDeletedCells Ways to keep cells marked for delete around. - + MemoryCompactionPolicy Enum describing all possible memory compaction policies - + NamespaceDescriptor Namespace POJO class. - + NamespaceNotFoundException Thrown when a namespace can not be located - + ProcedureInfo Procedure information - + RegionException Thrown when something happens related to region handling. - + RegionLoad Encapsulates per-region load metrics. - + ServerName Name of a particular incarnation of an HBase Server. - + TableExistsException Thrown when a table exists but should not - + TableName Immutable POJO class for representing a table name. - + TableNotFoundException Thrown when a table can not be located http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/apidocs/org/apache/hadoop/hbase/rest/client/RemoteHTable.html -- diff --git a/apidocs/org/apache/hadoop/hbase/rest/client/RemoteHTable.html b/apidocs/org/apache/hadoop/hbase/rest/client/RemoteHTable.html index 19f40fc..e8579f5 100644 --- a/apidocs/org/apache/hadoop/hbase/rest/client/RemoteHTable.html +++ b/apidocs/org/apache/hadoop/hbase/rest/client/RemoteHTable.html @@ -1180,10 +1180,9 @@ publichttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean. Description copied from interface:Table Increments one or more columns within a single row. - This operation does not appear atomic to readers. Increments are done - under a single row lock, so write operations to a row are synchronized, but - readers do not take row locks so get and scan operations can see this - operation partially completed. + This operation ensures atomicity to readers. Increments are done + under a single row lock, so write operations to a row are synchronized, and + readers are guaranteed to see this operation fully completed. Specified by: incrementin interfaceTable @@ -1208,10 +1207,9 @@ publichttp://docs.oracle.com/javase/8/docs/api/java/lang/Boolean. Description copied from interface:Table Appends values to one or more columns within a single row. - This operation does not appear atomic to readers. Appends are done - under a single row lock, so write operations to a row are synchronized, but - readers do not take row locks so get and scan operations can see this - operation partially completed. + This operation guaranteed atomicity to readers. Appends are done + under a single row lock, so write operations to a row are synchronized, and + readers are guaranteed to see this operation fully completed. Specified by: appendin interfaceTable
[32/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/org/apache/hadoop/hbase/client/HTable.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/client/HTable.html b/devapidocs/org/apache/hadoop/hbase/client/HTable.html index 6a7c36a..1a74501 100644 --- a/devapidocs/org/apache/hadoop/hbase/client/HTable.html +++ b/devapidocs/org/apache/hadoop/hbase/client/HTable.html @@ -1030,7 +1030,7 @@ public statichttp://docs.oracle.com/javase/8/docs/api/java/util/c getKeysAndRegionsInRange -privatePairhttp://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">Listbyte[],http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListHRegionLocationgetKeysAndRegionsInRange(byte[]startKey, +privatePairhttp://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">Listbyte[],http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListHRegionLocationgetKeysAndRegionsInRange(byte[]startKey, byte[]endKey, booleanincludeEndKey) throws http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true; title="class or interface in java.io">IOException @@ -1056,7 +1056,7 @@ public statichttp://docs.oracle.com/javase/8/docs/api/java/util/c getKeysAndRegionsInRange -privatePairhttp://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">Listbyte[],http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListHRegionLocationgetKeysAndRegionsInRange(byte[]startKey, +privatePairhttp://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">Listbyte[],http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListHRegionLocationgetKeysAndRegionsInRange(byte[]startKey, byte[]endKey, booleanincludeEndKey, booleanreload) @@ -1084,7 +1084,7 @@ public statichttp://docs.oracle.com/javase/8/docs/api/java/util/c getScanner -publicResultScannergetScanner(Scanscan) +publicResultScannergetScanner(Scanscan) throws http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true; title="class or interface in java.io">IOException The underlying HTable must not be closed. Table.getScanner(Scan) has other usage details. @@ -1106,7 +1106,7 @@ public statichttp://docs.oracle.com/javase/8/docs/api/java/util/c getScanner -publicResultScannergetScanner(byte[]family) +publicResultScannergetScanner(byte[]family) throws http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true; title="class or interface in java.io">IOException The underlying HTable must not be closed. Table.getScanner(byte[]) has other usage details. @@ -1128,7 +1128,7 @@ public statichttp://docs.oracle.com/javase/8/docs/api/java/util/c getScanner -publicResultScannergetScanner(byte[]family, +publicResultScannergetScanner(byte[]family, byte[]qualifier) throws http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true; title="class or interface in java.io">IOException The underlying HTable must not be closed. @@ -1152,7 +1152,7 @@ public statichttp://docs.oracle.com/javase/8/docs/api/java/util/c get -publicResultget(Getget) +publicResultget(Getget) throws http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true; title="class or interface in java.io">IOException Extracts certain cells from a given row. @@ -1175,7 +1175,7 @@ public statichttp://docs.oracle.com/javase/8/docs/api/java/util/c get -privateResultget(Getget, +privateResultget(Getget, booleancheckExistenceOnly) throws http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true; title="class or interface in java.io">IOException @@ -1190,7 +1190,7 @@ public statichttp://docs.oracle.com/javase/8/docs/api/java/util/c get -publicResult[]get(http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListGetgets)
[24/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DeleteColumnFamilyFuture.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DeleteColumnFamilyFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DeleteColumnFamilyFuture.html index 08c80d4..868c46e 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DeleteColumnFamilyFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DeleteColumnFamilyFuture.html @@ -1002,3395 +1002,3361 @@ 994return getAlterStatus(TableName.valueOf(tableName)); 995 } 996 -997 /** -998 * {@inheritDoc} -999 * @deprecated Since 2.0. Will be removed in 3.0. Use -1000 * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead. -1001 */ -1002 @Override -1003 @Deprecated -1004 public void addColumn(final TableName tableName, final HColumnDescriptor columnFamily) -1005 throws IOException { -1006addColumnFamily(tableName, columnFamily); -1007 } -1008 -1009 @Override -1010 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) -1011 throws IOException { -1012get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); -1013 } -1014 -1015 @Override -1016 public FutureVoid addColumnFamilyAsync(final TableName tableName, -1017 final ColumnFamilyDescriptor columnFamily) throws IOException { -1018AddColumnResponse response = -1019executeCallable(new MasterCallableAddColumnResponse(getConnection(), -1020getRpcControllerFactory()) { -1021 @Override -1022 protected AddColumnResponse rpcCall() throws Exception { -1023setPriority(tableName); -1024AddColumnRequest req = -1025 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), -1026 ng.newNonce()); -1027return master.addColumn(getRpcController(), req); -1028 } -1029}); -1030return new AddColumnFamilyFuture(this, tableName, response); -1031 } -1032 -1033 private static class AddColumnFamilyFuture extends ModifyTableFuture { -1034public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, -1035final AddColumnResponse response) { -1036 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() -1037 : null); -1038} -1039 -1040@Override -1041public String getOperationType() { -1042 return "ADD_COLUMN_FAMILY"; -1043} +997 @Override +998 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) +999 throws IOException { +1000get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); +1001 } +1002 +1003 @Override +1004 public FutureVoid addColumnFamilyAsync(final TableName tableName, +1005 final ColumnFamilyDescriptor columnFamily) throws IOException { +1006AddColumnResponse response = +1007executeCallable(new MasterCallableAddColumnResponse(getConnection(), +1008getRpcControllerFactory()) { +1009 @Override +1010 protected AddColumnResponse rpcCall() throws Exception { +1011setPriority(tableName); +1012AddColumnRequest req = +1013 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), +1014 ng.newNonce()); +1015return master.addColumn(getRpcController(), req); +1016 } +1017}); +1018return new AddColumnFamilyFuture(this, tableName, response); +1019 } +1020 +1021 private static class AddColumnFamilyFuture extends ModifyTableFuture { +1022public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, +1023final AddColumnResponse response) { +1024 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() +1025 : null); +1026} +1027 +1028@Override +1029public String getOperationType() { +1030 return "ADD_COLUMN_FAMILY"; +1031} +1032 } +1033 +1034 /** +1035 * {@inheritDoc} +1036 * @deprecated Since 2.0. Will be removed in 3.0. Use +1037 * {@link #deleteColumnFamily(TableName, byte[])} instead. +1038 */ +1039 @Override +1040 @Deprecated +1041 public void deleteColumn(final TableName tableName, final byte[] columnFamily) +1042 throws IOException { +1043deleteColumnFamily(tableName, columnFamily); 1044 } 1045 -1046 /** -1047 * {@inheritDoc} -1048 * @deprecated Since 2.0. Will be removed in 3.0. Use -1049 * {@link #deleteColumnFamily(TableName, byte[])} instead. -1050 */ -1051 @Override -1052 @Deprecated -1053
[20/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.MergeTableRegionsFuture.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.MergeTableRegionsFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.MergeTableRegionsFuture.html index 08c80d4..868c46e 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.MergeTableRegionsFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.MergeTableRegionsFuture.html @@ -1002,3395 +1002,3361 @@ 994return getAlterStatus(TableName.valueOf(tableName)); 995 } 996 -997 /** -998 * {@inheritDoc} -999 * @deprecated Since 2.0. Will be removed in 3.0. Use -1000 * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead. -1001 */ -1002 @Override -1003 @Deprecated -1004 public void addColumn(final TableName tableName, final HColumnDescriptor columnFamily) -1005 throws IOException { -1006addColumnFamily(tableName, columnFamily); -1007 } -1008 -1009 @Override -1010 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) -1011 throws IOException { -1012get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); -1013 } -1014 -1015 @Override -1016 public FutureVoid addColumnFamilyAsync(final TableName tableName, -1017 final ColumnFamilyDescriptor columnFamily) throws IOException { -1018AddColumnResponse response = -1019executeCallable(new MasterCallableAddColumnResponse(getConnection(), -1020getRpcControllerFactory()) { -1021 @Override -1022 protected AddColumnResponse rpcCall() throws Exception { -1023setPriority(tableName); -1024AddColumnRequest req = -1025 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), -1026 ng.newNonce()); -1027return master.addColumn(getRpcController(), req); -1028 } -1029}); -1030return new AddColumnFamilyFuture(this, tableName, response); -1031 } -1032 -1033 private static class AddColumnFamilyFuture extends ModifyTableFuture { -1034public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, -1035final AddColumnResponse response) { -1036 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() -1037 : null); -1038} -1039 -1040@Override -1041public String getOperationType() { -1042 return "ADD_COLUMN_FAMILY"; -1043} +997 @Override +998 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) +999 throws IOException { +1000get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); +1001 } +1002 +1003 @Override +1004 public FutureVoid addColumnFamilyAsync(final TableName tableName, +1005 final ColumnFamilyDescriptor columnFamily) throws IOException { +1006AddColumnResponse response = +1007executeCallable(new MasterCallableAddColumnResponse(getConnection(), +1008getRpcControllerFactory()) { +1009 @Override +1010 protected AddColumnResponse rpcCall() throws Exception { +1011setPriority(tableName); +1012AddColumnRequest req = +1013 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), +1014 ng.newNonce()); +1015return master.addColumn(getRpcController(), req); +1016 } +1017}); +1018return new AddColumnFamilyFuture(this, tableName, response); +1019 } +1020 +1021 private static class AddColumnFamilyFuture extends ModifyTableFuture { +1022public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, +1023final AddColumnResponse response) { +1024 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() +1025 : null); +1026} +1027 +1028@Override +1029public String getOperationType() { +1030 return "ADD_COLUMN_FAMILY"; +1031} +1032 } +1033 +1034 /** +1035 * {@inheritDoc} +1036 * @deprecated Since 2.0. Will be removed in 3.0. Use +1037 * {@link #deleteColumnFamily(TableName, byte[])} instead. +1038 */ +1039 @Override +1040 @Deprecated +1041 public void deleteColumn(final TableName tableName, final byte[] columnFamily) +1042 throws IOException { +1043deleteColumnFamily(tableName, columnFamily); 1044 } 1045 -1046 /** -1047 * {@inheritDoc} -1048 * @deprecated Since 2.0. Will be removed in 3.0. Use -1049 * {@link #deleteColumnFamily(TableName, byte[])} instead. -1050 */ -1051 @Override -1052 @Deprecated -1053 public
[30/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html index fcf1102..9075437 100644 --- a/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html +++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html @@ -273,12 +273,12 @@ java.lang.http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true; title="class or interface in java.lang">EnumE (implements java.lang.http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true; title="class or interface in java.lang">ComparableT, java.io.http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true; title="class or interface in java.io">Serializable) -org.apache.hadoop.hbase.io.hfile.BlockType.BlockCategory -org.apache.hadoop.hbase.io.hfile.Cacheable.MemoryType -org.apache.hadoop.hbase.io.hfile.HFileBlock.Writer.State org.apache.hadoop.hbase.io.hfile.BlockPriority org.apache.hadoop.hbase.io.hfile.BlockType +org.apache.hadoop.hbase.io.hfile.BlockType.BlockCategory org.apache.hadoop.hbase.io.hfile.CacheConfig.ExternalBlockCaches +org.apache.hadoop.hbase.io.hfile.HFileBlock.Writer.State +org.apache.hadoop.hbase.io.hfile.Cacheable.MemoryType http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html b/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html index 007957e..ea3d1c5 100644 --- a/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html +++ b/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html @@ -341,9 +341,9 @@ java.lang.http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true; title="class or interface in java.lang">EnumE (implements java.lang.http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true; title="class or interface in java.lang">ComparableT, java.io.http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true; title="class or interface in java.io">Serializable) -org.apache.hadoop.hbase.ipc.CallEvent.Type org.apache.hadoop.hbase.ipc.MetricsHBaseServerSourceFactoryImpl.SourceStorage org.apache.hadoop.hbase.ipc.BufferCallBeforeInitHandler.BufferCallAction +org.apache.hadoop.hbase.ipc.CallEvent.Type http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html index 588fdf0..2bfdd97 100644 --- a/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html +++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html @@ -293,10 +293,10 @@ java.lang.http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true; title="class or interface in java.lang">EnumE (implements java.lang.http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true; title="class or interface in java.lang">ComparableT, java.io.http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true; title="class or interface in java.io">Serializable) -org.apache.hadoop.hbase.mapreduce.CellCounter.CellCounterMapper.Counters -org.apache.hadoop.hbase.mapreduce.SyncTable.SyncMapper.Counter org.apache.hadoop.hbase.mapreduce.TableSplit.Version org.apache.hadoop.hbase.mapreduce.RowCounter.RowCounterMapper.Counters +org.apache.hadoop.hbase.mapreduce.SyncTable.SyncMapper.Counter +org.apache.hadoop.hbase.mapreduce.CellCounter.CellCounterMapper.Counters http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/org/apache/hadoop/hbase/master/balancer/package-tree.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/master/balancer/package-tree.html b/devapidocs/org/apache/hadoop/hbase/master/balancer/package-tree.html index e458be7..c73f25f 100644 --- a/devapidocs/org/apache/hadoop/hbase/master/balancer/package-tree.html +++ b/devapidocs/org/apache/hadoop/hbase/master/balancer/package-tree.html @@ -197,8 +197,8 @@ java.lang.http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true; title="class or interface in java.lang">EnumE (implements java.lang.http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true; title="class or interface in java.lang">ComparableT,
[36/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/org/apache/hadoop/hbase/client/Admin.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/client/Admin.html b/devapidocs/org/apache/hadoop/hbase/client/Admin.html index 91d80e9..21b6ca6 100644 --- a/devapidocs/org/apache/hadoop/hbase/client/Admin.html +++ b/devapidocs/org/apache/hadoop/hbase/client/Admin.html @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":6,"i1":6,"i2":6,"i3":38,"i4":6,"i5":6,"i6":18,"i7":18,"i8":6,"i9":6,"i10":6,"i11":6,"i12":6,"i13":6,"i14":6,"i15":6,"i16":6,"i17":38,"i18":38,"i19":38,"i20":38,"i21":6,"i22":6,"i23":6,"i24":6,"i25":6,"i26":6,"i27":6,"i28":6,"i29":6,"i30":6,"i31":6,"i32":50,"i33":50,"i34":50,"i35":6,"i36":6,"i37":6,"i38":50,"i39":6,"i40":38,"i41":6,"i42":6,"i43":6,"i44":6,"i45":6,"i46":6,"i47":6,"i48":6,"i49":6,"i50":6,"i51":38,"i52":38,"i53":6,"i54":6,"i55":18,"i56":6,"i57":6,"i58":6,"i59":38,"i60":38,"i61":6,"i62":6,"i63":18,"i64":6,"i65":6,"i66":6,"i67":38,"i68":38,"i69":6,"i70":6,"i71":6,"i72":6,"i73":38,"i74":6,"i75":6,"i76":6,"i77":6,"i78":6,"i79":6,"i80":6,"i81":6,"i82":6,"i83":6,"i84":6,"i85":6,"i86":6,"i87":6,"i88":6,"i89":6,"i90":6,"i91":6,"i92":18,"i93":6,"i94":38,"i95":38,"i96":38,"i97":6,"i98":6,"i99":6,"i100":6,"i101":6,"i102":6,"i103":6,"i104":6,"i105":6,"i106":6,"i107":6,"i108":6,"i109":6,"i110":6,"i111":6,"i112":6,"i113":6,"i114":6,"i115":6,"i116":18,"i117":18,"i1 18":18,"i119":6,"i120":6,"i121":6,"i122":6,"i123":6,"i124":6,"i125":6,"i126":6,"i127":6,"i128":6,"i129":6,"i130":38,"i131":6,"i132":6,"i133":6,"i134":6,"i135":6,"i136":6,"i137":38,"i138":38,"i139":38,"i140":38,"i141":38,"i142":6,"i143":6,"i144":6,"i145":6,"i146":6,"i147":6,"i148":6,"i149":6,"i150":38,"i151":6,"i152":6,"i153":38,"i154":6,"i155":6,"i156":6,"i157":6,"i158":6,"i159":38,"i160":6,"i161":38,"i162":6,"i163":6,"i164":6,"i165":6,"i166":18,"i167":18,"i168":6,"i169":6,"i170":6,"i171":6,"i172":6,"i173":6,"i174":6,"i175":6,"i176":6,"i177":6,"i178":6,"i179":6,"i180":6,"i181":6,"i182":6,"i183":6,"i184":6,"i185":6,"i186":6,"i187":6,"i188":6,"i189":38,"i190":38,"i191":6,"i192":6,"i193":6,"i194":6,"i195":6,"i196":6,"i197":6,"i198":6,"i199":6,"i200":6,"i201":18}; +var methods = {"i0":6,"i1":6,"i2":6,"i3":50,"i4":6,"i5":6,"i6":18,"i7":18,"i8":6,"i9":6,"i10":6,"i11":6,"i12":6,"i13":6,"i14":6,"i15":6,"i16":6,"i17":38,"i18":38,"i19":38,"i20":38,"i21":6,"i22":6,"i23":6,"i24":6,"i25":6,"i26":6,"i27":6,"i28":6,"i29":6,"i30":6,"i31":6,"i32":6,"i33":6,"i34":6,"i35":6,"i36":38,"i37":6,"i38":6,"i39":6,"i40":6,"i41":6,"i42":6,"i43":6,"i44":6,"i45":6,"i46":6,"i47":38,"i48":38,"i49":6,"i50":6,"i51":18,"i52":6,"i53":6,"i54":6,"i55":38,"i56":38,"i57":6,"i58":6,"i59":18,"i60":6,"i61":6,"i62":6,"i63":38,"i64":38,"i65":6,"i66":6,"i67":6,"i68":6,"i69":38,"i70":6,"i71":6,"i72":6,"i73":6,"i74":6,"i75":6,"i76":6,"i77":6,"i78":6,"i79":6,"i80":6,"i81":6,"i82":6,"i83":6,"i84":6,"i85":6,"i86":6,"i87":6,"i88":18,"i89":6,"i90":38,"i91":38,"i92":38,"i93":6,"i94":6,"i95":6,"i96":6,"i97":6,"i98":6,"i99":6,"i100":6,"i101":6,"i102":6,"i103":6,"i104":6,"i105":6,"i106":6,"i107":6,"i108":6,"i109":6,"i110":6,"i111":6,"i112":18,"i113":18,"i114":18,"i115":6,"i116":6,"i117":6,"i118" :6,"i119":6,"i120":6,"i121":6,"i122":6,"i123":6,"i124":6,"i125":6,"i126":38,"i127":6,"i128":6,"i129":6,"i130":6,"i131":6,"i132":6,"i133":38,"i134":38,"i135":38,"i136":38,"i137":38,"i138":6,"i139":6,"i140":6,"i141":6,"i142":6,"i143":6,"i144":6,"i145":6,"i146":38,"i147":6,"i148":6,"i149":50,"i150":6,"i151":6,"i152":6,"i153":6,"i154":6,"i155":38,"i156":6,"i157":38,"i158":6,"i159":6,"i160":6,"i161":6,"i162":18,"i163":18,"i164":6,"i165":6,"i166":6,"i167":6,"i168":6,"i169":6,"i170":6,"i171":6,"i172":6,"i173":6,"i174":6,"i175":6,"i176":6,"i177":6,"i178":6,"i179":6,"i180":6,"i181":6,"i182":6,"i183":6,"i184":6,"i185":38,"i186":38,"i187":6,"i188":6,"i189":6,"i190":6,"i191":6,"i192":6,"i193":6,"i194":6,"i195":6,"i196":6,"i197":18}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],16:["t5","Default Methods"],32:["t6","Deprecated Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -110,7 +110,7 @@ var activeTableTab = "activeTableTab"; @InterfaceAudience.Public -public interface Admin +public interface Admin extends Abortable, http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html?is-external=true; title="class or interface in java.io">Closeable The administrative API for HBase. Obtain an instance from an Connection.getAdmin() and call close() afterwards. @@ -164,9 +164,9 @@ extends -void -addColumn(TableNametableName, - HColumnDescriptorcolumnFamily) +default void +addColumn(TableNametableName, + ColumnFamilyDescriptorcolumnFamily) Deprecated. As of release 2.0.0. (https://issues.apache.org/jira/browse/HBASE-1989;>HBASE-1989). @@ -379,50 +379,19 @@ extends -default void
[25/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.CreateTableFuture.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.CreateTableFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.CreateTableFuture.html index 08c80d4..868c46e 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.CreateTableFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.CreateTableFuture.html @@ -1002,3395 +1002,3361 @@ 994return getAlterStatus(TableName.valueOf(tableName)); 995 } 996 -997 /** -998 * {@inheritDoc} -999 * @deprecated Since 2.0. Will be removed in 3.0. Use -1000 * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead. -1001 */ -1002 @Override -1003 @Deprecated -1004 public void addColumn(final TableName tableName, final HColumnDescriptor columnFamily) -1005 throws IOException { -1006addColumnFamily(tableName, columnFamily); -1007 } -1008 -1009 @Override -1010 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) -1011 throws IOException { -1012get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); -1013 } -1014 -1015 @Override -1016 public FutureVoid addColumnFamilyAsync(final TableName tableName, -1017 final ColumnFamilyDescriptor columnFamily) throws IOException { -1018AddColumnResponse response = -1019executeCallable(new MasterCallableAddColumnResponse(getConnection(), -1020getRpcControllerFactory()) { -1021 @Override -1022 protected AddColumnResponse rpcCall() throws Exception { -1023setPriority(tableName); -1024AddColumnRequest req = -1025 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), -1026 ng.newNonce()); -1027return master.addColumn(getRpcController(), req); -1028 } -1029}); -1030return new AddColumnFamilyFuture(this, tableName, response); -1031 } -1032 -1033 private static class AddColumnFamilyFuture extends ModifyTableFuture { -1034public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, -1035final AddColumnResponse response) { -1036 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() -1037 : null); -1038} -1039 -1040@Override -1041public String getOperationType() { -1042 return "ADD_COLUMN_FAMILY"; -1043} +997 @Override +998 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) +999 throws IOException { +1000get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); +1001 } +1002 +1003 @Override +1004 public FutureVoid addColumnFamilyAsync(final TableName tableName, +1005 final ColumnFamilyDescriptor columnFamily) throws IOException { +1006AddColumnResponse response = +1007executeCallable(new MasterCallableAddColumnResponse(getConnection(), +1008getRpcControllerFactory()) { +1009 @Override +1010 protected AddColumnResponse rpcCall() throws Exception { +1011setPriority(tableName); +1012AddColumnRequest req = +1013 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), +1014 ng.newNonce()); +1015return master.addColumn(getRpcController(), req); +1016 } +1017}); +1018return new AddColumnFamilyFuture(this, tableName, response); +1019 } +1020 +1021 private static class AddColumnFamilyFuture extends ModifyTableFuture { +1022public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, +1023final AddColumnResponse response) { +1024 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() +1025 : null); +1026} +1027 +1028@Override +1029public String getOperationType() { +1030 return "ADD_COLUMN_FAMILY"; +1031} +1032 } +1033 +1034 /** +1035 * {@inheritDoc} +1036 * @deprecated Since 2.0. Will be removed in 3.0. Use +1037 * {@link #deleteColumnFamily(TableName, byte[])} instead. +1038 */ +1039 @Override +1040 @Deprecated +1041 public void deleteColumn(final TableName tableName, final byte[] columnFamily) +1042 throws IOException { +1043deleteColumnFamily(tableName, columnFamily); 1044 } 1045 -1046 /** -1047 * {@inheritDoc} -1048 * @deprecated Since 2.0. Will be removed in 3.0. Use -1049 * {@link #deleteColumnFamily(TableName, byte[])} instead. -1050 */ -1051 @Override -1052 @Deprecated -1053 public void deleteColumn(final
[41/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/dependency-convergence.html -- diff --git a/dependency-convergence.html b/dependency-convergence.html index a41e21e..7c0019a 100644 --- a/dependency-convergence.html +++ b/dependency-convergence.html @@ -7,7 +7,7 @@ - + Apache HBase Reactor Dependency Convergence @@ -361,7 +361,7 @@ 11.0.2 -org.apache.hbase:hbase-spark-it:jar:3.0.0-SNAPSHOT\-org.apache.hbase:hbase-common:jar:3.0.0-SNAPSHOT:compile\-org.apache.hadoop:hadoop-common:jar:2.7.1:compile\-com.google.guava:guava:jar:11.0.2:compile +org.apache.hbase:hbase-spark-it:jar:3.0.0-SNAPSHOT+-org.apache.hbase:hbase-common:jar:3.0.0-SNAPSHOT:compile|\-org.apache.hadoop:hadoop-common:jar:2.7.1:compile|\-com.google.guava:guava:jar:11.0.2:compile\-org.apache.hbase:hbase-it:test-jar:tests:3.0.0-SNAPSHOT:test\-org.apache.hbase:hbase-backup:jar:3.0.0-SNAPSHOT:test\-(com.google.guava:guava:jar:11.0.2:test - omitted for duplicate) org.apache.hbase:hbase-spark:jar:3.0.0-SNAPSHOT+-org.apache.hadoop:hadoop-client:jar:2.7.1:compile|+-org.apache.hadoop:hadoop-hdfs:jar:2.7.1:compile||\-(com.google.guava:guava:jar:11.0.2:compile - omitted for conflict with 14.0.1)|+-org.apache.hadoop:hadoop-mapreduce-client-app:jar:2.7.1:compile||\-org.apache.hadoop:hadoop-mapreduce-client-common:jar:2.7.1:compile||+-org.apache.hadoop:hadoop-yarn-client:jar:2.7.1:compile|||\-(com.google.guava:guava:jar:11.0.2:compile - omitted for conflict with 14.0.1)||\-org.apache.hadoop:hadoop-yarn-server-common:jar:2.7.1:compile||\-(com.google.guava:guava:jar:11.0.2:comp ile - omitted for conflict with 14.0.1)|+-org.apache.hadoop:hadoop-yarn-api:jar:2.7.1:compile||\-(com.google.guava:guava:jar:11.0.2:compile - omitted for conflict with 14.0.1)|\-org.apache.hadoop:hadoop-mapreduce-client-core:jar:2.7.1:compile|\-org.apache.hadoop:hadoop-yarn-common:jar:2.7.1:compile|\-(com.google.guava:guava:jar:11.0.2:compile - omitted for conflict with 14.0.1)+-org.apache.hadoop:hadoop-common:jar:2.7.1:compile|\-com.google.guava:guava:jar:11.0.2:compile+-org.apache.hadoop:hadoop-common:test-jar:tests:2.7.1:test|\-(com.google.guava:guava:jar:11.0.2:test - omitted for duplicate)\-org.apache.hadoop:hadoop-hdfs:test-jar:tests:2.7.1:test\-(com.google.guava:guava:jar:11.0.2:te st - omitted for duplicate) 14.0.1 @@ -428,7 +428,7 @@ 3.6.2.Final -org.apache.hbase:hbase-spark-it:jar:3.0.0-SNAPSHOT\-io.netty:netty:jar:3.6.2.Final:test +org.apache.hbase:hbase-spark-it:jar:3.0.0-SNAPSHOT+-org.apache.hbase:hbase-it:test-jar:tests:3.0.0-SNAPSHOT:test|\-org.apache.hbase:hbase-backup:jar:3.0.0-SNAPSHOT:test|\-(io.netty:netty:jar:3.6.2.Final:test - omitted for duplicate)\-io.netty:netty:jar:3.6.2.Final:test 3.8.0.Final @@ -518,6 +518,25 @@ +3.4.10 + + +org.apache.hbase:hbase-assembly:pom:3.0.0-SNAPSHOT+-org.apache.hbase:hbase-server:jar:3.0.0-SNAPSHOT:compile|+-org.apache.hbase:hbase-client:jar:3.0.0-SNAPSHOT:compile||+-(org.apache.zookeeper:zookeeper:jar:3.4.10:compile - version managed from 3.4.6; omitted for duplicate)||\-org.apache.curator:curator-client:jar:2.12.0:compile||\-(org.apache.zookeeper:zookeeper:jar:3.4.10:compile - version managed from 3.4.8; omitted for duplicate)|+-org.apache.hbase:hbase-replication:jar:3.0.0-SNAPSHOT:compile||\-(org.apache.zookeeper:zookeeper:jar:3.4.10:compile - version managed from 3.4.6; omitted for duplicate)|+-org.apache.zookeeper:zookeeper:jar:3.4.10:compile|+-org.apache.hadoop:hadoop-common:jar:2.7.1:compile| 0;|\-(org.apache.zookeeper:zookeeper:jar:3.4.10:compile - version managed from 3.4.6; omitted for duplicate)|+-org.apache.hadoop:hadoop-auth:jar:2.7.1:compile||\-(org.apache.zookeeper:zookeeper:jar:3.4.10:compile - version managed from 3.4.6; omitted for duplicate)|\-org.apache.hadoop:hadoop-client:jar:2.7.1:compile|\-org.apache.hadoop:hadoop-mapreduce-client-app:jar:2.7.1:compile|\-org.apache.hadoop:hadoop-mapreduce-client-common:jar:2.7.1:compile|\-org.apache.hadoop:hadoop-yarn-server-common:jar:2.7.1:compile|\-(org.apache.zookeeper:zookeeper:jar:3.4.10:compile - version managed from 3.4.6; omitted for d uplicate)+-org.apache.hbase:hbase-mapreduce:jar:3.0.0-SNAPSHOT:compile|\-(org.apache.zookeeper:zookeeper:jar:3.4.10:compile - version managed from 3.4.6; omitted for duplicate)+-org.apache.hbase:hbase-testing-util:jar:3.0.0-SNAPSHOT:test|+-org.apache.hbase:hbase-server:test-jar:tests:3.0.0-SNAPSHOT:test||\-(org.apache.zookeeper:zookeeper:jar:3.4.10:test - version managed from 3.4.6; omitted for duplicate)|\-org.apache.hadoop:hadoop-minicluster:jar:2.7.1:test|+-org.apache.hadoop:hadoop-common:test-jar:tests:2.7.1:test||\-(org.apache.zookeeper:zookeeper:jar:3.4.10:test - version managed from 3.4.6; omitted for duplicate)|\-org.apache.hadoop:hadoop-yarn-server-tests:test-jar:tests:2.7.1:test|
[37/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/org/apache/hadoop/hbase/classification/package-tree.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/classification/package-tree.html b/devapidocs/org/apache/hadoop/hbase/classification/package-tree.html index a96db7e..e1205c4 100644 --- a/devapidocs/org/apache/hadoop/hbase/classification/package-tree.html +++ b/devapidocs/org/apache/hadoop/hbase/classification/package-tree.html @@ -89,10 +89,10 @@ Annotation Type Hierarchy org.apache.hadoop.hbase.classification.InterfaceAudience.Private (implements java.lang.annotation.http://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Annotation.html?is-external=true; title="class or interface in java.lang.annotation">Annotation) +org.apache.hadoop.hbase.classification.InterfaceStability.Evolving (implements java.lang.annotation.http://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Annotation.html?is-external=true; title="class or interface in java.lang.annotation">Annotation) +org.apache.hadoop.hbase.classification.InterfaceStability.Unstable (implements java.lang.annotation.http://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Annotation.html?is-external=true; title="class or interface in java.lang.annotation">Annotation) org.apache.hadoop.hbase.classification.InterfaceStability.Stable (implements java.lang.annotation.http://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Annotation.html?is-external=true; title="class or interface in java.lang.annotation">Annotation) org.apache.hadoop.hbase.classification.InterfaceAudience.LimitedPrivate (implements java.lang.annotation.http://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Annotation.html?is-external=true; title="class or interface in java.lang.annotation">Annotation) -org.apache.hadoop.hbase.classification.InterfaceStability.Unstable (implements java.lang.annotation.http://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Annotation.html?is-external=true; title="class or interface in java.lang.annotation">Annotation) -org.apache.hadoop.hbase.classification.InterfaceStability.Evolving (implements java.lang.annotation.http://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Annotation.html?is-external=true; title="class or interface in java.lang.annotation">Annotation) org.apache.hadoop.hbase.classification.InterfaceAudience.Public (implements java.lang.annotation.http://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Annotation.html?is-external=true; title="class or interface in java.lang.annotation">Annotation)
[17/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.NamespaceFuture.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.NamespaceFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.NamespaceFuture.html index 08c80d4..868c46e 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.NamespaceFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.NamespaceFuture.html @@ -1002,3395 +1002,3361 @@ 994return getAlterStatus(TableName.valueOf(tableName)); 995 } 996 -997 /** -998 * {@inheritDoc} -999 * @deprecated Since 2.0. Will be removed in 3.0. Use -1000 * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead. -1001 */ -1002 @Override -1003 @Deprecated -1004 public void addColumn(final TableName tableName, final HColumnDescriptor columnFamily) -1005 throws IOException { -1006addColumnFamily(tableName, columnFamily); -1007 } -1008 -1009 @Override -1010 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) -1011 throws IOException { -1012get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); -1013 } -1014 -1015 @Override -1016 public FutureVoid addColumnFamilyAsync(final TableName tableName, -1017 final ColumnFamilyDescriptor columnFamily) throws IOException { -1018AddColumnResponse response = -1019executeCallable(new MasterCallableAddColumnResponse(getConnection(), -1020getRpcControllerFactory()) { -1021 @Override -1022 protected AddColumnResponse rpcCall() throws Exception { -1023setPriority(tableName); -1024AddColumnRequest req = -1025 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), -1026 ng.newNonce()); -1027return master.addColumn(getRpcController(), req); -1028 } -1029}); -1030return new AddColumnFamilyFuture(this, tableName, response); -1031 } -1032 -1033 private static class AddColumnFamilyFuture extends ModifyTableFuture { -1034public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, -1035final AddColumnResponse response) { -1036 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() -1037 : null); -1038} -1039 -1040@Override -1041public String getOperationType() { -1042 return "ADD_COLUMN_FAMILY"; -1043} +997 @Override +998 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) +999 throws IOException { +1000get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); +1001 } +1002 +1003 @Override +1004 public FutureVoid addColumnFamilyAsync(final TableName tableName, +1005 final ColumnFamilyDescriptor columnFamily) throws IOException { +1006AddColumnResponse response = +1007executeCallable(new MasterCallableAddColumnResponse(getConnection(), +1008getRpcControllerFactory()) { +1009 @Override +1010 protected AddColumnResponse rpcCall() throws Exception { +1011setPriority(tableName); +1012AddColumnRequest req = +1013 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), +1014 ng.newNonce()); +1015return master.addColumn(getRpcController(), req); +1016 } +1017}); +1018return new AddColumnFamilyFuture(this, tableName, response); +1019 } +1020 +1021 private static class AddColumnFamilyFuture extends ModifyTableFuture { +1022public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, +1023final AddColumnResponse response) { +1024 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() +1025 : null); +1026} +1027 +1028@Override +1029public String getOperationType() { +1030 return "ADD_COLUMN_FAMILY"; +1031} +1032 } +1033 +1034 /** +1035 * {@inheritDoc} +1036 * @deprecated Since 2.0. Will be removed in 3.0. Use +1037 * {@link #deleteColumnFamily(TableName, byte[])} instead. +1038 */ +1039 @Override +1040 @Deprecated +1041 public void deleteColumn(final TableName tableName, final byte[] columnFamily) +1042 throws IOException { +1043deleteColumnFamily(tableName, columnFamily); 1044 } 1045 -1046 /** -1047 * {@inheritDoc} -1048 * @deprecated Since 2.0. Will be removed in 3.0. Use -1049 * {@link #deleteColumnFamily(TableName, byte[])} instead. -1050 */ -1051 @Override -1052 @Deprecated -1053 public void deleteColumn(final TableName
[29/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/src-html/org/apache/hadoop/hbase/client/Admin.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/Admin.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/Admin.html index 5a77704..b2f4152 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/Admin.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/Admin.html @@ -40,2314 +40,2231 @@ 032import org.apache.hadoop.hbase.Abortable; 033import org.apache.hadoop.hbase.ClusterStatus; 034import org.apache.hadoop.hbase.ClusterStatus.Options; -035import org.apache.hadoop.hbase.HColumnDescriptor; -036import org.apache.hadoop.hbase.HRegionInfo; -037import org.apache.hadoop.hbase.HTableDescriptor; -038import org.apache.hadoop.hbase.NamespaceDescriptor; -039import org.apache.hadoop.hbase.NamespaceNotFoundException; -040import org.apache.hadoop.hbase.ProcedureInfo; -041import org.apache.hadoop.hbase.RegionLoad; -042import org.apache.hadoop.hbase.ServerName; -043import org.apache.hadoop.hbase.TableExistsException; -044import org.apache.hadoop.hbase.TableName; -045import org.apache.hadoop.hbase.TableNotFoundException; -046import org.apache.hadoop.hbase.classification.InterfaceAudience; -047import org.apache.hadoop.hbase.client.replication.TableCFs; -048import org.apache.hadoop.hbase.client.security.SecurityCapability; -049import org.apache.hadoop.hbase.ipc.CoprocessorRpcChannel; -050import org.apache.hadoop.hbase.procedure2.LockInfo; -051import org.apache.hadoop.hbase.quotas.QuotaFilter; -052import org.apache.hadoop.hbase.quotas.QuotaRetriever; -053import org.apache.hadoop.hbase.quotas.QuotaSettings; -054import org.apache.hadoop.hbase.regionserver.wal.FailedLogCloseException; -055import org.apache.hadoop.hbase.replication.ReplicationException; -056import org.apache.hadoop.hbase.replication.ReplicationPeerConfig; -057import org.apache.hadoop.hbase.replication.ReplicationPeerDescription; -058import org.apache.hadoop.hbase.snapshot.HBaseSnapshotException; -059import org.apache.hadoop.hbase.snapshot.RestoreSnapshotException; -060import org.apache.hadoop.hbase.snapshot.SnapshotCreationException; -061import org.apache.hadoop.hbase.snapshot.UnknownSnapshotException; -062import org.apache.hadoop.hbase.util.Pair; -063 -064/** -065 * The administrative API for HBase. Obtain an instance from an {@link Connection#getAdmin()} and -066 * call {@link #close()} afterwards. -067 * pAdmin can be used to create, drop, list, enable and disable tables, add and drop table -068 * column families and other administrative operations. -069 * -070 * @see ConnectionFactory -071 * @see Connection -072 * @see Table -073 * @since 0.99.0 -074 */ -075@InterfaceAudience.Public -076public interface Admin extends Abortable, Closeable { -077 int getOperationTimeout(); -078 -079 @Override -080 void abort(String why, Throwable e); -081 -082 @Override -083 boolean isAborted(); -084 -085 /** -086 * @return Connection used by this object. -087 */ -088 Connection getConnection(); -089 -090 /** -091 * @param tableName Table to check. -092 * @return True if table exists already. -093 * @throws IOException -094 */ -095 boolean tableExists(final TableName tableName) throws IOException; -096 -097 /** -098 * List all the userspace tables. -099 * -100 * @return - returns an array of read-only HTableDescriptors -101 * @throws IOException if a remote or network exception occurs -102 * @deprecated since 2.0 version and will be removed in 3.0 version. -103 * use {@link #listTableDescriptors()} -104 */ -105 @Deprecated -106 HTableDescriptor[] listTables() throws IOException; -107 -108 /** -109 * List all the userspace tables. -110 * -111 * @return - returns a list of TableDescriptors -112 * @throws IOException if a remote or network exception occurs -113 */ -114 ListTableDescriptor listTableDescriptors() throws IOException; -115 -116 /** -117 * List all the userspace tables matching the given pattern. -118 * -119 * @param pattern The compiled regular expression to match against -120 * @return - returns an array of read-only HTableDescriptors -121 * @throws IOException if a remote or network exception occurs -122 * @see #listTables() -123 * @deprecated since 2.0 version and will be removed in 3.0 version. -124 * use {@link #listTableDescriptors(java.util.regex.Pattern)} -125 */ -126 @Deprecated -127 HTableDescriptor[] listTables(Pattern pattern) throws IOException; -128 -129 /** -130 * List all the userspace tables matching the given pattern. -131 * -132 * @param pattern The compiled regular expression to match against -133 * @return - returns a list of TableDescriptors -134 * @throws IOException if a remote or network exception occurs -135 * @see #listTables() -136 */ -137
[48/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/apidocs/org/apache/hadoop/hbase/client/Admin.html -- diff --git a/apidocs/org/apache/hadoop/hbase/client/Admin.html b/apidocs/org/apache/hadoop/hbase/client/Admin.html index eb53c97..80bbcfd 100644 --- a/apidocs/org/apache/hadoop/hbase/client/Admin.html +++ b/apidocs/org/apache/hadoop/hbase/client/Admin.html @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":6,"i1":6,"i2":6,"i3":38,"i4":6,"i5":6,"i6":18,"i7":18,"i8":6,"i9":6,"i10":6,"i11":6,"i12":6,"i13":6,"i14":6,"i15":6,"i16":6,"i17":38,"i18":38,"i19":38,"i20":38,"i21":6,"i22":6,"i23":6,"i24":6,"i25":6,"i26":6,"i27":6,"i28":6,"i29":6,"i30":6,"i31":6,"i32":50,"i33":50,"i34":50,"i35":6,"i36":6,"i37":6,"i38":50,"i39":6,"i40":38,"i41":6,"i42":6,"i43":6,"i44":6,"i45":6,"i46":6,"i47":6,"i48":6,"i49":6,"i50":6,"i51":38,"i52":38,"i53":6,"i54":6,"i55":18,"i56":6,"i57":6,"i58":6,"i59":38,"i60":38,"i61":6,"i62":6,"i63":18,"i64":6,"i65":6,"i66":6,"i67":38,"i68":38,"i69":6,"i70":6,"i71":6,"i72":6,"i73":38,"i74":6,"i75":6,"i76":6,"i77":6,"i78":6,"i79":6,"i80":6,"i81":6,"i82":6,"i83":6,"i84":6,"i85":6,"i86":6,"i87":6,"i88":6,"i89":6,"i90":6,"i91":6,"i92":18,"i93":6,"i94":38,"i95":38,"i96":38,"i97":6,"i98":6,"i99":6,"i100":6,"i101":6,"i102":6,"i103":6,"i104":6,"i105":6,"i106":6,"i107":6,"i108":6,"i109":6,"i110":6,"i111":6,"i112":6,"i113":6,"i114":6,"i115":6,"i116":18,"i117":18,"i1 18":18,"i119":6,"i120":6,"i121":6,"i122":6,"i123":6,"i124":6,"i125":6,"i126":6,"i127":6,"i128":6,"i129":6,"i130":38,"i131":6,"i132":6,"i133":6,"i134":6,"i135":6,"i136":6,"i137":38,"i138":38,"i139":38,"i140":38,"i141":38,"i142":6,"i143":6,"i144":6,"i145":6,"i146":6,"i147":6,"i148":6,"i149":6,"i150":38,"i151":6,"i152":6,"i153":38,"i154":6,"i155":6,"i156":6,"i157":6,"i158":6,"i159":38,"i160":6,"i161":38,"i162":6,"i163":6,"i164":6,"i165":6,"i166":18,"i167":18,"i168":6,"i169":6,"i170":6,"i171":6,"i172":6,"i173":6,"i174":6,"i175":6,"i176":6,"i177":6,"i178":6,"i179":6,"i180":6,"i181":6,"i182":6,"i183":6,"i184":6,"i185":6,"i186":6,"i187":6,"i188":6,"i189":38,"i190":38,"i191":6,"i192":6,"i193":6,"i194":6,"i195":6,"i196":6,"i197":6,"i198":6,"i199":6,"i200":6,"i201":18}; +var methods = {"i0":6,"i1":6,"i2":6,"i3":50,"i4":6,"i5":6,"i6":18,"i7":18,"i8":6,"i9":6,"i10":6,"i11":6,"i12":6,"i13":6,"i14":6,"i15":6,"i16":6,"i17":38,"i18":38,"i19":38,"i20":38,"i21":6,"i22":6,"i23":6,"i24":6,"i25":6,"i26":6,"i27":6,"i28":6,"i29":6,"i30":6,"i31":6,"i32":6,"i33":6,"i34":6,"i35":6,"i36":38,"i37":6,"i38":6,"i39":6,"i40":6,"i41":6,"i42":6,"i43":6,"i44":6,"i45":6,"i46":6,"i47":38,"i48":38,"i49":6,"i50":6,"i51":18,"i52":6,"i53":6,"i54":6,"i55":38,"i56":38,"i57":6,"i58":6,"i59":18,"i60":6,"i61":6,"i62":6,"i63":38,"i64":38,"i65":6,"i66":6,"i67":6,"i68":6,"i69":38,"i70":6,"i71":6,"i72":6,"i73":6,"i74":6,"i75":6,"i76":6,"i77":6,"i78":6,"i79":6,"i80":6,"i81":6,"i82":6,"i83":6,"i84":6,"i85":6,"i86":6,"i87":6,"i88":18,"i89":6,"i90":38,"i91":38,"i92":38,"i93":6,"i94":6,"i95":6,"i96":6,"i97":6,"i98":6,"i99":6,"i100":6,"i101":6,"i102":6,"i103":6,"i104":6,"i105":6,"i106":6,"i107":6,"i108":6,"i109":6,"i110":6,"i111":6,"i112":18,"i113":18,"i114":18,"i115":6,"i116":6,"i117":6,"i118" :6,"i119":6,"i120":6,"i121":6,"i122":6,"i123":6,"i124":6,"i125":6,"i126":38,"i127":6,"i128":6,"i129":6,"i130":6,"i131":6,"i132":6,"i133":38,"i134":38,"i135":38,"i136":38,"i137":38,"i138":6,"i139":6,"i140":6,"i141":6,"i142":6,"i143":6,"i144":6,"i145":6,"i146":38,"i147":6,"i148":6,"i149":50,"i150":6,"i151":6,"i152":6,"i153":6,"i154":6,"i155":38,"i156":6,"i157":38,"i158":6,"i159":6,"i160":6,"i161":6,"i162":18,"i163":18,"i164":6,"i165":6,"i166":6,"i167":6,"i168":6,"i169":6,"i170":6,"i171":6,"i172":6,"i173":6,"i174":6,"i175":6,"i176":6,"i177":6,"i178":6,"i179":6,"i180":6,"i181":6,"i182":6,"i183":6,"i184":6,"i185":38,"i186":38,"i187":6,"i188":6,"i189":6,"i190":6,"i191":6,"i192":6,"i193":6,"i194":6,"i195":6,"i196":6,"i197":18}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],16:["t5","Default Methods"],32:["t6","Deprecated Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -106,7 +106,7 @@ var activeTableTab = "activeTableTab"; @InterfaceAudience.Public -public interface Admin +public interface Admin extends org.apache.hadoop.hbase.Abortable, http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html?is-external=true; title="class or interface in java.io">Closeable The administrative API for HBase. Obtain an instance from an Connection.getAdmin() and call close() afterwards. @@ -160,9 +160,9 @@ extends org.apache.hadoop.hbase.Abortable, http://docs.oracle.com/javas -void -addColumn(TableNametableName, - HColumnDescriptorcolumnFamily) +default void +addColumn(TableNametableName, + ColumnFamilyDescriptorcolumnFamily) Deprecated. As of release 2.0.0.
hbase-site git commit: INFRA-10751 Empty commit
Repository: hbase-site Updated Branches: refs/heads/asf-site e1eb0a072 -> 85f4b09a2 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/85f4b09a Tree: http://git-wip-us.apache.org/repos/asf/hbase-site/tree/85f4b09a Diff: http://git-wip-us.apache.org/repos/asf/hbase-site/diff/85f4b09a Branch: refs/heads/asf-site Commit: 85f4b09a2572f97948c8690375a8c0d52f909d78 Parents: e1eb0a0 Author: jenkinsAuthored: Mon Sep 4 15:13:30 2017 + Committer: jenkins Committed: Mon Sep 4 15:13:30 2017 + -- --
[45/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/apidocs/src-html/org/apache/hadoop/hbase/client/Admin.html -- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/client/Admin.html b/apidocs/src-html/org/apache/hadoop/hbase/client/Admin.html index 5a77704..b2f4152 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/client/Admin.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/client/Admin.html @@ -40,2314 +40,2231 @@ 032import org.apache.hadoop.hbase.Abortable; 033import org.apache.hadoop.hbase.ClusterStatus; 034import org.apache.hadoop.hbase.ClusterStatus.Options; -035import org.apache.hadoop.hbase.HColumnDescriptor; -036import org.apache.hadoop.hbase.HRegionInfo; -037import org.apache.hadoop.hbase.HTableDescriptor; -038import org.apache.hadoop.hbase.NamespaceDescriptor; -039import org.apache.hadoop.hbase.NamespaceNotFoundException; -040import org.apache.hadoop.hbase.ProcedureInfo; -041import org.apache.hadoop.hbase.RegionLoad; -042import org.apache.hadoop.hbase.ServerName; -043import org.apache.hadoop.hbase.TableExistsException; -044import org.apache.hadoop.hbase.TableName; -045import org.apache.hadoop.hbase.TableNotFoundException; -046import org.apache.hadoop.hbase.classification.InterfaceAudience; -047import org.apache.hadoop.hbase.client.replication.TableCFs; -048import org.apache.hadoop.hbase.client.security.SecurityCapability; -049import org.apache.hadoop.hbase.ipc.CoprocessorRpcChannel; -050import org.apache.hadoop.hbase.procedure2.LockInfo; -051import org.apache.hadoop.hbase.quotas.QuotaFilter; -052import org.apache.hadoop.hbase.quotas.QuotaRetriever; -053import org.apache.hadoop.hbase.quotas.QuotaSettings; -054import org.apache.hadoop.hbase.regionserver.wal.FailedLogCloseException; -055import org.apache.hadoop.hbase.replication.ReplicationException; -056import org.apache.hadoop.hbase.replication.ReplicationPeerConfig; -057import org.apache.hadoop.hbase.replication.ReplicationPeerDescription; -058import org.apache.hadoop.hbase.snapshot.HBaseSnapshotException; -059import org.apache.hadoop.hbase.snapshot.RestoreSnapshotException; -060import org.apache.hadoop.hbase.snapshot.SnapshotCreationException; -061import org.apache.hadoop.hbase.snapshot.UnknownSnapshotException; -062import org.apache.hadoop.hbase.util.Pair; -063 -064/** -065 * The administrative API for HBase. Obtain an instance from an {@link Connection#getAdmin()} and -066 * call {@link #close()} afterwards. -067 * pAdmin can be used to create, drop, list, enable and disable tables, add and drop table -068 * column families and other administrative operations. -069 * -070 * @see ConnectionFactory -071 * @see Connection -072 * @see Table -073 * @since 0.99.0 -074 */ -075@InterfaceAudience.Public -076public interface Admin extends Abortable, Closeable { -077 int getOperationTimeout(); -078 -079 @Override -080 void abort(String why, Throwable e); -081 -082 @Override -083 boolean isAborted(); -084 -085 /** -086 * @return Connection used by this object. -087 */ -088 Connection getConnection(); -089 -090 /** -091 * @param tableName Table to check. -092 * @return True if table exists already. -093 * @throws IOException -094 */ -095 boolean tableExists(final TableName tableName) throws IOException; -096 -097 /** -098 * List all the userspace tables. -099 * -100 * @return - returns an array of read-only HTableDescriptors -101 * @throws IOException if a remote or network exception occurs -102 * @deprecated since 2.0 version and will be removed in 3.0 version. -103 * use {@link #listTableDescriptors()} -104 */ -105 @Deprecated -106 HTableDescriptor[] listTables() throws IOException; -107 -108 /** -109 * List all the userspace tables. -110 * -111 * @return - returns a list of TableDescriptors -112 * @throws IOException if a remote or network exception occurs -113 */ -114 ListTableDescriptor listTableDescriptors() throws IOException; -115 -116 /** -117 * List all the userspace tables matching the given pattern. -118 * -119 * @param pattern The compiled regular expression to match against -120 * @return - returns an array of read-only HTableDescriptors -121 * @throws IOException if a remote or network exception occurs -122 * @see #listTables() -123 * @deprecated since 2.0 version and will be removed in 3.0 version. -124 * use {@link #listTableDescriptors(java.util.regex.Pattern)} -125 */ -126 @Deprecated -127 HTableDescriptor[] listTables(Pattern pattern) throws IOException; -128 -129 /** -130 * List all the userspace tables matching the given pattern. -131 * -132 * @param pattern The compiled regular expression to match against -133 * @return - returns a list of TableDescriptors -134 * @throws IOException if a remote or network exception occurs -135 * @see #listTables() -136 */ -137
[49/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/apidocs/deprecated-list.html -- diff --git a/apidocs/deprecated-list.html b/apidocs/deprecated-list.html index b2332c6..3d2c333 100644 --- a/apidocs/deprecated-list.html +++ b/apidocs/deprecated-list.html @@ -219,7 +219,7 @@ -org.apache.hadoop.hbase.client.Admin.addColumn(TableName, HColumnDescriptor) +org.apache.hadoop.hbase.client.Admin.addColumn(TableName, ColumnFamilyDescriptor) As of release 2.0.0. (https://issues.apache.org/jira/browse/HBASE-1989;>HBASE-1989). This will be removed in HBase 3.0.0. @@ -356,30 +356,6 @@ -org.apache.hadoop.hbase.client.Admin.createTable(HTableDescriptor) -since 2.0 version and will be removed in 3.0 version. - use Admin.createTable(TableDescriptor) - - - -org.apache.hadoop.hbase.client.Admin.createTable(HTableDescriptor, byte[][]) -since 2.0 version and will be removed in 3.0 version. - use Admin.createTable(TableDescriptor, byte[][]) - - - -org.apache.hadoop.hbase.client.Admin.createTable(HTableDescriptor, byte[], byte[], int) -since 2.0 version and will be removed in 3.0 version. - use Admin.createTable(TableDescriptor, byte[], byte[], int) - - - -org.apache.hadoop.hbase.client.Admin.createTableAsync(HTableDescriptor, byte[][]) -since 2.0 version and will be removed in 3.0 version. - use Admin.createTableAsync(TableDescriptor, byte[][]) - - - org.apache.hadoop.hbase.client.Admin.deleteColumn(TableName, byte[]) As of release 2.0.0. (https://issues.apache.org/jira/browse/HBASE-1989;>HBASE-1989). @@ -739,7 +715,7 @@ -org.apache.hadoop.hbase.client.Admin.modifyColumn(TableName, HColumnDescriptor) +org.apache.hadoop.hbase.client.Admin.modifyColumn(TableName, ColumnFamilyDescriptor) As of release 2.0.0. (https://issues.apache.org/jira/browse/HBASE-1989;>HBASE-1989). This will be removed in HBase 3.0.0. @@ -747,13 +723,13 @@ -org.apache.hadoop.hbase.client.Admin.modifyTable(TableName, HTableDescriptor) +org.apache.hadoop.hbase.client.Admin.modifyTable(TableName, TableDescriptor) since 2.0 version and will be removed in 3.0 version. use Admin.modifyTable(TableDescriptor) -org.apache.hadoop.hbase.client.Admin.modifyTableAsync(TableName, HTableDescriptor) +org.apache.hadoop.hbase.client.Admin.modifyTableAsync(TableName, TableDescriptor) since 2.0 version and will be removed in 3.0 version. use Admin.modifyTableAsync(TableDescriptor) http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/apidocs/index-all.html -- diff --git a/apidocs/index-all.html b/apidocs/index-all.html index d866bd8..f53ea21 100644 --- a/apidocs/index-all.html +++ b/apidocs/index-all.html @@ -177,7 +177,7 @@ Add a client port to the list. -addColumn(TableName, HColumnDescriptor) - Method in interface org.apache.hadoop.hbase.client.Admin +addColumn(TableName, ColumnFamilyDescriptor) - Method in interface org.apache.hadoop.hbase.client.Admin Deprecated. As of release 2.0.0. @@ -2654,35 +2654,14 @@ Sets up the actual job. -createTable(HTableDescriptor) - Method in interface org.apache.hadoop.hbase.client.Admin - -Deprecated. -since 2.0 version and will be removed in 3.0 version. - use Admin.createTable(TableDescriptor) - - createTable(TableDescriptor) - Method in interface org.apache.hadoop.hbase.client.Admin Creates a new table. -createTable(HTableDescriptor, byte[], byte[], int) - Method in interface org.apache.hadoop.hbase.client.Admin - -Deprecated. -since 2.0 version and will be removed in 3.0 version. - use Admin.createTable(TableDescriptor, byte[], byte[], int) - - createTable(TableDescriptor, byte[], byte[], int) - Method in interface org.apache.hadoop.hbase.client.Admin Creates a new table with the specified number of regions. -createTable(HTableDescriptor, byte[][]) - Method in interface org.apache.hadoop.hbase.client.Admin - -Deprecated. -since 2.0 version and will be removed in 3.0 version. - use Admin.createTable(TableDescriptor, byte[][]) - - createTable(TableDescriptor, byte[][]) - Method in interface org.apache.hadoop.hbase.client.Admin Creates a new table with an initial set of empty regions defined by the specified split keys. @@ -2705,13 +2684,6 @@ Creates a new table. -createTableAsync(HTableDescriptor, byte[][]) - Method in interface org.apache.hadoop.hbase.client.Admin - -Deprecated. -since 2.0 version and will be removed in 3.0 version. - use Admin.createTableAsync(TableDescriptor, byte[][]) - - createTableAsync(TableDescriptor, byte[][]) - Method in interface org.apache.hadoop.hbase.client.Admin Creates a new table but does not block and wait for it to come online. @@
[35/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/org/apache/hadoop/hbase/client/Append.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/client/Append.html b/devapidocs/org/apache/hadoop/hbase/client/Append.html index ac7381d..b2a2a72 100644 --- a/devapidocs/org/apache/hadoop/hbase/client/Append.html +++ b/devapidocs/org/apache/hadoop/hbase/client/Append.html @@ -129,14 +129,13 @@ var activeTableTab = "activeTableTab"; @InterfaceAudience.Public -public class Append +public class Append extends Mutation Performs Append operations on a single row. - Note that this operation does not appear atomic to readers. Appends are done - under a single row lock, so write operations to a row are synchronized, but - readers do not take row locks so get and scan operations can see this - operation partially completed. + This operation ensures atomicty to readers. Appends are done + under a single row lock, so write operations to a row are synchronized, and + readers are guaranteed to see this operation fully completed. To append to a set of columns of a row, instantiate an Append object with the row to append to. At least one column to append must be specified using the @@ -350,7 +349,7 @@ extends Append -publicAppend(byte[]row) +publicAppend(byte[]row) Create a Append operation for the specified row. At least one column must be appended to. @@ -366,7 +365,7 @@ extends Append -publicAppend(Appenda) +publicAppend(Appenda) Copy constructor Parameters: @@ -380,7 +379,7 @@ extends Append -publicAppend(byte[]rowArray, +publicAppend(byte[]rowArray, introwOffset, introwLength) Create a Append operation for the specified row. @@ -408,7 +407,7 @@ extends setReturnResults -publicAppendsetReturnResults(booleanreturnResults) +publicAppendsetReturnResults(booleanreturnResults) Overrides: setReturnResultsin classMutation @@ -425,7 +424,7 @@ extends isReturnResults -publicbooleanisReturnResults() +publicbooleanisReturnResults() Overrides: isReturnResultsin classMutation @@ -441,7 +440,7 @@ extends add http://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true; title="class or interface in java.lang">@Deprecated -publicAppendadd(byte[]family, +publicAppendadd(byte[]family, byte[]qualifier, byte[]value) Deprecated.As of release 2.0.0, this will be removed in HBase 3.0.0. @@ -463,7 +462,7 @@ public addColumn -publicAppendaddColumn(byte[]family, +publicAppendaddColumn(byte[]family, byte[]qualifier, byte[]value) Add the specified column and value to this Append operation. @@ -483,7 +482,7 @@ public add -publicAppendadd(Cellcell) +publicAppendadd(Cellcell) Add column and value to this Append operation. Parameters: @@ -499,7 +498,7 @@ public setAttribute -publicAppendsetAttribute(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringname, +publicAppendsetAttribute(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringname, byte[]value) Description copied from interface:Attributes Sets an attribute. @@ -522,7 +521,7 @@ public setId -publicAppendsetId(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringid) +publicAppendsetId(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringid) Description copied from class:OperationWithAttributes This method allows you to set an identifier on an operation. The original motivation for this was to allow the identifier to be used in slow query @@ -543,7 +542,7 @@ public setDurability -publicAppendsetDurability(Durabilityd) +publicAppendsetDurability(Durabilityd) Description copied from class:Mutation Set the durability for this mutation @@ -558,7 +557,7 @@ public setFamilyCellMap -publicAppendsetFamilyCellMap(http://docs.oracle.com/javase/8/docs/api/java/util/NavigableMap.html?is-external=true; title="class or interface in java.util">NavigableMapbyte[],http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListCellmap) +publicAppendsetFamilyCellMap(http://docs.oracle.com/javase/8/docs/api/java/util/NavigableMap.html?is-external=true; title="class or interface in java.util">NavigableMapbyte[],http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListCellmap) Description copied from class:Mutation Method for setting the put's familyMap @@ -573,7 +572,7 @@ public setClusterIds
[44/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/apidocs/src-html/org/apache/hadoop/hbase/client/Append.html -- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/client/Append.html b/apidocs/src-html/org/apache/hadoop/hbase/client/Append.html index c58b1bd..49d1207 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/client/Append.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/client/Append.html @@ -42,165 +42,164 @@ 034/** 035 * Performs Append operations on a single row. 036 * p -037 * Note that this operation does not appear atomic to readers. Appends are done -038 * under a single row lock, so write operations to a row are synchronized, but -039 * readers do not take row locks so get and scan operations can see this -040 * operation partially completed. -041 * p -042 * To append to a set of columns of a row, instantiate an Append object with the -043 * row to append to. At least one column to append must be specified using the -044 * {@link #addColumn(byte[], byte[], byte[])} method. -045 */ -046@InterfaceAudience.Public -047public class Append extends Mutation { -048 /** -049 * @param returnResults -050 * True (default) if the append operation should return the results. -051 * A client that is not interested in the result can save network -052 * bandwidth setting this to false. -053 */ -054 public Append setReturnResults(boolean returnResults) { -055 super.setReturnResults(returnResults); -056return this; -057 } -058 -059 /** -060 * @return current setting for returnResults -061 */ -062 // This method makes public the superclasses's protected method. -063 public boolean isReturnResults() { -064return super.isReturnResults(); -065 } -066 -067 /** -068 * Create a Append operation for the specified row. -069 * p -070 * At least one column must be appended to. -071 * @param row row key; makes a local copy of passed in array. -072 */ -073 public Append(byte[] row) { -074this(row, 0, row.length); -075 } -076 /** -077 * Copy constructor -078 * @param a -079 */ -080 public Append(Append a) { -081this.row = a.getRow(); -082this.ts = a.getTimeStamp(); -083 this.familyMap.putAll(a.getFamilyCellMap()); -084for (Map.EntryString, byte[] entry : a.getAttributesMap().entrySet()) { -085 this.setAttribute(entry.getKey(), entry.getValue()); -086} -087this.setPriority(a.getPriority()); -088 } -089 -090 /** Create a Append operation for the specified row. -091 * p -092 * At least one column must be appended to. -093 * @param rowArray Makes a copy out of this buffer. -094 * @param rowOffset -095 * @param rowLength -096 */ -097 public Append(final byte [] rowArray, final int rowOffset, final int rowLength) { -098checkRow(rowArray, rowOffset, rowLength); -099this.row = Bytes.copy(rowArray, rowOffset, rowLength); -100 } -101 -102 /** -103 * Add the specified column and value to this Append operation. -104 * @param family family name -105 * @param qualifier column qualifier -106 * @param value value to append to specified column -107 * @return this -108 * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0. -109 * Use {@link #addColumn(byte[], byte[], byte[])} instead -110 */ -111 @Deprecated -112 public Append add(byte [] family, byte [] qualifier, byte [] value) { -113return this.addColumn(family, qualifier, value); -114 } -115 -116 /** -117 * Add the specified column and value to this Append operation. -118 * @param family family name -119 * @param qualifier column qualifier -120 * @param value value to append to specified column -121 * @return this -122 */ -123 public Append addColumn(byte[] family, byte[] qualifier, byte[] value) { -124KeyValue kv = new KeyValue(this.row, family, qualifier, this.ts, KeyValue.Type.Put, value); -125return add(kv); -126 } -127 -128 /** -129 * Add column and value to this Append operation. -130 * @param cell -131 * @return This instance -132 */ -133 @SuppressWarnings("unchecked") -134 public Append add(final Cell cell) { -135// Presume it is KeyValue for now. -136byte [] family = CellUtil.cloneFamily(cell); -137 -138// Get cell list for the family -139ListCell list = getCellList(family); -140 -141// find where the new entry should be placed in the List -142list.add(cell); -143return this; -144 } -145 -146 @Override -147 public Append setAttribute(String name, byte[] value) { -148return (Append) super.setAttribute(name, value); -149 } -150 -151 @Override -152 public Append setId(String id) { -153return (Append) super.setId(id); -154 } -155 -156 @Override -157 public Append setDurability(Durability d) { -158return (Append) super.setDurability(d); -159 } -160 -161 @Override -162 public
[51/51] [partial] hbase-site git commit: Published site at .
Published site at . Project: http://git-wip-us.apache.org/repos/asf/hbase-site/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase-site/commit/e1eb0a07 Tree: http://git-wip-us.apache.org/repos/asf/hbase-site/tree/e1eb0a07 Diff: http://git-wip-us.apache.org/repos/asf/hbase-site/diff/e1eb0a07 Branch: refs/heads/asf-site Commit: e1eb0a07259ab3caff4587bac3eff4d0c457d284 Parents: d8499ce Author: jenkinsAuthored: Mon Sep 4 15:13:13 2017 + Committer: jenkins Committed: Mon Sep 4 15:13:13 2017 + -- acid-semantics.html | 4 +- apache_hbase_reference_guide.pdf| 14347 - apidocs/deprecated-list.html|32 +- apidocs/index-all.html |36 +- .../hbase/class-use/HColumnDescriptor.html |44 - .../hbase/class-use/HTableDescriptor.html |70 - .../hadoop/hbase/class-use/TableName.html |20 +- .../org/apache/hadoop/hbase/client/Admin.html | 933 +- .../org/apache/hadoop/hbase/client/Append.html |45 +- .../apache/hadoop/hbase/client/Increment.html |63 +- .../org/apache/hadoop/hbase/client/Table.html |52 +- .../class-use/ColumnFamilyDescriptor.html |32 +- .../hbase/client/class-use/TableDescriptor.html |20 + .../org/apache/hadoop/hbase/package-use.html|31 +- .../hadoop/hbase/rest/client/RemoteHTable.html |14 +- .../org/apache/hadoop/hbase/client/Admin.html | 4465 +++-- .../org/apache/hadoop/hbase/client/Append.html | 317 +- .../apache/hadoop/hbase/client/Increment.html | 595 +- .../org/apache/hadoop/hbase/client/Table.html | 620 +- .../hadoop/hbase/snapshot/SnapshotInfo.html | 2 +- book.html |21 +- bulk-loads.html | 4 +- checkstyle-aggregate.html | 434 +- checkstyle.rss | 4 +- coc.html| 4 +- cygwin.html | 4 +- dependencies.html | 4 +- dependency-convergence.html | 100 +- dependency-info.html| 4 +- dependency-management.html | 6 +- devapidocs/constant-values.html | 6 +- devapidocs/deprecated-list.html | 352 +- devapidocs/index-all.html |56 +- .../hadoop/hbase/backup/package-tree.html | 4 +- .../hbase/class-use/HColumnDescriptor.html |53 - .../hbase/class-use/HTableDescriptor.html |71 - .../hadoop/hbase/class-use/TableName.html | 500 +- .../hbase/classification/package-tree.html | 4 +- .../org/apache/hadoop/hbase/client/Admin.html | 933 +- .../org/apache/hadoop/hbase/client/Append.html |45 +- .../HBaseAdmin.AddColumnFamilyFuture.html | 6 +- .../HBaseAdmin.DeleteColumnFamilyFuture.html| 6 +- .../HBaseAdmin.MergeTableRegionsFuture.html | 8 +- .../HBaseAdmin.ModifyColumnFamilyFuture.html| 6 +- .../client/HBaseAdmin.ModifyTableFuture.html|10 +- .../client/HBaseAdmin.NamespaceFuture.html |12 +- ...in.ProcedureFuture.WaitForStateCallable.html | 8 +- .../client/HBaseAdmin.ProcedureFuture.html |48 +- .../client/HBaseAdmin.ReplicationState.html |12 +- .../HBaseAdmin.RestoreSnapshotFuture.html | 8 +- .../HBaseAdmin.SplitTableRegionFuture.html | 8 +- ...n.TableFuture.TableWaitForStateCallable.html | 8 +- .../hbase/client/HBaseAdmin.TableFuture.html|30 +- .../client/HBaseAdmin.ThrowableAbortable.html | 8 +- .../apache/hadoop/hbase/client/HBaseAdmin.html | 904 +- .../org/apache/hadoop/hbase/client/HTable.html | 114 +- .../hadoop/hbase/client/HTableWrapper.html |14 +- .../apache/hadoop/hbase/client/Increment.html |67 +- .../org/apache/hadoop/hbase/client/Table.html |52 +- .../class-use/ColumnFamilyDescriptor.html |42 +- .../hbase/client/class-use/TableDescriptor.html |30 + .../hadoop/hbase/client/package-tree.html |26 +- .../hadoop/hbase/executor/package-tree.html | 2 +- .../hadoop/hbase/filter/package-tree.html | 6 +- .../hadoop/hbase/io/hfile/package-tree.html | 6 +- .../apache/hadoop/hbase/ipc/package-tree.html | 2 +- .../hadoop/hbase/mapreduce/package-tree.html| 4 +- .../hbase/master/balancer/package-tree.html | 2 +- .../hadoop/hbase/master/package-tree.html | 6 +- .../hadoop/hbase/monitoring/package-tree.html | 2 +- .../org/apache/hadoop/hbase/package-tree.html |10 +- .../hadoop/hbase/procedure2/package-tree.html | 6 +- .../hadoop/hbase/quotas/package-tree.html
[47/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/apidocs/org/apache/hadoop/hbase/client/Append.html -- diff --git a/apidocs/org/apache/hadoop/hbase/client/Append.html b/apidocs/org/apache/hadoop/hbase/client/Append.html index 15391df..e197d63 100644 --- a/apidocs/org/apache/hadoop/hbase/client/Append.html +++ b/apidocs/org/apache/hadoop/hbase/client/Append.html @@ -129,14 +129,13 @@ var activeTableTab = "activeTableTab"; @InterfaceAudience.Public -public class Append +public class Append extends Mutation Performs Append operations on a single row. - Note that this operation does not appear atomic to readers. Appends are done - under a single row lock, so write operations to a row are synchronized, but - readers do not take row locks so get and scan operations can see this - operation partially completed. + This operation ensures atomicty to readers. Appends are done + under a single row lock, so write operations to a row are synchronized, and + readers are guaranteed to see this operation fully completed. To append to a set of columns of a row, instantiate an Append object with the row to append to. At least one column to append must be specified using the @@ -350,7 +349,7 @@ extends Append -publicAppend(byte[]row) +publicAppend(byte[]row) Create a Append operation for the specified row. At least one column must be appended to. @@ -366,7 +365,7 @@ extends Append -publicAppend(Appenda) +publicAppend(Appenda) Copy constructor Parameters: @@ -380,7 +379,7 @@ extends Append -publicAppend(byte[]rowArray, +publicAppend(byte[]rowArray, introwOffset, introwLength) Create a Append operation for the specified row. @@ -408,7 +407,7 @@ extends setReturnResults -publicAppendsetReturnResults(booleanreturnResults) +publicAppendsetReturnResults(booleanreturnResults) Parameters: returnResults - True (default) if the append operation should return the results. @@ -423,7 +422,7 @@ extends isReturnResults -publicbooleanisReturnResults() +publicbooleanisReturnResults() Returns: current setting for returnResults @@ -437,7 +436,7 @@ extends add http://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true; title="class or interface in java.lang">@Deprecated -publicAppendadd(byte[]family, +publicAppendadd(byte[]family, byte[]qualifier, byte[]value) Deprecated.As of release 2.0.0, this will be removed in HBase 3.0.0. @@ -459,7 +458,7 @@ public addColumn -publicAppendaddColumn(byte[]family, +publicAppendaddColumn(byte[]family, byte[]qualifier, byte[]value) Add the specified column and value to this Append operation. @@ -479,7 +478,7 @@ public add -publicAppendadd(Cellcell) +publicAppendadd(Cellcell) Add column and value to this Append operation. Parameters: @@ -495,7 +494,7 @@ public setAttribute -publicAppendsetAttribute(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringname, +publicAppendsetAttribute(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringname, byte[]value) Description copied from interface:Attributes Sets an attribute. @@ -518,7 +517,7 @@ public setId -publicAppendsetId(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringid) +publicAppendsetId(http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">Stringid) Description copied from class:OperationWithAttributes This method allows you to set an identifier on an operation. The original motivation for this was to allow the identifier to be used in slow query @@ -539,7 +538,7 @@ public setDurability -publicAppendsetDurability(Durabilityd) +publicAppendsetDurability(Durabilityd) Description copied from class:Mutation Set the durability for this mutation @@ -554,7 +553,7 @@ public setFamilyCellMap -publicAppendsetFamilyCellMap(http://docs.oracle.com/javase/8/docs/api/java/util/NavigableMap.html?is-external=true; title="class or interface in java.util">NavigableMapbyte[],http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListCellmap) +publicAppendsetFamilyCellMap(http://docs.oracle.com/javase/8/docs/api/java/util/NavigableMap.html?is-external=true; title="class or interface in java.util">NavigableMapbyte[],http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true; title="class or interface in java.util">ListCellmap) Description copied from class:Mutation Method for setting the put's familyMap @@ -569,7 +568,7 @@
[39/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/index-all.html -- diff --git a/devapidocs/index-all.html b/devapidocs/index-all.html index 452cf2f..0c63f2f 100644 --- a/devapidocs/index-all.html +++ b/devapidocs/index-all.html @@ -1342,7 +1342,7 @@ Marks that the cluster with the given clusterId has consumed the change -addColumn(TableName, HColumnDescriptor) - Method in interface org.apache.hadoop.hbase.client.Admin +addColumn(TableName, ColumnFamilyDescriptor) - Method in interface org.apache.hadoop.hbase.client.Admin Deprecated. As of release 2.0.0. @@ -1367,13 +1367,6 @@ Get the column from the specific family with the specified qualifier. -addColumn(TableName, HColumnDescriptor) - Method in class org.apache.hadoop.hbase.client.HBaseAdmin - -Deprecated. -Since 2.0. Will be removed in 3.0. Use - HBaseAdmin.addColumnFamily(TableName, ColumnFamilyDescriptor) instead. - - addColumn(byte[], byte[], long) - Method in class org.apache.hadoop.hbase.client.Increment Increment the column from the specific family with the specified qualifier @@ -19921,35 +19914,14 @@ Create a system table using the given table definition. -createTable(HTableDescriptor) - Method in interface org.apache.hadoop.hbase.client.Admin - -Deprecated. -since 2.0 version and will be removed in 3.0 version. - use Admin.createTable(TableDescriptor) - - createTable(TableDescriptor) - Method in interface org.apache.hadoop.hbase.client.Admin Creates a new table. -createTable(HTableDescriptor, byte[], byte[], int) - Method in interface org.apache.hadoop.hbase.client.Admin - -Deprecated. -since 2.0 version and will be removed in 3.0 version. - use Admin.createTable(TableDescriptor, byte[], byte[], int) - - createTable(TableDescriptor, byte[], byte[], int) - Method in interface org.apache.hadoop.hbase.client.Admin Creates a new table with the specified number of regions. -createTable(HTableDescriptor, byte[][]) - Method in interface org.apache.hadoop.hbase.client.Admin - -Deprecated. -since 2.0 version and will be removed in 3.0 version. - use Admin.createTable(TableDescriptor, byte[][]) - - createTable(TableDescriptor, byte[][]) - Method in interface org.apache.hadoop.hbase.client.Admin Creates a new table with an initial set of empty regions defined by the specified split keys. @@ -20008,13 +19980,6 @@ If the table is created for the first time, then "completebulkload" reads the files twice. -createTableAsync(HTableDescriptor, byte[][]) - Method in interface org.apache.hadoop.hbase.client.Admin - -Deprecated. -since 2.0 version and will be removed in 3.0 version. - use Admin.createTableAsync(TableDescriptor, byte[][]) - - createTableAsync(TableDescriptor, byte[][]) - Method in interface org.apache.hadoop.hbase.client.Admin Creates a new table but does not block and wait for it to come online. @@ -71102,7 +71067,7 @@ ModifyableTableDescriptor(TableName, CollectionColumnFamilyDescriptor, MapBytes, Bytes) - Constructor for class org.apache.hadoop.hbase.client.TableDescriptorBuilder.ModifyableTableDescriptor -modifyColumn(TableName, HColumnDescriptor) - Method in interface org.apache.hadoop.hbase.client.Admin +modifyColumn(TableName, ColumnFamilyDescriptor) - Method in interface org.apache.hadoop.hbase.client.Admin Deprecated. As of release 2.0.0. @@ -7,13 +71076,6 @@ Use Admin.modifyColumnFamily(TableName, ColumnFamilyDescriptor). -modifyColumn(TableName, HColumnDescriptor) - Method in class org.apache.hadoop.hbase.client.HBaseAdmin - -Deprecated. -As of 2.0. Will be removed in 3.0. Use - HBaseAdmin.modifyColumnFamily(TableName, ColumnFamilyDescriptor) instead. - - modifyColumn(RpcController, MasterProtos.ModifyColumnRequest) - Method in class org.apache.hadoop.hbase.client.ShortCircuitMasterConnection modifyColumn(TableName, ColumnFamilyDescriptor, long, long) - Method in class org.apache.hadoop.hbase.master.HMaster @@ -71227,7 +71185,7 @@ ModifyRegionUtils.RegionFillTask - Interface in org.apache.hadoop.hbase.util -modifyTable(TableName, HTableDescriptor) - Method in interface org.apache.hadoop.hbase.client.Admin +modifyTable(TableName, TableDescriptor) - Method in interface org.apache.hadoop.hbase.client.Admin Deprecated. since 2.0 version and will be removed in 3.0 version. @@ -71240,7 +71198,7 @@ modifyTable(TableDescriptor) - Method in class org.apache.hadoop.hbase.client.HBaseAdmin -modifyTable(TableName, HTableDescriptor) - Method in class org.apache.hadoop.hbase.client.HBaseAdmin +modifyTable(TableName, TableDescriptor) - Method in class org.apache.hadoop.hbase.client.HBaseAdmin modifyTable(RpcController, MasterProtos.ModifyTableRequest) - Method in class org.apache.hadoop.hbase.client.ShortCircuitMasterConnection @@ -71252,7
[18/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ModifyTableFuture.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ModifyTableFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ModifyTableFuture.html index 08c80d4..868c46e 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ModifyTableFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ModifyTableFuture.html @@ -1002,3395 +1002,3361 @@ 994return getAlterStatus(TableName.valueOf(tableName)); 995 } 996 -997 /** -998 * {@inheritDoc} -999 * @deprecated Since 2.0. Will be removed in 3.0. Use -1000 * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead. -1001 */ -1002 @Override -1003 @Deprecated -1004 public void addColumn(final TableName tableName, final HColumnDescriptor columnFamily) -1005 throws IOException { -1006addColumnFamily(tableName, columnFamily); -1007 } -1008 -1009 @Override -1010 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) -1011 throws IOException { -1012get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); -1013 } -1014 -1015 @Override -1016 public FutureVoid addColumnFamilyAsync(final TableName tableName, -1017 final ColumnFamilyDescriptor columnFamily) throws IOException { -1018AddColumnResponse response = -1019executeCallable(new MasterCallableAddColumnResponse(getConnection(), -1020getRpcControllerFactory()) { -1021 @Override -1022 protected AddColumnResponse rpcCall() throws Exception { -1023setPriority(tableName); -1024AddColumnRequest req = -1025 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), -1026 ng.newNonce()); -1027return master.addColumn(getRpcController(), req); -1028 } -1029}); -1030return new AddColumnFamilyFuture(this, tableName, response); -1031 } -1032 -1033 private static class AddColumnFamilyFuture extends ModifyTableFuture { -1034public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, -1035final AddColumnResponse response) { -1036 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() -1037 : null); -1038} -1039 -1040@Override -1041public String getOperationType() { -1042 return "ADD_COLUMN_FAMILY"; -1043} +997 @Override +998 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) +999 throws IOException { +1000get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); +1001 } +1002 +1003 @Override +1004 public FutureVoid addColumnFamilyAsync(final TableName tableName, +1005 final ColumnFamilyDescriptor columnFamily) throws IOException { +1006AddColumnResponse response = +1007executeCallable(new MasterCallableAddColumnResponse(getConnection(), +1008getRpcControllerFactory()) { +1009 @Override +1010 protected AddColumnResponse rpcCall() throws Exception { +1011setPriority(tableName); +1012AddColumnRequest req = +1013 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), +1014 ng.newNonce()); +1015return master.addColumn(getRpcController(), req); +1016 } +1017}); +1018return new AddColumnFamilyFuture(this, tableName, response); +1019 } +1020 +1021 private static class AddColumnFamilyFuture extends ModifyTableFuture { +1022public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, +1023final AddColumnResponse response) { +1024 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() +1025 : null); +1026} +1027 +1028@Override +1029public String getOperationType() { +1030 return "ADD_COLUMN_FAMILY"; +1031} +1032 } +1033 +1034 /** +1035 * {@inheritDoc} +1036 * @deprecated Since 2.0. Will be removed in 3.0. Use +1037 * {@link #deleteColumnFamily(TableName, byte[])} instead. +1038 */ +1039 @Override +1040 @Deprecated +1041 public void deleteColumn(final TableName tableName, final byte[] columnFamily) +1042 throws IOException { +1043deleteColumnFamily(tableName, columnFamily); 1044 } 1045 -1046 /** -1047 * {@inheritDoc} -1048 * @deprecated Since 2.0. Will be removed in 3.0. Use -1049 * {@link #deleteColumnFamily(TableName, byte[])} instead. -1050 */ -1051 @Override -1052 @Deprecated -1053 public void deleteColumn(final
[05/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/src-html/org/apache/hadoop/hbase/client/Increment.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/Increment.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/Increment.html index 0dbe2fb..0dfce60 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/Increment.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/Increment.html @@ -46,304 +46,303 @@ 038/** 039 * Used to perform Increment operations on a single row. 040 * p -041 * This operation does not appear atomic to readers. Increments are done -042 * under a single row lock, so write operations to a row are synchronized, but -043 * readers do not take row locks so get and scan operations can see this -044 * operation partially completed. -045 * p -046 * To increment columns of a row, instantiate an Increment object with the row -047 * to increment. At least one column to increment must be specified using the -048 * {@link #addColumn(byte[], byte[], long)} method. -049 */ -050@InterfaceAudience.Public -051public class Increment extends Mutation implements ComparableRow { -052 private static final long HEAP_OVERHEAD = ClassSize.REFERENCE + ClassSize.TIMERANGE; -053 private TimeRange tr = new TimeRange(); -054 -055 /** -056 * Create a Increment operation for the specified row. -057 * p -058 * At least one column must be incremented. -059 * @param row row key (we will make a copy of this). -060 */ -061 public Increment(byte [] row) { -062this(row, 0, row.length); -063 } -064 -065 /** -066 * Create a Increment operation for the specified row. -067 * p -068 * At least one column must be incremented. -069 * @param row row key (we will make a copy of this). -070 */ -071 public Increment(final byte [] row, final int offset, final int length) { -072checkRow(row, offset, length); -073this.row = Bytes.copy(row, offset, length); -074 } -075 /** -076 * Copy constructor -077 * @param i -078 */ -079 public Increment(Increment i) { -080this.row = i.getRow(); -081this.ts = i.getTimeStamp(); -082this.tr = i.getTimeRange(); -083 this.familyMap.putAll(i.getFamilyCellMap()); -084for (Map.EntryString, byte[] entry : i.getAttributesMap().entrySet()) { -085 this.setAttribute(entry.getKey(), entry.getValue()); -086} -087super.setPriority(i.getPriority()); -088 } -089 -090 /** -091 * Add the specified KeyValue to this operation. -092 * @param cell individual Cell -093 * @return this -094 * @throws java.io.IOException e -095 */ -096 public Increment add(Cell cell) throws IOException{ -097byte [] family = CellUtil.cloneFamily(cell); -098ListCell list = getCellList(family); -099//Checking that the row of the kv is the same as the put -100if (!CellUtil.matchingRow(cell, this.row)) { -101 throw new WrongRowIOException("The row in " + cell + -102" doesn't match the original one " + Bytes.toStringBinary(this.row)); -103} -104list.add(cell); -105return this; -106 } -107 -108 /** -109 * Increment the column from the specific family with the specified qualifier -110 * by the specified amount. -111 * p -112 * Overrides previous calls to addColumn for this family and qualifier. -113 * @param family family name -114 * @param qualifier column qualifier -115 * @param amount amount to increment by -116 * @return the Increment object -117 */ -118 public Increment addColumn(byte [] family, byte [] qualifier, long amount) { -119if (family == null) { -120 throw new IllegalArgumentException("family cannot be null"); -121} -122ListCell list = getCellList(family); -123KeyValue kv = createPutKeyValue(family, qualifier, ts, Bytes.toBytes(amount)); -124list.add(kv); -125return this; -126 } -127 -128 /** -129 * Gets the TimeRange used for this increment. -130 * @return TimeRange -131 */ -132 public TimeRange getTimeRange() { -133return this.tr; -134 } -135 -136 /** -137 * Sets the TimeRange to be used on the Get for this increment. -138 * p -139 * This is useful for when you have counters that only last for specific -140 * periods of time (ie. counters that are partitioned by time). By setting -141 * the range of valid times for this increment, you can potentially gain -142 * some performance with a more optimal Get operation. -143 * p -144 * This range is used as [minStamp, maxStamp). -145 * @param minStamp minimum timestamp value, inclusive -146 * @param maxStamp maximum timestamp value, exclusive -147 * @throws IOException if invalid time range -148 * @return this -149 */ -150 public Increment setTimeRange(long minStamp, long maxStamp) -151 throws IOException { -152tr = new TimeRange(minStamp, maxStamp); -153return this; -154
[33/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.html b/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.html index f5bfbfd..12691dd 100644 --- a/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.html +++ b/devapidocs/org/apache/hadoop/hbase/client/HBaseAdmin.html @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":42,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":9,"i11":10,"i12":10,"i13":10,"i14":41,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":42,"i23":42,"i24":42,"i25":42,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":10,"i45":10,"i46":42,"i47":10,"i48":10,"i49":10,"i50":10,"i51":10,"i52":10,"i53":10,"i54":10,"i55":10,"i56":10,"i57":10,"i58":10,"i59":10,"i60":10,"i61":10,"i62":10,"i63":10,"i64":10,"i65":10,"i66":10,"i67":10,"i68":10,"i69":10,"i70":10,"i71":10,"i72":10,"i73":10,"i74":10,"i75":10,"i76":10,"i77":10,"i78":9,"i79":10,"i80":10,"i81":9,"i82":10,"i83":10,"i84":10,"i85":10,"i86":10,"i87":10,"i88":10,"i89":10,"i90":10,"i91":41,"i92":10,"i93":10,"i94":10,"i95":10,"i96":10,"i97":10,"i98":10,"i99":10,"i100":10,"i101":10,"i102":10,"i103":10,"i104":10,"i105":10,"i106":10,"i107":10,"i108":10,"i109 ":10,"i110":10,"i111":10,"i112":9,"i113":10,"i114":10,"i115":10,"i116":10,"i117":10,"i118":10,"i119":10,"i120":10,"i121":10,"i122":10,"i123":10,"i124":10,"i125":10,"i126":10,"i127":10,"i128":10,"i129":10,"i130":10,"i131":10,"i132":10,"i133":10,"i134":10,"i135":10,"i136":10,"i137":10,"i138":10,"i139":10,"i140":10,"i141":10,"i142":10,"i143":10,"i144":10,"i145":10,"i146":10,"i147":10,"i148":10,"i149":10,"i150":10,"i151":10,"i152":10,"i153":10,"i154":10,"i155":10,"i156":10,"i157":10,"i158":10,"i159":10,"i160":10,"i161":10,"i162":10,"i163":10,"i164":10,"i165":10,"i166":10,"i167":10,"i168":10,"i169":10,"i170":10,"i171":10,"i172":10,"i173":42,"i174":10,"i175":10,"i176":10,"i177":42,"i178":10,"i179":10,"i180":10,"i181":10,"i182":10,"i183":10,"i184":10,"i185":10,"i186":10,"i187":10,"i188":10,"i189":10,"i190":10,"i191":10,"i192":10,"i193":10,"i194":10,"i195":10,"i196":10,"i197":10,"i198":10,"i199":42,"i200":10,"i201":10,"i202":10,"i203":10,"i204":10,"i205":10,"i206":10,"i207":10,"i208":10,"i2 09":10,"i210":10,"i211":10,"i212":10,"i213":10,"i214":10,"i215":10,"i216":10,"i217":10,"i218":10,"i219":10,"i220":10,"i221":10,"i222":10,"i223":10,"i224":10,"i225":10,"i226":10,"i227":10,"i228":10,"i229":10,"i230":10,"i231":10,"i232":10}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":9,"i10":10,"i11":10,"i12":10,"i13":41,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":42,"i22":42,"i23":42,"i24":42,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":10,"i45":42,"i46":10,"i47":10,"i48":10,"i49":10,"i50":10,"i51":10,"i52":10,"i53":10,"i54":10,"i55":10,"i56":10,"i57":10,"i58":10,"i59":10,"i60":10,"i61":10,"i62":10,"i63":10,"i64":10,"i65":10,"i66":10,"i67":10,"i68":10,"i69":10,"i70":10,"i71":10,"i72":10,"i73":10,"i74":10,"i75":10,"i76":10,"i77":9,"i78":10,"i79":10,"i80":9,"i81":10,"i82":10,"i83":10,"i84":10,"i85":10,"i86":10,"i87":10,"i88":10,"i89":10,"i90":41,"i91":10,"i92":10,"i93":10,"i94":10,"i95":10,"i96":10,"i97":10,"i98":10,"i99":10,"i100":10,"i101":10,"i102":10,"i103":10,"i104":10,"i105":10,"i106":10,"i107":10,"i108":10,"i109 ":10,"i110":10,"i111":9,"i112":10,"i113":10,"i114":10,"i115":10,"i116":10,"i117":10,"i118":10,"i119":10,"i120":10,"i121":10,"i122":10,"i123":10,"i124":10,"i125":10,"i126":10,"i127":10,"i128":10,"i129":10,"i130":10,"i131":10,"i132":10,"i133":10,"i134":10,"i135":10,"i136":10,"i137":10,"i138":10,"i139":10,"i140":10,"i141":10,"i142":10,"i143":10,"i144":10,"i145":10,"i146":10,"i147":10,"i148":10,"i149":10,"i150":10,"i151":10,"i152":10,"i153":10,"i154":10,"i155":10,"i156":10,"i157":10,"i158":10,"i159":10,"i160":10,"i161":10,"i162":10,"i163":10,"i164":10,"i165":10,"i166":10,"i167":10,"i168":10,"i169":10,"i170":10,"i171":10,"i172":42,"i173":10,"i174":10,"i175":10,"i176":10,"i177":10,"i178":10,"i179":10,"i180":10,"i181":10,"i182":10,"i183":10,"i184":10,"i185":10,"i186":10,"i187":10,"i188":10,"i189":10,"i190":10,"i191":10,"i192":10,"i193":10,"i194":10,"i195":10,"i196":10,"i197":42,"i198":10,"i199":10,"i200":10,"i201":10,"i202":10,"i203":10,"i204":10,"i205":10,"i206":10,"i207":10,"i208":10,"i2 09":10,"i210":10,"i211":10,"i212":10,"i213":10,"i214":10,"i215":10,"i216":10,"i217":10,"i218":10,"i219":10,"i220":10,"i221":10,"i222":10,"i223":10,"i224":10,"i225":10,"i226":10,"i227":10,"i228":10,"i229":10,"i230":10};
[14/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ReplicationState.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ReplicationState.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ReplicationState.html index 08c80d4..868c46e 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ReplicationState.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ReplicationState.html @@ -1002,3395 +1002,3361 @@ 994return getAlterStatus(TableName.valueOf(tableName)); 995 } 996 -997 /** -998 * {@inheritDoc} -999 * @deprecated Since 2.0. Will be removed in 3.0. Use -1000 * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead. -1001 */ -1002 @Override -1003 @Deprecated -1004 public void addColumn(final TableName tableName, final HColumnDescriptor columnFamily) -1005 throws IOException { -1006addColumnFamily(tableName, columnFamily); -1007 } -1008 -1009 @Override -1010 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) -1011 throws IOException { -1012get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); -1013 } -1014 -1015 @Override -1016 public FutureVoid addColumnFamilyAsync(final TableName tableName, -1017 final ColumnFamilyDescriptor columnFamily) throws IOException { -1018AddColumnResponse response = -1019executeCallable(new MasterCallableAddColumnResponse(getConnection(), -1020getRpcControllerFactory()) { -1021 @Override -1022 protected AddColumnResponse rpcCall() throws Exception { -1023setPriority(tableName); -1024AddColumnRequest req = -1025 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), -1026 ng.newNonce()); -1027return master.addColumn(getRpcController(), req); -1028 } -1029}); -1030return new AddColumnFamilyFuture(this, tableName, response); -1031 } -1032 -1033 private static class AddColumnFamilyFuture extends ModifyTableFuture { -1034public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, -1035final AddColumnResponse response) { -1036 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() -1037 : null); -1038} -1039 -1040@Override -1041public String getOperationType() { -1042 return "ADD_COLUMN_FAMILY"; -1043} +997 @Override +998 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) +999 throws IOException { +1000get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); +1001 } +1002 +1003 @Override +1004 public FutureVoid addColumnFamilyAsync(final TableName tableName, +1005 final ColumnFamilyDescriptor columnFamily) throws IOException { +1006AddColumnResponse response = +1007executeCallable(new MasterCallableAddColumnResponse(getConnection(), +1008getRpcControllerFactory()) { +1009 @Override +1010 protected AddColumnResponse rpcCall() throws Exception { +1011setPriority(tableName); +1012AddColumnRequest req = +1013 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), +1014 ng.newNonce()); +1015return master.addColumn(getRpcController(), req); +1016 } +1017}); +1018return new AddColumnFamilyFuture(this, tableName, response); +1019 } +1020 +1021 private static class AddColumnFamilyFuture extends ModifyTableFuture { +1022public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, +1023final AddColumnResponse response) { +1024 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() +1025 : null); +1026} +1027 +1028@Override +1029public String getOperationType() { +1030 return "ADD_COLUMN_FAMILY"; +1031} +1032 } +1033 +1034 /** +1035 * {@inheritDoc} +1036 * @deprecated Since 2.0. Will be removed in 3.0. Use +1037 * {@link #deleteColumnFamily(TableName, byte[])} instead. +1038 */ +1039 @Override +1040 @Deprecated +1041 public void deleteColumn(final TableName tableName, final byte[] columnFamily) +1042 throws IOException { +1043deleteColumnFamily(tableName, columnFamily); 1044 } 1045 -1046 /** -1047 * {@inheritDoc} -1048 * @deprecated Since 2.0. Will be removed in 3.0. Use -1049 * {@link #deleteColumnFamily(TableName, byte[])} instead. -1050 */ -1051 @Override -1052 @Deprecated -1053 public void deleteColumn(final TableName
[12/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.SplitTableRegionFuture.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.SplitTableRegionFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.SplitTableRegionFuture.html index 08c80d4..868c46e 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.SplitTableRegionFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.SplitTableRegionFuture.html @@ -1002,3395 +1002,3361 @@ 994return getAlterStatus(TableName.valueOf(tableName)); 995 } 996 -997 /** -998 * {@inheritDoc} -999 * @deprecated Since 2.0. Will be removed in 3.0. Use -1000 * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead. -1001 */ -1002 @Override -1003 @Deprecated -1004 public void addColumn(final TableName tableName, final HColumnDescriptor columnFamily) -1005 throws IOException { -1006addColumnFamily(tableName, columnFamily); -1007 } -1008 -1009 @Override -1010 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) -1011 throws IOException { -1012get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); -1013 } -1014 -1015 @Override -1016 public FutureVoid addColumnFamilyAsync(final TableName tableName, -1017 final ColumnFamilyDescriptor columnFamily) throws IOException { -1018AddColumnResponse response = -1019executeCallable(new MasterCallableAddColumnResponse(getConnection(), -1020getRpcControllerFactory()) { -1021 @Override -1022 protected AddColumnResponse rpcCall() throws Exception { -1023setPriority(tableName); -1024AddColumnRequest req = -1025 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), -1026 ng.newNonce()); -1027return master.addColumn(getRpcController(), req); -1028 } -1029}); -1030return new AddColumnFamilyFuture(this, tableName, response); -1031 } -1032 -1033 private static class AddColumnFamilyFuture extends ModifyTableFuture { -1034public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, -1035final AddColumnResponse response) { -1036 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() -1037 : null); -1038} -1039 -1040@Override -1041public String getOperationType() { -1042 return "ADD_COLUMN_FAMILY"; -1043} +997 @Override +998 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) +999 throws IOException { +1000get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); +1001 } +1002 +1003 @Override +1004 public FutureVoid addColumnFamilyAsync(final TableName tableName, +1005 final ColumnFamilyDescriptor columnFamily) throws IOException { +1006AddColumnResponse response = +1007executeCallable(new MasterCallableAddColumnResponse(getConnection(), +1008getRpcControllerFactory()) { +1009 @Override +1010 protected AddColumnResponse rpcCall() throws Exception { +1011setPriority(tableName); +1012AddColumnRequest req = +1013 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), +1014 ng.newNonce()); +1015return master.addColumn(getRpcController(), req); +1016 } +1017}); +1018return new AddColumnFamilyFuture(this, tableName, response); +1019 } +1020 +1021 private static class AddColumnFamilyFuture extends ModifyTableFuture { +1022public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, +1023final AddColumnResponse response) { +1024 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() +1025 : null); +1026} +1027 +1028@Override +1029public String getOperationType() { +1030 return "ADD_COLUMN_FAMILY"; +1031} +1032 } +1033 +1034 /** +1035 * {@inheritDoc} +1036 * @deprecated Since 2.0. Will be removed in 3.0. Use +1037 * {@link #deleteColumnFamily(TableName, byte[])} instead. +1038 */ +1039 @Override +1040 @Deprecated +1041 public void deleteColumn(final TableName tableName, final byte[] columnFamily) +1042 throws IOException { +1043deleteColumnFamily(tableName, columnFamily); 1044 } 1045 -1046 /** -1047 * {@inheritDoc} -1048 * @deprecated Since 2.0. Will be removed in 3.0. Use -1049 * {@link #deleteColumnFamily(TableName, byte[])} instead. -1050 */ -1051 @Override -1052 @Deprecated -1053 public void
[11/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.TableWaitForStateCallable.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.TableWaitForStateCallable.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.TableWaitForStateCallable.html index 08c80d4..868c46e 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.TableWaitForStateCallable.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.TableWaitForStateCallable.html @@ -1002,3395 +1002,3361 @@ 994return getAlterStatus(TableName.valueOf(tableName)); 995 } 996 -997 /** -998 * {@inheritDoc} -999 * @deprecated Since 2.0. Will be removed in 3.0. Use -1000 * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead. -1001 */ -1002 @Override -1003 @Deprecated -1004 public void addColumn(final TableName tableName, final HColumnDescriptor columnFamily) -1005 throws IOException { -1006addColumnFamily(tableName, columnFamily); -1007 } -1008 -1009 @Override -1010 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) -1011 throws IOException { -1012get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); -1013 } -1014 -1015 @Override -1016 public FutureVoid addColumnFamilyAsync(final TableName tableName, -1017 final ColumnFamilyDescriptor columnFamily) throws IOException { -1018AddColumnResponse response = -1019executeCallable(new MasterCallableAddColumnResponse(getConnection(), -1020getRpcControllerFactory()) { -1021 @Override -1022 protected AddColumnResponse rpcCall() throws Exception { -1023setPriority(tableName); -1024AddColumnRequest req = -1025 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), -1026 ng.newNonce()); -1027return master.addColumn(getRpcController(), req); -1028 } -1029}); -1030return new AddColumnFamilyFuture(this, tableName, response); -1031 } -1032 -1033 private static class AddColumnFamilyFuture extends ModifyTableFuture { -1034public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, -1035final AddColumnResponse response) { -1036 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() -1037 : null); -1038} -1039 -1040@Override -1041public String getOperationType() { -1042 return "ADD_COLUMN_FAMILY"; -1043} +997 @Override +998 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) +999 throws IOException { +1000get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); +1001 } +1002 +1003 @Override +1004 public FutureVoid addColumnFamilyAsync(final TableName tableName, +1005 final ColumnFamilyDescriptor columnFamily) throws IOException { +1006AddColumnResponse response = +1007executeCallable(new MasterCallableAddColumnResponse(getConnection(), +1008getRpcControllerFactory()) { +1009 @Override +1010 protected AddColumnResponse rpcCall() throws Exception { +1011setPriority(tableName); +1012AddColumnRequest req = +1013 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), +1014 ng.newNonce()); +1015return master.addColumn(getRpcController(), req); +1016 } +1017}); +1018return new AddColumnFamilyFuture(this, tableName, response); +1019 } +1020 +1021 private static class AddColumnFamilyFuture extends ModifyTableFuture { +1022public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, +1023final AddColumnResponse response) { +1024 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() +1025 : null); +1026} +1027 +1028@Override +1029public String getOperationType() { +1030 return "ADD_COLUMN_FAMILY"; +1031} +1032 } +1033 +1034 /** +1035 * {@inheritDoc} +1036 * @deprecated Since 2.0. Will be removed in 3.0. Use +1037 * {@link #deleteColumnFamily(TableName, byte[])} instead. +1038 */ +1039 @Override +1040 @Deprecated +1041 public void deleteColumn(final TableName tableName, final byte[] columnFamily) +1042 throws IOException { +1043deleteColumnFamily(tableName, columnFamily); 1044 } 1045 -1046 /** -1047 * {@inheritDoc} -1048 * @deprecated Since 2.0. Will be removed in 3.0. Use -1049 * {@link #deleteColumnFamily(TableName, byte[])}
[27/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.AbortProcedureFuture.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.AbortProcedureFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.AbortProcedureFuture.html index 08c80d4..868c46e 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.AbortProcedureFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.AbortProcedureFuture.html @@ -1002,3395 +1002,3361 @@ 994return getAlterStatus(TableName.valueOf(tableName)); 995 } 996 -997 /** -998 * {@inheritDoc} -999 * @deprecated Since 2.0. Will be removed in 3.0. Use -1000 * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead. -1001 */ -1002 @Override -1003 @Deprecated -1004 public void addColumn(final TableName tableName, final HColumnDescriptor columnFamily) -1005 throws IOException { -1006addColumnFamily(tableName, columnFamily); -1007 } -1008 -1009 @Override -1010 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) -1011 throws IOException { -1012get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); -1013 } -1014 -1015 @Override -1016 public FutureVoid addColumnFamilyAsync(final TableName tableName, -1017 final ColumnFamilyDescriptor columnFamily) throws IOException { -1018AddColumnResponse response = -1019executeCallable(new MasterCallableAddColumnResponse(getConnection(), -1020getRpcControllerFactory()) { -1021 @Override -1022 protected AddColumnResponse rpcCall() throws Exception { -1023setPriority(tableName); -1024AddColumnRequest req = -1025 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), -1026 ng.newNonce()); -1027return master.addColumn(getRpcController(), req); -1028 } -1029}); -1030return new AddColumnFamilyFuture(this, tableName, response); -1031 } -1032 -1033 private static class AddColumnFamilyFuture extends ModifyTableFuture { -1034public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, -1035final AddColumnResponse response) { -1036 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() -1037 : null); -1038} -1039 -1040@Override -1041public String getOperationType() { -1042 return "ADD_COLUMN_FAMILY"; -1043} +997 @Override +998 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) +999 throws IOException { +1000get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); +1001 } +1002 +1003 @Override +1004 public FutureVoid addColumnFamilyAsync(final TableName tableName, +1005 final ColumnFamilyDescriptor columnFamily) throws IOException { +1006AddColumnResponse response = +1007executeCallable(new MasterCallableAddColumnResponse(getConnection(), +1008getRpcControllerFactory()) { +1009 @Override +1010 protected AddColumnResponse rpcCall() throws Exception { +1011setPriority(tableName); +1012AddColumnRequest req = +1013 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), +1014 ng.newNonce()); +1015return master.addColumn(getRpcController(), req); +1016 } +1017}); +1018return new AddColumnFamilyFuture(this, tableName, response); +1019 } +1020 +1021 private static class AddColumnFamilyFuture extends ModifyTableFuture { +1022public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, +1023final AddColumnResponse response) { +1024 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() +1025 : null); +1026} +1027 +1028@Override +1029public String getOperationType() { +1030 return "ADD_COLUMN_FAMILY"; +1031} +1032 } +1033 +1034 /** +1035 * {@inheritDoc} +1036 * @deprecated Since 2.0. Will be removed in 3.0. Use +1037 * {@link #deleteColumnFamily(TableName, byte[])} instead. +1038 */ +1039 @Override +1040 @Deprecated +1041 public void deleteColumn(final TableName tableName, final byte[] columnFamily) +1042 throws IOException { +1043deleteColumnFamily(tableName, columnFamily); 1044 } 1045 -1046 /** -1047 * {@inheritDoc} -1048 * @deprecated Since 2.0. Will be removed in 3.0. Use -1049 * {@link #deleteColumnFamily(TableName, byte[])} instead. -1050 */ -1051 @Override -1052 @Deprecated -1053 public void
[15/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.html index 08c80d4..868c46e 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ProcedureFuture.html @@ -1002,3395 +1002,3361 @@ 994return getAlterStatus(TableName.valueOf(tableName)); 995 } 996 -997 /** -998 * {@inheritDoc} -999 * @deprecated Since 2.0. Will be removed in 3.0. Use -1000 * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead. -1001 */ -1002 @Override -1003 @Deprecated -1004 public void addColumn(final TableName tableName, final HColumnDescriptor columnFamily) -1005 throws IOException { -1006addColumnFamily(tableName, columnFamily); -1007 } -1008 -1009 @Override -1010 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) -1011 throws IOException { -1012get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); -1013 } -1014 -1015 @Override -1016 public FutureVoid addColumnFamilyAsync(final TableName tableName, -1017 final ColumnFamilyDescriptor columnFamily) throws IOException { -1018AddColumnResponse response = -1019executeCallable(new MasterCallableAddColumnResponse(getConnection(), -1020getRpcControllerFactory()) { -1021 @Override -1022 protected AddColumnResponse rpcCall() throws Exception { -1023setPriority(tableName); -1024AddColumnRequest req = -1025 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), -1026 ng.newNonce()); -1027return master.addColumn(getRpcController(), req); -1028 } -1029}); -1030return new AddColumnFamilyFuture(this, tableName, response); -1031 } -1032 -1033 private static class AddColumnFamilyFuture extends ModifyTableFuture { -1034public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, -1035final AddColumnResponse response) { -1036 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() -1037 : null); -1038} -1039 -1040@Override -1041public String getOperationType() { -1042 return "ADD_COLUMN_FAMILY"; -1043} +997 @Override +998 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) +999 throws IOException { +1000get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); +1001 } +1002 +1003 @Override +1004 public FutureVoid addColumnFamilyAsync(final TableName tableName, +1005 final ColumnFamilyDescriptor columnFamily) throws IOException { +1006AddColumnResponse response = +1007executeCallable(new MasterCallableAddColumnResponse(getConnection(), +1008getRpcControllerFactory()) { +1009 @Override +1010 protected AddColumnResponse rpcCall() throws Exception { +1011setPriority(tableName); +1012AddColumnRequest req = +1013 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), +1014 ng.newNonce()); +1015return master.addColumn(getRpcController(), req); +1016 } +1017}); +1018return new AddColumnFamilyFuture(this, tableName, response); +1019 } +1020 +1021 private static class AddColumnFamilyFuture extends ModifyTableFuture { +1022public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, +1023final AddColumnResponse response) { +1024 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() +1025 : null); +1026} +1027 +1028@Override +1029public String getOperationType() { +1030 return "ADD_COLUMN_FAMILY"; +1031} +1032 } +1033 +1034 /** +1035 * {@inheritDoc} +1036 * @deprecated Since 2.0. Will be removed in 3.0. Use +1037 * {@link #deleteColumnFamily(TableName, byte[])} instead. +1038 */ +1039 @Override +1040 @Deprecated +1041 public void deleteColumn(final TableName tableName, final byte[] columnFamily) +1042 throws IOException { +1043deleteColumnFamily(tableName, columnFamily); 1044 } 1045 -1046 /** -1047 * {@inheritDoc} -1048 * @deprecated Since 2.0. Will be removed in 3.0. Use -1049 * {@link #deleteColumnFamily(TableName, byte[])} instead. -1050 */ -1051 @Override -1052 @Deprecated -1053 public void deleteColumn(final TableName
[23/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DeleteTableFuture.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DeleteTableFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DeleteTableFuture.html index 08c80d4..868c46e 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DeleteTableFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DeleteTableFuture.html @@ -1002,3395 +1002,3361 @@ 994return getAlterStatus(TableName.valueOf(tableName)); 995 } 996 -997 /** -998 * {@inheritDoc} -999 * @deprecated Since 2.0. Will be removed in 3.0. Use -1000 * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead. -1001 */ -1002 @Override -1003 @Deprecated -1004 public void addColumn(final TableName tableName, final HColumnDescriptor columnFamily) -1005 throws IOException { -1006addColumnFamily(tableName, columnFamily); -1007 } -1008 -1009 @Override -1010 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) -1011 throws IOException { -1012get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); -1013 } -1014 -1015 @Override -1016 public FutureVoid addColumnFamilyAsync(final TableName tableName, -1017 final ColumnFamilyDescriptor columnFamily) throws IOException { -1018AddColumnResponse response = -1019executeCallable(new MasterCallableAddColumnResponse(getConnection(), -1020getRpcControllerFactory()) { -1021 @Override -1022 protected AddColumnResponse rpcCall() throws Exception { -1023setPriority(tableName); -1024AddColumnRequest req = -1025 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), -1026 ng.newNonce()); -1027return master.addColumn(getRpcController(), req); -1028 } -1029}); -1030return new AddColumnFamilyFuture(this, tableName, response); -1031 } -1032 -1033 private static class AddColumnFamilyFuture extends ModifyTableFuture { -1034public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, -1035final AddColumnResponse response) { -1036 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() -1037 : null); -1038} -1039 -1040@Override -1041public String getOperationType() { -1042 return "ADD_COLUMN_FAMILY"; -1043} +997 @Override +998 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) +999 throws IOException { +1000get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); +1001 } +1002 +1003 @Override +1004 public FutureVoid addColumnFamilyAsync(final TableName tableName, +1005 final ColumnFamilyDescriptor columnFamily) throws IOException { +1006AddColumnResponse response = +1007executeCallable(new MasterCallableAddColumnResponse(getConnection(), +1008getRpcControllerFactory()) { +1009 @Override +1010 protected AddColumnResponse rpcCall() throws Exception { +1011setPriority(tableName); +1012AddColumnRequest req = +1013 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), +1014 ng.newNonce()); +1015return master.addColumn(getRpcController(), req); +1016 } +1017}); +1018return new AddColumnFamilyFuture(this, tableName, response); +1019 } +1020 +1021 private static class AddColumnFamilyFuture extends ModifyTableFuture { +1022public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, +1023final AddColumnResponse response) { +1024 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() +1025 : null); +1026} +1027 +1028@Override +1029public String getOperationType() { +1030 return "ADD_COLUMN_FAMILY"; +1031} +1032 } +1033 +1034 /** +1035 * {@inheritDoc} +1036 * @deprecated Since 2.0. Will be removed in 3.0. Use +1037 * {@link #deleteColumnFamily(TableName, byte[])} instead. +1038 */ +1039 @Override +1040 @Deprecated +1041 public void deleteColumn(final TableName tableName, final byte[] columnFamily) +1042 throws IOException { +1043deleteColumnFamily(tableName, columnFamily); 1044 } 1045 -1046 /** -1047 * {@inheritDoc} -1048 * @deprecated Since 2.0. Will be removed in 3.0. Use -1049 * {@link #deleteColumnFamily(TableName, byte[])} instead. -1050 */ -1051 @Override -1052 @Deprecated -1053 public void deleteColumn(final
[19/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ModifyColumnFamilyFuture.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ModifyColumnFamilyFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ModifyColumnFamilyFuture.html index 08c80d4..868c46e 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ModifyColumnFamilyFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ModifyColumnFamilyFuture.html @@ -1002,3395 +1002,3361 @@ 994return getAlterStatus(TableName.valueOf(tableName)); 995 } 996 -997 /** -998 * {@inheritDoc} -999 * @deprecated Since 2.0. Will be removed in 3.0. Use -1000 * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead. -1001 */ -1002 @Override -1003 @Deprecated -1004 public void addColumn(final TableName tableName, final HColumnDescriptor columnFamily) -1005 throws IOException { -1006addColumnFamily(tableName, columnFamily); -1007 } -1008 -1009 @Override -1010 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) -1011 throws IOException { -1012get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); -1013 } -1014 -1015 @Override -1016 public FutureVoid addColumnFamilyAsync(final TableName tableName, -1017 final ColumnFamilyDescriptor columnFamily) throws IOException { -1018AddColumnResponse response = -1019executeCallable(new MasterCallableAddColumnResponse(getConnection(), -1020getRpcControllerFactory()) { -1021 @Override -1022 protected AddColumnResponse rpcCall() throws Exception { -1023setPriority(tableName); -1024AddColumnRequest req = -1025 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), -1026 ng.newNonce()); -1027return master.addColumn(getRpcController(), req); -1028 } -1029}); -1030return new AddColumnFamilyFuture(this, tableName, response); -1031 } -1032 -1033 private static class AddColumnFamilyFuture extends ModifyTableFuture { -1034public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, -1035final AddColumnResponse response) { -1036 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() -1037 : null); -1038} -1039 -1040@Override -1041public String getOperationType() { -1042 return "ADD_COLUMN_FAMILY"; -1043} +997 @Override +998 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) +999 throws IOException { +1000get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); +1001 } +1002 +1003 @Override +1004 public FutureVoid addColumnFamilyAsync(final TableName tableName, +1005 final ColumnFamilyDescriptor columnFamily) throws IOException { +1006AddColumnResponse response = +1007executeCallable(new MasterCallableAddColumnResponse(getConnection(), +1008getRpcControllerFactory()) { +1009 @Override +1010 protected AddColumnResponse rpcCall() throws Exception { +1011setPriority(tableName); +1012AddColumnRequest req = +1013 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), +1014 ng.newNonce()); +1015return master.addColumn(getRpcController(), req); +1016 } +1017}); +1018return new AddColumnFamilyFuture(this, tableName, response); +1019 } +1020 +1021 private static class AddColumnFamilyFuture extends ModifyTableFuture { +1022public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, +1023final AddColumnResponse response) { +1024 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() +1025 : null); +1026} +1027 +1028@Override +1029public String getOperationType() { +1030 return "ADD_COLUMN_FAMILY"; +1031} +1032 } +1033 +1034 /** +1035 * {@inheritDoc} +1036 * @deprecated Since 2.0. Will be removed in 3.0. Use +1037 * {@link #deleteColumnFamily(TableName, byte[])} instead. +1038 */ +1039 @Override +1040 @Deprecated +1041 public void deleteColumn(final TableName tableName, final byte[] columnFamily) +1042 throws IOException { +1043deleteColumnFamily(tableName, columnFamily); 1044 } 1045 -1046 /** -1047 * {@inheritDoc} -1048 * @deprecated Since 2.0. Will be removed in 3.0. Use -1049 * {@link #deleteColumnFamily(TableName, byte[])} instead. -1050 */ -1051 @Override -1052 @Deprecated -1053
[22/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DisableTableFuture.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DisableTableFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DisableTableFuture.html index 08c80d4..868c46e 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DisableTableFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.DisableTableFuture.html @@ -1002,3395 +1002,3361 @@ 994return getAlterStatus(TableName.valueOf(tableName)); 995 } 996 -997 /** -998 * {@inheritDoc} -999 * @deprecated Since 2.0. Will be removed in 3.0. Use -1000 * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead. -1001 */ -1002 @Override -1003 @Deprecated -1004 public void addColumn(final TableName tableName, final HColumnDescriptor columnFamily) -1005 throws IOException { -1006addColumnFamily(tableName, columnFamily); -1007 } -1008 -1009 @Override -1010 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) -1011 throws IOException { -1012get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); -1013 } -1014 -1015 @Override -1016 public FutureVoid addColumnFamilyAsync(final TableName tableName, -1017 final ColumnFamilyDescriptor columnFamily) throws IOException { -1018AddColumnResponse response = -1019executeCallable(new MasterCallableAddColumnResponse(getConnection(), -1020getRpcControllerFactory()) { -1021 @Override -1022 protected AddColumnResponse rpcCall() throws Exception { -1023setPriority(tableName); -1024AddColumnRequest req = -1025 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), -1026 ng.newNonce()); -1027return master.addColumn(getRpcController(), req); -1028 } -1029}); -1030return new AddColumnFamilyFuture(this, tableName, response); -1031 } -1032 -1033 private static class AddColumnFamilyFuture extends ModifyTableFuture { -1034public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, -1035final AddColumnResponse response) { -1036 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() -1037 : null); -1038} -1039 -1040@Override -1041public String getOperationType() { -1042 return "ADD_COLUMN_FAMILY"; -1043} +997 @Override +998 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) +999 throws IOException { +1000get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); +1001 } +1002 +1003 @Override +1004 public FutureVoid addColumnFamilyAsync(final TableName tableName, +1005 final ColumnFamilyDescriptor columnFamily) throws IOException { +1006AddColumnResponse response = +1007executeCallable(new MasterCallableAddColumnResponse(getConnection(), +1008getRpcControllerFactory()) { +1009 @Override +1010 protected AddColumnResponse rpcCall() throws Exception { +1011setPriority(tableName); +1012AddColumnRequest req = +1013 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), +1014 ng.newNonce()); +1015return master.addColumn(getRpcController(), req); +1016 } +1017}); +1018return new AddColumnFamilyFuture(this, tableName, response); +1019 } +1020 +1021 private static class AddColumnFamilyFuture extends ModifyTableFuture { +1022public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, +1023final AddColumnResponse response) { +1024 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() +1025 : null); +1026} +1027 +1028@Override +1029public String getOperationType() { +1030 return "ADD_COLUMN_FAMILY"; +1031} +1032 } +1033 +1034 /** +1035 * {@inheritDoc} +1036 * @deprecated Since 2.0. Will be removed in 3.0. Use +1037 * {@link #deleteColumnFamily(TableName, byte[])} instead. +1038 */ +1039 @Override +1040 @Deprecated +1041 public void deleteColumn(final TableName tableName, final byte[] columnFamily) +1042 throws IOException { +1043deleteColumnFamily(tableName, columnFamily); 1044 } 1045 -1046 /** -1047 * {@inheritDoc} -1048 * @deprecated Since 2.0. Will be removed in 3.0. Use -1049 * {@link #deleteColumnFamily(TableName, byte[])} instead. -1050 */ -1051 @Override -1052 @Deprecated -1053 public void deleteColumn(final
[43/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/apidocs/src-html/org/apache/hadoop/hbase/client/Table.html -- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/client/Table.html b/apidocs/src-html/org/apache/hadoop/hbase/client/Table.html index 4b28df6..fff3c46 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/client/Table.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/client/Table.html @@ -334,319 +334,317 @@ 326 /** 327 * Appends values to one or more columns within a single row. 328 * p -329 * This operation does not appear atomic to readers. Appends are done -330 * under a single row lock, so write operations to a row are synchronized, but -331 * readers do not take row locks so get and scan operations can see this -332 * operation partially completed. -333 * -334 * @param append object that specifies the columns and amounts to be used -335 * for the increment operations -336 * @throws IOException e -337 * @return values of columns after the append operation (maybe null) -338 */ -339 Result append(final Append append) throws IOException; -340 -341 /** -342 * Increments one or more columns within a single row. -343 * p -344 * This operation does not appear atomic to readers. Increments are done -345 * under a single row lock, so write operations to a row are synchronized, but -346 * readers do not take row locks so get and scan operations can see this -347 * operation partially completed. -348 * -349 * @param increment object that specifies the columns and amounts to be used -350 * for the increment operations -351 * @throws IOException e -352 * @return values of columns after the increment -353 */ -354 Result increment(final Increment increment) throws IOException; -355 -356 /** -357 * See {@link #incrementColumnValue(byte[], byte[], byte[], long, Durability)} -358 * p -359 * The {@link Durability} is defaulted to {@link Durability#SYNC_WAL}. -360 * @param row The row that contains the cell to increment. -361 * @param family The column family of the cell to increment. -362 * @param qualifier The column qualifier of the cell to increment. -363 * @param amount The amount to increment the cell with (or decrement, if the -364 * amount is negative). -365 * @return The new value, post increment. -366 * @throws IOException if a remote or network exception occurs. -367 */ -368 long incrementColumnValue(byte[] row, byte[] family, byte[] qualifier, -369long amount) throws IOException; -370 -371 /** -372 * Atomically increments a column value. If the column value already exists -373 * and is not a big-endian long, this could throw an exception. If the column -374 * value does not yet exist it is initialized to codeamount/code and -375 * written to the specified column. -376 * -377 * pSetting durability to {@link Durability#SKIP_WAL} means that in a fail -378 * scenario you will lose any increments that have not been flushed. -379 * @param row The row that contains the cell to increment. -380 * @param family The column family of the cell to increment. -381 * @param qualifier The column qualifier of the cell to increment. -382 * @param amount The amount to increment the cell with (or decrement, if the -383 * amount is negative). -384 * @param durability The persistence guarantee for this increment. -385 * @return The new value, post increment. -386 * @throws IOException if a remote or network exception occurs. -387 */ -388 long incrementColumnValue(byte[] row, byte[] family, byte[] qualifier, -389long amount, Durability durability) throws IOException; -390 -391 /** -392 * Releases any resources held or pending changes in internal buffers. -393 * -394 * @throws IOException if a remote or network exception occurs. -395 */ -396 @Override -397 void close() throws IOException; -398 -399 /** -400 * Creates and returns a {@link com.google.protobuf.RpcChannel} instance connected to the -401 * table region containing the specified row. The row given does not actually have -402 * to exist. Whichever region would contain the row based on start and end keys will -403 * be used. Note that the {@code row} parameter is also not passed to the -404 * coprocessor handler registered for this protocol, unless the {@code row} -405 * is separately passed as an argument in the service request. The parameter -406 * here is only used to locate the region used to handle the call. -407 * -408 * p -409 * The obtained {@link com.google.protobuf.RpcChannel} instance can be used to access a published -410 * coprocessor {@link com.google.protobuf.Service} using standard protobuf service invocations: -411 * /p -412 * -413 * div style="background-color: #cc; padding: 2px" -414 * blockquotepre -415
[31/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/org/apache/hadoop/hbase/client/Increment.html -- diff --git a/devapidocs/org/apache/hadoop/hbase/client/Increment.html b/devapidocs/org/apache/hadoop/hbase/client/Increment.html index d4f29b6..9876429 100644 --- a/devapidocs/org/apache/hadoop/hbase/client/Increment.html +++ b/devapidocs/org/apache/hadoop/hbase/client/Increment.html @@ -129,15 +129,14 @@ var activeTableTab = "activeTableTab"; @InterfaceAudience.Public -public class Increment +public class Increment extends Mutation implements http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true; title="class or interface in java.lang">ComparableRow Used to perform Increment operations on a single row. - This operation does not appear atomic to readers. Increments are done - under a single row lock, so write operations to a row are synchronized, but - readers do not take row locks so get and scan operations can see this - operation partially completed. + This operation ensures atomicity to readers. Increments are done + under a single row lock, so write operations to a row are synchronized, and + readers are guaranteed to see this operation fully completed. To increment columns of a row, instantiate an Increment object with the row to increment. At least one column to increment must be specified using the @@ -412,7 +411,7 @@ implements http://docs.oracle.com/javase/8/docs/api/java/lang/Comparabl HEAP_OVERHEAD -private static finallong HEAP_OVERHEAD +private static finallong HEAP_OVERHEAD @@ -421,7 +420,7 @@ implements http://docs.oracle.com/javase/8/docs/api/java/lang/Comparabl tr -privateTimeRange tr +privateTimeRange tr @@ -438,7 +437,7 @@ implements http://docs.oracle.com/javase/8/docs/api/java/lang/Comparabl Increment -publicIncrement(byte[]row) +publicIncrement(byte[]row) Create a Increment operation for the specified row. At least one column must be incremented. @@ -454,7 +453,7 @@ implements http://docs.oracle.com/javase/8/docs/api/java/lang/Comparabl Increment -publicIncrement(byte[]row, +publicIncrement(byte[]row, intoffset, intlength) Create a Increment operation for the specified row. @@ -472,7 +471,7 @@ implements http://docs.oracle.com/javase/8/docs/api/java/lang/Comparabl Increment -publicIncrement(Incrementi) +publicIncrement(Incrementi) Copy constructor Parameters: @@ -494,7 +493,7 @@ implements http://docs.oracle.com/javase/8/docs/api/java/lang/Comparabl add -publicIncrementadd(Cellcell) +publicIncrementadd(Cellcell) throws http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true; title="class or interface in java.io">IOException Add the specified KeyValue to this operation. @@ -513,7 +512,7 @@ implements http://docs.oracle.com/javase/8/docs/api/java/lang/Comparabl addColumn -publicIncrementaddColumn(byte[]family, +publicIncrementaddColumn(byte[]family, byte[]qualifier, longamount) Increment the column from the specific family with the specified qualifier @@ -536,7 +535,7 @@ implements http://docs.oracle.com/javase/8/docs/api/java/lang/Comparabl getTimeRange -publicTimeRangegetTimeRange() +publicTimeRangegetTimeRange() Gets the TimeRange used for this increment. Returns: @@ -550,7 +549,7 @@ implements http://docs.oracle.com/javase/8/docs/api/java/lang/Comparabl setTimeRange -publicIncrementsetTimeRange(longminStamp, +publicIncrementsetTimeRange(longminStamp, longmaxStamp) throws http://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true; title="class or interface in java.io">IOException Sets the TimeRange to be used on the Get for this increment. @@ -578,7 +577,7 @@ implements http://docs.oracle.com/javase/8/docs/api/java/lang/Comparabl setReturnResults -publicIncrementsetReturnResults(booleanreturnResults) +publicIncrementsetReturnResults(booleanreturnResults) Overrides: setReturnResultsin classMutation @@ -595,7 +594,7 @@ implements http://docs.oracle.com/javase/8/docs/api/java/lang/Comparabl isReturnResults -publicbooleanisReturnResults() +publicbooleanisReturnResults() Overrides: isReturnResultsin classMutation @@ -610,7 +609,7 @@ implements http://docs.oracle.com/javase/8/docs/api/java/lang/Comparabl numFamilies -publicintnumFamilies() +publicintnumFamilies() Method for retrieving the number of families to increment from Overrides: @@ -626,7 +625,7 @@ implements http://docs.oracle.com/javase/8/docs/api/java/lang/Comparabl hasFamilies -publicbooleanhasFamilies() +publicbooleanhasFamilies() Method for checking if any families have been inserted into this Increment Returns: @@ -640,7 +639,7 @@ implements
[01/51] [partial] hbase-site git commit: Published site at .
Repository: hbase-site Updated Branches: refs/heads/asf-site d8499ce78 -> e1eb0a072 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/hbase-build-configuration/dependency-info.html -- diff --git a/hbase-build-configuration/dependency-info.html b/hbase-build-configuration/dependency-info.html index 3b2ef5b..d960763 100644 --- a/hbase-build-configuration/dependency-info.html +++ b/hbase-build-configuration/dependency-info.html @@ -7,7 +7,7 @@ - + Apache HBase - Build Configuration Dependency Information @@ -148,7 +148,7 @@ https://www.apache.org/;>The Apache Software Foundation. All rights reserved. - Last Published: 2017-09-03 + Last Published: 2017-09-04
[08/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TruncateTableFuture.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TruncateTableFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TruncateTableFuture.html index 08c80d4..868c46e 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TruncateTableFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TruncateTableFuture.html @@ -1002,3395 +1002,3361 @@ 994return getAlterStatus(TableName.valueOf(tableName)); 995 } 996 -997 /** -998 * {@inheritDoc} -999 * @deprecated Since 2.0. Will be removed in 3.0. Use -1000 * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead. -1001 */ -1002 @Override -1003 @Deprecated -1004 public void addColumn(final TableName tableName, final HColumnDescriptor columnFamily) -1005 throws IOException { -1006addColumnFamily(tableName, columnFamily); -1007 } -1008 -1009 @Override -1010 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) -1011 throws IOException { -1012get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); -1013 } -1014 -1015 @Override -1016 public FutureVoid addColumnFamilyAsync(final TableName tableName, -1017 final ColumnFamilyDescriptor columnFamily) throws IOException { -1018AddColumnResponse response = -1019executeCallable(new MasterCallableAddColumnResponse(getConnection(), -1020getRpcControllerFactory()) { -1021 @Override -1022 protected AddColumnResponse rpcCall() throws Exception { -1023setPriority(tableName); -1024AddColumnRequest req = -1025 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), -1026 ng.newNonce()); -1027return master.addColumn(getRpcController(), req); -1028 } -1029}); -1030return new AddColumnFamilyFuture(this, tableName, response); -1031 } -1032 -1033 private static class AddColumnFamilyFuture extends ModifyTableFuture { -1034public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, -1035final AddColumnResponse response) { -1036 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() -1037 : null); -1038} -1039 -1040@Override -1041public String getOperationType() { -1042 return "ADD_COLUMN_FAMILY"; -1043} +997 @Override +998 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) +999 throws IOException { +1000get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); +1001 } +1002 +1003 @Override +1004 public FutureVoid addColumnFamilyAsync(final TableName tableName, +1005 final ColumnFamilyDescriptor columnFamily) throws IOException { +1006AddColumnResponse response = +1007executeCallable(new MasterCallableAddColumnResponse(getConnection(), +1008getRpcControllerFactory()) { +1009 @Override +1010 protected AddColumnResponse rpcCall() throws Exception { +1011setPriority(tableName); +1012AddColumnRequest req = +1013 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), +1014 ng.newNonce()); +1015return master.addColumn(getRpcController(), req); +1016 } +1017}); +1018return new AddColumnFamilyFuture(this, tableName, response); +1019 } +1020 +1021 private static class AddColumnFamilyFuture extends ModifyTableFuture { +1022public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, +1023final AddColumnResponse response) { +1024 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() +1025 : null); +1026} +1027 +1028@Override +1029public String getOperationType() { +1030 return "ADD_COLUMN_FAMILY"; +1031} +1032 } +1033 +1034 /** +1035 * {@inheritDoc} +1036 * @deprecated Since 2.0. Will be removed in 3.0. Use +1037 * {@link #deleteColumnFamily(TableName, byte[])} instead. +1038 */ +1039 @Override +1040 @Deprecated +1041 public void deleteColumn(final TableName tableName, final byte[] columnFamily) +1042 throws IOException { +1043deleteColumnFamily(tableName, columnFamily); 1044 } 1045 -1046 /** -1047 * {@inheritDoc} -1048 * @deprecated Since 2.0. Will be removed in 3.0. Use -1049 * {@link #deleteColumnFamily(TableName, byte[])} instead. -1050 */ -1051 @Override -1052 @Deprecated -1053 public void
[28/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/src-html/org/apache/hadoop/hbase/client/Append.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/Append.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/Append.html index c58b1bd..49d1207 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/Append.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/Append.html @@ -42,165 +42,164 @@ 034/** 035 * Performs Append operations on a single row. 036 * p -037 * Note that this operation does not appear atomic to readers. Appends are done -038 * under a single row lock, so write operations to a row are synchronized, but -039 * readers do not take row locks so get and scan operations can see this -040 * operation partially completed. -041 * p -042 * To append to a set of columns of a row, instantiate an Append object with the -043 * row to append to. At least one column to append must be specified using the -044 * {@link #addColumn(byte[], byte[], byte[])} method. -045 */ -046@InterfaceAudience.Public -047public class Append extends Mutation { -048 /** -049 * @param returnResults -050 * True (default) if the append operation should return the results. -051 * A client that is not interested in the result can save network -052 * bandwidth setting this to false. -053 */ -054 public Append setReturnResults(boolean returnResults) { -055 super.setReturnResults(returnResults); -056return this; -057 } -058 -059 /** -060 * @return current setting for returnResults -061 */ -062 // This method makes public the superclasses's protected method. -063 public boolean isReturnResults() { -064return super.isReturnResults(); -065 } -066 -067 /** -068 * Create a Append operation for the specified row. -069 * p -070 * At least one column must be appended to. -071 * @param row row key; makes a local copy of passed in array. -072 */ -073 public Append(byte[] row) { -074this(row, 0, row.length); -075 } -076 /** -077 * Copy constructor -078 * @param a -079 */ -080 public Append(Append a) { -081this.row = a.getRow(); -082this.ts = a.getTimeStamp(); -083 this.familyMap.putAll(a.getFamilyCellMap()); -084for (Map.EntryString, byte[] entry : a.getAttributesMap().entrySet()) { -085 this.setAttribute(entry.getKey(), entry.getValue()); -086} -087this.setPriority(a.getPriority()); -088 } -089 -090 /** Create a Append operation for the specified row. -091 * p -092 * At least one column must be appended to. -093 * @param rowArray Makes a copy out of this buffer. -094 * @param rowOffset -095 * @param rowLength -096 */ -097 public Append(final byte [] rowArray, final int rowOffset, final int rowLength) { -098checkRow(rowArray, rowOffset, rowLength); -099this.row = Bytes.copy(rowArray, rowOffset, rowLength); -100 } -101 -102 /** -103 * Add the specified column and value to this Append operation. -104 * @param family family name -105 * @param qualifier column qualifier -106 * @param value value to append to specified column -107 * @return this -108 * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0. -109 * Use {@link #addColumn(byte[], byte[], byte[])} instead -110 */ -111 @Deprecated -112 public Append add(byte [] family, byte [] qualifier, byte [] value) { -113return this.addColumn(family, qualifier, value); -114 } -115 -116 /** -117 * Add the specified column and value to this Append operation. -118 * @param family family name -119 * @param qualifier column qualifier -120 * @param value value to append to specified column -121 * @return this -122 */ -123 public Append addColumn(byte[] family, byte[] qualifier, byte[] value) { -124KeyValue kv = new KeyValue(this.row, family, qualifier, this.ts, KeyValue.Type.Put, value); -125return add(kv); -126 } -127 -128 /** -129 * Add column and value to this Append operation. -130 * @param cell -131 * @return This instance -132 */ -133 @SuppressWarnings("unchecked") -134 public Append add(final Cell cell) { -135// Presume it is KeyValue for now. -136byte [] family = CellUtil.cloneFamily(cell); -137 -138// Get cell list for the family -139ListCell list = getCellList(family); -140 -141// find where the new entry should be placed in the List -142list.add(cell); -143return this; -144 } -145 -146 @Override -147 public Append setAttribute(String name, byte[] value) { -148return (Append) super.setAttribute(name, value); -149 } -150 -151 @Override -152 public Append setId(String id) { -153return (Append) super.setId(id); -154 } -155 -156 @Override -157 public Append setDurability(Durability d) { -158return (Append) super.setDurability(d); -159 } -160 -161
[07/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.html index 08c80d4..868c46e 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.html @@ -1002,3395 +1002,3361 @@ 994return getAlterStatus(TableName.valueOf(tableName)); 995 } 996 -997 /** -998 * {@inheritDoc} -999 * @deprecated Since 2.0. Will be removed in 3.0. Use -1000 * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead. -1001 */ -1002 @Override -1003 @Deprecated -1004 public void addColumn(final TableName tableName, final HColumnDescriptor columnFamily) -1005 throws IOException { -1006addColumnFamily(tableName, columnFamily); -1007 } -1008 -1009 @Override -1010 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) -1011 throws IOException { -1012get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); -1013 } -1014 -1015 @Override -1016 public FutureVoid addColumnFamilyAsync(final TableName tableName, -1017 final ColumnFamilyDescriptor columnFamily) throws IOException { -1018AddColumnResponse response = -1019executeCallable(new MasterCallableAddColumnResponse(getConnection(), -1020getRpcControllerFactory()) { -1021 @Override -1022 protected AddColumnResponse rpcCall() throws Exception { -1023setPriority(tableName); -1024AddColumnRequest req = -1025 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), -1026 ng.newNonce()); -1027return master.addColumn(getRpcController(), req); -1028 } -1029}); -1030return new AddColumnFamilyFuture(this, tableName, response); -1031 } -1032 -1033 private static class AddColumnFamilyFuture extends ModifyTableFuture { -1034public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, -1035final AddColumnResponse response) { -1036 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() -1037 : null); -1038} -1039 -1040@Override -1041public String getOperationType() { -1042 return "ADD_COLUMN_FAMILY"; -1043} +997 @Override +998 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) +999 throws IOException { +1000get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); +1001 } +1002 +1003 @Override +1004 public FutureVoid addColumnFamilyAsync(final TableName tableName, +1005 final ColumnFamilyDescriptor columnFamily) throws IOException { +1006AddColumnResponse response = +1007executeCallable(new MasterCallableAddColumnResponse(getConnection(), +1008getRpcControllerFactory()) { +1009 @Override +1010 protected AddColumnResponse rpcCall() throws Exception { +1011setPriority(tableName); +1012AddColumnRequest req = +1013 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), +1014 ng.newNonce()); +1015return master.addColumn(getRpcController(), req); +1016 } +1017}); +1018return new AddColumnFamilyFuture(this, tableName, response); +1019 } +1020 +1021 private static class AddColumnFamilyFuture extends ModifyTableFuture { +1022public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, +1023final AddColumnResponse response) { +1024 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() +1025 : null); +1026} +1027 +1028@Override +1029public String getOperationType() { +1030 return "ADD_COLUMN_FAMILY"; +1031} +1032 } +1033 +1034 /** +1035 * {@inheritDoc} +1036 * @deprecated Since 2.0. Will be removed in 3.0. Use +1037 * {@link #deleteColumnFamily(TableName, byte[])} instead. +1038 */ +1039 @Override +1040 @Deprecated +1041 public void deleteColumn(final TableName tableName, final byte[] columnFamily) +1042 throws IOException { +1043deleteColumnFamily(tableName, columnFamily); 1044 } 1045 -1046 /** -1047 * {@inheritDoc} -1048 * @deprecated Since 2.0. Will be removed in 3.0. Use -1049 * {@link #deleteColumnFamily(TableName, byte[])} instead. -1050 */ -1051 @Override -1052 @Deprecated -1053 public void deleteColumn(final TableName tableName, final byte[] columnFamily) -1054 throws IOException { -1055
[04/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/src-html/org/apache/hadoop/hbase/client/Table.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/Table.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/Table.html index 4b28df6..fff3c46 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/Table.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/Table.html @@ -334,319 +334,317 @@ 326 /** 327 * Appends values to one or more columns within a single row. 328 * p -329 * This operation does not appear atomic to readers. Appends are done -330 * under a single row lock, so write operations to a row are synchronized, but -331 * readers do not take row locks so get and scan operations can see this -332 * operation partially completed. -333 * -334 * @param append object that specifies the columns and amounts to be used -335 * for the increment operations -336 * @throws IOException e -337 * @return values of columns after the append operation (maybe null) -338 */ -339 Result append(final Append append) throws IOException; -340 -341 /** -342 * Increments one or more columns within a single row. -343 * p -344 * This operation does not appear atomic to readers. Increments are done -345 * under a single row lock, so write operations to a row are synchronized, but -346 * readers do not take row locks so get and scan operations can see this -347 * operation partially completed. -348 * -349 * @param increment object that specifies the columns and amounts to be used -350 * for the increment operations -351 * @throws IOException e -352 * @return values of columns after the increment -353 */ -354 Result increment(final Increment increment) throws IOException; -355 -356 /** -357 * See {@link #incrementColumnValue(byte[], byte[], byte[], long, Durability)} -358 * p -359 * The {@link Durability} is defaulted to {@link Durability#SYNC_WAL}. -360 * @param row The row that contains the cell to increment. -361 * @param family The column family of the cell to increment. -362 * @param qualifier The column qualifier of the cell to increment. -363 * @param amount The amount to increment the cell with (or decrement, if the -364 * amount is negative). -365 * @return The new value, post increment. -366 * @throws IOException if a remote or network exception occurs. -367 */ -368 long incrementColumnValue(byte[] row, byte[] family, byte[] qualifier, -369long amount) throws IOException; -370 -371 /** -372 * Atomically increments a column value. If the column value already exists -373 * and is not a big-endian long, this could throw an exception. If the column -374 * value does not yet exist it is initialized to codeamount/code and -375 * written to the specified column. -376 * -377 * pSetting durability to {@link Durability#SKIP_WAL} means that in a fail -378 * scenario you will lose any increments that have not been flushed. -379 * @param row The row that contains the cell to increment. -380 * @param family The column family of the cell to increment. -381 * @param qualifier The column qualifier of the cell to increment. -382 * @param amount The amount to increment the cell with (or decrement, if the -383 * amount is negative). -384 * @param durability The persistence guarantee for this increment. -385 * @return The new value, post increment. -386 * @throws IOException if a remote or network exception occurs. -387 */ -388 long incrementColumnValue(byte[] row, byte[] family, byte[] qualifier, -389long amount, Durability durability) throws IOException; -390 -391 /** -392 * Releases any resources held or pending changes in internal buffers. -393 * -394 * @throws IOException if a remote or network exception occurs. -395 */ -396 @Override -397 void close() throws IOException; -398 -399 /** -400 * Creates and returns a {@link com.google.protobuf.RpcChannel} instance connected to the -401 * table region containing the specified row. The row given does not actually have -402 * to exist. Whichever region would contain the row based on start and end keys will -403 * be used. Note that the {@code row} parameter is also not passed to the -404 * coprocessor handler registered for this protocol, unless the {@code row} -405 * is separately passed as an argument in the service request. The parameter -406 * here is only used to locate the region used to handle the call. -407 * -408 * p -409 * The obtained {@link com.google.protobuf.RpcChannel} instance can be used to access a published -410 * coprocessor {@link com.google.protobuf.Service} using standard protobuf service invocations: -411 * /p -412 * -413 * div style="background-color: #cc; padding: 2px" -414 *
[02/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/hbase-build-configuration/dependency-convergence.html -- diff --git a/hbase-build-configuration/dependency-convergence.html b/hbase-build-configuration/dependency-convergence.html index 7f824cd..668a54c 100644 --- a/hbase-build-configuration/dependency-convergence.html +++ b/hbase-build-configuration/dependency-convergence.html @@ -7,7 +7,7 @@ - + Apache HBase - Build Configuration Reactor Dependency Convergence @@ -191,7 +191,7 @@ 11.0.2 -org.apache.hbase:hbase-spark-it:jar:3.0.0-SNAPSHOT\-org.apache.hbase:hbase-common:jar:3.0.0-SNAPSHOT:compile\-org.apache.hadoop:hadoop-common:jar:2.7.1:compile\-com.google.guava:guava:jar:11.0.2:compile +org.apache.hbase:hbase-spark-it:jar:3.0.0-SNAPSHOT+-org.apache.hbase:hbase-common:jar:3.0.0-SNAPSHOT:compile|\-org.apache.hadoop:hadoop-common:jar:2.7.1:compile|\-com.google.guava:guava:jar:11.0.2:compile\-org.apache.hbase:hbase-it:test-jar:tests:3.0.0-SNAPSHOT:test\-org.apache.hbase:hbase-backup:jar:3.0.0-SNAPSHOT:test\-(com.google.guava:guava:jar:11.0.2:test - omitted for duplicate) org.apache.hbase:hbase-spark:jar:3.0.0-SNAPSHOT+-org.apache.hadoop:hadoop-client:jar:2.7.1:compile|+-org.apache.hadoop:hadoop-hdfs:jar:2.7.1:compile||\-(com.google.guava:guava:jar:11.0.2:compile - omitted for conflict with 14.0.1)|+-org.apache.hadoop:hadoop-mapreduce-client-app:jar:2.7.1:compile||\-org.apache.hadoop:hadoop-mapreduce-client-common:jar:2.7.1:compile||+-org.apache.hadoop:hadoop-yarn-client:jar:2.7.1:compile|||\-(com.google.guava:guava:jar:11.0.2:compile - omitted for conflict with 14.0.1)||\-org.apache.hadoop:hadoop-yarn-server-common:jar:2.7.1:compile||\-(com.google.guava:guava:jar:11.0.2:comp ile - omitted for conflict with 14.0.1)|+-org.apache.hadoop:hadoop-yarn-api:jar:2.7.1:compile||\-(com.google.guava:guava:jar:11.0.2:compile - omitted for conflict with 14.0.1)|\-org.apache.hadoop:hadoop-mapreduce-client-core:jar:2.7.1:compile|\-org.apache.hadoop:hadoop-yarn-common:jar:2.7.1:compile|\-(com.google.guava:guava:jar:11.0.2:compile - omitted for conflict with 14.0.1)+-org.apache.hadoop:hadoop-common:jar:2.7.1:compile|\-com.google.guava:guava:jar:11.0.2:compile+-org.apache.hadoop:hadoop-common:test-jar:tests:2.7.1:test|\-(com.google.guava:guava:jar:11.0.2:test - omitted for duplicate)\-org.apache.hadoop:hadoop-hdfs:test-jar:tests:2.7.1:test\-(com.google.guava:guava:jar:11.0.2:te st - omitted for duplicate) 14.0.1 @@ -258,7 +258,7 @@ 3.6.2.Final -org.apache.hbase:hbase-spark-it:jar:3.0.0-SNAPSHOT\-io.netty:netty:jar:3.6.2.Final:test +org.apache.hbase:hbase-spark-it:jar:3.0.0-SNAPSHOT+-org.apache.hbase:hbase-it:test-jar:tests:3.0.0-SNAPSHOT:test|\-org.apache.hbase:hbase-backup:jar:3.0.0-SNAPSHOT:test|\-(io.netty:netty:jar:3.6.2.Final:test - omitted for duplicate)\-io.netty:netty:jar:3.6.2.Final:test 3.8.0.Final @@ -348,6 +348,25 @@ +3.4.10 + + +org.apache.hbase:hbase-assembly:pom:3.0.0-SNAPSHOT+-org.apache.hbase:hbase-server:jar:3.0.0-SNAPSHOT:compile|+-org.apache.hbase:hbase-client:jar:3.0.0-SNAPSHOT:compile||+-(org.apache.zookeeper:zookeeper:jar:3.4.10:compile - version managed from 3.4.6; omitted for duplicate)||\-org.apache.curator:curator-client:jar:2.12.0:compile||\-(org.apache.zookeeper:zookeeper:jar:3.4.10:compile - version managed from 3.4.8; omitted for duplicate)|+-org.apache.hbase:hbase-replication:jar:3.0.0-SNAPSHOT:compile||\-(org.apache.zookeeper:zookeeper:jar:3.4.10:compile - version managed from 3.4.6; omitted for duplicate)|+-org.apache.zookeeper:zookeeper:jar:3.4.10:compile|+-org.apache.hadoop:hadoop-common:jar:2.7.1:compile| 0;|\-(org.apache.zookeeper:zookeeper:jar:3.4.10:compile - version managed from 3.4.6; omitted for duplicate)|+-org.apache.hadoop:hadoop-auth:jar:2.7.1:compile||\-(org.apache.zookeeper:zookeeper:jar:3.4.10:compile - version managed from 3.4.6; omitted for duplicate)|\-org.apache.hadoop:hadoop-client:jar:2.7.1:compile|\-org.apache.hadoop:hadoop-mapreduce-client-app:jar:2.7.1:compile|\-org.apache.hadoop:hadoop-mapreduce-client-common:jar:2.7.1:compile|\-org.apache.hadoop:hadoop-yarn-server-common:jar:2.7.1:compile|\-(org.apache.zookeeper:zookeeper:jar:3.4.10:compile - version managed from 3.4.6; omitted for d uplicate)+-org.apache.hbase:hbase-mapreduce:jar:3.0.0-SNAPSHOT:compile|\-(org.apache.zookeeper:zookeeper:jar:3.4.10:compile - version managed from 3.4.6; omitted for duplicate)+-org.apache.hbase:hbase-testing-util:jar:3.0.0-SNAPSHOT:test|+-org.apache.hbase:hbase-server:test-jar:tests:3.0.0-SNAPSHOT:test||\-(org.apache.zookeeper:zookeeper:jar:3.4.10:test - version managed from 3.4.6; omitted for duplicate)|\-org.apache.hadoop:hadoop-minicluster:jar:2.7.1:test|+-org.apache.hadoop:hadoop-common:test-jar:tests:2.7.1:test||\-(org.apache.zookeeper:zookeeper:jar:3.4.10:test - version managed from 3.4.6; omitted for
[42/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/checkstyle-aggregate.html -- diff --git a/checkstyle-aggregate.html b/checkstyle-aggregate.html index 6c9e998..7c9b1fd 100644 --- a/checkstyle-aggregate.html +++ b/checkstyle-aggregate.html @@ -7,7 +7,7 @@ - + Apache HBase Checkstyle Results @@ -289,7 +289,7 @@ 2038 0 0 -12900 +12894 Files @@ -782,7 +782,7 @@ org/apache/hadoop/hbase/client/Admin.java 0 0 -89 +83 org/apache/hadoop/hbase/client/Append.java 0 @@ -7141,12 +7141,12 @@ http://checkstyle.sourceforge.net/config_javadoc.html#JavadocTagContinuationIndentation;>JavadocTagContinuationIndentation offset: 2 -770 +766 Error http://checkstyle.sourceforge.net/config_javadoc.html#NonEmptyAtclauseDescription;>NonEmptyAtclauseDescription -3232 +3230 Error misc @@ -14210,535 +14210,499 @@ javadoc NonEmptyAtclauseDescription At-clause should have a non-empty description. -93 - -Error -javadoc -NonEmptyAtclauseDescription -At-clause should have a non-empty description. -265 - -Error -javadoc -NonEmptyAtclauseDescription -At-clause should have a non-empty description. -279 - -Error -javadoc -JavadocTagContinuationIndentation -Line continuation have incorrect indentation level, expected level should be 2. -292 - -Error -javadoc -JavadocTagContinuationIndentation -Line continuation have incorrect indentation level, expected level should be 2. -309 +92 Error javadoc -JavadocTagContinuationIndentation -Line continuation have incorrect indentation level, expected level should be 2. -328 - -Error -javadoc NonEmptyAtclauseDescription At-clause should have a non-empty description. -329 - -Error -javadoc -JavadocTagContinuationIndentation -Line continuation have incorrect indentation level, expected level should be 2. -353 +264 Error javadoc NonEmptyAtclauseDescription At-clause should have a non-empty description. -354 +278 Error javadoc JavadocTagContinuationIndentation Line continuation have incorrect indentation level, expected level should be 2. -367 +291 Error javadoc JavadocTagContinuationIndentation Line continuation have incorrect indentation level, expected level should be 2. -370 +310 Error javadoc NonEmptyAtclauseDescription At-clause should have a non-empty description. -371 +311 Error javadoc JavadocTagContinuationIndentation Line continuation have incorrect indentation level, expected level should be 2. -388 +324 Error javadoc JavadocTagContinuationIndentation Line continuation have incorrect indentation level, expected level should be 2. -391 +327 Error javadoc NonEmptyAtclauseDescription At-clause should have a non-empty description. -392 +328 Error javadoc NonEmptyAtclauseDescription At-clause should have a non-empty description. -468 +381 Error javadoc NonEmptyAtclauseDescription At-clause should have a non-empty description. -488 +401 Error javadoc JavadocTagContinuationIndentation Line continuation have incorrect indentation level, expected level should be 2. -529 +442 Error javadoc JavadocTagContinuationIndentation Line continuation have incorrect indentation level, expected level should be 2. -530 +443 Error sizes LineLength Line is longer than 100 characters (found 105). -554 +467 Error javadoc NonEmptyAtclauseDescription At-clause should have a non-empty description. -557 +470 Error javadoc NonEmptyAtclauseDescription At-clause should have a non-empty description. -577 +490 Error javadoc NonEmptyAtclauseDescription At-clause should have a non-empty description. -608 +521 Error javadoc JavadocTagContinuationIndentation Line continuation have incorrect indentation level, expected level should be 2. -610 +523 Error javadoc NonEmptyAtclauseDescription At-clause should have a non-empty description. -623 +536 Error javadoc NonEmptyAtclauseDescription At-clause should have a non-empty description. -643 +556 Error javadoc JavadocTagContinuationIndentation Line continuation have incorrect indentation level, expected level should be 2. -690 +603 Error javadoc JavadocTagContinuationIndentation Line continuation have incorrect indentation level, expected level should be 2. -701 +614 Error sizes LineLength Line is longer than 100 characters (found 105). -747 +662 Error javadoc JavadocTagContinuationIndentation Line continuation have incorrect indentation level, expected level should be 2. -860 +777 Error javadoc JavadocTagContinuationIndentation Line continuation have incorrect indentation level, expected level should be 2. -862 +779 Error javadoc NonEmptyAtclauseDescription At-clause should have a non-empty description. -982 +899 Error javadoc NonEmptyAtclauseDescription At-clause should have a non-empty description. -983 +900 Error javadoc JavadocTagContinuationIndentation Line
[06/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/src-html/org/apache/hadoop/hbase/client/HTable.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HTable.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HTable.html index 14660e3..0e9a950 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HTable.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HTable.html @@ -251,1007 +251,1003 @@ 243 244 @Override 245 public TableDescriptor getDescriptor() throws IOException { -246HTableDescriptor htd = HBaseAdmin.getHTableDescriptor(tableName, connection, rpcCallerFactory, +246return HBaseAdmin.getTableDescriptor(tableName, connection, rpcCallerFactory, 247 rpcControllerFactory, operationTimeout, readRpcTimeout); -248if (htd != null) { -249 return new ImmutableHTableDescriptor(htd); -250} -251return null; -252 } -253 -254 /** -255 * Get the corresponding start keys and regions for an arbitrary range of -256 * keys. -257 * p -258 * @param startKey Starting row in range, inclusive -259 * @param endKey Ending row in range -260 * @param includeEndKey true if endRow is inclusive, false if exclusive -261 * @return A pair of list of start keys and list of HRegionLocations that -262 * contain the specified range -263 * @throws IOException if a remote or network exception occurs -264 */ -265 private PairListbyte[], ListHRegionLocation getKeysAndRegionsInRange( -266 final byte[] startKey, final byte[] endKey, final boolean includeEndKey) -267 throws IOException { -268return getKeysAndRegionsInRange(startKey, endKey, includeEndKey, false); -269 } -270 -271 /** -272 * Get the corresponding start keys and regions for an arbitrary range of -273 * keys. -274 * p -275 * @param startKey Starting row in range, inclusive -276 * @param endKey Ending row in range -277 * @param includeEndKey true if endRow is inclusive, false if exclusive -278 * @param reload true to reload information or false to use cached information -279 * @return A pair of list of start keys and list of HRegionLocations that -280 * contain the specified range -281 * @throws IOException if a remote or network exception occurs -282 */ -283 private PairListbyte[], ListHRegionLocation getKeysAndRegionsInRange( -284 final byte[] startKey, final byte[] endKey, final boolean includeEndKey, -285 final boolean reload) throws IOException { -286final boolean endKeyIsEndOfTable = Bytes.equals(endKey,HConstants.EMPTY_END_ROW); -287if ((Bytes.compareTo(startKey, endKey) 0) !endKeyIsEndOfTable) { -288 throw new IllegalArgumentException( -289"Invalid range: " + Bytes.toStringBinary(startKey) + -290" " + Bytes.toStringBinary(endKey)); -291} -292Listbyte[] keysInRange = new ArrayList(); -293ListHRegionLocation regionsInRange = new ArrayList(); -294byte[] currentKey = startKey; -295do { -296 HRegionLocation regionLocation = getRegionLocator().getRegionLocation(currentKey, reload); -297 keysInRange.add(currentKey); -298 regionsInRange.add(regionLocation); -299 currentKey = regionLocation.getRegionInfo().getEndKey(); -300} while (!Bytes.equals(currentKey, HConstants.EMPTY_END_ROW) -301 (endKeyIsEndOfTable || Bytes.compareTo(currentKey, endKey) 0 -302|| (includeEndKey Bytes.compareTo(currentKey, endKey) == 0))); -303return new Pair(keysInRange, regionsInRange); -304 } -305 -306 /** -307 * The underlying {@link HTable} must not be closed. -308 * {@link Table#getScanner(Scan)} has other usage details. -309 */ -310 @Override -311 public ResultScanner getScanner(Scan scan) throws IOException { -312if (scan.getCaching() = 0) { -313 scan.setCaching(scannerCaching); -314} -315if (scan.getMaxResultSize() = 0) { -316 scan.setMaxResultSize(scannerMaxResultSize); +248 } +249 +250 /** +251 * Get the corresponding start keys and regions for an arbitrary range of +252 * keys. +253 * p +254 * @param startKey Starting row in range, inclusive +255 * @param endKey Ending row in range +256 * @param includeEndKey true if endRow is inclusive, false if exclusive +257 * @return A pair of list of start keys and list of HRegionLocations that +258 * contain the specified range +259 * @throws IOException if a remote or network exception occurs +260 */ +261 private PairListbyte[], ListHRegionLocation getKeysAndRegionsInRange( +262 final byte[] startKey, final byte[] endKey, final boolean includeEndKey) +263 throws IOException { +264return getKeysAndRegionsInRange(startKey, endKey, includeEndKey, false); +265 } +266 +267 /** +268 * Get the corresponding start keys and regions for an arbitrary range of +269 * keys.
[10/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.html index 08c80d4..868c46e 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.TableFuture.html @@ -1002,3395 +1002,3361 @@ 994return getAlterStatus(TableName.valueOf(tableName)); 995 } 996 -997 /** -998 * {@inheritDoc} -999 * @deprecated Since 2.0. Will be removed in 3.0. Use -1000 * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead. -1001 */ -1002 @Override -1003 @Deprecated -1004 public void addColumn(final TableName tableName, final HColumnDescriptor columnFamily) -1005 throws IOException { -1006addColumnFamily(tableName, columnFamily); -1007 } -1008 -1009 @Override -1010 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) -1011 throws IOException { -1012get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); -1013 } -1014 -1015 @Override -1016 public FutureVoid addColumnFamilyAsync(final TableName tableName, -1017 final ColumnFamilyDescriptor columnFamily) throws IOException { -1018AddColumnResponse response = -1019executeCallable(new MasterCallableAddColumnResponse(getConnection(), -1020getRpcControllerFactory()) { -1021 @Override -1022 protected AddColumnResponse rpcCall() throws Exception { -1023setPriority(tableName); -1024AddColumnRequest req = -1025 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), -1026 ng.newNonce()); -1027return master.addColumn(getRpcController(), req); -1028 } -1029}); -1030return new AddColumnFamilyFuture(this, tableName, response); -1031 } -1032 -1033 private static class AddColumnFamilyFuture extends ModifyTableFuture { -1034public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, -1035final AddColumnResponse response) { -1036 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() -1037 : null); -1038} -1039 -1040@Override -1041public String getOperationType() { -1042 return "ADD_COLUMN_FAMILY"; -1043} +997 @Override +998 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) +999 throws IOException { +1000get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); +1001 } +1002 +1003 @Override +1004 public FutureVoid addColumnFamilyAsync(final TableName tableName, +1005 final ColumnFamilyDescriptor columnFamily) throws IOException { +1006AddColumnResponse response = +1007executeCallable(new MasterCallableAddColumnResponse(getConnection(), +1008getRpcControllerFactory()) { +1009 @Override +1010 protected AddColumnResponse rpcCall() throws Exception { +1011setPriority(tableName); +1012AddColumnRequest req = +1013 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), +1014 ng.newNonce()); +1015return master.addColumn(getRpcController(), req); +1016 } +1017}); +1018return new AddColumnFamilyFuture(this, tableName, response); +1019 } +1020 +1021 private static class AddColumnFamilyFuture extends ModifyTableFuture { +1022public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, +1023final AddColumnResponse response) { +1024 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() +1025 : null); +1026} +1027 +1028@Override +1029public String getOperationType() { +1030 return "ADD_COLUMN_FAMILY"; +1031} +1032 } +1033 +1034 /** +1035 * {@inheritDoc} +1036 * @deprecated Since 2.0. Will be removed in 3.0. Use +1037 * {@link #deleteColumnFamily(TableName, byte[])} instead. +1038 */ +1039 @Override +1040 @Deprecated +1041 public void deleteColumn(final TableName tableName, final byte[] columnFamily) +1042 throws IOException { +1043deleteColumnFamily(tableName, columnFamily); 1044 } 1045 -1046 /** -1047 * {@inheritDoc} -1048 * @deprecated Since 2.0. Will be removed in 3.0. Use -1049 * {@link #deleteColumnFamily(TableName, byte[])} instead. -1050 */ -1051 @Override -1052 @Deprecated -1053 public void deleteColumn(final TableName tableName, final byte[]
[03/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/src-html/org/apache/hbase/archetypes/exemplars/client/HelloHBase.html -- diff --git a/devapidocs/src-html/org/apache/hbase/archetypes/exemplars/client/HelloHBase.html b/devapidocs/src-html/org/apache/hbase/archetypes/exemplars/client/HelloHBase.html index e787c65..3b73c38 100644 --- a/devapidocs/src-html/org/apache/hbase/archetypes/exemplars/client/HelloHBase.html +++ b/devapidocs/src-html/org/apache/hbase/archetypes/exemplars/client/HelloHBase.html @@ -29,209 +29,211 @@ 021import java.io.IOException; 022import java.util.Map.Entry; 023import java.util.NavigableMap; -024import org.apache.hadoop.hbase.HColumnDescriptor; -025import org.apache.hadoop.hbase.HTableDescriptor; -026import org.apache.hadoop.hbase.NamespaceDescriptor; -027import org.apache.hadoop.hbase.NamespaceNotFoundException; -028import org.apache.hadoop.hbase.TableName; -029import org.apache.hadoop.hbase.client.Admin; -030import org.apache.hadoop.hbase.client.Connection; -031import org.apache.hadoop.hbase.client.ConnectionFactory; -032import org.apache.hadoop.hbase.client.Delete; -033import org.apache.hadoop.hbase.client.Get; -034import org.apache.hadoop.hbase.client.Put; -035import org.apache.hadoop.hbase.client.Result; -036import org.apache.hadoop.hbase.client.Table; -037import org.apache.hadoop.hbase.util.Bytes; -038 -039/** -040 * Successful running of this application requires access to an active instance -041 * of HBase. For install instructions for a standalone instance of HBase, please -042 * refer to https://hbase.apache.org/book.html#quickstart -043 */ -044public final class HelloHBase { -045 -046 protected static final String MY_NAMESPACE_NAME = "myTestNamespace"; -047 static final TableName MY_TABLE_NAME = TableName.valueOf("myTestTable"); -048 static final byte[] MY_COLUMN_FAMILY_NAME = Bytes.toBytes("cf"); -049 static final byte[] MY_FIRST_COLUMN_QUALIFIER -050 = Bytes.toBytes("myFirstColumn"); -051 static final byte[] MY_SECOND_COLUMN_QUALIFIER -052 = Bytes.toBytes("mySecondColumn"); -053 static final byte[] MY_ROW_ID = Bytes.toBytes("rowId01"); -054 -055 // Private constructor included here to avoid checkstyle warnings -056 private HelloHBase() { -057 } -058 -059 public static void main(final String[] args) throws IOException { -060final boolean deleteAllAtEOJ = true; -061 -062/** -063 * ConnectionFactory#createConnection() automatically looks for -064 * hbase-site.xml (HBase configuration parameters) on the system's -065 * CLASSPATH, to enable creation of Connection to HBase via ZooKeeper. -066 */ -067try (Connection connection = ConnectionFactory.createConnection(); -068Admin admin = connection.getAdmin()) { -069 -070 admin.getClusterStatus(); // assure connection successfully established -071 System.out.println("\n*** Hello HBase! -- Connection has been " -072 + "established via ZooKeeper!!\n"); -073 -074 createNamespaceAndTable(admin); -075 -076 System.out.println("Getting a Table object for [" + MY_TABLE_NAME -077 + "] with which to perform CRUD operations in HBase."); -078 try (Table table = connection.getTable(MY_TABLE_NAME)) { -079 -080putRowToTable(table); -081getAndPrintRowContents(table); -082 -083if (deleteAllAtEOJ) { -084 deleteRow(table); -085} -086 } -087 -088 if (deleteAllAtEOJ) { -089deleteNamespaceAndTable(admin); -090 } -091} -092 } -093 -094 /** -095 * Invokes Admin#createNamespace and Admin#createTable to create a namespace -096 * with a table that has one column-family. -097 * -098 * @param admin Standard Admin object -099 * @throws IOException If IO problem encountered -100 */ -101 static void createNamespaceAndTable(final Admin admin) throws IOException { -102 -103if (!namespaceExists(admin, MY_NAMESPACE_NAME)) { -104 System.out.println("Creating Namespace [" + MY_NAMESPACE_NAME + "]."); -105 -106 admin.createNamespace(NamespaceDescriptor -107 .create(MY_NAMESPACE_NAME).build()); -108} -109if (!admin.tableExists(MY_TABLE_NAME)) { -110 System.out.println("Creating Table [" + MY_TABLE_NAME.getNameAsString() -111 + "], with one Column Family [" -112 + Bytes.toString(MY_COLUMN_FAMILY_NAME) + "]."); -113 -114 admin.createTable(new HTableDescriptor(MY_TABLE_NAME) -115 .addFamily(new HColumnDescriptor(MY_COLUMN_FAMILY_NAME))); -116} -117 } -118 -119 /** -120 * Invokes Table#put to store a row (with two new columns created 'on the -121 * fly') into the table. -122 * -123 * @param table Standard Table object (used for CRUD operations). -124 * @throws IOException If IO problem encountered -125 */ -126 static
[13/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.RestoreSnapshotFuture.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.RestoreSnapshotFuture.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.RestoreSnapshotFuture.html index 08c80d4..868c46e 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.RestoreSnapshotFuture.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.RestoreSnapshotFuture.html @@ -1002,3395 +1002,3361 @@ 994return getAlterStatus(TableName.valueOf(tableName)); 995 } 996 -997 /** -998 * {@inheritDoc} -999 * @deprecated Since 2.0. Will be removed in 3.0. Use -1000 * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead. -1001 */ -1002 @Override -1003 @Deprecated -1004 public void addColumn(final TableName tableName, final HColumnDescriptor columnFamily) -1005 throws IOException { -1006addColumnFamily(tableName, columnFamily); -1007 } -1008 -1009 @Override -1010 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) -1011 throws IOException { -1012get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); -1013 } -1014 -1015 @Override -1016 public FutureVoid addColumnFamilyAsync(final TableName tableName, -1017 final ColumnFamilyDescriptor columnFamily) throws IOException { -1018AddColumnResponse response = -1019executeCallable(new MasterCallableAddColumnResponse(getConnection(), -1020getRpcControllerFactory()) { -1021 @Override -1022 protected AddColumnResponse rpcCall() throws Exception { -1023setPriority(tableName); -1024AddColumnRequest req = -1025 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), -1026 ng.newNonce()); -1027return master.addColumn(getRpcController(), req); -1028 } -1029}); -1030return new AddColumnFamilyFuture(this, tableName, response); -1031 } -1032 -1033 private static class AddColumnFamilyFuture extends ModifyTableFuture { -1034public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, -1035final AddColumnResponse response) { -1036 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() -1037 : null); -1038} -1039 -1040@Override -1041public String getOperationType() { -1042 return "ADD_COLUMN_FAMILY"; -1043} +997 @Override +998 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) +999 throws IOException { +1000get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); +1001 } +1002 +1003 @Override +1004 public FutureVoid addColumnFamilyAsync(final TableName tableName, +1005 final ColumnFamilyDescriptor columnFamily) throws IOException { +1006AddColumnResponse response = +1007executeCallable(new MasterCallableAddColumnResponse(getConnection(), +1008getRpcControllerFactory()) { +1009 @Override +1010 protected AddColumnResponse rpcCall() throws Exception { +1011setPriority(tableName); +1012AddColumnRequest req = +1013 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), +1014 ng.newNonce()); +1015return master.addColumn(getRpcController(), req); +1016 } +1017}); +1018return new AddColumnFamilyFuture(this, tableName, response); +1019 } +1020 +1021 private static class AddColumnFamilyFuture extends ModifyTableFuture { +1022public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, +1023final AddColumnResponse response) { +1024 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() +1025 : null); +1026} +1027 +1028@Override +1029public String getOperationType() { +1030 return "ADD_COLUMN_FAMILY"; +1031} +1032 } +1033 +1034 /** +1035 * {@inheritDoc} +1036 * @deprecated Since 2.0. Will be removed in 3.0. Use +1037 * {@link #deleteColumnFamily(TableName, byte[])} instead. +1038 */ +1039 @Override +1040 @Deprecated +1041 public void deleteColumn(final TableName tableName, final byte[] columnFamily) +1042 throws IOException { +1043deleteColumnFamily(tableName, columnFamily); 1044 } 1045 -1046 /** -1047 * {@inheritDoc} -1048 * @deprecated Since 2.0. Will be removed in 3.0. Use -1049 * {@link #deleteColumnFamily(TableName, byte[])} instead. -1050 */ -1051 @Override -1052 @Deprecated -1053 public void
[09/51] [partial] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e1eb0a07/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ThrowableAbortable.html -- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ThrowableAbortable.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ThrowableAbortable.html index 08c80d4..868c46e 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ThrowableAbortable.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/HBaseAdmin.ThrowableAbortable.html @@ -1002,3395 +1002,3361 @@ 994return getAlterStatus(TableName.valueOf(tableName)); 995 } 996 -997 /** -998 * {@inheritDoc} -999 * @deprecated Since 2.0. Will be removed in 3.0. Use -1000 * {@link #addColumnFamily(TableName, ColumnFamilyDescriptor)} instead. -1001 */ -1002 @Override -1003 @Deprecated -1004 public void addColumn(final TableName tableName, final HColumnDescriptor columnFamily) -1005 throws IOException { -1006addColumnFamily(tableName, columnFamily); -1007 } -1008 -1009 @Override -1010 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) -1011 throws IOException { -1012get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); -1013 } -1014 -1015 @Override -1016 public FutureVoid addColumnFamilyAsync(final TableName tableName, -1017 final ColumnFamilyDescriptor columnFamily) throws IOException { -1018AddColumnResponse response = -1019executeCallable(new MasterCallableAddColumnResponse(getConnection(), -1020getRpcControllerFactory()) { -1021 @Override -1022 protected AddColumnResponse rpcCall() throws Exception { -1023setPriority(tableName); -1024AddColumnRequest req = -1025 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), -1026 ng.newNonce()); -1027return master.addColumn(getRpcController(), req); -1028 } -1029}); -1030return new AddColumnFamilyFuture(this, tableName, response); -1031 } -1032 -1033 private static class AddColumnFamilyFuture extends ModifyTableFuture { -1034public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, -1035final AddColumnResponse response) { -1036 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() -1037 : null); -1038} -1039 -1040@Override -1041public String getOperationType() { -1042 return "ADD_COLUMN_FAMILY"; -1043} +997 @Override +998 public void addColumnFamily(final TableName tableName, final ColumnFamilyDescriptor columnFamily) +999 throws IOException { +1000get(addColumnFamilyAsync(tableName, columnFamily), syncWaitTimeout, TimeUnit.MILLISECONDS); +1001 } +1002 +1003 @Override +1004 public FutureVoid addColumnFamilyAsync(final TableName tableName, +1005 final ColumnFamilyDescriptor columnFamily) throws IOException { +1006AddColumnResponse response = +1007executeCallable(new MasterCallableAddColumnResponse(getConnection(), +1008getRpcControllerFactory()) { +1009 @Override +1010 protected AddColumnResponse rpcCall() throws Exception { +1011setPriority(tableName); +1012AddColumnRequest req = +1013 RequestConverter.buildAddColumnRequest(tableName, columnFamily, ng.getNonceGroup(), +1014 ng.newNonce()); +1015return master.addColumn(getRpcController(), req); +1016 } +1017}); +1018return new AddColumnFamilyFuture(this, tableName, response); +1019 } +1020 +1021 private static class AddColumnFamilyFuture extends ModifyTableFuture { +1022public AddColumnFamilyFuture(final HBaseAdmin admin, final TableName tableName, +1023final AddColumnResponse response) { +1024 super(admin, tableName, (response != null response.hasProcId()) ? response.getProcId() +1025 : null); +1026} +1027 +1028@Override +1029public String getOperationType() { +1030 return "ADD_COLUMN_FAMILY"; +1031} +1032 } +1033 +1034 /** +1035 * {@inheritDoc} +1036 * @deprecated Since 2.0. Will be removed in 3.0. Use +1037 * {@link #deleteColumnFamily(TableName, byte[])} instead. +1038 */ +1039 @Override +1040 @Deprecated +1041 public void deleteColumn(final TableName tableName, final byte[] columnFamily) +1042 throws IOException { +1043deleteColumnFamily(tableName, columnFamily); 1044 } 1045 -1046 /** -1047 * {@inheritDoc} -1048 * @deprecated Since 2.0. Will be removed in 3.0. Use -1049 * {@link #deleteColumnFamily(TableName, byte[])} instead. -1050 */ -1051 @Override -1052 @Deprecated -1053 public void deleteColumn(final
hbase git commit: HBASE-18743 HFiles in use by a table which has the same name and namespace with a default table cloned from snapshot may be deleted when that snapshot and default table are deleted (
Repository: hbase Updated Branches: refs/heads/branch-1.3 67be2d11e -> d59ca6323 HBASE-18743 HFiles in use by a table which has the same name and namespace with a default table cloned from snapshot may be deleted when that snapshot and default table are deleted (wenbang) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d59ca632 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d59ca632 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d59ca632 Branch: refs/heads/branch-1.3 Commit: d59ca63237a064f18ca5b7069b558c3fb21cdfb4 Parents: 67be2d1 Author: tedyuAuthored: Mon Sep 4 07:56:07 2017 -0700 Committer: tedyu Committed: Mon Sep 4 07:56:07 2017 -0700 -- .../main/java/org/apache/hadoop/hbase/TableName.java| 2 +- .../java/org/apache/hadoop/hbase/TestNamespace.java | 12 .../java/org/apache/hadoop/hbase/io/TestHFileLink.java | 5 +++-- 3 files changed, 16 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/d59ca632/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java -- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java index 198a5eb..9904c78 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java @@ -388,7 +388,7 @@ public final class TableName implements Comparable { for (TableName tn : tableCache) { if (qualifierAsString.equals(tn.getQualifierAsString()) && - namespaceAsString.equals(tn.getNameAsString())) { + namespaceAsString.equals(tn.getNamespaceAsString())) { return tn; } } http://git-wip-us.apache.org/repos/asf/hbase/blob/d59ca632/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java -- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java index f0dc132..662cba6 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java @@ -393,4 +393,16 @@ public class TestNamespace { fail("Should have thrown exception " + exceptionClass); } + @Test + public void testValueOfNamespaceAndQualifier() { +TableName name0 = TableName.valueOf("table"); +TableName name1 = TableName.valueOf("table", "table"); +assertEquals(NamespaceDescriptor.DEFAULT_NAMESPACE_NAME_STR, name0.getNamespaceAsString()); +assertEquals("table", name0.getQualifierAsString()); +assertEquals("table", name0.getNameAsString()); +assertEquals("table", name1.getNamespaceAsString()); +assertEquals("table", name1.getQualifierAsString()); +assertEquals("table:table", name1.getNameAsString()); + } + } http://git-wip-us.apache.org/repos/asf/hbase/blob/d59ca632/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHFileLink.java -- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHFileLink.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHFileLink.java index 044975d..e4d09c3 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHFileLink.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHFileLink.java @@ -102,7 +102,8 @@ public class TestHFileLink { TableName.NAMESPACE_DELIM, '=') + "=" + encodedRegion + "-" + storeFileName; TableName tableNames[] = {TableName.valueOf("tableName1"), - TableName.valueOf("ns", "tableName2")}; + TableName.valueOf("ns", "tableName2"), + TableName.valueOf("refTable:refTable")}; for( TableName tableName : tableNames) { Path tableDir = FSUtils.getTableDir(rootDir, tableName); @@ -112,7 +113,7 @@ public class TestHFileLink { //Verify back reference creation assertEquals(encodedRegion+"."+ tableName.getNameAsString().replace(TableName.NAMESPACE_DELIM, '='), -HFileLink.createBackReferenceName(tableName.getNameAsString(), + HFileLink.createBackReferenceName(FSUtils.getTableName(tableDir).getNameAsString(), encodedRegion)); //verify parsing back reference
hbase git commit: HBASE-18743 HFiles in use by a table which has the same name and namespace with a default table cloned from snapshot may be deleted when that snapshot and default table are deleted (
Repository: hbase Updated Branches: refs/heads/branch-1.2 55629b2c6 -> 9b0f2fa3e HBASE-18743 HFiles in use by a table which has the same name and namespace with a default table cloned from snapshot may be deleted when that snapshot and default table are deleted (wenbang) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9b0f2fa3 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9b0f2fa3 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9b0f2fa3 Branch: refs/heads/branch-1.2 Commit: 9b0f2fa3e225554f6b36028c276f056fe27dfe7e Parents: 55629b2 Author: tedyuAuthored: Mon Sep 4 07:56:47 2017 -0700 Committer: tedyu Committed: Mon Sep 4 07:56:47 2017 -0700 -- .../main/java/org/apache/hadoop/hbase/TableName.java| 2 +- .../java/org/apache/hadoop/hbase/TestNamespace.java | 12 .../java/org/apache/hadoop/hbase/io/TestHFileLink.java | 5 +++-- 3 files changed, 16 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/9b0f2fa3/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java -- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java index 198a5eb..9904c78 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java @@ -388,7 +388,7 @@ public final class TableName implements Comparable { for (TableName tn : tableCache) { if (qualifierAsString.equals(tn.getQualifierAsString()) && - namespaceAsString.equals(tn.getNameAsString())) { + namespaceAsString.equals(tn.getNamespaceAsString())) { return tn; } } http://git-wip-us.apache.org/repos/asf/hbase/blob/9b0f2fa3/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java -- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java index d72b176..ea24eb8 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java @@ -421,4 +421,16 @@ public class TestNamespace { fail("Should have thrown exception " + exceptionClass); } + @Test + public void testValueOfNamespaceAndQualifier() { +TableName name0 = TableName.valueOf("table"); +TableName name1 = TableName.valueOf("table", "table"); +assertEquals(NamespaceDescriptor.DEFAULT_NAMESPACE_NAME_STR, name0.getNamespaceAsString()); +assertEquals("table", name0.getQualifierAsString()); +assertEquals("table", name0.getNameAsString()); +assertEquals("table", name1.getNamespaceAsString()); +assertEquals("table", name1.getQualifierAsString()); +assertEquals("table:table", name1.getNameAsString()); + } + } http://git-wip-us.apache.org/repos/asf/hbase/blob/9b0f2fa3/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHFileLink.java -- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHFileLink.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHFileLink.java index 044975d..e4d09c3 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHFileLink.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHFileLink.java @@ -102,7 +102,8 @@ public class TestHFileLink { TableName.NAMESPACE_DELIM, '=') + "=" + encodedRegion + "-" + storeFileName; TableName tableNames[] = {TableName.valueOf("tableName1"), - TableName.valueOf("ns", "tableName2")}; + TableName.valueOf("ns", "tableName2"), + TableName.valueOf("refTable:refTable")}; for( TableName tableName : tableNames) { Path tableDir = FSUtils.getTableDir(rootDir, tableName); @@ -112,7 +113,7 @@ public class TestHFileLink { //Verify back reference creation assertEquals(encodedRegion+"."+ tableName.getNameAsString().replace(TableName.NAMESPACE_DELIM, '='), -HFileLink.createBackReferenceName(tableName.getNameAsString(), + HFileLink.createBackReferenceName(FSUtils.getTableName(tableDir).getNameAsString(), encodedRegion)); //verify parsing back reference
hbase git commit: HBASE-18743 HFiles in use by a table which has the same name and namespace with a default table cloned from snapshot may be deleted when that snapshot and default table are deleted (
Repository: hbase Updated Branches: refs/heads/branch-1.4 ccaef7c02 -> c97f0f2f2 HBASE-18743 HFiles in use by a table which has the same name and namespace with a default table cloned from snapshot may be deleted when that snapshot and default table are deleted (wenbang) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c97f0f2f Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c97f0f2f Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c97f0f2f Branch: refs/heads/branch-1.4 Commit: c97f0f2f24ab760d61ac74d159ee4f47a7c7d2d6 Parents: ccaef7c Author: tedyuAuthored: Mon Sep 4 07:53:43 2017 -0700 Committer: tedyu Committed: Mon Sep 4 07:53:43 2017 -0700 -- .../main/java/org/apache/hadoop/hbase/TableName.java| 2 +- .../java/org/apache/hadoop/hbase/TestNamespace.java | 12 .../java/org/apache/hadoop/hbase/io/TestHFileLink.java | 5 +++-- 3 files changed, 16 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/c97f0f2f/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java -- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java index 198a5eb..9904c78 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java @@ -388,7 +388,7 @@ public final class TableName implements Comparable { for (TableName tn : tableCache) { if (qualifierAsString.equals(tn.getQualifierAsString()) && - namespaceAsString.equals(tn.getNameAsString())) { + namespaceAsString.equals(tn.getNamespaceAsString())) { return tn; } } http://git-wip-us.apache.org/repos/asf/hbase/blob/c97f0f2f/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java -- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java index f0dc132..662cba6 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java @@ -393,4 +393,16 @@ public class TestNamespace { fail("Should have thrown exception " + exceptionClass); } + @Test + public void testValueOfNamespaceAndQualifier() { +TableName name0 = TableName.valueOf("table"); +TableName name1 = TableName.valueOf("table", "table"); +assertEquals(NamespaceDescriptor.DEFAULT_NAMESPACE_NAME_STR, name0.getNamespaceAsString()); +assertEquals("table", name0.getQualifierAsString()); +assertEquals("table", name0.getNameAsString()); +assertEquals("table", name1.getNamespaceAsString()); +assertEquals("table", name1.getQualifierAsString()); +assertEquals("table:table", name1.getNameAsString()); + } + } http://git-wip-us.apache.org/repos/asf/hbase/blob/c97f0f2f/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHFileLink.java -- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHFileLink.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHFileLink.java index 044975d..e4d09c3 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHFileLink.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHFileLink.java @@ -102,7 +102,8 @@ public class TestHFileLink { TableName.NAMESPACE_DELIM, '=') + "=" + encodedRegion + "-" + storeFileName; TableName tableNames[] = {TableName.valueOf("tableName1"), - TableName.valueOf("ns", "tableName2")}; + TableName.valueOf("ns", "tableName2"), + TableName.valueOf("refTable:refTable")}; for( TableName tableName : tableNames) { Path tableDir = FSUtils.getTableDir(rootDir, tableName); @@ -112,7 +113,7 @@ public class TestHFileLink { //Verify back reference creation assertEquals(encodedRegion+"."+ tableName.getNameAsString().replace(TableName.NAMESPACE_DELIM, '='), -HFileLink.createBackReferenceName(tableName.getNameAsString(), + HFileLink.createBackReferenceName(FSUtils.getTableName(tableDir).getNameAsString(), encodedRegion)); //verify parsing back reference
hbase git commit: HBASE-18743 HFiles in use by a table which has the same name and namespace with a default table cloned from snapshot may be deleted when that snapshot and default table are deleted (
Repository: hbase Updated Branches: refs/heads/branch-1 8ce811c6e -> d5033fd35 HBASE-18743 HFiles in use by a table which has the same name and namespace with a default table cloned from snapshot may be deleted when that snapshot and default table are deleted (wenbang) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d5033fd3 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d5033fd3 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d5033fd3 Branch: refs/heads/branch-1 Commit: d5033fd3502e24af358dd208b39769bcaee2dc3a Parents: 8ce811c Author: tedyuAuthored: Mon Sep 4 07:52:57 2017 -0700 Committer: tedyu Committed: Mon Sep 4 07:52:57 2017 -0700 -- .../main/java/org/apache/hadoop/hbase/TableName.java| 2 +- .../java/org/apache/hadoop/hbase/TestNamespace.java | 12 .../java/org/apache/hadoop/hbase/io/TestHFileLink.java | 5 +++-- 3 files changed, 16 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/d5033fd3/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java -- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java index 198a5eb..9904c78 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java @@ -388,7 +388,7 @@ public final class TableName implements Comparable { for (TableName tn : tableCache) { if (qualifierAsString.equals(tn.getQualifierAsString()) && - namespaceAsString.equals(tn.getNameAsString())) { + namespaceAsString.equals(tn.getNamespaceAsString())) { return tn; } } http://git-wip-us.apache.org/repos/asf/hbase/blob/d5033fd3/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java -- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java index f0dc132..662cba6 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java @@ -393,4 +393,16 @@ public class TestNamespace { fail("Should have thrown exception " + exceptionClass); } + @Test + public void testValueOfNamespaceAndQualifier() { +TableName name0 = TableName.valueOf("table"); +TableName name1 = TableName.valueOf("table", "table"); +assertEquals(NamespaceDescriptor.DEFAULT_NAMESPACE_NAME_STR, name0.getNamespaceAsString()); +assertEquals("table", name0.getQualifierAsString()); +assertEquals("table", name0.getNameAsString()); +assertEquals("table", name1.getNamespaceAsString()); +assertEquals("table", name1.getQualifierAsString()); +assertEquals("table:table", name1.getNameAsString()); + } + } http://git-wip-us.apache.org/repos/asf/hbase/blob/d5033fd3/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHFileLink.java -- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHFileLink.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHFileLink.java index 044975d..e4d09c3 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHFileLink.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHFileLink.java @@ -102,7 +102,8 @@ public class TestHFileLink { TableName.NAMESPACE_DELIM, '=') + "=" + encodedRegion + "-" + storeFileName; TableName tableNames[] = {TableName.valueOf("tableName1"), - TableName.valueOf("ns", "tableName2")}; + TableName.valueOf("ns", "tableName2"), + TableName.valueOf("refTable:refTable")}; for( TableName tableName : tableNames) { Path tableDir = FSUtils.getTableDir(rootDir, tableName); @@ -112,7 +113,7 @@ public class TestHFileLink { //Verify back reference creation assertEquals(encodedRegion+"."+ tableName.getNameAsString().replace(TableName.NAMESPACE_DELIM, '='), -HFileLink.createBackReferenceName(tableName.getNameAsString(), + HFileLink.createBackReferenceName(FSUtils.getTableName(tableDir).getNameAsString(), encodedRegion)); //verify parsing back reference
hbase git commit: HBASE-18736 Cleanup the HTD/HCD for Admin
Repository: hbase Updated Branches: refs/heads/master 476973654 -> 32ddb1f60 HBASE-18736 Cleanup the HTD/HCD for Admin Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/32ddb1f6 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/32ddb1f6 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/32ddb1f6 Branch: refs/heads/master Commit: 32ddb1f604666e020e04a02c6fc213b22e5badef Parents: 4769736 Author: Chia-Ping TsaiAuthored: Sat Sep 2 00:06:02 2017 +0800 Committer: Chia-Ping Tsai Committed: Mon Sep 4 16:59:36 2017 +0800 -- .../archetypes/exemplars/client/HelloHBase.java | 12 ++- .../org/apache/hadoop/hbase/client/Admin.java | 107 +++ .../apache/hadoop/hbase/client/HBaseAdmin.java | 46 ++-- .../org/apache/hadoop/hbase/client/HTable.java | 6 +- .../hadoop/hbase/snapshot/SnapshotInfo.java | 2 +- 5 files changed, 27 insertions(+), 146 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/32ddb1f6/hbase-archetypes/hbase-client-project/src/main/java/org/apache/hbase/archetypes/exemplars/client/HelloHBase.java -- diff --git a/hbase-archetypes/hbase-client-project/src/main/java/org/apache/hbase/archetypes/exemplars/client/HelloHBase.java b/hbase-archetypes/hbase-client-project/src/main/java/org/apache/hbase/archetypes/exemplars/client/HelloHBase.java index e327541..ee2f034 100644 --- a/hbase-archetypes/hbase-client-project/src/main/java/org/apache/hbase/archetypes/exemplars/client/HelloHBase.java +++ b/hbase-archetypes/hbase-client-project/src/main/java/org/apache/hbase/archetypes/exemplars/client/HelloHBase.java @@ -21,12 +21,11 @@ package org.apache.hbase.archetypes.exemplars.client; import java.io.IOException; import java.util.Map.Entry; import java.util.NavigableMap; -import org.apache.hadoop.hbase.HColumnDescriptor; -import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.NamespaceDescriptor; import org.apache.hadoop.hbase.NamespaceNotFoundException; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; +import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.ConnectionFactory; import org.apache.hadoop.hbase.client.Delete; @@ -34,6 +33,8 @@ import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.client.TableDescriptor; +import org.apache.hadoop.hbase.client.TableDescriptorBuilder; import org.apache.hadoop.hbase.util.Bytes; /** @@ -110,9 +111,10 @@ public final class HelloHBase { System.out.println("Creating Table [" + MY_TABLE_NAME.getNameAsString() + "], with one Column Family [" + Bytes.toString(MY_COLUMN_FAMILY_NAME) + "]."); - - admin.createTable(new HTableDescriptor(MY_TABLE_NAME) - .addFamily(new HColumnDescriptor(MY_COLUMN_FAMILY_NAME))); + TableDescriptor desc = TableDescriptorBuilder.newBuilder(MY_TABLE_NAME) + .addColumnFamily(ColumnFamilyDescriptorBuilder.of(MY_COLUMN_FAMILY_NAME)) + .build(); + admin.createTable(desc); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/32ddb1f6/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java index 8de9f89..b19c107 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java @@ -32,7 +32,6 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Abortable; import org.apache.hadoop.hbase.ClusterStatus; import org.apache.hadoop.hbase.ClusterStatus.Options; -import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.NamespaceDescriptor; @@ -291,23 +290,6 @@ public interface Admin extends Abortable, Closeable { * @throws org.apache.hadoop.hbase.TableExistsException if table already exists (If concurrent * threads, the table may have been created between test-for-existence and attempt-at-creation). * @throws IOException if a remote or network exception occurs - * @deprecated since 2.0 version and will be removed in 3.0 version. - * use {@link
hbase git commit: HBASE-18736 Cleanup the HTD/HCD for Admin
Repository: hbase Updated Branches: refs/heads/branch-2 a1efda29e -> 0e0154483 HBASE-18736 Cleanup the HTD/HCD for Admin Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0e015448 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0e015448 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0e015448 Branch: refs/heads/branch-2 Commit: 0e0154483872a9d85dc2e75aab8274f065ea8931 Parents: a1efda2 Author: Chia-Ping TsaiAuthored: Sat Sep 2 00:06:02 2017 +0800 Committer: Chia-Ping Tsai Committed: Mon Sep 4 17:02:28 2017 +0800 -- .../archetypes/exemplars/client/HelloHBase.java | 12 ++- .../org/apache/hadoop/hbase/client/Admin.java | 107 +++ .../apache/hadoop/hbase/client/HBaseAdmin.java | 46 ++-- .../org/apache/hadoop/hbase/client/HTable.java | 6 +- .../hadoop/hbase/snapshot/SnapshotInfo.java | 2 +- 5 files changed, 27 insertions(+), 146 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/0e015448/hbase-archetypes/hbase-client-project/src/main/java/org/apache/hbase/archetypes/exemplars/client/HelloHBase.java -- diff --git a/hbase-archetypes/hbase-client-project/src/main/java/org/apache/hbase/archetypes/exemplars/client/HelloHBase.java b/hbase-archetypes/hbase-client-project/src/main/java/org/apache/hbase/archetypes/exemplars/client/HelloHBase.java index e327541..ee2f034 100644 --- a/hbase-archetypes/hbase-client-project/src/main/java/org/apache/hbase/archetypes/exemplars/client/HelloHBase.java +++ b/hbase-archetypes/hbase-client-project/src/main/java/org/apache/hbase/archetypes/exemplars/client/HelloHBase.java @@ -21,12 +21,11 @@ package org.apache.hbase.archetypes.exemplars.client; import java.io.IOException; import java.util.Map.Entry; import java.util.NavigableMap; -import org.apache.hadoop.hbase.HColumnDescriptor; -import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.NamespaceDescriptor; import org.apache.hadoop.hbase.NamespaceNotFoundException; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; +import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.ConnectionFactory; import org.apache.hadoop.hbase.client.Delete; @@ -34,6 +33,8 @@ import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.client.TableDescriptor; +import org.apache.hadoop.hbase.client.TableDescriptorBuilder; import org.apache.hadoop.hbase.util.Bytes; /** @@ -110,9 +111,10 @@ public final class HelloHBase { System.out.println("Creating Table [" + MY_TABLE_NAME.getNameAsString() + "], with one Column Family [" + Bytes.toString(MY_COLUMN_FAMILY_NAME) + "]."); - - admin.createTable(new HTableDescriptor(MY_TABLE_NAME) - .addFamily(new HColumnDescriptor(MY_COLUMN_FAMILY_NAME))); + TableDescriptor desc = TableDescriptorBuilder.newBuilder(MY_TABLE_NAME) + .addColumnFamily(ColumnFamilyDescriptorBuilder.of(MY_COLUMN_FAMILY_NAME)) + .build(); + admin.createTable(desc); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/0e015448/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java index 8de9f89..b19c107 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java @@ -32,7 +32,6 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Abortable; import org.apache.hadoop.hbase.ClusterStatus; import org.apache.hadoop.hbase.ClusterStatus.Options; -import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.NamespaceDescriptor; @@ -291,23 +290,6 @@ public interface Admin extends Abortable, Closeable { * @throws org.apache.hadoop.hbase.TableExistsException if table already exists (If concurrent * threads, the table may have been created between test-for-existence and attempt-at-creation). * @throws IOException if a remote or network exception occurs - * @deprecated since 2.0 version and will be removed in 3.0 version. - * use {@link
hbase git commit: HBASE-15497 Incorrect javadoc for atomicity guarantee of Increment and Append
Repository: hbase Updated Branches: refs/heads/branch-1.2 298bae209 -> 55629b2c6 HBASE-15497 Incorrect javadoc for atomicity guarantee of Increment and Append Signed-off-by: Chia-Ping TsaiProject: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/55629b2c Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/55629b2c Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/55629b2c Branch: refs/heads/branch-1.2 Commit: 55629b2c675311468caf76069dc3e276421d25c0 Parents: 298bae2 Author: cuijianwei Authored: Sun Apr 10 14:31:31 2016 +0800 Committer: Chia-Ping Tsai Committed: Mon Sep 4 16:23:29 2017 +0800 -- .../java/org/apache/hadoop/hbase/client/Append.java | 7 +++ .../org/apache/hadoop/hbase/client/Increment.java | 7 +++ .../java/org/apache/hadoop/hbase/client/Table.java| 14 ++ 3 files changed, 12 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/55629b2c/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java index f20f727..4412e52 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java @@ -35,10 +35,9 @@ import org.apache.hadoop.hbase.util.Bytes; /** * Performs Append operations on a single row. * - * Note that this operation does not appear atomic to readers. Appends are done - * under a single row lock, so write operations to a row are synchronized, but - * readers do not take row locks so get and scan operations can see this - * operation partially completed. + * This operation ensures atomicty to readers. Appends are done + * under a single row lock, so write operations to a row are synchronized, and + * readers are guaranteed to see this operation fully completed. * * To append to a set of columns of a row, instantiate an Append object with the * row to append to. At least one column to append must be specified using the http://git-wip-us.apache.org/repos/asf/hbase/blob/55629b2c/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java index b60cbde..8b7250f 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java @@ -39,10 +39,9 @@ import org.apache.hadoop.hbase.util.ClassSize; /** * Used to perform Increment operations on a single row. * - * This operation does not appear atomic to readers. Increments are done - * under a single row lock, so write operations to a row are synchronized, but - * readers do not take row locks so get and scan operations can see this - * operation partially completed. + * This operation ensures atomicity to readers. Increments are done + * under a single row lock, so write operations to a row are synchronized, and + * readers are guaranteed to see this operation fully completed. * * To increment columns of a row, instantiate an Increment object with the row * to increment. At least one column to increment must be specified using the http://git-wip-us.apache.org/repos/asf/hbase/blob/55629b2c/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java index 7ed89fb..85eb538 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java @@ -341,10 +341,9 @@ public interface Table extends Closeable { /** * Appends values to one or more columns within a single row. * - * This operation does not appear atomic to readers. Appends are done - * under a single row lock, so write operations to a row are synchronized, but - * readers do not take row locks so get and scan operations can see this - * operation partially completed. + * This operation guaranteed atomicity to readers. Appends are done + * under a single row lock, so write operations to a row are synchronized, and + * readers are guaranteed to see this operation fully completed. * * @param append object
hbase git commit: HBASE-15497 Incorrect javadoc for atomicity guarantee of Increment and Append
Repository: hbase Updated Branches: refs/heads/branch-1.3 c25d60599 -> 67be2d11e HBASE-15497 Incorrect javadoc for atomicity guarantee of Increment and Append Signed-off-by: Chia-Ping TsaiProject: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/67be2d11 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/67be2d11 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/67be2d11 Branch: refs/heads/branch-1.3 Commit: 67be2d11e4389d5ced9317c67dabb195afa8a25b Parents: c25d605 Author: cuijianwei Authored: Sun Apr 10 14:31:31 2016 +0800 Committer: Chia-Ping Tsai Committed: Mon Sep 4 16:23:23 2017 +0800 -- .../java/org/apache/hadoop/hbase/client/Append.java | 7 +++ .../org/apache/hadoop/hbase/client/Increment.java | 7 +++ .../java/org/apache/hadoop/hbase/client/Table.java| 14 ++ 3 files changed, 12 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/67be2d11/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java index f20f727..4412e52 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java @@ -35,10 +35,9 @@ import org.apache.hadoop.hbase.util.Bytes; /** * Performs Append operations on a single row. * - * Note that this operation does not appear atomic to readers. Appends are done - * under a single row lock, so write operations to a row are synchronized, but - * readers do not take row locks so get and scan operations can see this - * operation partially completed. + * This operation ensures atomicty to readers. Appends are done + * under a single row lock, so write operations to a row are synchronized, and + * readers are guaranteed to see this operation fully completed. * * To append to a set of columns of a row, instantiate an Append object with the * row to append to. At least one column to append must be specified using the http://git-wip-us.apache.org/repos/asf/hbase/blob/67be2d11/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java index b60cbde..8b7250f 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java @@ -39,10 +39,9 @@ import org.apache.hadoop.hbase.util.ClassSize; /** * Used to perform Increment operations on a single row. * - * This operation does not appear atomic to readers. Increments are done - * under a single row lock, so write operations to a row are synchronized, but - * readers do not take row locks so get and scan operations can see this - * operation partially completed. + * This operation ensures atomicity to readers. Increments are done + * under a single row lock, so write operations to a row are synchronized, and + * readers are guaranteed to see this operation fully completed. * * To increment columns of a row, instantiate an Increment object with the row * to increment. At least one column to increment must be specified using the http://git-wip-us.apache.org/repos/asf/hbase/blob/67be2d11/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java index 8c6169d..ae7bc73 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java @@ -341,10 +341,9 @@ public interface Table extends Closeable { /** * Appends values to one or more columns within a single row. * - * This operation does not appear atomic to readers. Appends are done - * under a single row lock, so write operations to a row are synchronized, but - * readers do not take row locks so get and scan operations can see this - * operation partially completed. + * This operation guaranteed atomicity to readers. Appends are done + * under a single row lock, so write operations to a row are synchronized, and + * readers are guaranteed to see this operation fully completed. * * @param append object
hbase git commit: HBASE-15497 Incorrect javadoc for atomicity guarantee of Increment and Append
Repository: hbase Updated Branches: refs/heads/branch-1.4 fd9a29a23 -> ccaef7c02 HBASE-15497 Incorrect javadoc for atomicity guarantee of Increment and Append Signed-off-by: Chia-Ping TsaiProject: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ccaef7c0 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ccaef7c0 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ccaef7c0 Branch: refs/heads/branch-1.4 Commit: ccaef7c029fb210cf1dfeb992c9d3b4e4427111b Parents: fd9a29a Author: cuijianwei Authored: Sun Apr 10 14:31:31 2016 +0800 Committer: Chia-Ping Tsai Committed: Mon Sep 4 16:23:18 2017 +0800 -- .../java/org/apache/hadoop/hbase/client/Append.java | 7 +++ .../org/apache/hadoop/hbase/client/Increment.java | 7 +++ .../java/org/apache/hadoop/hbase/client/Table.java| 14 ++ 3 files changed, 12 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/ccaef7c0/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java index efc958d..6144570 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java @@ -35,10 +35,9 @@ import org.apache.hadoop.hbase.util.Bytes; /** * Performs Append operations on a single row. * - * Note that this operation does not appear atomic to readers. Appends are done - * under a single row lock, so write operations to a row are synchronized, but - * readers do not take row locks so get and scan operations can see this - * operation partially completed. + * This operation ensures atomicty to readers. Appends are done + * under a single row lock, so write operations to a row are synchronized, and + * readers are guaranteed to see this operation fully completed. * * To append to a set of columns of a row, instantiate an Append object with the * row to append to. At least one column to append must be specified using the http://git-wip-us.apache.org/repos/asf/hbase/blob/ccaef7c0/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java index 88c7bc1..48f2fd6 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java @@ -39,10 +39,9 @@ import org.apache.hadoop.hbase.util.ClassSize; /** * Used to perform Increment operations on a single row. * - * This operation does not appear atomic to readers. Increments are done - * under a single row lock, so write operations to a row are synchronized, but - * readers do not take row locks so get and scan operations can see this - * operation partially completed. + * This operation ensures atomicity to readers. Increments are done + * under a single row lock, so write operations to a row are synchronized, and + * readers are guaranteed to see this operation fully completed. * * To increment columns of a row, instantiate an Increment object with the row * to increment. At least one column to increment must be specified using the http://git-wip-us.apache.org/repos/asf/hbase/blob/ccaef7c0/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java index ac9cfbd..28b3f87 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java @@ -341,10 +341,9 @@ public interface Table extends Closeable { /** * Appends values to one or more columns within a single row. * - * This operation does not appear atomic to readers. Appends are done - * under a single row lock, so write operations to a row are synchronized, but - * readers do not take row locks so get and scan operations can see this - * operation partially completed. + * This operation guaranteed atomicity to readers. Appends are done + * under a single row lock, so write operations to a row are synchronized, and + * readers are guaranteed to see this operation fully completed. * * @param append object
hbase git commit: HBASE-15497 Incorrect javadoc for atomicity guarantee of Increment and Append
Repository: hbase Updated Branches: refs/heads/branch-1 6a5bb3b48 -> 8ce811c6e HBASE-15497 Incorrect javadoc for atomicity guarantee of Increment and Append Signed-off-by: Chia-Ping TsaiProject: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8ce811c6 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8ce811c6 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8ce811c6 Branch: refs/heads/branch-1 Commit: 8ce811c6edd9c745710f31c3781425e75ec49361 Parents: 6a5bb3b Author: cuijianwei Authored: Sun Apr 10 14:31:31 2016 +0800 Committer: Chia-Ping Tsai Committed: Mon Sep 4 16:23:12 2017 +0800 -- .../java/org/apache/hadoop/hbase/client/Append.java | 7 +++ .../org/apache/hadoop/hbase/client/Increment.java | 7 +++ .../java/org/apache/hadoop/hbase/client/Table.java| 14 ++ 3 files changed, 12 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/8ce811c6/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java index efc958d..6144570 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java @@ -35,10 +35,9 @@ import org.apache.hadoop.hbase.util.Bytes; /** * Performs Append operations on a single row. * - * Note that this operation does not appear atomic to readers. Appends are done - * under a single row lock, so write operations to a row are synchronized, but - * readers do not take row locks so get and scan operations can see this - * operation partially completed. + * This operation ensures atomicty to readers. Appends are done + * under a single row lock, so write operations to a row are synchronized, and + * readers are guaranteed to see this operation fully completed. * * To append to a set of columns of a row, instantiate an Append object with the * row to append to. At least one column to append must be specified using the http://git-wip-us.apache.org/repos/asf/hbase/blob/8ce811c6/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java index 88c7bc1..48f2fd6 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java @@ -39,10 +39,9 @@ import org.apache.hadoop.hbase.util.ClassSize; /** * Used to perform Increment operations on a single row. * - * This operation does not appear atomic to readers. Increments are done - * under a single row lock, so write operations to a row are synchronized, but - * readers do not take row locks so get and scan operations can see this - * operation partially completed. + * This operation ensures atomicity to readers. Increments are done + * under a single row lock, so write operations to a row are synchronized, and + * readers are guaranteed to see this operation fully completed. * * To increment columns of a row, instantiate an Increment object with the row * to increment. At least one column to increment must be specified using the http://git-wip-us.apache.org/repos/asf/hbase/blob/8ce811c6/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java index ac9cfbd..28b3f87 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java @@ -341,10 +341,9 @@ public interface Table extends Closeable { /** * Appends values to one or more columns within a single row. * - * This operation does not appear atomic to readers. Appends are done - * under a single row lock, so write operations to a row are synchronized, but - * readers do not take row locks so get and scan operations can see this - * operation partially completed. + * This operation guaranteed atomicity to readers. Appends are done + * under a single row lock, so write operations to a row are synchronized, and + * readers are guaranteed to see this operation fully completed. * * @param append object that
hbase git commit: HBASE-15497 Incorrect javadoc for atomicity guarantee of Increment and Append
Repository: hbase Updated Branches: refs/heads/branch-2 2d5012e7c -> a1efda29e HBASE-15497 Incorrect javadoc for atomicity guarantee of Increment and Append Signed-off-by: Chia-Ping TsaiProject: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a1efda29 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a1efda29 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a1efda29 Branch: refs/heads/branch-2 Commit: a1efda29e9f89f6ded192213e90164c7a221f041 Parents: 2d5012e Author: cuijianwei Authored: Sun Apr 10 14:31:31 2016 +0800 Committer: Chia-Ping Tsai Committed: Mon Sep 4 16:23:02 2017 +0800 -- .../java/org/apache/hadoop/hbase/client/Append.java | 7 +++ .../org/apache/hadoop/hbase/client/Increment.java | 7 +++ .../java/org/apache/hadoop/hbase/client/Table.java| 14 ++ 3 files changed, 12 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/a1efda29/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java index 6947313..56b5c42 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java @@ -34,10 +34,9 @@ import org.apache.hadoop.hbase.util.Bytes; /** * Performs Append operations on a single row. * - * Note that this operation does not appear atomic to readers. Appends are done - * under a single row lock, so write operations to a row are synchronized, but - * readers do not take row locks so get and scan operations can see this - * operation partially completed. + * This operation ensures atomicty to readers. Appends are done + * under a single row lock, so write operations to a row are synchronized, and + * readers are guaranteed to see this operation fully completed. * * To append to a set of columns of a row, instantiate an Append object with the * row to append to. At least one column to append must be specified using the http://git-wip-us.apache.org/repos/asf/hbase/blob/a1efda29/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java index c144c87..a5765c3 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java @@ -38,10 +38,9 @@ import org.apache.hadoop.hbase.util.ClassSize; /** * Used to perform Increment operations on a single row. * - * This operation does not appear atomic to readers. Increments are done - * under a single row lock, so write operations to a row are synchronized, but - * readers do not take row locks so get and scan operations can see this - * operation partially completed. + * This operation ensures atomicity to readers. Increments are done + * under a single row lock, so write operations to a row are synchronized, and + * readers are guaranteed to see this operation fully completed. * * To increment columns of a row, instantiate an Increment object with the row * to increment. At least one column to increment must be specified using the http://git-wip-us.apache.org/repos/asf/hbase/blob/a1efda29/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java index a215903..0aaf6dd 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java @@ -326,10 +326,9 @@ public interface Table extends Closeable { /** * Appends values to one or more columns within a single row. * - * This operation does not appear atomic to readers. Appends are done - * under a single row lock, so write operations to a row are synchronized, but - * readers do not take row locks so get and scan operations can see this - * operation partially completed. + * This operation guaranteed atomicity to readers. Appends are done + * under a single row lock, so write operations to a row are synchronized, and + * readers are guaranteed to see this operation fully completed. * * @param append object that
[2/2] hbase git commit: HBASE-15497 Incorrect javadoc for atomicity guarantee of Increment and Append
HBASE-15497 Incorrect javadoc for atomicity guarantee of Increment and Append Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/47697365 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/47697365 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/47697365 Branch: refs/heads/master Commit: 476973654c297198e33405ff7bc588ffe213aae9 Parents: 0a3a9a5 Author: cuijianweiAuthored: Sun Apr 10 14:31:31 2016 +0800 Committer: Chia-Ping Tsai Committed: Mon Sep 4 16:20:45 2017 +0800 -- .../java/org/apache/hadoop/hbase/client/Append.java | 7 +++ .../org/apache/hadoop/hbase/client/Increment.java | 7 +++ .../java/org/apache/hadoop/hbase/client/Table.java| 14 ++ 3 files changed, 12 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/47697365/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java index 6947313..56b5c42 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java @@ -34,10 +34,9 @@ import org.apache.hadoop.hbase.util.Bytes; /** * Performs Append operations on a single row. * - * Note that this operation does not appear atomic to readers. Appends are done - * under a single row lock, so write operations to a row are synchronized, but - * readers do not take row locks so get and scan operations can see this - * operation partially completed. + * This operation ensures atomicty to readers. Appends are done + * under a single row lock, so write operations to a row are synchronized, and + * readers are guaranteed to see this operation fully completed. * * To append to a set of columns of a row, instantiate an Append object with the * row to append to. At least one column to append must be specified using the http://git-wip-us.apache.org/repos/asf/hbase/blob/47697365/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java index c144c87..a5765c3 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java @@ -38,10 +38,9 @@ import org.apache.hadoop.hbase.util.ClassSize; /** * Used to perform Increment operations on a single row. * - * This operation does not appear atomic to readers. Increments are done - * under a single row lock, so write operations to a row are synchronized, but - * readers do not take row locks so get and scan operations can see this - * operation partially completed. + * This operation ensures atomicity to readers. Increments are done + * under a single row lock, so write operations to a row are synchronized, and + * readers are guaranteed to see this operation fully completed. * * To increment columns of a row, instantiate an Increment object with the row * to increment. At least one column to increment must be specified using the http://git-wip-us.apache.org/repos/asf/hbase/blob/47697365/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java index a215903..0aaf6dd 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java @@ -326,10 +326,9 @@ public interface Table extends Closeable { /** * Appends values to one or more columns within a single row. * - * This operation does not appear atomic to readers. Appends are done - * under a single row lock, so write operations to a row are synchronized, but - * readers do not take row locks so get and scan operations can see this - * operation partially completed. + * This operation guaranteed atomicity to readers. Appends are done + * under a single row lock, so write operations to a row are synchronized, and + * readers are guaranteed to see this operation fully completed. * * @param append object that specifies the columns and amounts to be used * for the increment operations @@ -341,10 +340,9 @@ public interface
[1/2] hbase git commit: Revert "HBASE-15497 Incorrect javadoc for atomicity guarantee of Increment and Append" Wrong author information This reverts commit 6e3ffd03e7a27274315b859a3b624736ef0ed20b.
Repository: hbase Updated Branches: refs/heads/master 6e3ffd03e -> 476973654 Revert "HBASE-15497 Incorrect javadoc for atomicity guarantee of Increment and Append" Wrong author information This reverts commit 6e3ffd03e7a27274315b859a3b624736ef0ed20b. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0a3a9a54 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0a3a9a54 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0a3a9a54 Branch: refs/heads/master Commit: 0a3a9a5417932da30d12dda2baa1464d4294ace4 Parents: 6e3ffd0 Author: Chia-Ping TsaiAuthored: Mon Sep 4 16:19:44 2017 +0800 Committer: Chia-Ping Tsai Committed: Mon Sep 4 16:19:44 2017 +0800 -- .../java/org/apache/hadoop/hbase/client/Append.java | 7 --- .../org/apache/hadoop/hbase/client/Increment.java | 7 --- .../java/org/apache/hadoop/hbase/client/Table.java| 14 -- 3 files changed, 16 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/0a3a9a54/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java index 56b5c42..6947313 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java @@ -34,9 +34,10 @@ import org.apache.hadoop.hbase.util.Bytes; /** * Performs Append operations on a single row. * - * This operation ensures atomicty to readers. Appends are done - * under a single row lock, so write operations to a row are synchronized, and - * readers are guaranteed to see this operation fully completed. + * Note that this operation does not appear atomic to readers. Appends are done + * under a single row lock, so write operations to a row are synchronized, but + * readers do not take row locks so get and scan operations can see this + * operation partially completed. * * To append to a set of columns of a row, instantiate an Append object with the * row to append to. At least one column to append must be specified using the http://git-wip-us.apache.org/repos/asf/hbase/blob/0a3a9a54/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java index a5765c3..c144c87 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java @@ -38,9 +38,10 @@ import org.apache.hadoop.hbase.util.ClassSize; /** * Used to perform Increment operations on a single row. * - * This operation ensures atomicity to readers. Increments are done - * under a single row lock, so write operations to a row are synchronized, and - * readers are guaranteed to see this operation fully completed. + * This operation does not appear atomic to readers. Increments are done + * under a single row lock, so write operations to a row are synchronized, but + * readers do not take row locks so get and scan operations can see this + * operation partially completed. * * To increment columns of a row, instantiate an Increment object with the row * to increment. At least one column to increment must be specified using the http://git-wip-us.apache.org/repos/asf/hbase/blob/0a3a9a54/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java index 0aaf6dd..a215903 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java @@ -326,9 +326,10 @@ public interface Table extends Closeable { /** * Appends values to one or more columns within a single row. * - * This operation guaranteed atomicity to readers. Appends are done - * under a single row lock, so write operations to a row are synchronized, and - * readers are guaranteed to see this operation fully completed. + * This operation does not appear atomic to readers. Appends are done + * under a single row lock, so write operations to a row are synchronized, but + * readers do not take row locks so get and scan operations can see this + * operation partially
hbase git commit: HBASE-15497 Incorrect javadoc for atomicity guarantee of Increment and Append
Repository: hbase Updated Branches: refs/heads/master a5131a049 -> 6e3ffd03e HBASE-15497 Incorrect javadoc for atomicity guarantee of Increment and Append Signed-off-by: Chia-Ping TsaiProject: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6e3ffd03 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6e3ffd03 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6e3ffd03 Branch: refs/heads/master Commit: 6e3ffd03e7a27274315b859a3b624736ef0ed20b Parents: a5131a0 Author: cuijianwei Authored: Sun Apr 10 14:31:31 2016 +0800 Committer: Chia-Ping Tsai Committed: Mon Sep 4 16:13:36 2017 +0800 -- .../java/org/apache/hadoop/hbase/client/Append.java | 7 +++ .../org/apache/hadoop/hbase/client/Increment.java | 7 +++ .../java/org/apache/hadoop/hbase/client/Table.java| 14 ++ 3 files changed, 12 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/6e3ffd03/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java index 6947313..56b5c42 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java @@ -34,10 +34,9 @@ import org.apache.hadoop.hbase.util.Bytes; /** * Performs Append operations on a single row. * - * Note that this operation does not appear atomic to readers. Appends are done - * under a single row lock, so write operations to a row are synchronized, but - * readers do not take row locks so get and scan operations can see this - * operation partially completed. + * This operation ensures atomicty to readers. Appends are done + * under a single row lock, so write operations to a row are synchronized, and + * readers are guaranteed to see this operation fully completed. * * To append to a set of columns of a row, instantiate an Append object with the * row to append to. At least one column to append must be specified using the http://git-wip-us.apache.org/repos/asf/hbase/blob/6e3ffd03/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java index c144c87..a5765c3 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Increment.java @@ -38,10 +38,9 @@ import org.apache.hadoop.hbase.util.ClassSize; /** * Used to perform Increment operations on a single row. * - * This operation does not appear atomic to readers. Increments are done - * under a single row lock, so write operations to a row are synchronized, but - * readers do not take row locks so get and scan operations can see this - * operation partially completed. + * This operation ensures atomicity to readers. Increments are done + * under a single row lock, so write operations to a row are synchronized, and + * readers are guaranteed to see this operation fully completed. * * To increment columns of a row, instantiate an Increment object with the row * to increment. At least one column to increment must be specified using the http://git-wip-us.apache.org/repos/asf/hbase/blob/6e3ffd03/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java index a215903..0aaf6dd 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java @@ -326,10 +326,9 @@ public interface Table extends Closeable { /** * Appends values to one or more columns within a single row. * - * This operation does not appear atomic to readers. Appends are done - * under a single row lock, so write operations to a row are synchronized, but - * readers do not take row locks so get and scan operations can see this - * operation partially completed. + * This operation guaranteed atomicity to readers. Appends are done + * under a single row lock, so write operations to a row are synchronized, and + * readers are guaranteed to see this operation fully completed. * * @param
hbase git commit: HBASE-16390 Fix documentation around setAutoFlush
Repository: hbase Updated Branches: refs/heads/master 2305510b7 -> a5131a049 HBASE-16390 Fix documentation around setAutoFlush Signed-off-by: Chia-Ping TsaiProject: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a5131a04 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a5131a04 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a5131a04 Branch: refs/heads/master Commit: a5131a0491e65907d721e571ae6c4f68e905be3d Parents: 2305510 Author: sahil aggarwal Authored: Sun Jan 22 13:23:45 2017 +0530 Committer: Chia-Ping Tsai Committed: Mon Sep 4 13:58:13 2017 +0800 -- src/main/asciidoc/_chapters/performance.adoc | 10 -- 1 file changed, 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/a5131a04/src/main/asciidoc/_chapters/performance.adoc -- diff --git a/src/main/asciidoc/_chapters/performance.adoc b/src/main/asciidoc/_chapters/performance.adoc index 114754f..d3942bc 100644 --- a/src/main/asciidoc/_chapters/performance.adoc +++ b/src/main/asciidoc/_chapters/performance.adoc @@ -552,16 +552,6 @@ This is safer, however, than not using WAL at all with Puts. Deferred log flush can be configured on tables via link:http://hbase.apache.org/apidocs/org/apache/hadoop/hbase/HTableDescriptor.html[HTableDescriptor]. The default value of `hbase.regionserver.optionallogflushinterval` is 1000ms. -[[perf.hbase.client.autoflush]] -=== HBase Client: AutoFlush - -When performing a lot of Puts, make sure that setAutoFlush is set to false on your link:http://hbase.apache.org/apidocs/org/apache/hadoop/hbase/client/Table.html[Table] instance. -Otherwise, the Puts will be sent one at a time to the RegionServer. -Puts added via `table.add(Put)` and `table.add( Put)` wind up in the same write buffer. -If `autoFlush = false`, these messages are not sent until the write-buffer is filled. -To explicitly flush the messages, call `flushCommits`. -Calling `close` on the `Table` instance will invoke `flushCommits`. - [[perf.hbase.client.putwal]] === HBase Client: Turn off WAL on Puts