[3/5] phoenix git commit: PHOENIX-4660 Use TransactionProvider interface

2018-03-23 Thread pboado 
PHOENIX-4660 Use TransactionProvider interface


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/af0f68b9
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/af0f68b9
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/af0f68b9

Branch: refs/heads/4.x-cdh5.14
Commit: af0f68b919087553f9356142c223829ae5cf1bff
Parents: c1827f2
Author: James Taylor 
Authored: Sat Mar 17 22:16:24 2018 +
Committer: Pedro Boado 
Committed: Fri Mar 23 21:31:53 2018 +

--
 .../phoenix/tx/FlappingTransactionIT.java   |   8 +-
 .../PhoenixTransactionalProcessor.java  |   2 +-
 .../apache/phoenix/execute/MutationState.java   |   8 +-
 .../PhoenixTxIndexMutationGenerator.java|   2 +-
 .../apache/phoenix/index/IndexMaintainer.java   |   2 +-
 .../index/IndexMetaDataCacheFactory.java|   2 +-
 .../index/PhoenixIndexMetaDataBuilder.java  |   2 +-
 .../query/ConnectionQueryServicesImpl.java  |   2 +-
 .../query/ConnectionlessQueryServicesImpl.java  |   2 +-
 .../transaction/OmidTransactionProvider.java|  78 +
 .../transaction/TephraTransactionProvider.java  |  76 
 .../phoenix/transaction/TransactionFactory.java | 117 ++-
 .../transaction/TransactionProvider.java|  36 ++
 .../org/apache/phoenix/util/PhoenixRuntime.java |   2 +-
 .../apache/phoenix/util/TransactionUtil.java|   4 +-
 .../java/org/apache/phoenix/query/BaseTest.java |   6 +-
 16 files changed, 218 insertions(+), 131 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/af0f68b9/phoenix-core/src/it/java/org/apache/phoenix/tx/FlappingTransactionIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/tx/FlappingTransactionIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/tx/FlappingTransactionIT.java
index 301768b..200cf1c 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/tx/FlappingTransactionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/tx/FlappingTransactionIT.java
@@ -225,9 +225,9 @@ public class FlappingTransactionIT extends 
ParallelStatsDisabledIT {
 }
 
 PhoenixTransactionContext txContext =
-  
TransactionFactory.getTransactionFactory().getTransactionContext(pconn);
+  
TransactionFactory.getTransactionProvider().getTransactionContext(pconn);
 PhoenixTransactionalTable txTable =
-  
TransactionFactory.getTransactionFactory().getTransactionalTable(txContext, 
htable);
+  
TransactionFactory.getTransactionProvider().getTransactionalTable(txContext, 
htable);
 
 txContext.begin();
 
@@ -277,9 +277,9 @@ public class FlappingTransactionIT extends 
ParallelStatsDisabledIT {
 
 // Repeat the same as above, but this time abort the transaction
 txContext =
-  
TransactionFactory.getTransactionFactory().getTransactionContext(pconn);
+  
TransactionFactory.getTransactionProvider().getTransactionContext(pconn);
 txTable =
-  
TransactionFactory.getTransactionFactory().getTransactionalTable(txContext, 
htable);
+  
TransactionFactory.getTransactionProvider().getTransactionalTable(txContext, 
htable);
 
 txContext.begin();
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/af0f68b9/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixTransactionalProcessor.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixTransactionalProcessor.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixTransactionalProcessor.java
index ca0c997..0c26ecc 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixTransactionalProcessor.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixTransactionalProcessor.java
@@ -22,7 +22,7 @@ import org.apache.phoenix.transaction.TransactionFactory;
 public class PhoenixTransactionalProcessor extends DelegateRegionObserver {
 
 public PhoenixTransactionalProcessor() {
-
super(TransactionFactory.getTransactionFactory().getTransactionContext().getCoprocessor());
+
super(TransactionFactory.getTransactionProvider().getTransactionContext().getCoprocessor());
 }
 
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/af0f68b9/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

[3/5] phoenix git commit: PHOENIX-4660 Use TransactionProvider interface

2018-03-23 Thread pboado 
PHOENIX-4660 Use TransactionProvider interface


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/af0f68b9
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/af0f68b9
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/af0f68b9

Branch: refs/heads/4.x-cdh5.13
Commit: af0f68b919087553f9356142c223829ae5cf1bff
Parents: c1827f2
Author: James Taylor 
Authored: Sat Mar 17 22:16:24 2018 +
Committer: Pedro Boado 
Committed: Fri Mar 23 21:31:53 2018 +

--
 .../phoenix/tx/FlappingTransactionIT.java   |   8 +-
 .../PhoenixTransactionalProcessor.java  |   2 +-
 .../apache/phoenix/execute/MutationState.java   |   8 +-
 .../PhoenixTxIndexMutationGenerator.java|   2 +-
 .../apache/phoenix/index/IndexMaintainer.java   |   2 +-
 .../index/IndexMetaDataCacheFactory.java|   2 +-
 .../index/PhoenixIndexMetaDataBuilder.java  |   2 +-
 .../query/ConnectionQueryServicesImpl.java  |   2 +-
 .../query/ConnectionlessQueryServicesImpl.java  |   2 +-
 .../transaction/OmidTransactionProvider.java|  78 +
 .../transaction/TephraTransactionProvider.java  |  76 
 .../phoenix/transaction/TransactionFactory.java | 117 ++-
 .../transaction/TransactionProvider.java|  36 ++
 .../org/apache/phoenix/util/PhoenixRuntime.java |   2 +-
 .../apache/phoenix/util/TransactionUtil.java|   4 +-
 .../java/org/apache/phoenix/query/BaseTest.java |   6 +-
 16 files changed, 218 insertions(+), 131 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/af0f68b9/phoenix-core/src/it/java/org/apache/phoenix/tx/FlappingTransactionIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/tx/FlappingTransactionIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/tx/FlappingTransactionIT.java
index 301768b..200cf1c 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/tx/FlappingTransactionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/tx/FlappingTransactionIT.java
@@ -225,9 +225,9 @@ public class FlappingTransactionIT extends 
ParallelStatsDisabledIT {
 }
 
 PhoenixTransactionContext txContext =
-  
TransactionFactory.getTransactionFactory().getTransactionContext(pconn);
+  
TransactionFactory.getTransactionProvider().getTransactionContext(pconn);
 PhoenixTransactionalTable txTable =
-  
TransactionFactory.getTransactionFactory().getTransactionalTable(txContext, 
htable);
+  
TransactionFactory.getTransactionProvider().getTransactionalTable(txContext, 
htable);
 
 txContext.begin();
 
@@ -277,9 +277,9 @@ public class FlappingTransactionIT extends 
ParallelStatsDisabledIT {
 
 // Repeat the same as above, but this time abort the transaction
 txContext =
-  
TransactionFactory.getTransactionFactory().getTransactionContext(pconn);
+  
TransactionFactory.getTransactionProvider().getTransactionContext(pconn);
 txTable =
-  
TransactionFactory.getTransactionFactory().getTransactionalTable(txContext, 
htable);
+  
TransactionFactory.getTransactionProvider().getTransactionalTable(txContext, 
htable);
 
 txContext.begin();
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/af0f68b9/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixTransactionalProcessor.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixTransactionalProcessor.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixTransactionalProcessor.java
index ca0c997..0c26ecc 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixTransactionalProcessor.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixTransactionalProcessor.java
@@ -22,7 +22,7 @@ import org.apache.phoenix.transaction.TransactionFactory;
 public class PhoenixTransactionalProcessor extends DelegateRegionObserver {
 
 public PhoenixTransactionalProcessor() {
-
super(TransactionFactory.getTransactionFactory().getTransactionContext().getCoprocessor());
+
super(TransactionFactory.getTransactionProvider().getTransactionContext().getCoprocessor());
 }
 
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/af0f68b9/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

[3/5] phoenix git commit: PHOENIX-4660 Use TransactionProvider interface

2018-03-23 Thread pboado 
PHOENIX-4660 Use TransactionProvider interface


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/af0f68b9
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/af0f68b9
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/af0f68b9

Branch: refs/heads/4.x-cdh5.12
Commit: af0f68b919087553f9356142c223829ae5cf1bff
Parents: c1827f2
Author: James Taylor 
Authored: Sat Mar 17 22:16:24 2018 +
Committer: Pedro Boado 
Committed: Fri Mar 23 21:31:53 2018 +

--
 .../phoenix/tx/FlappingTransactionIT.java   |   8 +-
 .../PhoenixTransactionalProcessor.java  |   2 +-
 .../apache/phoenix/execute/MutationState.java   |   8 +-
 .../PhoenixTxIndexMutationGenerator.java|   2 +-
 .../apache/phoenix/index/IndexMaintainer.java   |   2 +-
 .../index/IndexMetaDataCacheFactory.java|   2 +-
 .../index/PhoenixIndexMetaDataBuilder.java  |   2 +-
 .../query/ConnectionQueryServicesImpl.java  |   2 +-
 .../query/ConnectionlessQueryServicesImpl.java  |   2 +-
 .../transaction/OmidTransactionProvider.java|  78 +
 .../transaction/TephraTransactionProvider.java  |  76 
 .../phoenix/transaction/TransactionFactory.java | 117 ++-
 .../transaction/TransactionProvider.java|  36 ++
 .../org/apache/phoenix/util/PhoenixRuntime.java |   2 +-
 .../apache/phoenix/util/TransactionUtil.java|   4 +-
 .../java/org/apache/phoenix/query/BaseTest.java |   6 +-
 16 files changed, 218 insertions(+), 131 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/af0f68b9/phoenix-core/src/it/java/org/apache/phoenix/tx/FlappingTransactionIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/tx/FlappingTransactionIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/tx/FlappingTransactionIT.java
index 301768b..200cf1c 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/tx/FlappingTransactionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/tx/FlappingTransactionIT.java
@@ -225,9 +225,9 @@ public class FlappingTransactionIT extends 
ParallelStatsDisabledIT {
 }
 
 PhoenixTransactionContext txContext =
-  
TransactionFactory.getTransactionFactory().getTransactionContext(pconn);
+  
TransactionFactory.getTransactionProvider().getTransactionContext(pconn);
 PhoenixTransactionalTable txTable =
-  
TransactionFactory.getTransactionFactory().getTransactionalTable(txContext, 
htable);
+  
TransactionFactory.getTransactionProvider().getTransactionalTable(txContext, 
htable);
 
 txContext.begin();
 
@@ -277,9 +277,9 @@ public class FlappingTransactionIT extends 
ParallelStatsDisabledIT {
 
 // Repeat the same as above, but this time abort the transaction
 txContext =
-  
TransactionFactory.getTransactionFactory().getTransactionContext(pconn);
+  
TransactionFactory.getTransactionProvider().getTransactionContext(pconn);
 txTable =
-  
TransactionFactory.getTransactionFactory().getTransactionalTable(txContext, 
htable);
+  
TransactionFactory.getTransactionProvider().getTransactionalTable(txContext, 
htable);
 
 txContext.begin();
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/af0f68b9/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixTransactionalProcessor.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixTransactionalProcessor.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixTransactionalProcessor.java
index ca0c997..0c26ecc 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixTransactionalProcessor.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixTransactionalProcessor.java
@@ -22,7 +22,7 @@ import org.apache.phoenix.transaction.TransactionFactory;
 public class PhoenixTransactionalProcessor extends DelegateRegionObserver {
 
 public PhoenixTransactionalProcessor() {
-
super(TransactionFactory.getTransactionFactory().getTransactionContext().getCoprocessor());
+
super(TransactionFactory.getTransactionProvider().getTransactionContext().getCoprocessor());
 }
 
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/af0f68b9/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