phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tdsi...@apache.org
Subject [50/50] [abbrv] phoenix git commit: merged master
Date Tue, 10 Nov 2015 01:19:05 GMT
merged master


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

Branch: refs/heads/txn
Commit: b3bb2000102160d6a5eda99b72f3846c69713334
Parents: 9abc852 e1e4344
Author: Thomas D'Silva <tdsilva@salesforce.com>
Authored: Mon Nov 9 17:17:39 2015 -0800
Committer: Thomas D'Silva <tdsilva@salesforce.com>
Committed: Mon Nov 9 17:17:39 2015 -0800

----------------------------------------------------------------------
 bin/phoenix_sandbox.py                          |   4 +-
 .../apache/phoenix/end2end/AlterTableIT.java    | 109 +++++++++++++++++++
 .../apache/phoenix/schema/MetaDataClient.java   |   3 -
 3 files changed, 111 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/b3bb2000/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/phoenix/blob/b3bb2000/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
----------------------------------------------------------------------
diff --cc phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
index de408f4,82239ea..4020736
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
@@@ -2736,12 -2599,11 +2736,11 @@@ public class MetaDataClient 
                      }
                  }
  
 -                if (numPkColumnsAdded>0 && !table.getIndexes().isEmpty()) {
 +                if (!table.getIndexes().isEmpty() && (numPkColumnsAdded>0 ||
nonTxToTx)) {
                      for (PTable index : table.getIndexes()) {
-                         // TODO: verify master has fix for multiple index columns added
and unit test
 -                        incrementTableSeqNum(index, index.getType(), numPkColumnsAdded);
 +                        incrementTableSeqNum(index, index.getType(), numPkColumnsAdded,
nonTxToTx ? Boolean.TRUE : null);
                      }
 -                    tableMetaData.addAll(connection.getMutationState().toMutations().next().getSecond());
 +                    tableMetaData.addAll(connection.getMutationState().toMutations(timeStamp).next().getSecond());
                      connection.rollback();
                  }
                  long seqNum = table.getSequenceNumber();
@@@ -2981,19 -2831,16 +2980,17 @@@
                          }
                      }
                      if(!indexColumnsToDrop.isEmpty()) {
-                         // TODO: verify master has fix for multiple index columns dropped
and unit test
 -                        incrementTableSeqNum(index, index.getType(), -indexColumnsToDrop.size());
 +                        incrementTableSeqNum(index, index.getType(), -indexColumnsToDrop.size(),
null);
                          dropColumnMutations(index, indexColumnsToDrop, tableMetaData);
                      }
  
                  }
 -                tableMetaData.addAll(connection.getMutationState().toMutations().next().getSecond());
 +                Long timeStamp = table.isTransactional() ? tableRef.getTimeStamp() : null;
 +                tableMetaData.addAll(connection.getMutationState().toMutations(timeStamp).next().getSecond());
                  connection.rollback();
  
-                 // TODO: verify master has fix for multiple data columns dropped and unit
test
 -                long seqNum = incrementTableSeqNum(table, statement.getTableType(), -tableColumnsToDrop.size());
 -                tableMetaData.addAll(connection.getMutationState().toMutations().next().getSecond());
 +                long seqNum = incrementTableSeqNum(table, statement.getTableType(), -tableColumnsToDrop.size(),
null);
 +                tableMetaData.addAll(connection.getMutationState().toMutations(timeStamp).next().getSecond());
                  connection.rollback();
                  // Force table header to be first in list
                  Collections.reverse(tableMetaData);


Mime
View raw message