Published site at 29a192ef3cbe3b9cc12a6ee38f39e1199ac9790f.
Project: http://git-wip-us.apache.org/repos/asf/hbase-site/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase-site/commit/8bb348c6 Tree: http://git-wip-us.apache.org/repos/asf/hbase-site/tree/8bb348c6 Diff: http://git-wip-us.apache.org/repos/asf/hbase-site/diff/8bb348c6 Branch: refs/heads/asf-site Commit: 8bb348c660e5512aeca9ed3b6a0b0fb20ca695bb Parents: 40ef21e Author: jenkins <bui...@apache.org> Authored: Thu Feb 11 15:41:49 2016 +0000 Committer: Misty Stanley-Jones <mstanleyjo...@cloudera.com> Committed: Thu Feb 11 09:32:25 2016 -0800 ---------------------------------------------------------------------- acid-semantics.html | 4 +- apache_hbase_reference_guide.pdf | 4 +- apache_hbase_reference_guide.pdfmarks | 4 +- apidocs/index-all.html | 8 + .../hadoop/hbase/client/class-use/Scan.html | 40 +- .../hbase/mapreduce/TableMapReduceUtil.html | 42 + .../hadoop/hbase/mapreduce/TableSplit.html | 6 +- .../hbase/mapreduce/TableInputFormatBase.html | 10 +- .../hbase/mapreduce/TableMapReduceUtil.html | 4 +- .../hadoop/hbase/mapreduce/TableSplit.html | 99 +- .../hadoop/hbase/rest/client/Cluster.html | 2 +- book.html | 2 +- bulk-loads.html | 4 +- checkstyle-aggregate.html | 25792 ++++++++--------- checkstyle.rss | 8 +- coc.html | 4 +- cygwin.html | 4 +- dependencies.html | 4 +- dependency-convergence.html | 4 +- dependency-info.html | 4 +- dependency-management.html | 4 +- devapidocs/index-all.html | 23 +- .../hbase/class-use/HBaseIOException.html | 15 +- .../hadoop/hbase/class-use/HRegionInfo.html | 110 +- .../hadoop/hbase/class-use/ServerName.html | 120 +- .../hbase/classification/package-tree.html | 6 +- .../hadoop/hbase/client/ClusterConnection.html | 39 +- .../hbase/client/ConnectionImplementation.html | 116 +- .../ConnectionUtils.MasterlessConnection.html | 2 +- .../hbase/client/CoprocessorHConnection.html | 2 +- .../hbase/client/MultiServerCallable.html | 28 +- .../hadoop/hbase/client/class-use/Scan.html | 4 +- .../hadoop/hbase/client/package-tree.html | 4 +- .../hadoop/hbase/filter/package-tree.html | 10 +- .../hadoop/hbase/io/hfile/package-tree.html | 6 +- ...Client.BlockingRpcChannelImplementation.html | 14 +- .../hadoop/hbase/ipc/AbstractRpcClient.html | 32 +- .../apache/hadoop/hbase/ipc/AsyncRpcClient.html | 2 +- .../org/apache/hadoop/hbase/ipc/RpcClient.html | 17 +- .../apache/hadoop/hbase/ipc/RpcClientImpl.html | 2 +- .../hbase/mapreduce/TableMapReduceUtil.html | 12 +- .../hadoop/hbase/mapreduce/TableSplit.html | 6 +- .../hadoop/hbase/mapreduce/package-tree.html | 2 +- .../hadoop/hbase/master/LoadBalancer.html | 67 +- .../hbase/master/balancer/BaseLoadBalancer.html | 96 +- .../balancer/FavoredNodeLoadBalancer.html | 2 +- .../SimpleLoadBalancer.BalanceInfo.html | 14 +- .../master/balancer/SimpleLoadBalancer.html | 26 +- .../master/balancer/StochasticLoadBalancer.html | 2 +- .../balancer/class-use/MetricsBalancer.html | 2 +- .../hadoop/hbase/master/package-tree.html | 4 +- .../org/apache/hadoop/hbase/package-tree.html | 10 +- .../hadoop/hbase/quotas/package-tree.html | 4 +- .../regionserver/HRegion.RegionScannerImpl.html | 92 +- .../regionserver/HRegion.RowLockContext.html | 24 +- .../hbase/regionserver/HRegion.RowLockImpl.html | 16 +- .../hadoop/hbase/regionserver/HRegion.html | 308 +- .../hadoop/hbase/regionserver/package-tree.html | 24 +- .../hadoop/hbase/regionserver/wal/WALEdit.html | 78 +- .../hadoop/hbase/rest/model/package-tree.html | 2 +- .../hbase/security/access/package-tree.html | 4 +- .../tmpl/master/MasterStatusTmpl.ImplData.html | 270 +- .../hbase/tmpl/master/MasterStatusTmpl.html | 108 +- .../hbase/tmpl/master/MasterStatusTmplImpl.html | 54 +- .../regionserver/RSStatusTmpl.ImplData.html | 120 +- .../hbase/tmpl/regionserver/RSStatusTmpl.html | 48 +- .../tmpl/regionserver/RSStatusTmplImpl.html | 24 +- .../hadoop/hbase/tool/Canary.Monitor.html | 36 +- .../hadoop/hbase/tool/Canary.RegionMonitor.html | 32 +- .../hbase/tool/Canary.RegionServerMonitor.html | 20 +- .../org/apache/hadoop/hbase/tool/Canary.html | 14 +- .../apache/hadoop/hbase/util/package-tree.html | 4 +- .../apache/hadoop/hbase/wal/package-tree.html | 2 +- .../hadoop/hbase/client/ClusterConnection.html | 7 +- ...ectionImplementation.MasterServiceState.html | 7 +- ...onImplementation.MasterServiceStubMaker.html | 7 +- ...nnectionImplementation.NoNonceGenerator.html | 7 +- ...ntation.ServerErrorTracker.ServerErrors.html | 7 +- ...ectionImplementation.ServerErrorTracker.html | 7 +- .../ConnectionImplementation.StubMaker.html | 7 +- .../hbase/client/ConnectionImplementation.html | 7 +- .../hbase/client/MultiServerCallable.html | 290 +- ...Client.BlockingRpcChannelImplementation.html | 361 +- .../hadoop/hbase/ipc/AbstractRpcClient.html | 361 +- .../org/apache/hadoop/hbase/ipc/RpcClient.html | 8 +- .../hbase/mapreduce/TableInputFormatBase.html | 10 +- .../hbase/mapreduce/TableMapReduceUtil.html | 4 +- .../hbase/mapreduce/TableSplit.Version.html | 99 +- .../hadoop/hbase/mapreduce/TableSplit.html | 99 +- .../hadoop/hbase/master/LoadBalancer.html | 205 +- .../BaseLoadBalancer.Cluster.Action.Type.html | 519 +- .../BaseLoadBalancer.Cluster.Action.html | 519 +- ...LoadBalancer.Cluster.AssignRegionAction.html | 519 +- ...seLoadBalancer.Cluster.MoveRegionAction.html | 519 +- ...eLoadBalancer.Cluster.SwapRegionsAction.html | 519 +- .../balancer/BaseLoadBalancer.Cluster.html | 519 +- .../BaseLoadBalancer.DefaultRackManager.html | 519 +- .../hbase/master/balancer/BaseLoadBalancer.html | 519 +- .../SimpleLoadBalancer.BalanceInfo.html | 760 +- .../master/balancer/SimpleLoadBalancer.html | 760 +- .../regionserver/HRegion.BatchOperation.html | 9624 +++--- .../regionserver/HRegion.FlushResultImpl.html | 9624 +++--- .../regionserver/HRegion.MutationBatch.html | 9624 +++--- .../HRegion.PrepareFlushResult.html | 9624 +++--- .../regionserver/HRegion.RegionScannerImpl.html | 9624 +++--- .../hbase/regionserver/HRegion.ReplayBatch.html | 9624 +++--- .../regionserver/HRegion.RowLockContext.html | 9624 +++--- .../hbase/regionserver/HRegion.RowLockImpl.html | 9624 +++--- .../hbase/regionserver/HRegion.WriteState.html | 9624 +++--- .../hadoop/hbase/regionserver/HRegion.html | 9624 +++--- .../hadoop/hbase/regionserver/wal/WALEdit.html | 525 +- .../hadoop/hbase/rest/client/Cluster.html | 2 +- .../tmpl/master/MasterStatusTmpl.ImplData.html | 270 +- .../tmpl/master/MasterStatusTmpl.Intf.html | 270 +- .../hbase/tmpl/master/MasterStatusTmpl.html | 270 +- .../hbase/tmpl/master/MasterStatusTmplImpl.html | 76 +- .../regionserver/RSStatusTmpl.ImplData.html | 120 +- .../tmpl/regionserver/RSStatusTmpl.Intf.html | 120 +- .../hbase/tmpl/regionserver/RSStatusTmpl.html | 120 +- .../tmpl/regionserver/RSStatusTmplImpl.html | 36 +- .../hadoop/hbase/tool/Canary.ExtendedSink.html | 1247 +- .../hadoop/hbase/tool/Canary.Monitor.html | 1247 +- .../hadoop/hbase/tool/Canary.RegionMonitor.html | 1247 +- .../hbase/tool/Canary.RegionServerMonitor.html | 1247 +- .../tool/Canary.RegionServerStdOutSink.html | 1247 +- .../hbase/tool/Canary.RegionServerTask.html | 1247 +- .../hbase/tool/Canary.RegionTask.TaskType.html | 1247 +- .../hadoop/hbase/tool/Canary.RegionTask.html | 1247 +- .../apache/hadoop/hbase/tool/Canary.Sink.html | 1247 +- .../hadoop/hbase/tool/Canary.StdOutSink.html | 1247 +- .../org/apache/hadoop/hbase/tool/Canary.html | 1247 +- distribution-management.html | 4 +- export_control.html | 4 +- hbase-annotations/checkstyle.html | 6 +- hbase-annotations/dependencies.html | 6 +- hbase-annotations/dependency-convergence.html | 6 +- hbase-annotations/dependency-info.html | 6 +- hbase-annotations/dependency-management.html | 6 +- hbase-annotations/distribution-management.html | 6 +- hbase-annotations/index.html | 6 +- hbase-annotations/integration.html | 6 +- hbase-annotations/issue-tracking.html | 6 +- hbase-annotations/license.html | 6 +- hbase-annotations/mail-lists.html | 6 +- hbase-annotations/plugin-management.html | 6 +- hbase-annotations/plugins.html | 6 +- hbase-annotations/project-info.html | 6 +- hbase-annotations/project-reports.html | 6 +- hbase-annotations/project-summary.html | 6 +- hbase-annotations/source-repository.html | 6 +- hbase-annotations/team-list.html | 6 +- hbase-spark/checkstyle.html | 6 +- hbase-spark/dependencies.html | 6 +- hbase-spark/dependency-convergence.html | 6 +- hbase-spark/dependency-info.html | 6 +- hbase-spark/dependency-management.html | 6 +- hbase-spark/distribution-management.html | 6 +- hbase-spark/index.html | 6 +- hbase-spark/integration.html | 6 +- hbase-spark/issue-tracking.html | 6 +- hbase-spark/license.html | 6 +- hbase-spark/mail-lists.html | 6 +- hbase-spark/plugin-management.html | 6 +- hbase-spark/plugins.html | 6 +- hbase-spark/project-info.html | 6 +- hbase-spark/project-reports.html | 6 +- hbase-spark/project-summary.html | 6 +- hbase-spark/source-repository.html | 6 +- hbase-spark/team-list.html | 6 +- index.html | 4 +- integration.html | 4 +- issue-tracking.html | 4 +- license.html | 4 +- mail-lists.html | 4 +- metrics.html | 4 +- modules.html | 4 +- old_news.html | 4 +- plugin-management.html | 4 +- plugins.html | 4 +- poweredbyhbase.html | 4 +- project-info.html | 4 +- project-reports.html | 4 +- project-summary.html | 4 +- pseudo-distributed.html | 4 +- replication.html | 4 +- resources.html | 4 +- source-repository.html | 4 +- sponsors.html | 4 +- supportingprojects.html | 4 +- team-list.html | 4 +- testdevapidocs/index-all.html | 8 +- .../hbase/TestZooKeeper.MockLoadBalancer.html | 2 +- .../TestAsyncProcess.MyConnectionImpl.html | 99 +- .../TestAsyncProcess.MyConnectionImpl2.html | 97 +- ...luster.ManyServersManyRegionsConnection.html | 97 +- ...ionServerStoppedOnScannerOpenConnection.html | 97 +- ...estClientNoCluster.RpcTimeoutConnection.html | 97 +- ...stClientTimeouts.RandomTimeoutRpcClient.html | 2 +- .../hbase/client/TestFromClientSide3.html | 32 +- .../ipc/TestRpcClientLeaks.MyRpcClientImpl.html | 2 +- ...signmentManagerOnCluster.MyLoadBalancer.html | 2 +- .../TestBaseLoadBalancer.MockBalancer.html | 2 +- .../master/balancer/TestBaseLoadBalancer.html | 45 +- .../org/apache/hadoop/hbase/package-tree.html | 10 +- .../security/access/TestAccessController.html | 86 +- .../apache/hadoop/hbase/test/package-tree.html | 2 +- .../hbase/client/TestFromClientSide3.html | 8 +- .../TestBaseLoadBalancer.MockBalancer.html | 782 +- .../master/balancer/TestBaseLoadBalancer.html | 782 +- .../TestAccessController.BulkLoadHelper.html | 474 +- .../TestAccessController.PingCoprocessor.html | 474 +- ...tAccessController.TestTableDDLProcedure.html | 474 +- .../security/access/TestAccessController.html | 474 +- .../hbase/client/TestFromClientSide3.html | 8 +- .../master/balancer/TestBaseLoadBalancer.html | 782 +- .../security/access/TestAccessController.html | 474 +- .../hadoop/hbase/client/ClusterConnection.html | 7 +- .../hbase/client/ConnectionImplementation.html | 7 +- .../hbase/client/MultiServerCallable.html | 290 +- .../hadoop/hbase/ipc/AbstractRpcClient.html | 361 +- xref/org/apache/hadoop/hbase/ipc/RpcClient.html | 8 +- .../hbase/mapreduce/TableInputFormatBase.html | 10 +- .../hbase/mapreduce/TableMapReduceUtil.html | 4 +- .../hadoop/hbase/mapreduce/TableSplit.html | 99 +- .../hadoop/hbase/master/LoadBalancer.html | 205 +- .../hbase/master/balancer/BaseLoadBalancer.html | 519 +- .../master/balancer/SimpleLoadBalancer.html | 760 +- .../hadoop/hbase/protobuf/ProtobufUtil.html | 4048 ++- .../hadoop/hbase/protobuf/RequestConverter.html | 2056 +- .../hadoop/hbase/regionserver/HRegion.html | 9624 +++--- .../hadoop/hbase/regionserver/wal/WALEdit.html | 525 +- .../hadoop/hbase/rest/client/Cluster.html | 2 +- .../hbase/tmpl/common/TaskMonitorTmpl.html | 60 +- .../hbase/tmpl/common/TaskMonitorTmplImpl.html | 16 +- .../hbase/tmpl/master/MasterStatusTmpl.html | 270 +- .../hbase/tmpl/master/MasterStatusTmplImpl.html | 76 +- .../hbase/tmpl/regionserver/RSStatusTmpl.html | 120 +- .../tmpl/regionserver/RSStatusTmplImpl.html | 36 +- xref/org/apache/hadoop/hbase/tool/Canary.html | 1247 +- 239 files changed, 86450 insertions(+), 86683 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8bb348c6/acid-semantics.html ---------------------------------------------------------------------- diff --git a/acid-semantics.html b/acid-semantics.html index 8350946..f6ef090 100644 --- a/acid-semantics.html +++ b/acid-semantics.html @@ -7,7 +7,7 @@ <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20160210" /> + <meta name="Date-Revision-yyyymmdd" content="20160211" /> <meta http-equiv="Content-Language" content="en" /> <title>Apache HBase – Apache HBase (TM) ACID Properties @@ -600,7 +600,7 @@ under the License. --> <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved. - <li id="publishDate" class="pull-right">Last Published: 2016-02-10</li> + <li id="publishDate" class="pull-right">Last Published: 2016-02-11</li> </p> </div> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8bb348c6/apache_hbase_reference_guide.pdf ---------------------------------------------------------------------- diff --git a/apache_hbase_reference_guide.pdf b/apache_hbase_reference_guide.pdf index 15fd93e..011e924 100644 --- a/apache_hbase_reference_guide.pdf +++ b/apache_hbase_reference_guide.pdf @@ -5,8 +5,8 @@ /Author (Apache HBase Team) /Creator (Asciidoctor PDF 1.5.0.alpha.6, based on Prawn 1.2.1) /Producer (Apache HBase Team) -/CreationDate (D:20160210153420+00'00') -/ModDate (D:20160210153420+00'00') +/CreationDate (D:20160211153628+00'00') +/ModDate (D:20160211153628+00'00') >> endobj 2 0 obj http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8bb348c6/apache_hbase_reference_guide.pdfmarks ---------------------------------------------------------------------- diff --git a/apache_hbase_reference_guide.pdfmarks b/apache_hbase_reference_guide.pdfmarks index 4e91a55..99d5ad8 100644 --- a/apache_hbase_reference_guide.pdfmarks +++ b/apache_hbase_reference_guide.pdfmarks @@ -2,8 +2,8 @@ /Author (Apache HBase Team) /Subject () /Keywords () - /ModDate (D:20160210153610) - /CreationDate (D:20160210153610) + /ModDate (D:20160211153818) + /CreationDate (D:20160211153818) /Creator (Asciidoctor PDF 1.5.0.alpha.6, based on Prawn 1.2.1) /Producer () /DOCINFO pdfmark http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8bb348c6/apidocs/index-all.html ---------------------------------------------------------------------- diff --git a/apidocs/index-all.html b/apidocs/index-all.html index cea5c48..d42c9b7 100644 --- a/apidocs/index-all.html +++ b/apidocs/index-all.html @@ -1598,6 +1598,14 @@ <dd> <div class="block">Converts a long expressed in a byte array to an actual long</div> </dd> +<dt><span class="strong"><a href="./org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#convertScanToString(org.apache.hadoop.hbase.client.Scan)">convertScanToString(Scan)</a></span> - Static method in class org.apache.hadoop.hbase.mapreduce.<a href="./org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html" title="class in org.apache.hadoop.hbase.mapreduce">TableMapReduceUtil</a></dt> +<dd> +<div class="block">Writes the given scan into a Base64 encoded string.</div> +</dd> +<dt><span class="strong"><a href="./org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#convertStringToScan(java.lang.String)">convertStringToScan(String)</a></span> - Static method in class org.apache.hadoop.hbase.mapreduce.<a href="./org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html" title="class in org.apache.hadoop.hbase.mapreduce">TableMapReduceUtil</a></dt> +<dd> +<div class="block">Converts the given Base64 string back into a Scan instance.</div> +</dd> <dt><span class="strong"><a href="./org/apache/hadoop/hbase/ProcedureInfo.html#convertToProcedureProto(org.apache.hadoop.hbase.ProcedureInfo)">convertToProcedureProto(ProcedureInfo)</a></span> - Static method in class org.apache.hadoop.hbase.<a href="./org/apache/hadoop/hbase/ProcedureInfo.html" title="class in org.apache.hadoop.hbase">ProcedureInfo</a></dt> <dd> </dd> <dt><span class="strong"><a href="./org/apache/hadoop/hbase/HBaseInterfaceAudience.html#COPROC">COPROC</a></span> - Static variable in class org.apache.hadoop.hbase.<a href="./org/apache/hadoop/hbase/HBaseInterfaceAudience.html" title="class in org.apache.hadoop.hbase">HBaseInterfaceAudience</a></dt> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8bb348c6/apidocs/org/apache/hadoop/hbase/client/class-use/Scan.html ---------------------------------------------------------------------- diff --git a/apidocs/org/apache/hadoop/hbase/client/class-use/Scan.html b/apidocs/org/apache/hadoop/hbase/client/class-use/Scan.html index a5ff7e9..ab7da16 100644 --- a/apidocs/org/apache/hadoop/hbase/client/class-use/Scan.html +++ b/apidocs/org/apache/hadoop/hbase/client/class-use/Scan.html @@ -397,12 +397,18 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div> </tr> <tbody> <tr class="altColor"> +<td class="colFirst"><code>static <a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a></code></td> +<td class="colLast"><span class="strong">TableMapReduceUtil.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#convertStringToScan(java.lang.String)">convertStringToScan</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> base64)</code> +<div class="block">Converts the given Base64 string back into a Scan instance.</div> +</td> +</tr> +<tr class="rowColor"> <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a></code></td> <td class="colLast"><span class="strong">TableSplit.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableSplit.html#getScan()">getScan</a></strong>()</code> <div class="block">Returns a Scan object from the stored string representation.</div> </td> </tr> -<tr class="rowColor"> +<tr class="altColor"> <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a></code></td> <td class="colLast"><span class="strong">TableInputFormatBase.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.html#getScan()">getScan</a></strong>()</code> <div class="block">Gets the scan defining the actual details like columns etc.</div> @@ -440,6 +446,12 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div> </td> </tr> <tr class="rowColor"> +<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td> +<td class="colLast"><span class="strong">TableMapReduceUtil.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#convertScanToString(org.apache.hadoop.hbase.client.Scan)">convertScanToString</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a> scan)</code> +<div class="block">Writes the given scan into a Base64 encoded string.</div> +</td> +</tr> +<tr class="altColor"> <td class="colFirst"><code>static void</code></td> <td class="colLast"><span class="strong">IdentityTableMapper.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/IdentityTableMapper.html#initJob(java.lang.String,%20org.apache.hadoop.hbase.client.Scan,%20java.lang.Class,%20org.apache.hadoop.mapreduce.Job)">initJob</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> table, <a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a> scan, @@ -448,7 +460,7 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div> <div class="block">Use this before submitting a TableMap job.</div> </td> </tr> -<tr class="altColor"> +<tr class="rowColor"> <td class="colFirst"><code>static void</code></td> <td class="colLast"><span class="strong">GroupingTableMapper.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/GroupingTableMapper.html#initJob(java.lang.String,%20org.apache.hadoop.hbase.client.Scan,%20java.lang.String,%20java.lang.Class,%20org.apache.hadoop.mapreduce.Job)">initJob</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> table, <a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a> scan, @@ -458,7 +470,7 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div> <div class="block">Use this before submitting a TableMap job.</div> </td> </tr> -<tr class="rowColor"> +<tr class="altColor"> <td class="colFirst"><code>static void</code></td> <td class="colLast"><span class="strong">TableMapReduceUtil.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#initTableMapperJob(byte[],%20org.apache.hadoop.hbase.client.Scan,%20java.lang.Class,%20java.lang.Class,%20java.lang.Class,%20org.apache.hadoop.mapreduce.Job)">initTableMapperJob</a></strong>(byte[] table, <a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a> scan, @@ -469,7 +481,7 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div> <div class="block">Use this before submitting a TableMap job.</div> </td> </tr> -<tr class="altColor"> +<tr class="rowColor"> <td class="colFirst"><code>static void</code></td> <td class="colLast"><span class="strong">TableMapReduceUtil.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#initTableMapperJob(byte[],%20org.apache.hadoop.hbase.client.Scan,%20java.lang.Class,%20java.lang.Class,%20java.lang.Class,%20org.apache.hadoop.mapreduce.Job,%20boolean)">initTableMapperJob</a></strong>(byte[] table, <a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a> scan, @@ -481,7 +493,7 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div> <div class="block">Use this before submitting a TableMap job.</div> </td> </tr> -<tr class="rowColor"> +<tr class="altColor"> <td class="colFirst"><code>static void</code></td> <td class="colLast"><span class="strong">TableMapReduceUtil.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#initTableMapperJob(byte[],%20org.apache.hadoop.hbase.client.Scan,%20java.lang.Class,%20java.lang.Class,%20java.lang.Class,%20org.apache.hadoop.mapreduce.Job,%20boolean,%20java.lang.Class)">initTableMapperJob</a></strong>(byte[] table, <a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a> scan, @@ -494,7 +506,7 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div> <div class="block">Use this before submitting a TableMap job.</div> </td> </tr> -<tr class="altColor"> +<tr class="rowColor"> <td class="colFirst"><code>static void</code></td> <td class="colLast"><span class="strong">TableMapReduceUtil.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#initTableMapperJob(java.lang.String,%20org.apache.hadoop.hbase.client.Scan,%20java.lang.Class,%20java.lang.Class,%20java.lang.Class,%20org.apache.hadoop.mapreduce.Job)">initTableMapperJob</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> table, <a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a> scan, @@ -505,7 +517,7 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div> <div class="block">Use this before submitting a TableMap job.</div> </td> </tr> -<tr class="rowColor"> +<tr class="altColor"> <td class="colFirst"><code>static void</code></td> <td class="colLast"><span class="strong">TableMapReduceUtil.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#initTableMapperJob(java.lang.String,%20org.apache.hadoop.hbase.client.Scan,%20java.lang.Class,%20java.lang.Class,%20java.lang.Class,%20org.apache.hadoop.mapreduce.Job,%20boolean)">initTableMapperJob</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> table, <a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a> scan, @@ -517,7 +529,7 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div> <div class="block">Use this before submitting a TableMap job.</div> </td> </tr> -<tr class="altColor"> +<tr class="rowColor"> <td class="colFirst"><code>static void</code></td> <td class="colLast"><span class="strong">TableMapReduceUtil.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#initTableMapperJob(java.lang.String,%20org.apache.hadoop.hbase.client.Scan,%20java.lang.Class,%20java.lang.Class,%20java.lang.Class,%20org.apache.hadoop.mapreduce.Job,%20boolean,%20boolean,%20java.lang.Class)">initTableMapperJob</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> table, <a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a> scan, @@ -531,7 +543,7 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div> <div class="block">Use this before submitting a TableMap job.</div> </td> </tr> -<tr class="rowColor"> +<tr class="altColor"> <td class="colFirst"><code>static void</code></td> <td class="colLast"><span class="strong">TableMapReduceUtil.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#initTableMapperJob(java.lang.String,%20org.apache.hadoop.hbase.client.Scan,%20java.lang.Class,%20java.lang.Class,%20java.lang.Class,%20org.apache.hadoop.mapreduce.Job,%20boolean,%20java.lang.Class)">initTableMapperJob</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> table, <a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a> scan, @@ -544,7 +556,7 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div> <div class="block">Use this before submitting a TableMap job.</div> </td> </tr> -<tr class="altColor"> +<tr class="rowColor"> <td class="colFirst"><code>static void</code></td> <td class="colLast"><span class="strong">TableMapReduceUtil.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#initTableMapperJob(org.apache.hadoop.hbase.TableName,%20org.apache.hadoop.hbase.client.Scan,%20java.lang.Class,%20java.lang.Class,%20java.lang.Class,%20org.apache.hadoop.mapreduce.Job)">initTableMapperJob</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> table, <a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a> scan, @@ -555,7 +567,7 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div> <div class="block">Use this before submitting a TableMap job.</div> </td> </tr> -<tr class="rowColor"> +<tr class="altColor"> <td class="colFirst"><code>static void</code></td> <td class="colLast"><span class="strong">TableMapReduceUtil.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#initTableSnapshotMapperJob(java.lang.String,%20org.apache.hadoop.hbase.client.Scan,%20java.lang.Class,%20java.lang.Class,%20java.lang.Class,%20org.apache.hadoop.mapreduce.Job,%20boolean,%20org.apache.hadoop.fs.Path)">initTableSnapshotMapperJob</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> snapshotName, <a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a> scan, @@ -568,19 +580,19 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div> <div class="block">Sets up the job for reading from a table snapshot.</div> </td> </tr> -<tr class="altColor"> +<tr class="rowColor"> <td class="colFirst"><code>void</code></td> <td class="colLast"><span class="strong">TableRecordReaderImpl.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.html#setScan(org.apache.hadoop.hbase.client.Scan)">setScan</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a> scan)</code> <div class="block">Sets the scan defining the actual details like columns etc.</div> </td> </tr> -<tr class="rowColor"> +<tr class="altColor"> <td class="colFirst"><code>void</code></td> <td class="colLast"><span class="strong">TableRecordReader.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableRecordReader.html#setScan(org.apache.hadoop.hbase.client.Scan)">setScan</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a> scan)</code> <div class="block">Sets the scan defining the actual details like columns etc.</div> </td> </tr> -<tr class="altColor"> +<tr class="rowColor"> <td class="colFirst"><code>void</code></td> <td class="colLast"><span class="strong">TableInputFormatBase.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.html#setScan(org.apache.hadoop.hbase.client.Scan)">setScan</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a> scan)</code> <div class="block">Sets the scan defining the actual details like columns etc.</div> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8bb348c6/apidocs/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html ---------------------------------------------------------------------- diff --git a/apidocs/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html b/apidocs/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html index e531f43..c6bd1ee 100644 --- a/apidocs/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html +++ b/apidocs/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html @@ -165,6 +165,18 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html? </td> </tr> <tr class="altColor"> +<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td> +<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#convertScanToString(org.apache.hadoop.hbase.client.Scan)">convertScanToString</a></strong>(<a href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a> scan)</code> +<div class="block">Writes the given scan into a Base64 encoded string.</div> +</td> +</tr> +<tr class="rowColor"> +<td class="colFirst"><code>static <a href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a></code></td> +<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#convertStringToScan(java.lang.String)">convertStringToScan</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> base64)</code> +<div class="block">Converts the given Base64 string back into a Scan instance.</div> +</td> +</tr> +<tr class="altColor"> <td class="colFirst"><code>static void</code></td> <td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#initCredentials(org.apache.hadoop.mapreduce.Job)">initCredentials</a></strong>(org.apache.hadoop.mapreduce.Job job)</code> </td> </tr> @@ -811,6 +823,36 @@ public static void <a href="../../../../../src-html/org/apache/hadoop/ <dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - When the authentication token cannot be obtained.</dd></dl> </li> </ul> +<a name="convertScanToString(org.apache.hadoop.hbase.client.Scan)"> +<!-- --> +</a> +<ul class="blockList"> +<li class="blockList"> +<h4>convertScanToString</h4> +<pre>public static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#line.564">convertScanToString</a>(<a href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a> scan) + throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre> +<div class="block">Writes the given scan into a Base64 encoded string.</div> +<dl><dt><span class="strong">Parameters:</span></dt><dd><code>scan</code> - The scan to write out.</dd> +<dt><span class="strong">Returns:</span></dt><dd>The scan saved in a Base64 encoded string.</dd> +<dt><span class="strong">Throws:</span></dt> +<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - When writing the scan fails.</dd></dl> +</li> +</ul> +<a name="convertStringToScan(java.lang.String)"> +<!-- --> +</a> +<ul class="blockList"> +<li class="blockList"> +<h4>convertStringToScan</h4> +<pre>public static <a href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html#line.576">convertStringToScan</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> base64) + throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre> +<div class="block">Converts the given Base64 string back into a Scan instance.</div> +<dl><dt><span class="strong">Parameters:</span></dt><dd><code>base64</code> - The scan details.</dd> +<dt><span class="strong">Returns:</span></dt><dd>The newly created Scan instance.</dd> +<dt><span class="strong">Throws:</span></dt> +<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code> - When reading the scan instance fails.</dd></dl> +</li> +</ul> <a name="initTableReducerJob(java.lang.String, java.lang.Class, org.apache.hadoop.mapreduce.Job)"> <!-- --> </a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8bb348c6/apidocs/org/apache/hadoop/hbase/mapreduce/TableSplit.html ---------------------------------------------------------------------- diff --git a/apidocs/org/apache/hadoop/hbase/mapreduce/TableSplit.html b/apidocs/org/apache/hadoop/hbase/mapreduce/TableSplit.html index a61d279..79b2c87 100644 --- a/apidocs/org/apache/hadoop/hbase/mapreduce/TableSplit.html +++ b/apidocs/org/apache/hadoop/hbase/mapreduce/TableSplit.html @@ -565,7 +565,7 @@ public static final org.apache.commons.logging.Log <a href="../../../../../ <ul class="blockList"> <li class="blockList"> <h4>compareTo</h4> -<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableSplit.html#line.320">compareTo</a>(<a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableSplit.html" title="class in org.apache.hadoop.hbase.mapreduce">TableSplit</a> split)</pre> +<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableSplit.html#line.331">compareTo</a>(<a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableSplit.html" title="class in org.apache.hadoop.hbase.mapreduce">TableSplit</a> split)</pre> <div class="block">Compares this split against the given one.</div> <dl> <dt><strong>Specified by:</strong></dt> @@ -580,7 +580,7 @@ public static final org.apache.commons.logging.Log <a href="../../../../../ <ul class="blockList"> <li class="blockList"> <h4>equals</h4> -<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableSplit.html#line.330">equals</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)</pre> +<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableSplit.html#line.341">equals</a>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> o)</pre> <dl> <dt><strong>Overrides:</strong></dt> <dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#equals(java.lang.Object)" title="class or interface in java.lang">equals</a></code> in class <code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd> @@ -593,7 +593,7 @@ public static final org.apache.commons.logging.Log <a href="../../../../../ <ul class="blockListLast"> <li class="blockList"> <h4>hashCode</h4> -<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableSplit.html#line.341">hashCode</a>()</pre> +<pre>public int <a href="../../../../../src-html/org/apache/hadoop/hbase/mapreduce/TableSplit.html#line.352">hashCode</a>()</pre> <dl> <dt><strong>Overrides:</strong></dt> <dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true#hashCode()" title="class or interface in java.lang">hashCode</a></code> in class <code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8bb348c6/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.html ---------------------------------------------------------------------- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.html b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.html index 5344a96..6c2b2de 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.html @@ -274,7 +274,7 @@ <span class="sourceLineNo">266</span> }<a name="line.266"></a> <span class="sourceLineNo">267</span> List<InputSplit> splits = new ArrayList<InputSplit>(1);<a name="line.267"></a> <span class="sourceLineNo">268</span> long regionSize = sizeCalculator.getRegionSize(regLoc.getRegionInfo().getRegionName());<a name="line.268"></a> -<span class="sourceLineNo">269</span> TableSplit split = new TableSplit(tableName,<a name="line.269"></a> +<span class="sourceLineNo">269</span> TableSplit split = new TableSplit(tableName, scan,<a name="line.269"></a> <span class="sourceLineNo">270</span> HConstants.EMPTY_BYTE_ARRAY, HConstants.EMPTY_BYTE_ARRAY, regLoc<a name="line.270"></a> <span class="sourceLineNo">271</span> .getHostnamePort().split(Addressing.HOSTNAME_PORT_SEPARATOR)[0], regionSize);<a name="line.271"></a> <span class="sourceLineNo">272</span> splits.add(split);<a name="line.272"></a> @@ -317,7 +317,7 @@ <span class="sourceLineNo">309</span> <a name="line.309"></a> <span class="sourceLineNo">310</span> byte[] regionName = location.getRegionInfo().getRegionName();<a name="line.310"></a> <span class="sourceLineNo">311</span> long regionSize = sizeCalculator.getRegionSize(regionName);<a name="line.311"></a> -<span class="sourceLineNo">312</span> TableSplit split = new TableSplit(tableName,<a name="line.312"></a> +<span class="sourceLineNo">312</span> TableSplit split = new TableSplit(tableName, scan,<a name="line.312"></a> <span class="sourceLineNo">313</span> splitStart, splitStop, regionLocation, regionSize);<a name="line.313"></a> <span class="sourceLineNo">314</span> splits.add(split);<a name="line.314"></a> <span class="sourceLineNo">315</span> if (LOG.isDebugEnabled()) {<a name="line.315"></a> @@ -405,9 +405,9 @@ <span class="sourceLineNo">397</span> byte[] splitKey = getSplitKey(ts.getStartRow(), ts.getEndRow(), isTextKey);<a name="line.397"></a> <span class="sourceLineNo">398</span> //Set the size of child TableSplit as 1/2 of the region size. The exact size of the<a name="line.398"></a> <span class="sourceLineNo">399</span> // MapReduce input splits is not far off.<a name="line.399"></a> -<span class="sourceLineNo">400</span> TableSplit t1 = new TableSplit(tableName, ts.getStartRow(), splitKey, regionLocation,<a name="line.400"></a> +<span class="sourceLineNo">400</span> TableSplit t1 = new TableSplit(tableName, scan, ts.getStartRow(), splitKey, regionLocation,<a name="line.400"></a> <span class="sourceLineNo">401</span> regionSize / 2);<a name="line.401"></a> -<span class="sourceLineNo">402</span> TableSplit t2 = new TableSplit(tableName, splitKey, ts.getEndRow(), regionLocation,<a name="line.402"></a> +<span class="sourceLineNo">402</span> TableSplit t2 = new TableSplit(tableName, scan, splitKey, ts.getEndRow(), regionLocation,<a name="line.402"></a> <span class="sourceLineNo">403</span> regionSize - regionSize / 2);<a name="line.403"></a> <span class="sourceLineNo">404</span> resultList.add(t1);<a name="line.404"></a> <span class="sourceLineNo">405</span> resultList.add(t2);<a name="line.405"></a> @@ -434,7 +434,7 @@ <span class="sourceLineNo">426</span> break;<a name="line.426"></a> <span class="sourceLineNo">427</span> }<a name="line.427"></a> <span class="sourceLineNo">428</span> }<a name="line.428"></a> -<span class="sourceLineNo">429</span> TableSplit t = new TableSplit(tableName, splitStartKey, splitEndKey,<a name="line.429"></a> +<span class="sourceLineNo">429</span> TableSplit t = new TableSplit(tableName, scan, splitStartKey, splitEndKey,<a name="line.429"></a> <span class="sourceLineNo">430</span> regionLocation, totalSize);<a name="line.430"></a> <span class="sourceLineNo">431</span> resultList.add(t);<a name="line.431"></a> <span class="sourceLineNo">432</span> }<a name="line.432"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8bb348c6/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html ---------------------------------------------------------------------- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html index 4bcfbd0..a5703ad 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html @@ -569,7 +569,7 @@ <span class="sourceLineNo">561</span> * @return The scan saved in a Base64 encoded string.<a name="line.561"></a> <span class="sourceLineNo">562</span> * @throws IOException When writing the scan fails.<a name="line.562"></a> <span class="sourceLineNo">563</span> */<a name="line.563"></a> -<span class="sourceLineNo">564</span> static String convertScanToString(Scan scan) throws IOException {<a name="line.564"></a> +<span class="sourceLineNo">564</span> public static String convertScanToString(Scan scan) throws IOException {<a name="line.564"></a> <span class="sourceLineNo">565</span> ClientProtos.Scan proto = ProtobufUtil.toScan(scan);<a name="line.565"></a> <span class="sourceLineNo">566</span> return Base64.encodeBytes(proto.toByteArray());<a name="line.566"></a> <span class="sourceLineNo">567</span> }<a name="line.567"></a> @@ -581,7 +581,7 @@ <span class="sourceLineNo">573</span> * @return The newly created Scan instance.<a name="line.573"></a> <span class="sourceLineNo">574</span> * @throws IOException When reading the scan instance fails.<a name="line.574"></a> <span class="sourceLineNo">575</span> */<a name="line.575"></a> -<span class="sourceLineNo">576</span> static Scan convertStringToScan(String base64) throws IOException {<a name="line.576"></a> +<span class="sourceLineNo">576</span> public static Scan convertStringToScan(String base64) throws IOException {<a name="line.576"></a> <span class="sourceLineNo">577</span> byte [] decoded = Base64.decode(base64);<a name="line.577"></a> <span class="sourceLineNo">578</span> ClientProtos.Scan scan;<a name="line.578"></a> <span class="sourceLineNo">579</span> try {<a name="line.579"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8bb348c6/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableSplit.html ---------------------------------------------------------------------- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableSplit.html b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableSplit.html index 5cb57d5..ab01266 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableSplit.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableSplit.html @@ -309,52 +309,63 @@ <span class="sourceLineNo">301</span> StringBuilder sb = new StringBuilder();<a name="line.301"></a> <span class="sourceLineNo">302</span> sb.append("HBase table split(");<a name="line.302"></a> <span class="sourceLineNo">303</span> sb.append("table name: ").append(tableName);<a name="line.303"></a> -<span class="sourceLineNo">304</span> sb.append(", scan: ").append(scan);<a name="line.304"></a> -<span class="sourceLineNo">305</span> sb.append(", start row: ").append(Bytes.toStringBinary(startRow));<a name="line.305"></a> -<span class="sourceLineNo">306</span> sb.append(", end row: ").append(Bytes.toStringBinary(endRow));<a name="line.306"></a> -<span class="sourceLineNo">307</span> sb.append(", region location: ").append(regionLocation);<a name="line.307"></a> -<span class="sourceLineNo">308</span> sb.append(")");<a name="line.308"></a> -<span class="sourceLineNo">309</span> return sb.toString();<a name="line.309"></a> -<span class="sourceLineNo">310</span> }<a name="line.310"></a> -<span class="sourceLineNo">311</span><a name="line.311"></a> -<span class="sourceLineNo">312</span> /**<a name="line.312"></a> -<span class="sourceLineNo">313</span> * Compares this split against the given one.<a name="line.313"></a> -<span class="sourceLineNo">314</span> *<a name="line.314"></a> -<span class="sourceLineNo">315</span> * @param split The split to compare to.<a name="line.315"></a> -<span class="sourceLineNo">316</span> * @return The result of the comparison.<a name="line.316"></a> -<span class="sourceLineNo">317</span> * @see java.lang.Comparable#compareTo(java.lang.Object)<a name="line.317"></a> -<span class="sourceLineNo">318</span> */<a name="line.318"></a> -<span class="sourceLineNo">319</span> @Override<a name="line.319"></a> -<span class="sourceLineNo">320</span> public int compareTo(TableSplit split) {<a name="line.320"></a> -<span class="sourceLineNo">321</span> // If The table name of the two splits is the same then compare start row<a name="line.321"></a> -<span class="sourceLineNo">322</span> // otherwise compare based on table names<a name="line.322"></a> -<span class="sourceLineNo">323</span> int tableNameComparison =<a name="line.323"></a> -<span class="sourceLineNo">324</span> getTable().compareTo(split.getTable());<a name="line.324"></a> -<span class="sourceLineNo">325</span> return tableNameComparison != 0 ? tableNameComparison : Bytes.compareTo(<a name="line.325"></a> -<span class="sourceLineNo">326</span> getStartRow(), split.getStartRow());<a name="line.326"></a> -<span class="sourceLineNo">327</span> }<a name="line.327"></a> -<span class="sourceLineNo">328</span><a name="line.328"></a> -<span class="sourceLineNo">329</span> @Override<a name="line.329"></a> -<span class="sourceLineNo">330</span> public boolean equals(Object o) {<a name="line.330"></a> -<span class="sourceLineNo">331</span> if (o == null || !(o instanceof TableSplit)) {<a name="line.331"></a> -<span class="sourceLineNo">332</span> return false;<a name="line.332"></a> -<span class="sourceLineNo">333</span> }<a name="line.333"></a> -<span class="sourceLineNo">334</span> return tableName.equals(((TableSplit)o).tableName) &&<a name="line.334"></a> -<span class="sourceLineNo">335</span> Bytes.equals(startRow, ((TableSplit)o).startRow) &&<a name="line.335"></a> -<span class="sourceLineNo">336</span> Bytes.equals(endRow, ((TableSplit)o).endRow) &&<a name="line.336"></a> -<span class="sourceLineNo">337</span> regionLocation.equals(((TableSplit)o).regionLocation);<a name="line.337"></a> +<span class="sourceLineNo">304</span> // null scan input is represented by ""<a name="line.304"></a> +<span class="sourceLineNo">305</span> String printScan = "";<a name="line.305"></a> +<span class="sourceLineNo">306</span> if (!scan.equals("")) {<a name="line.306"></a> +<span class="sourceLineNo">307</span> try {<a name="line.307"></a> +<span class="sourceLineNo">308</span> // get the real scan here in toString, not the Base64 string<a name="line.308"></a> +<span class="sourceLineNo">309</span> printScan = TableMapReduceUtil.convertStringToScan(scan).toString();<a name="line.309"></a> +<span class="sourceLineNo">310</span> }<a name="line.310"></a> +<span class="sourceLineNo">311</span> catch (IOException e) {<a name="line.311"></a> +<span class="sourceLineNo">312</span> printScan = "";<a name="line.312"></a> +<span class="sourceLineNo">313</span> }<a name="line.313"></a> +<span class="sourceLineNo">314</span> }<a name="line.314"></a> +<span class="sourceLineNo">315</span> sb.append(", scan: ").append(printScan);<a name="line.315"></a> +<span class="sourceLineNo">316</span> sb.append(", start row: ").append(Bytes.toStringBinary(startRow));<a name="line.316"></a> +<span class="sourceLineNo">317</span> sb.append(", end row: ").append(Bytes.toStringBinary(endRow));<a name="line.317"></a> +<span class="sourceLineNo">318</span> sb.append(", region location: ").append(regionLocation);<a name="line.318"></a> +<span class="sourceLineNo">319</span> sb.append(")");<a name="line.319"></a> +<span class="sourceLineNo">320</span> return sb.toString();<a name="line.320"></a> +<span class="sourceLineNo">321</span> }<a name="line.321"></a> +<span class="sourceLineNo">322</span><a name="line.322"></a> +<span class="sourceLineNo">323</span> /**<a name="line.323"></a> +<span class="sourceLineNo">324</span> * Compares this split against the given one.<a name="line.324"></a> +<span class="sourceLineNo">325</span> *<a name="line.325"></a> +<span class="sourceLineNo">326</span> * @param split The split to compare to.<a name="line.326"></a> +<span class="sourceLineNo">327</span> * @return The result of the comparison.<a name="line.327"></a> +<span class="sourceLineNo">328</span> * @see java.lang.Comparable#compareTo(java.lang.Object)<a name="line.328"></a> +<span class="sourceLineNo">329</span> */<a name="line.329"></a> +<span class="sourceLineNo">330</span> @Override<a name="line.330"></a> +<span class="sourceLineNo">331</span> public int compareTo(TableSplit split) {<a name="line.331"></a> +<span class="sourceLineNo">332</span> // If The table name of the two splits is the same then compare start row<a name="line.332"></a> +<span class="sourceLineNo">333</span> // otherwise compare based on table names<a name="line.333"></a> +<span class="sourceLineNo">334</span> int tableNameComparison =<a name="line.334"></a> +<span class="sourceLineNo">335</span> getTable().compareTo(split.getTable());<a name="line.335"></a> +<span class="sourceLineNo">336</span> return tableNameComparison != 0 ? tableNameComparison : Bytes.compareTo(<a name="line.336"></a> +<span class="sourceLineNo">337</span> getStartRow(), split.getStartRow());<a name="line.337"></a> <span class="sourceLineNo">338</span> }<a name="line.338"></a> <span class="sourceLineNo">339</span><a name="line.339"></a> -<span class="sourceLineNo">340</span> @Override<a name="line.340"></a> -<span class="sourceLineNo">341</span> public int hashCode() {<a name="line.341"></a> -<span class="sourceLineNo">342</span> int result = tableName != null ? tableName.hashCode() : 0;<a name="line.342"></a> -<span class="sourceLineNo">343</span> result = 31 * result + (scan != null ? scan.hashCode() : 0);<a name="line.343"></a> -<span class="sourceLineNo">344</span> result = 31 * result + (startRow != null ? Arrays.hashCode(startRow) : 0);<a name="line.344"></a> -<span class="sourceLineNo">345</span> result = 31 * result + (endRow != null ? Arrays.hashCode(endRow) : 0);<a name="line.345"></a> -<span class="sourceLineNo">346</span> result = 31 * result + (regionLocation != null ? regionLocation.hashCode() : 0);<a name="line.346"></a> -<span class="sourceLineNo">347</span> return result;<a name="line.347"></a> -<span class="sourceLineNo">348</span> }<a name="line.348"></a> -<span class="sourceLineNo">349</span>}<a name="line.349"></a> +<span class="sourceLineNo">340</span> @Override<a name="line.340"></a> +<span class="sourceLineNo">341</span> public boolean equals(Object o) {<a name="line.341"></a> +<span class="sourceLineNo">342</span> if (o == null || !(o instanceof TableSplit)) {<a name="line.342"></a> +<span class="sourceLineNo">343</span> return false;<a name="line.343"></a> +<span class="sourceLineNo">344</span> }<a name="line.344"></a> +<span class="sourceLineNo">345</span> return tableName.equals(((TableSplit)o).tableName) &&<a name="line.345"></a> +<span class="sourceLineNo">346</span> Bytes.equals(startRow, ((TableSplit)o).startRow) &&<a name="line.346"></a> +<span class="sourceLineNo">347</span> Bytes.equals(endRow, ((TableSplit)o).endRow) &&<a name="line.347"></a> +<span class="sourceLineNo">348</span> regionLocation.equals(((TableSplit)o).regionLocation);<a name="line.348"></a> +<span class="sourceLineNo">349</span> }<a name="line.349"></a> +<span class="sourceLineNo">350</span><a name="line.350"></a> +<span class="sourceLineNo">351</span> @Override<a name="line.351"></a> +<span class="sourceLineNo">352</span> public int hashCode() {<a name="line.352"></a> +<span class="sourceLineNo">353</span> int result = tableName != null ? tableName.hashCode() : 0;<a name="line.353"></a> +<span class="sourceLineNo">354</span> result = 31 * result + (scan != null ? scan.hashCode() : 0);<a name="line.354"></a> +<span class="sourceLineNo">355</span> result = 31 * result + (startRow != null ? Arrays.hashCode(startRow) : 0);<a name="line.355"></a> +<span class="sourceLineNo">356</span> result = 31 * result + (endRow != null ? Arrays.hashCode(endRow) : 0);<a name="line.356"></a> +<span class="sourceLineNo">357</span> result = 31 * result + (regionLocation != null ? regionLocation.hashCode() : 0);<a name="line.357"></a> +<span class="sourceLineNo">358</span> return result;<a name="line.358"></a> +<span class="sourceLineNo">359</span> }<a name="line.359"></a> +<span class="sourceLineNo">360</span>}<a name="line.360"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8bb348c6/apidocs/src-html/org/apache/hadoop/hbase/rest/client/Cluster.html ---------------------------------------------------------------------- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/rest/client/Cluster.html b/apidocs/src-html/org/apache/hadoop/hbase/rest/client/Cluster.html index 6842786..7f0ebee 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/rest/client/Cluster.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/rest/client/Cluster.html @@ -55,7 +55,7 @@ <span class="sourceLineNo">047</span> * @param nodes a list of service locations, in 'host:port' format<a name="line.47"></a> <span class="sourceLineNo">048</span> */<a name="line.48"></a> <span class="sourceLineNo">049</span> public Cluster(List<String> nodes) {<a name="line.49"></a> -<span class="sourceLineNo">050</span> nodes.addAll(nodes);<a name="line.50"></a> +<span class="sourceLineNo">050</span> this.nodes.addAll(nodes);<a name="line.50"></a> <span class="sourceLineNo">051</span> }<a name="line.51"></a> <span class="sourceLineNo">052</span><a name="line.52"></a> <span class="sourceLineNo">053</span> /**<a name="line.53"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8bb348c6/book.html ---------------------------------------------------------------------- diff --git a/book.html b/book.html index 32526ea..bd9a097 100644 --- a/book.html +++ b/book.html @@ -33124,7 +33124,7 @@ The server will return cellblocks compressed using this same compressor as long <div id="footer"> <div id="footer-text"> Version 2.0.0-SNAPSHOT<br> -Last updated 2016-02-10 15:07:37 UTC +Last updated 2016-02-11 15:09:33 UTC </div> </div> </body> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8bb348c6/bulk-loads.html ---------------------------------------------------------------------- diff --git a/bulk-loads.html b/bulk-loads.html index 6dd4a03..11bdfcc 100644 --- a/bulk-loads.html +++ b/bulk-loads.html @@ -7,7 +7,7 @@ <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20160210" /> + <meta name="Date-Revision-yyyymmdd" content="20160211" /> <meta http-equiv="Content-Language" content="en" /> <title>Apache HBase – Bulk Loads in Apache HBase (TM) @@ -305,7 +305,7 @@ under the License. --> <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved. - <li id="publishDate" class="pull-right">Last Published: 2016-02-10</li> + <li id="publishDate" class="pull-right">Last Published: 2016-02-11</li> </p> </div>