Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 381EC195D0 for ; Tue, 5 Apr 2016 16:45:04 +0000 (UTC) Received: (qmail 22741 invoked by uid 500); 5 Apr 2016 16:44:58 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 22645 invoked by uid 500); 5 Apr 2016 16:44:58 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 22159 invoked by uid 99); 5 Apr 2016 16:44:58 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Apr 2016 16:44:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4F703E17A8; Tue, 5 Apr 2016 16:44:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: misty@apache.org To: commits@hbase.apache.org Date: Tue, 05 Apr 2016 16:45:11 -0000 Message-Id: In-Reply-To: <9e95fa583580408b836fece4f17108d0@git.apache.org> References: <9e95fa583580408b836fece4f17108d0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [15/17] hbase-site git commit: Published site at a93a8878fea49224310e9e51ac929c33ae6aa41f. http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7ebe435a/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html ---------------------------------------------------------------------- diff --git a/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html b/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html index 76f2d8b..2eb7e14 100644 --- a/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html +++ b/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.ImplData.html @@ -379,40 +379,40 @@ extends org.jamon.AbstractTemplateProxy.ImplData 
private HMaster m_master
- + - + - + - + @@ -433,112 +433,112 @@ extends org.jamon.AbstractTemplateProxy.ImplData 
private boolean m_serverManager__IsNotDefault
- + - + - + - + - + - + - + - + - + - + - + - + @@ -584,58 +584,58 @@ extends org.jamon.AbstractTemplateProxy.ImplData 
public HMaster getMaster()
- + - + - + - + - + - + @@ -665,166 +665,166 @@ extends org.jamon.AbstractTemplateProxy.ImplData 
public boolean getServerManager__IsNotDefault()
- + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7ebe435a/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html ---------------------------------------------------------------------- diff --git a/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html b/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html index 0102a65..106506b 100644 --- a/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html +++ b/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.html @@ -323,22 +323,22 @@ extends org.jamon.AbstractTemplateProxy

Field Detail

- + - + @@ -350,58 +350,58 @@ extends org.jamon.AbstractTemplateProxy 
protected ServerManager serverManager
- + - + - + - + - + - + @@ -473,22 +473,22 @@ extends org.jamon.AbstractTemplateProxy - + - + @@ -500,58 +500,58 @@ extends org.jamon.AbstractTemplateProxy 
public final MasterStatusTmpl setServerManager(ServerManager p_serverManager)
- + - + - + - + - + - + http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7ebe435a/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html ---------------------------------------------------------------------- diff --git a/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html b/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html index f915a78..dd02337 100644 --- a/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html +++ b/devapidocs/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmplImpl.html @@ -264,22 +264,22 @@ implements HMaster master - + - + @@ -291,58 +291,58 @@ implements ServerManager serverManager - + - + - + - + - + - + http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7ebe435a/devapidocs/org/apache/hadoop/hbase/util/package-tree.html ---------------------------------------------------------------------- diff --git a/devapidocs/org/apache/hadoop/hbase/util/package-tree.html b/devapidocs/org/apache/hadoop/hbase/util/package-tree.html index 223f541..5102b7f 100644 --- a/devapidocs/org/apache/hadoop/hbase/util/package-tree.html +++ b/devapidocs/org/apache/hadoop/hbase/util/package-tree.html @@ -473,14 +473,14 @@ http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7ebe435a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.BatchOperation.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.BatchOperation.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.BatchOperation.html index e11f17f..06538df 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.BatchOperation.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.BatchOperation.html @@ -5660,7 +5660,7 @@ 5652 // partial Result means that we should not reset the filters; filters 5653 // should only be reset in 5654 // between rows -5655 if (!scannerContext.partialResultFormed()) resetFilters(); +5655 if (!scannerContext.midRowResultFormed()) resetFilters(); 5656 5657 if (isFilterDoneInternal()) { 5658 moreValues = false; @@ -5735,7 +5735,7 @@ 5727 nextKv = heap.peek(); 5728 moreCellsInRow = moreCellsInRow(nextKv, currentRowCell); 5729 if (!moreCellsInRow) incrementCountOfRowsScannedMetric(scannerContext); -5730 if (scannerContext.checkBatchLimit(limitScope)) { +5730 if (moreCellsInRow && scannerContext.checkBatchLimit(limitScope)) { 5731 return scannerContext.setScannerState(NextState.BATCH_LIMIT_REACHED).hasMoreValues(); 5732 } else if (scannerContext.checkSizeLimit(limitScope)) { 5733 ScannerContext.NextState state = http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7ebe435a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.FlushResultImpl.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.FlushResultImpl.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.FlushResultImpl.html index e11f17f..06538df 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.FlushResultImpl.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.FlushResultImpl.html @@ -5660,7 +5660,7 @@ 5652 // partial Result means that we should not reset the filters; filters 5653 // should only be reset in 5654 // between rows -5655 if (!scannerContext.partialResultFormed()) resetFilters(); +5655 if (!scannerContext.midRowResultFormed()) resetFilters(); 5656 5657 if (isFilterDoneInternal()) { 5658 moreValues = false; @@ -5735,7 +5735,7 @@ 5727 nextKv = heap.peek(); 5728 moreCellsInRow = moreCellsInRow(nextKv, currentRowCell); 5729 if (!moreCellsInRow) incrementCountOfRowsScannedMetric(scannerContext); -5730 if (scannerContext.checkBatchLimit(limitScope)) { +5730 if (moreCellsInRow && scannerContext.checkBatchLimit(limitScope)) { 5731 return scannerContext.setScannerState(NextState.BATCH_LIMIT_REACHED).hasMoreValues(); 5732 } else if (scannerContext.checkSizeLimit(limitScope)) { 5733 ScannerContext.NextState state = http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7ebe435a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.MutationBatch.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.MutationBatch.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.MutationBatch.html index e11f17f..06538df 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.MutationBatch.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.MutationBatch.html @@ -5660,7 +5660,7 @@ 5652 // partial Result means that we should not reset the filters; filters 5653 // should only be reset in 5654 // between rows -5655 if (!scannerContext.partialResultFormed()) resetFilters(); +5655 if (!scannerContext.midRowResultFormed()) resetFilters(); 5656 5657 if (isFilterDoneInternal()) { 5658 moreValues = false; @@ -5735,7 +5735,7 @@ 5727 nextKv = heap.peek(); 5728 moreCellsInRow = moreCellsInRow(nextKv, currentRowCell); 5729 if (!moreCellsInRow) incrementCountOfRowsScannedMetric(scannerContext); -5730 if (scannerContext.checkBatchLimit(limitScope)) { +5730 if (moreCellsInRow && scannerContext.checkBatchLimit(limitScope)) { 5731 return scannerContext.setScannerState(NextState.BATCH_LIMIT_REACHED).hasMoreValues(); 5732 } else if (scannerContext.checkSizeLimit(limitScope)) { 5733 ScannerContext.NextState state = http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7ebe435a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.PrepareFlushResult.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.PrepareFlushResult.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.PrepareFlushResult.html index e11f17f..06538df 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.PrepareFlushResult.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.PrepareFlushResult.html @@ -5660,7 +5660,7 @@ 5652 // partial Result means that we should not reset the filters; filters 5653 // should only be reset in 5654 // between rows -5655 if (!scannerContext.partialResultFormed()) resetFilters(); +5655 if (!scannerContext.midRowResultFormed()) resetFilters(); 5656 5657 if (isFilterDoneInternal()) { 5658 moreValues = false; @@ -5735,7 +5735,7 @@ 5727 nextKv = heap.peek(); 5728 moreCellsInRow = moreCellsInRow(nextKv, currentRowCell); 5729 if (!moreCellsInRow) incrementCountOfRowsScannedMetric(scannerContext); -5730 if (scannerContext.checkBatchLimit(limitScope)) { +5730 if (moreCellsInRow && scannerContext.checkBatchLimit(limitScope)) { 5731 return scannerContext.setScannerState(NextState.BATCH_LIMIT_REACHED).hasMoreValues(); 5732 } else if (scannerContext.checkSizeLimit(limitScope)) { 5733 ScannerContext.NextState state = http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7ebe435a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.RegionScannerImpl.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.RegionScannerImpl.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.RegionScannerImpl.html index e11f17f..06538df 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.RegionScannerImpl.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.RegionScannerImpl.html @@ -5660,7 +5660,7 @@ 5652 // partial Result means that we should not reset the filters; filters 5653 // should only be reset in 5654 // between rows -5655 if (!scannerContext.partialResultFormed()) resetFilters(); +5655 if (!scannerContext.midRowResultFormed()) resetFilters(); 5656 5657 if (isFilterDoneInternal()) { 5658 moreValues = false; @@ -5735,7 +5735,7 @@ 5727 nextKv = heap.peek(); 5728 moreCellsInRow = moreCellsInRow(nextKv, currentRowCell); 5729 if (!moreCellsInRow) incrementCountOfRowsScannedMetric(scannerContext); -5730 if (scannerContext.checkBatchLimit(limitScope)) { +5730 if (moreCellsInRow && scannerContext.checkBatchLimit(limitScope)) { 5731 return scannerContext.setScannerState(NextState.BATCH_LIMIT_REACHED).hasMoreValues(); 5732 } else if (scannerContext.checkSizeLimit(limitScope)) { 5733 ScannerContext.NextState state = http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7ebe435a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.ReplayBatch.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.ReplayBatch.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.ReplayBatch.html index e11f17f..06538df 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.ReplayBatch.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.ReplayBatch.html @@ -5660,7 +5660,7 @@ 5652 // partial Result means that we should not reset the filters; filters 5653 // should only be reset in 5654 // between rows -5655 if (!scannerContext.partialResultFormed()) resetFilters(); +5655 if (!scannerContext.midRowResultFormed()) resetFilters(); 5656 5657 if (isFilterDoneInternal()) { 5658 moreValues = false; @@ -5735,7 +5735,7 @@ 5727 nextKv = heap.peek(); 5728 moreCellsInRow = moreCellsInRow(nextKv, currentRowCell); 5729 if (!moreCellsInRow) incrementCountOfRowsScannedMetric(scannerContext); -5730 if (scannerContext.checkBatchLimit(limitScope)) { +5730 if (moreCellsInRow && scannerContext.checkBatchLimit(limitScope)) { 5731 return scannerContext.setScannerState(NextState.BATCH_LIMIT_REACHED).hasMoreValues(); 5732 } else if (scannerContext.checkSizeLimit(limitScope)) { 5733 ScannerContext.NextState state = http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7ebe435a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.RowLockContext.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.RowLockContext.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.RowLockContext.html index e11f17f..06538df 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.RowLockContext.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.RowLockContext.html @@ -5660,7 +5660,7 @@ 5652 // partial Result means that we should not reset the filters; filters 5653 // should only be reset in 5654 // between rows -5655 if (!scannerContext.partialResultFormed()) resetFilters(); +5655 if (!scannerContext.midRowResultFormed()) resetFilters(); 5656 5657 if (isFilterDoneInternal()) { 5658 moreValues = false; @@ -5735,7 +5735,7 @@ 5727 nextKv = heap.peek(); 5728 moreCellsInRow = moreCellsInRow(nextKv, currentRowCell); 5729 if (!moreCellsInRow) incrementCountOfRowsScannedMetric(scannerContext); -5730 if (scannerContext.checkBatchLimit(limitScope)) { +5730 if (moreCellsInRow && scannerContext.checkBatchLimit(limitScope)) { 5731 return scannerContext.setScannerState(NextState.BATCH_LIMIT_REACHED).hasMoreValues(); 5732 } else if (scannerContext.checkSizeLimit(limitScope)) { 5733 ScannerContext.NextState state = http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7ebe435a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.RowLockImpl.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.RowLockImpl.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.RowLockImpl.html index e11f17f..06538df 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.RowLockImpl.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.RowLockImpl.html @@ -5660,7 +5660,7 @@ 5652 // partial Result means that we should not reset the filters; filters 5653 // should only be reset in 5654 // between rows -5655 if (!scannerContext.partialResultFormed()) resetFilters(); +5655 if (!scannerContext.midRowResultFormed()) resetFilters(); 5656 5657 if (isFilterDoneInternal()) { 5658 moreValues = false; @@ -5735,7 +5735,7 @@ 5727 nextKv = heap.peek(); 5728 moreCellsInRow = moreCellsInRow(nextKv, currentRowCell); 5729 if (!moreCellsInRow) incrementCountOfRowsScannedMetric(scannerContext); -5730 if (scannerContext.checkBatchLimit(limitScope)) { +5730 if (moreCellsInRow && scannerContext.checkBatchLimit(limitScope)) { 5731 return scannerContext.setScannerState(NextState.BATCH_LIMIT_REACHED).hasMoreValues(); 5732 } else if (scannerContext.checkSizeLimit(limitScope)) { 5733 ScannerContext.NextState state = http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7ebe435a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.WriteState.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.WriteState.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.WriteState.html index e11f17f..06538df 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.WriteState.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.WriteState.html @@ -5660,7 +5660,7 @@ 5652 // partial Result means that we should not reset the filters; filters 5653 // should only be reset in 5654 // between rows -5655 if (!scannerContext.partialResultFormed()) resetFilters(); +5655 if (!scannerContext.midRowResultFormed()) resetFilters(); 5656 5657 if (isFilterDoneInternal()) { 5658 moreValues = false; @@ -5735,7 +5735,7 @@ 5727 nextKv = heap.peek(); 5728 moreCellsInRow = moreCellsInRow(nextKv, currentRowCell); 5729 if (!moreCellsInRow) incrementCountOfRowsScannedMetric(scannerContext); -5730 if (scannerContext.checkBatchLimit(limitScope)) { +5730 if (moreCellsInRow && scannerContext.checkBatchLimit(limitScope)) { 5731 return scannerContext.setScannerState(NextState.BATCH_LIMIT_REACHED).hasMoreValues(); 5732 } else if (scannerContext.checkSizeLimit(limitScope)) { 5733 ScannerContext.NextState state =