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 12:29:43 UTC
[1/4] git commit: Remove unused (and slightly broken)
ColumnIdentifier.compareTo
Repository: cassandra
Updated Branches:
refs/heads/trunk f1075586e -> 54760888c
Remove unused (and slightly broken) ColumnIdentifier.compareTo
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c0c2de53
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c0c2de53
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c0c2de53
Branch: refs/heads/trunk
Commit: c0c2de53a075e00f3ee8b32db23a3cb3b289943a
Parents: 72203c5
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Apr 25 12:23:55 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Apr 25 12:26:36 2014 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/ColumnIdentifier.java | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0c2de53/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java b/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
index 495915e..b4cb9e0 100644
--- a/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
+++ b/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
@@ -28,7 +28,7 @@ import org.apache.cassandra.cql3.statements.RawSelector;
/**
* Represents an identifer for a CQL column definition.
*/
-public class ColumnIdentifier implements RawSelector, Comparable<ColumnIdentifier>
+public class ColumnIdentifier implements RawSelector
{
public final ByteBuffer key;
private final String text;
@@ -39,7 +39,7 @@ public class ColumnIdentifier implements RawSelector, Comparable<ColumnIdentifie
this.key = ByteBufferUtil.bytes(this.text);
}
- public ColumnIdentifier(ByteBuffer key, AbstractType type)
+ public ColumnIdentifier(ByteBuffer key, AbstractType<?> type)
{
this.key = key;
this.text = type.getString(key);
@@ -65,9 +65,4 @@ public class ColumnIdentifier implements RawSelector, Comparable<ColumnIdentifie
{
return text;
}
-
- public int compareTo(ColumnIdentifier other)
- {
- return key.compareTo(other.key);
- }
}
[4/4] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by sl...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/54760888
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54760888
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/54760888
Branch: refs/heads/trunk
Commit: 54760888c83e975caa3b833fd33c205896d8883a
Parents: f107558 4410edf
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Apr 25 12:29:36 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Apr 25 12:29:36 2014 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/ColumnIdentifier.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[3/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by sl...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4410edf0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4410edf0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4410edf0
Branch: refs/heads/trunk
Commit: 4410edf0e8c78adcaace151abed5903ebd519d3a
Parents: 8cb81f7 082bfc9
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Apr 25 12:29:21 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Apr 25 12:29:21 2014 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/ColumnIdentifier.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4410edf0/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
index 0b710ba,a8a25cf..3bf3acc
--- a/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
+++ b/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
@@@ -41,19 -35,13 +41,19 @@@ public class ColumnIdentifier implement
public ColumnIdentifier(String rawText, boolean keepCase)
{
this.text = keepCase ? rawText : rawText.toLowerCase(Locale.US);
- this.key = ByteBufferUtil.bytes(this.text);
+ this.bytes = ByteBufferUtil.bytes(this.text);
+ }
+
- public ColumnIdentifier(ByteBuffer bytes, AbstractType type)
++ public ColumnIdentifier(ByteBuffer bytes, AbstractType<?> type)
+ {
+ this.bytes = bytes;
+ this.text = type.getString(bytes);
}
- public ColumnIdentifier(ByteBuffer key, AbstractType<?> type)
+ private ColumnIdentifier(ByteBuffer bytes, String text)
{
- this.key = key;
- this.text = type.getString(key);
+ this.bytes = bytes;
+ this.text = text;
}
@Override
[2/4] 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/ColumnIdentifier.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/082bfc9e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/082bfc9e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/082bfc9e
Branch: refs/heads/trunk
Commit: 082bfc9ee6dc6db5314b0262430d3c8b8435a3a3
Parents: 86382f6 c0c2de5
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Apr 25 12:28:04 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Apr 25 12:28:04 2014 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/ColumnIdentifier.java | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/082bfc9e/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
index 330eec0,b4cb9e0..a8a25cf
--- a/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
+++ b/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
@@@ -27,7 -26,9 +27,7 @@@ import org.apache.cassandra.utils.ByteB
/**
* Represents an identifer for a CQL column definition.
*/
- public class ColumnIdentifier implements Selectable, Comparable<ColumnIdentifier>
-public class ColumnIdentifier implements RawSelector
++public class ColumnIdentifier implements Selectable
{
public final ByteBuffer key;
private final String text;