cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [1/5] git commit: Merge branch 'cassandra-1.1' into trunk
Date Thu, 03 May 2012 07:30:04 GMT
Updated Branches:
  refs/heads/trunk 4279ce466 -> a0f5dc515


Merge branch 'cassandra-1.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java


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

Branch: refs/heads/trunk
Commit: a0f5dc5156b0d6fe393194cc99a263defcad1311
Parents: 4279ce4 6d38881
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Thu May 3 09:29:50 2012 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Thu May 3 09:29:50 2012 +0200

----------------------------------------------------------------------
 CHANGES.txt                                        |    6 +-
 .../org/apache/cassandra/cql/SelectStatement.java  |    2 -
 src/java/org/apache/cassandra/cql3/CFPropDefs.java |    1 +
 src/java/org/apache/cassandra/cql3/Cql.g           |   44 ++++++--
 .../cql3/statements/AlterTableStatement.java       |    7 +-
 .../cassandra/cql3/statements/BatchStatement.java  |   16 ++-
 .../statements/CreateColumnFamilyStatement.java    |   28 ++++-
 .../cassandra/cql3/statements/DeleteStatement.java |   13 ++-
 .../cql3/statements/ModificationStatement.java     |    3 +
 .../cassandra/cql3/statements/SelectStatement.java |   90 ++++++++++-----
 .../cassandra/cql3/statements/UpdateStatement.java |   17 ++-
 .../org/apache/cassandra/db/marshal/DateType.java  |   15 ++-
 .../apache/cassandra/db/marshal/TimeUUIDType.java  |   27 +----
 13 files changed, 176 insertions(+), 93 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0f5dc51/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0f5dc51/src/java/org/apache/cassandra/cql/SelectStatement.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0f5dc51/src/java/org/apache/cassandra/cql3/CFPropDefs.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0f5dc51/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0f5dc51/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0f5dc51/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
index b774475,9ee0f94..c034ad2
--- a/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
@@@ -131,9 -135,10 +134,10 @@@ public class CreateColumnFamilyStatemen
  
          private final List<ColumnIdentifier> keyAliases = new ArrayList<ColumnIdentifier>();
          private final List<ColumnIdentifier> columnAliases = new ArrayList<ColumnIdentifier>();
+         private final Map<ColumnIdentifier, Boolean> definedOrdering = new HashMap<ColumnIdentifier,
Boolean>();
  
          private boolean useCompactStorage;
 -        private Multiset<ColumnIdentifier> definedNames = HashMultiset.create(1);
 +        private final Multiset<ColumnIdentifier> definedNames = HashMultiset.create(1);
  
          public RawStatement(CFName name)
          {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0f5dc51/src/java/org/apache/cassandra/cql3/statements/DeleteStatement.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0f5dc51/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0f5dc51/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0f5dc51/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0f5dc51/src/java/org/apache/cassandra/db/marshal/DateType.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0f5dc51/src/java/org/apache/cassandra/db/marshal/TimeUUIDType.java
----------------------------------------------------------------------


Mime
View raw message