phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamestay...@apache.org
Subject [13/13] phoenix git commit: Merge branch '4.x-HBase-1.3' into omid2
Date Fri, 05 Oct 2018 22:21:22 GMT
Merge branch '4.x-HBase-1.3' into omid2


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

Branch: refs/heads/omid2
Commit: c6a45bcf1e842fb8261ae1bdfd6a9283a2763cae
Parents: 52e1ab5 fd9af91
Author: James Taylor <jamestaylor@apache.org>
Authored: Fri Oct 5 15:20:58 2018 -0700
Committer: James Taylor <jamestaylor@apache.org>
Committed: Fri Oct 5 15:20:58 2018 -0700

----------------------------------------------------------------------
 .../AlterMultiTenantTableWithViewsIT.java       |  25 ++-
 .../phoenix/end2end/AlterTableWithViewsIT.java  | 196 ++++++++++-------
 .../java/org/apache/phoenix/end2end/ViewIT.java |  18 +-
 .../phoenix/end2end/index/BaseIndexIT.java      |   3 +
 .../end2end/index/MutableIndexFailureIT.java    |  17 +-
 .../MutableIndexFailureWithNamespaceIT.java     |   9 +-
 .../end2end/index/PhoenixMRJobSubmitterIT.java  | 113 ++++++++++
 .../coprocessor/HashJoinRegionScanner.java      |  50 ++++-
 .../coprocessor/MetaDataEndpointImpl.java       | 208 +++++++++++--------
 .../phoenix/jdbc/PhoenixDatabaseMetaData.java   | 158 +++++++++++---
 .../phoenix/mapreduce/index/IndexTool.java      |   2 +-
 .../index/PhoenixIndexImportDirectReducer.java  |  15 +-
 .../index/automation/PhoenixMRJobSubmitter.java |  16 +-
 .../query/ConnectionQueryServicesImpl.java      |  50 +++--
 .../apache/phoenix/schema/DelegateTable.java    |   5 +
 .../apache/phoenix/schema/MetaDataClient.java   |  40 ++--
 .../org/apache/phoenix/schema/PColumnImpl.java  |   3 +-
 .../java/org/apache/phoenix/schema/PTable.java  |   6 +
 .../org/apache/phoenix/schema/PTableImpl.java   |  38 ++--
 .../transaction/OmidTransactionContext.java     |   3 +
 .../phoenix/transaction/TransactionFactory.java |   2 +-
 21 files changed, 684 insertions(+), 293 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/c6a45bcf/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionContext.java
----------------------------------------------------------------------
diff --cc phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionContext.java
index f040ac1,9edc58b..f36ef6e
--- a/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionContext.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionContext.java
@@@ -38,22 -23,13 +38,25 @@@ import org.apache.phoenix.exception.SQL
  import org.apache.phoenix.jdbc.PhoenixConnection;
  import org.apache.phoenix.schema.PTable;
  import org.apache.phoenix.transaction.TransactionFactory.Provider;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
 +import com.google.protobuf.InvalidProtocolBufferException;
 +//import org.apache.omid.tso.TSOMockModule;
  
+ import com.google.protobuf.InvalidProtocolBufferException;
+ //import org.apache.omid.tso.TSOMockModule;
+ 
  public class OmidTransactionContext implements PhoenixTransactionContext {
  
 +    private static final Logger logger = LoggerFactory.getLogger(OmidTransactionContext.class);
 +
 +    private HBaseTransactionManager tm;
 +    private HBaseTransaction tx;
 +
      public OmidTransactionContext() {
 +        this.tx = null;
 +        this.tm = null;
      }
  
      public OmidTransactionContext(PhoenixConnection connection) throws SQLException {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c6a45bcf/phoenix-core/src/main/java/org/apache/phoenix/transaction/TransactionFactory.java
----------------------------------------------------------------------
diff --cc phoenix-core/src/main/java/org/apache/phoenix/transaction/TransactionFactory.java
index 6578b69,d1d531a..0f10b37
--- a/phoenix-core/src/main/java/org/apache/phoenix/transaction/TransactionFactory.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/transaction/TransactionFactory.java
@@@ -25,8 -25,8 +25,8 @@@ import org.apache.phoenix.coprocessor.M
  
  public class TransactionFactory {
      public enum Provider {
-         TEPHRA((byte)1, TephraTransactionProvider.getInstance(), false),
+         TEPHRA((byte)1, TephraTransactionProvider.getInstance(), true),
 -        OMID((byte)2, OmidTransactionProvider.getInstance(), false);
 +        OMID((byte)2, OmidTransactionProvider.getInstance(), true);
          
          private final byte code;
          private final PhoenixTransactionProvider provider;


Mime
View raw message