From 7d5425ee4a8dd3392be1c7276b34d107b510d731 Mon Sep 17 00:00:00 2001 From: Marcus Eriksson Date: Fri, 31 Aug 2018 17:42:46 +0200 Subject: [PATCH] tiny fixes, rename type -> batchType to not confuse it with type() and fix Batch weight calculation --- .../org/apache/cassandra/audit/FullQueryLogger.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/java/org/apache/cassandra/audit/FullQueryLogger.java b/src/java/org/apache/cassandra/audit/FullQueryLogger.java index 31e072ae5bb8..a7abcd9f3c12 100644 --- a/src/java/org/apache/cassandra/audit/FullQueryLogger.java +++ b/src/java/org/apache/cassandra/audit/FullQueryLogger.java @@ -112,11 +112,11 @@ void logQuery(String query, QueryOptions queryOptions, QueryState queryState, lo static class Batch extends AbstractLogEntry { private final int weight; - private final BatchStatement.Type type; + private final BatchStatement.Type batchType; private final List queries; private final List> values; - public Batch(BatchStatement.Type type, + public Batch(BatchStatement.Type batchType, List queries, List> values, QueryOptions queryOptions, @@ -127,12 +127,13 @@ public Batch(BatchStatement.Type type, this.queries = queries; this.values = values; - this.type = type; + this.batchType = batchType; int weight = super.weight(); - // weight, queries, values, batch type - weight += 8 + 2 * EMPTY_LIST_SIZE + 8; + weight += 4 + // weight + 2 * EMPTY_LIST_SIZE + // two lists, queries & values + 8; // enum size (batch type) for (String query : queries) weight += ObjectSizes.sizeOf(query); @@ -157,7 +158,7 @@ protected String type() public void writeMarshallable(WireOut wire) { super.writeMarshallable(wire); - wire.write(BATCH_TYPE).text(type.name()); + wire.write(BATCH_TYPE).text(batchType.name()); ValueOut valueOut = wire.write(QUERIES); valueOut.int32(queries.size()); for (String query : queries)