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

[slebresne]

Merge branch 'cassandra-2.0' into trunk

Conflicts:
        src/java/org/apache/cassandra/db/PagedRangeCommand.java
        src/java/org/apache/cassandra/db/RangeSliceCommand.java


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

Branch: refs/heads/trunk
Commit: f8138a3c2e93d4dbc92aee6455892c6acc8a010c
Parents: 1475d92 20793b0
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Tue Nov 5 16:35:19 2013 +0100
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Tue Nov 5 16:35:19 2013 +0100

----------------------------------------------------------------------
 CHANGES.txt                                            |  1 +
 .../org/apache/cassandra/db/PagedRangeCommand.java     | 13 +++++++++++--
 .../org/apache/cassandra/db/RangeSliceCommand.java     |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f8138a3c/src/java/org/apache/cassandra/db/PagedRangeCommand.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/PagedRangeCommand.java
index d813036,e152f43..0e24859
--- a/src/java/org/apache/cassandra/db/PagedRangeCommand.java
+++ b/src/java/org/apache/cassandra/db/PagedRangeCommand.java
@@@ -130,9 -138,9 +136,9 @@@ public class PagedRangeCommand extends 
              out.writeInt(cmd.rowFilter.size());
              for (IndexExpression expr : cmd.rowFilter)
              {
 -                ByteBufferUtil.writeWithShortLength(expr.column_name, out);
 -                out.writeInt(expr.op.getValue());
 +                ByteBufferUtil.writeWithShortLength(expr.column, out);
 +                out.writeInt(expr.operator.ordinal());
-                 ByteBufferUtil.writeWithLength(expr.value, out);
+                 ByteBufferUtil.writeWithShortLength(expr.value, out);
              }
  
              out.writeInt(cmd.limit);
@@@ -180,9 -191,9 +189,9 @@@
              size += TypeSizes.NATIVE.sizeof(cmd.rowFilter.size());
              for (IndexExpression expr : cmd.rowFilter)
              {
 -                size += 
TypeSizes.NATIVE.sizeofWithShortLength(expr.column_name);
 -                size += TypeSizes.NATIVE.sizeof(expr.op.getValue());
 +                size += TypeSizes.NATIVE.sizeofWithShortLength(expr.column);
 +                size += TypeSizes.NATIVE.sizeof(expr.operator.ordinal());
-                 size += TypeSizes.NATIVE.sizeofWithLength(expr.value);
+                 size += TypeSizes.NATIVE.sizeofWithShortLength(expr.value);
              }
  
              size += TypeSizes.NATIVE.sizeof(cmd.limit);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f8138a3c/src/java/org/apache/cassandra/db/RangeSliceCommand.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/RangeSliceCommand.java
index 28b86f8,4aa1595..a9a48a0
--- a/src/java/org/apache/cassandra/db/RangeSliceCommand.java
+++ b/src/java/org/apache/cassandra/db/RangeSliceCommand.java
@@@ -227,9 -308,9 +227,9 @@@ class RangeSliceCommandSerializer imple
              size += TypeSizes.NATIVE.sizeof(rsc.rowFilter.size());
              for (IndexExpression expr : rsc.rowFilter)
              {
 -                size += 
TypeSizes.NATIVE.sizeofWithShortLength(expr.column_name);
 -                size += TypeSizes.NATIVE.sizeof(expr.op.getValue());
 +                size += TypeSizes.NATIVE.sizeofWithShortLength(expr.column);
 +                size += TypeSizes.NATIVE.sizeof(expr.operator.ordinal());
-                 size += TypeSizes.NATIVE.sizeofWithLength(expr.value);
+                 size += TypeSizes.NATIVE.sizeofWithShortLength(expr.value);
              }
          }
          size += AbstractBounds.serializer.serializedSize(rsc.keyRange, 
version);