From d72d8485c17c0c9f8465663ed453b96241718153 Mon Sep 17 00:00:00 2001
From: Gary Helmling <gary@cask.co>
Date: Wed, 17 Dec 2014 15:53:39 -0800
Subject: [PATCH] TEPHRA-49 Use max versions on flush and compaction

---
 .../tephra/hbase94/coprocessor/TransactionProcessor.java  | 8 ++++----
 .../tephra/hbase96/coprocessor/TransactionProcessor.java  | 8 ++++----
 .../tephra/hbase98/coprocessor/TransactionProcessor.java  | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tephra-hbase-compat-0.94/src/main/java/co/cask/tephra/hbase94/coprocessor/TransactionProcessor.java b/tephra-hbase-compat-0.94/src/main/java/co/cask/tephra/hbase94/coprocessor/TransactionProcessor.java
index 30d712d6..a3976c0b 100644
--- a/tephra-hbase-compat-0.94/src/main/java/co/cask/tephra/hbase94/coprocessor/TransactionProcessor.java
+++ b/tephra-hbase-compat-0.94/src/main/java/co/cask/tephra/hbase94/coprocessor/TransactionProcessor.java
@@ -147,7 +147,7 @@ public void preGet(ObserverContext<RegionCoprocessorEnvironment> e, Get get, Lis
       if (LOG.isTraceEnabled()) {
         LOG.trace("Applying filter to GET for transaction " + tx.getWritePointer());
       }
-      get.setMaxVersions(tx.excludesSize() + 1);
+      get.setMaxVersions();
       get.setTimeRange(TxUtils.getOldestVisibleTimestamp(ttlByFamily, tx), TxUtils.getMaxVisibleTimestamp(tx));
       Filter newFilter = Filters.combine(getTransactionFilter(tx, ScanType.USER_SCAN), get.getFilter());
       get.setFilter(newFilter);
@@ -162,7 +162,7 @@ public RegionScanner preScannerOpen(ObserverContext<RegionCoprocessorEnvironment
       if (LOG.isTraceEnabled()) {
         LOG.trace("Applying filter to SCAN for transaction " + tx.getWritePointer());
       }
-      scan.setMaxVersions(tx.excludesSize() + 1);
+      scan.setMaxVersions();
       scan.setTimeRange(TxUtils.getOldestVisibleTimestamp(ttlByFamily, tx), TxUtils.getMaxVisibleTimestamp(tx));
       Filter newFilter = Filters.combine(getTransactionFilter(tx, ScanType.USER_SCAN), scan.getFilter());
       scan.setFilter(newFilter);
@@ -203,8 +203,8 @@ protected InternalScanner createStoreScanner(RegionCoprocessorEnvironment env, S
     // construct a dummy transaction from the latest snapshot
     Transaction dummyTx = TxUtils.createDummyTransaction(snapshot);
     Scan scan = new Scan();
-    // does not current support max versions setting per family
-    scan.setMaxVersions(dummyTx.excludesSize() + 1);
+    // need to see all versions, since we filter out excludes and applications may rely on multiple versions
+    scan.setMaxVersions();
     scan.setFilter(new IncludeInProgressFilter(dummyTx.getVisibilityUpperBound(),
                                                snapshot.getInvalid(),
                                                getTransactionFilter(dummyTx, type)));
diff --git a/tephra-hbase-compat-0.96/src/main/java/co/cask/tephra/hbase96/coprocessor/TransactionProcessor.java b/tephra-hbase-compat-0.96/src/main/java/co/cask/tephra/hbase96/coprocessor/TransactionProcessor.java
index 2b8af971..435f8dac 100644
--- a/tephra-hbase-compat-0.96/src/main/java/co/cask/tephra/hbase96/coprocessor/TransactionProcessor.java
+++ b/tephra-hbase-compat-0.96/src/main/java/co/cask/tephra/hbase96/coprocessor/TransactionProcessor.java
@@ -142,7 +142,7 @@ public void preGetOp(ObserverContext<RegionCoprocessorEnvironment> e, Get get, L
     throws IOException {
     Transaction tx = txCodec.getFromOperation(get);
     if (tx != null) {
-      get.setMaxVersions(tx.excludesSize() + 1);
+      get.setMaxVersions();
       get.setTimeRange(TxUtils.getOldestVisibleTimestamp(ttlByFamily, tx), TxUtils.getMaxVisibleTimestamp(tx));
       Filter newFilter = Filters.combine(getTransactionFilter(tx, ScanType.USER_SCAN), get.getFilter());
       get.setFilter(newFilter);
@@ -154,7 +154,7 @@ public RegionScanner preScannerOpen(ObserverContext<RegionCoprocessorEnvironment
     throws IOException {
     Transaction tx = txCodec.getFromOperation(scan);
     if (tx != null) {
-      scan.setMaxVersions(tx.excludesSize() + 1);
+      scan.setMaxVersions();
       scan.setTimeRange(TxUtils.getOldestVisibleTimestamp(ttlByFamily, tx), TxUtils.getMaxVisibleTimestamp(tx));
       Filter newFilter = Filters.combine(getTransactionFilter(tx, ScanType.USER_SCAN), scan.getFilter());
       scan.setFilter(newFilter);
@@ -195,8 +195,8 @@ protected InternalScanner createStoreScanner(RegionCoprocessorEnvironment env, S
     // construct a dummy transaction from the latest snapshot
     Transaction dummyTx = TxUtils.createDummyTransaction(snapshot);
     Scan scan = new Scan();
-    // does not current support max versions setting per family
-    scan.setMaxVersions(dummyTx.excludesSize() + 1);
+    // need to see all versions, since we filter out excludes and applications may rely on multiple versions
+    scan.setMaxVersions();
     scan.setFilter(
         new IncludeInProgressFilter(dummyTx.getVisibilityUpperBound(),
             snapshot.getInvalid(),
diff --git a/tephra-hbase-compat-0.98/src/main/java/co/cask/tephra/hbase98/coprocessor/TransactionProcessor.java b/tephra-hbase-compat-0.98/src/main/java/co/cask/tephra/hbase98/coprocessor/TransactionProcessor.java
index 547192c8..9c345877 100644
--- a/tephra-hbase-compat-0.98/src/main/java/co/cask/tephra/hbase98/coprocessor/TransactionProcessor.java
+++ b/tephra-hbase-compat-0.98/src/main/java/co/cask/tephra/hbase98/coprocessor/TransactionProcessor.java
@@ -142,7 +142,7 @@ public void preGetOp(ObserverContext<RegionCoprocessorEnvironment> e, Get get, L
     throws IOException {
     Transaction tx = txCodec.getFromOperation(get);
     if (tx != null) {
-      get.setMaxVersions(tx.excludesSize() + 1);
+      get.setMaxVersions();
       get.setTimeRange(TxUtils.getOldestVisibleTimestamp(ttlByFamily, tx), TxUtils.getMaxVisibleTimestamp(tx));
       Filter newFilter = Filters.combine(getTransactionFilter(tx, ScanType.USER_SCAN), get.getFilter());
       get.setFilter(newFilter);
@@ -154,7 +154,7 @@ public RegionScanner preScannerOpen(ObserverContext<RegionCoprocessorEnvironment
     throws IOException {
     Transaction tx = txCodec.getFromOperation(scan);
     if (tx != null) {
-      scan.setMaxVersions(tx.excludesSize() + 1);
+      scan.setMaxVersions();
       scan.setTimeRange(TxUtils.getOldestVisibleTimestamp(ttlByFamily, tx), TxUtils.getMaxVisibleTimestamp(tx));
       Filter newFilter = Filters.combine(getTransactionFilter(tx, ScanType.USER_SCAN), scan.getFilter());
       scan.setFilter(newFilter);
@@ -195,8 +195,8 @@ protected InternalScanner createStoreScanner(RegionCoprocessorEnvironment env, S
     // construct a dummy transaction from the latest snapshot
     Transaction dummyTx = TxUtils.createDummyTransaction(snapshot);
     Scan scan = new Scan();
-    // does not current support max versions setting per family
-    scan.setMaxVersions(dummyTx.excludesSize() + 1);
+    // need to see all versions, since we filter out excludes and applications may rely on multiple versions
+    scan.setMaxVersions();
     scan.setFilter(
         new IncludeInProgressFilter(dummyTx.getVisibilityUpperBound(),
             snapshot.getInvalid(),