Repository: phoenix Updated Branches: refs/heads/txn d81e660e3 -> 4c7f0cbb4
Fix compilation issue (maybe 1.7 specific) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/4c7f0cbb Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/4c7f0cbb Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/4c7f0cbb Branch: refs/heads/txn Commit: 4c7f0cbb4ef9fb2f5f9059279e4dbb0246ff5a4b Parents: d81e660 Author: James Taylor <[email protected]> Authored: Tue Oct 27 17:50:31 2015 -0700 Committer: James Taylor <[email protected]> Committed: Tue Oct 27 17:50:31 2015 -0700 ---------------------------------------------------------------------- .../apache/phoenix/execute/MutationState.java | 22 +++++++++----------- 1 file changed, 10 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/4c7f0cbb/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java b/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java index 79da59f..5fb7c9f 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java @@ -27,19 +27,8 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; -import co.cask.tephra.Transaction; -import co.cask.tephra.Transaction.VisibilityLevel; -import co.cask.tephra.TransactionAware; -import co.cask.tephra.TransactionCodec; -import co.cask.tephra.TransactionContext; -import co.cask.tephra.TransactionFailureException; -import co.cask.tephra.TransactionNotInProgressException; -import co.cask.tephra.TransactionSystemClient; -import co.cask.tephra.hbase98.TransactionAwareHTable; - import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.HTableInterface; @@ -89,6 +78,15 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import co.cask.tephra.Transaction; +import co.cask.tephra.Transaction.VisibilityLevel; +import co.cask.tephra.TransactionAware; +import co.cask.tephra.TransactionCodec; +import co.cask.tephra.TransactionContext; +import co.cask.tephra.TransactionFailureException; +import co.cask.tephra.TransactionSystemClient; +import co.cask.tephra.hbase98.TransactionAwareHTable; + /** * * Tracks the uncommitted state @@ -206,7 +204,7 @@ public class MutationState implements SQLCloseable { // Since we've checkpointed, we can clear out uncommitted set, since a statement run afterwards // should see all this data. uncommittedPhysicalNames.clear(); - } catch (TransactionFailureException | TransactionNotInProgressException e) { + } catch (TransactionFailureException e) { throw new SQLException(e); } }
