tiny fixes, rename type -> batchType to not confuse it with type() an…

…d fix Batch weight calculation
krummas · Aug 31, 2018 · 7d5425e · 7d5425e
1 parent 8385b17
commit 7d5425e
Showing 1 changed file with 7 additions and 6 deletions.
diff --git 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<String> queries;
         private final List<List<ByteBuffer>> values;
 
-        public Batch(BatchStatement.Type type,
+        public Batch(BatchStatement.Type batchType,
                      List<String> queries,
                      List<List<ByteBuffer>> 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)