You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zg...@apache.org on 2020/09/02 09:43:42 UTC
[hbase] branch master updated: HBASE-24973 Remove read point
parameter in method StoreFlush#performFlush and StoreFlush#createScanner
(#2337)
This is an automated email from the ASF dual-hosted git repository.
zghao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new 4dc0814 HBASE-24973 Remove read point parameter in method StoreFlush#performFlush and StoreFlush#createScanner (#2337)
4dc0814 is described below
commit 4dc08144f364bb899430d381a7717cebde17f647
Author: Qi Yu <yu...@gmail.com>
AuthorDate: Wed Sep 2 17:43:26 2020 +0800
HBASE-24973 Remove read point parameter in method StoreFlush#performFlush and StoreFlush#createScanner (#2337)
Signed-off-by: Viraj Jasani <vj...@apache.org>
---
.../java/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.java | 3 +--
.../apache/hadoop/hbase/regionserver/DefaultStoreFlusher.java | 5 ++---
.../java/org/apache/hadoop/hbase/regionserver/StoreFlusher.java | 9 ++++-----
.../org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.java | 5 ++---
4 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.java
index c1d5736..480b85c 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.java
@@ -119,8 +119,7 @@ public class DefaultMobStoreFlusher extends DefaultStoreFlusher {
if (cellsCount == 0) return result; // don't flush if there are no entries
// Use a store scanner to find which rows to flush.
- long smallestReadPoint = store.getSmallestReadPoint();
- InternalScanner scanner = createScanner(snapshot.getScanners(), smallestReadPoint, tracker);
+ InternalScanner scanner = createScanner(snapshot.getScanners(), tracker);
StoreFileWriter writer;
try {
// TODO: We can fail in the below block before we complete adding this flush to
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultStoreFlusher.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultStoreFlusher.java
index f1bb45b..a7d7fb1 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultStoreFlusher.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultStoreFlusher.java
@@ -52,8 +52,7 @@ public class DefaultStoreFlusher extends StoreFlusher {
if (cellsCount == 0) return result; // don't flush if there are no entries
// Use a store scanner to find which rows to flush.
- long smallestReadPoint = store.getSmallestReadPoint();
- InternalScanner scanner = createScanner(snapshot.getScanners(), smallestReadPoint, tracker);
+ InternalScanner scanner = createScanner(snapshot.getScanners(), tracker);
StoreFileWriter writer;
try {
// TODO: We can fail in the below block before we complete adding this flush to
@@ -66,7 +65,7 @@ public class DefaultStoreFlusher extends StoreFlusher {
snapshot.isTagsPresent(), false);
IOException e = null;
try {
- performFlush(scanner, writer, smallestReadPoint, throughputController);
+ performFlush(scanner, writer, throughputController);
} catch (IOException ioe) {
e = ioe;
// throw the exception out
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFlusher.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFlusher.java
index 177f24d..0991b2c 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFlusher.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFlusher.java
@@ -73,20 +73,20 @@ abstract class StoreFlusher {
/**
* Creates the scanner for flushing snapshot. Also calls coprocessors.
* @param snapshotScanners
- * @param smallestReadPoint
* @return The scanner; null if coprocessor is canceling the flush.
*/
protected final InternalScanner createScanner(List<KeyValueScanner> snapshotScanners,
- long smallestReadPoint, FlushLifeCycleTracker tracker) throws IOException {
+ FlushLifeCycleTracker tracker) throws IOException {
ScanInfo scanInfo;
if (store.getCoprocessorHost() != null) {
scanInfo = store.getCoprocessorHost().preFlushScannerOpen(store, tracker);
} else {
scanInfo = store.getScanInfo();
}
+ final long smallestReadPoint = store.getSmallestReadPoint();
InternalScanner scanner = new StoreScanner(store, scanInfo, snapshotScanners,
ScanType.COMPACT_RETAIN_DELETES, smallestReadPoint, HConstants.OLDEST_TIMESTAMP);
- assert scanner != null;
+
if (store.getCoprocessorHost() != null) {
try {
return store.getCoprocessorHost().preFlush(store, scanner, tracker);
@@ -102,11 +102,10 @@ abstract class StoreFlusher {
* Performs memstore flush, writing data from scanner into sink.
* @param scanner Scanner to get data from.
* @param sink Sink to write data to. Could be StoreFile.Writer.
- * @param smallestReadPoint Smallest read point used for the flush.
* @param throughputController A controller to avoid flush too fast
*/
protected void performFlush(InternalScanner scanner, CellSink sink,
- long smallestReadPoint, ThroughputController throughputController) throws IOException {
+ ThroughputController throughputController) throws IOException {
int compactionKVMax =
conf.getInt(HConstants.COMPACTION_KV_MAX, HConstants.COMPACTION_KV_MAX_DEFAULT);
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.java
index 59b91d5..7beec5e 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.java
@@ -61,8 +61,7 @@ public class StripeStoreFlusher extends StoreFlusher {
int cellsCount = snapshot.getCellsCount();
if (cellsCount == 0) return result; // don't flush if there are no entries
- long smallestReadPoint = store.getSmallestReadPoint();
- InternalScanner scanner = createScanner(snapshot.getScanners(), smallestReadPoint, tracker);
+ InternalScanner scanner = createScanner(snapshot.getScanners(), tracker);
// Let policy select flush method.
StripeFlushRequest req = this.policy.selectFlush(store.getComparator(), this.stripes,
@@ -77,7 +76,7 @@ public class StripeStoreFlusher extends StoreFlusher {
mw.init(storeScanner, factory);
synchronized (flushLock) {
- performFlush(scanner, mw, smallestReadPoint, throughputController);
+ performFlush(scanner, mw, throughputController);
result = mw.commitWriters(cacheFlushSeqNum, false);
success = true;
}