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/02/20 21:13:22 UTC
[1/5] git commit: Post-merge fixup
Repository: cassandra
Updated Branches:
refs/heads/trunk 262170712 -> 63e0eb4fa
Post-merge fixup
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d7019cc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d7019cc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d7019cc
Branch: refs/heads/trunk
Commit: 3d7019cc3c93acd0c4f3556f10497a2bd07c3a05
Parents: 63b1ef4
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Feb 20 21:07:08 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Feb 20 21:07:08 2014 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/composites/AbstractCType.java | 2 ++
src/java/org/apache/cassandra/db/filter/ColumnSlice.java | 5 +++++
2 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d7019cc/src/java/org/apache/cassandra/db/composites/AbstractCType.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/composites/AbstractCType.java b/src/java/org/apache/cassandra/db/composites/AbstractCType.java
index d3b8940..054706d 100644
--- a/src/java/org/apache/cassandra/db/composites/AbstractCType.java
+++ b/src/java/org/apache/cassandra/db/composites/AbstractCType.java
@@ -90,6 +90,8 @@ public abstract class AbstractCType implements CType
{
if (c1 == null || c1.isEmpty())
return c2 == null || c2.isEmpty() ? 0 : -1;
+ if (c2 == null || c2.isEmpty())
+ return 1;
if (c1.isStatic() != c2.isStatic())
return c1.isStatic() ? -1 : 1;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d7019cc/src/java/org/apache/cassandra/db/filter/ColumnSlice.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/filter/ColumnSlice.java b/src/java/org/apache/cassandra/db/filter/ColumnSlice.java
index 02a5a0c..19d26c7 100644
--- a/src/java/org/apache/cassandra/db/filter/ColumnSlice.java
+++ b/src/java/org/apache/cassandra/db/filter/ColumnSlice.java
@@ -215,6 +215,11 @@ public class ColumnSlice
return prefix.size();
}
+ public boolean isStatic()
+ {
+ return prefix.isStatic();
+ }
+
public ByteBuffer get(int i)
{
return prefix.get(i);
[5/5] 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/63e0eb4f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63e0eb4f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63e0eb4f
Branch: refs/heads/trunk
Commit: 63e0eb4faab4f06181cddd9911db9f7be93a3961
Parents: 2621707 13b753b
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Feb 20 21:13:10 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Feb 20 21:13:10 2014 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/composites/AbstractCType.java | 2 ++
src/java/org/apache/cassandra/db/filter/ColumnSlice.java | 5 +++++
.../org/apache/cassandra/db/marshal/AbstractCompositeType.java | 2 ++
src/java/org/apache/cassandra/db/marshal/LongType.java | 2 +-
4 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[3/5] git commit: Fix typos
Posted by sl...@apache.org.
Fix typos
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/edf16c95
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/edf16c95
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/edf16c95
Branch: refs/heads/trunk
Commit: edf16c950dadcf2b75c8faed33269881b58b1de6
Parents: b09d876
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Feb 20 21:11:33 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Feb 20 21:11:33 2014 +0100
----------------------------------------------------------------------
.../org/apache/cassandra/db/marshal/AbstractCompositeType.java | 2 ++
src/java/org/apache/cassandra/db/marshal/LongType.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/edf16c95/src/java/org/apache/cassandra/db/marshal/AbstractCompositeType.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/marshal/AbstractCompositeType.java b/src/java/org/apache/cassandra/db/marshal/AbstractCompositeType.java
index 9250b0f..c789d9b 100644
--- a/src/java/org/apache/cassandra/db/marshal/AbstractCompositeType.java
+++ b/src/java/org/apache/cassandra/db/marshal/AbstractCompositeType.java
@@ -76,6 +76,8 @@ public abstract class AbstractCompositeType extends AbstractType<ByteBuffer>
{
if (o1 == null || !o1.hasRemaining())
return o2 == null || !o2.hasRemaining() ? 0 : -1;
+ if (o2 == null || !o2.hasRemaining())
+ return 1;
ByteBuffer bb1 = o1.duplicate();
ByteBuffer bb2 = o2.duplicate();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/edf16c95/src/java/org/apache/cassandra/db/marshal/LongType.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/marshal/LongType.java b/src/java/org/apache/cassandra/db/marshal/LongType.java
index 142683d..9ad078e 100644
--- a/src/java/org/apache/cassandra/db/marshal/LongType.java
+++ b/src/java/org/apache/cassandra/db/marshal/LongType.java
@@ -47,7 +47,7 @@ public class LongType extends AbstractType<Long>
return 1;
}
- int diff = o1.get(o1.position() + o1.arrayOffset()) - o2.get(o2.position() + o2.arrayOffset());
+ int diff = o1.get(o1.position()) - o2.get(o2.position());
if (diff != 0)
return diff;
[2/5] git commit: Merge branch 'cassandra-2.1' of
https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1
Posted by sl...@apache.org.
Merge branch 'cassandra-2.1' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76e5c93f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76e5c93f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/76e5c93f
Branch: refs/heads/trunk
Commit: 76e5c93fb9eb6c3554a1a04fd4b5daa6e7fdbd05
Parents: 3d7019c 6ed241a
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Feb 20 21:07:27 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Feb 20 21:07:27 2014 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 +
.../cassandra/db/ArrayBackedSortedColumns.java | 126 +++++++++++--------
.../apache/cassandra/db/AtomicBTreeColumns.java | 16 ++-
.../org/apache/cassandra/db/ColumnFamily.java | 7 +-
.../AbstractSimplePerColumnSecondaryIndex.java | 19 +--
.../org/apache/cassandra/utils/btree/BTree.java | 24 +++-
6 files changed, 116 insertions(+), 78 deletions(-)
----------------------------------------------------------------------
[4/5] 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
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/13b753b0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/13b753b0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/13b753b0
Branch: refs/heads/trunk
Commit: 13b753b0169aa668c8c6091d68705a4034f7cdd4
Parents: 76e5c93 edf16c9
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Feb 20 21:11:55 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Feb 20 21:11:55 2014 +0100
----------------------------------------------------------------------
.../org/apache/cassandra/db/marshal/AbstractCompositeType.java | 2 ++
src/java/org/apache/cassandra/db/marshal/LongType.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/13b753b0/src/java/org/apache/cassandra/db/marshal/AbstractCompositeType.java
----------------------------------------------------------------------