You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2014/04/25 15:41:15 UTC
[1/2] git commit: Add back ColumnIdentifier comparison since we do
use it
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 082bfc9ee -> 98dcde103
Add back ColumnIdentifier comparison since we do use it
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/08a9d384
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/08a9d384
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/08a9d384
Branch: refs/heads/cassandra-2.0
Commit: 08a9d384d87d472d7f8383fa1d9b457190309b27
Parents: c0c2de5
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Apr 25 15:37:50 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Apr 25 15:37:50 2014 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/CFDefinition.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/08a9d384/src/java/org/apache/cassandra/cql3/CFDefinition.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/CFDefinition.java b/src/java/org/apache/cassandra/cql3/CFDefinition.java
index 6565a85..47de4dd 100644
--- a/src/java/org/apache/cassandra/cql3/CFDefinition.java
+++ b/src/java/org/apache/cassandra/cql3/CFDefinition.java
@@ -49,7 +49,13 @@ public class CFDefinition implements Iterable<CFDefinition.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>();
+ public final Map<ColumnIdentifier, Name> metadata = new TreeMap<ColumnIdentifier, Name>(new Comparator<ColumnIdentifier>()
+ {
+ public int compare(ColumnIdentifier id1, ColumnIdentifier id2)
+ {
+ return ByteBufferUtil.compareUnsigned(id1.key, id2.key);
+ }
+ });;
public final boolean isComposite;
public final boolean hasCompositeKey;
[2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by sl...@apache.org.
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/cassandra-2.0
Commit: 98dcde10320d3b4b57cdd73b86d21178eab1c8cb
Parents: 082bfc9 08a9d38
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Apr 25 15:40:57 2014 +0200
Committer: Sylvain Lebresne <sy...@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;