Repository: cassandra Updated Branches: refs/heads/trunk f2f2ee5bc -> 5642baf5e
don't mask fields (BatchStatement.type v. Message.type) Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5642baf5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5642baf5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5642baf5 Branch: refs/heads/trunk Commit: 5642baf5ea1899ab5168e403be75b3043f05f830 Parents: f2f2ee5 Author: Dave Brosius <[email protected]> Authored: Sat Aug 30 23:14:30 2014 -0400 Committer: Dave Brosius <[email protected]> Committed: Sat Aug 30 23:14:30 2014 -0400 ---------------------------------------------------------------------- .../apache/cassandra/transport/messages/BatchMessage.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5642baf5/src/java/org/apache/cassandra/transport/messages/BatchMessage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/messages/BatchMessage.java b/src/java/org/apache/cassandra/transport/messages/BatchMessage.java index 19fa6aa..6754119 100644 --- a/src/java/org/apache/cassandra/transport/messages/BatchMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/BatchMessage.java @@ -73,7 +73,7 @@ public class BatchMessage extends Message.Request { int queries = msg.queryOrIdList.size(); - dest.writeByte(fromType(msg.type)); + dest.writeByte(fromType(msg.batchType)); dest.writeShort(queries); for (int i = 0; i < queries; i++) @@ -137,7 +137,7 @@ public class BatchMessage extends Message.Request } }; - public final BatchStatement.Type type; + public final BatchStatement.Type batchType; public final List<Object> queryOrIdList; public final List<List<ByteBuffer>> values; public final QueryOptions options; @@ -145,7 +145,7 @@ public class BatchMessage extends Message.Request public BatchMessage(BatchStatement.Type type, List<Object> queryOrIdList, List<List<ByteBuffer>> values, QueryOptions options) { super(Message.Type.BATCH); - this.type = type; + this.batchType = type; this.queryOrIdList = queryOrIdList; this.values = values; this.options = options; @@ -210,7 +210,7 @@ public class BatchMessage extends Message.Request // Note: It's ok at this point to pass a bogus value for the number of bound terms in the BatchState ctor // (and no value would be really correct, so we prefer passing a clearly wrong one). - BatchStatement batch = new BatchStatement(-1, type, statements, Attributes.none()); + BatchStatement batch = new BatchStatement(-1, batchType, statements, Attributes.none()); Message.Response response = handler.processBatch(batch, state, batchOptions); if (tracingId != null)
