[2/5] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

[aleksey]

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
        src/java/org/apache/cassandra/cql3/CFDefinition.java


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

Branch: refs/heads/trunk
Commit: 98dcde10320d3b4b57cdd73b86d21178eab1c8cb
Parents: 082bfc9 08a9d38
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Fri Apr 25 15:40:57 2014 +0200
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Fri Apr 25 15:40:57 2014 +0200

----------------------------------------------------------------------
 src/java/org/apache/cassandra/cql3/CFDefinition.java | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/98dcde10/src/java/org/apache/cassandra/cql3/CFDefinition.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/CFDefinition.java
index b589a95,47de4dd..3266c95
--- a/src/java/org/apache/cassandra/cql3/CFDefinition.java
+++ b/src/java/org/apache/cassandra/cql3/CFDefinition.java
@@@ -39,15 -39,23 +39,23 @@@ public class CFDefinition implements It
  {
      public static final AbstractType<?> definitionType = UTF8Type.instance;
  
 -    private static final String DEFAULT_KEY_ALIAS = "key";
 -    private static final String DEFAULT_COLUMN_ALIAS = "column";
 -    private static final String DEFAULT_VALUE_ALIAS = "value";
 -
 -    public final CFMetaData cfm;
 -    // LinkedHashMap because the order does matter (it is the order in the 
composite type)
 -    public final LinkedHashMap<ColumnIdentifier, Name> keys = new 
LinkedHashMap<ColumnIdentifier, Name>();
 -    public final LinkedHashMap<ColumnIdentifier, Name> columns = new 
LinkedHashMap<ColumnIdentifier, Name>();
 -    public final Name value;
 -    // Keep metadata lexicographically ordered so that wildcard expansion 
have a deterministic order
 -    public final Map<ColumnIdentifier, Name> metadata = new 
TreeMap<ColumnIdentifier, Name>(new Comparator<ColumnIdentifier>()
++    // Keep static and regular columns lexicographically ordered so that 
wildcard expansion have a deterministic order
++    private static final Comparator<ColumnIdentifier> identifierComparator = 
new Comparator<ColumnIdentifier>()
+     {
+         public int compare(ColumnIdentifier id1, ColumnIdentifier id2)
+         {
+             return ByteBufferUtil.compareUnsigned(id1.key, id2.key);
+         }
 -    });;
++    };
 +
 +    public final CFMetaData cfm;
 +    // LinkedHashMap because the order does matter (it is the order in the 
composite type)
 +    private final LinkedHashMap<ColumnIdentifier, Name> partitionKeys = new 
LinkedHashMap<ColumnIdentifier, Name>();
 +    private final LinkedHashMap<ColumnIdentifier, Name> clusteringColumns = 
new LinkedHashMap<ColumnIdentifier, Name>();
 +    private final Name compactValue;
 +    // Keep metadata lexicographically ordered so that wildcard expansion 
have a deterministic order
-     private final Map<ColumnIdentifier, Name> staticColumns = new 
TreeMap<ColumnIdentifier, Name>();
-     private final Map<ColumnIdentifier, Name> regularColumns = new 
TreeMap<ColumnIdentifier, Name>();
++    private final Map<ColumnIdentifier, Name> staticColumns = new 
TreeMap<ColumnIdentifier, Name>(identifierComparator);
++    private final Map<ColumnIdentifier, Name> regularColumns = new 
TreeMap<ColumnIdentifier, Name>(identifierComparator);
  
      public final boolean isComposite;
      public final boolean hasCompositeKey;