Different Cassandra logging for easier cut and paste.

Author: Tom May

plugins/cassandra/src/main/java/org/elasticsearch/cassandra/blobstore/AbstractCassandraBlobContainer.java

@@ -75,7 +75,7 @@ public AbstractCassandraBlobContainer(BlobPath path, CassandraBlobStore blobStor
     }
 
     @Override public boolean blobExists(String blobName) {
-        logger.debug("TODO blobExists blobKey={}", blobKey(blobName));
+        logger.debug("TODO blobExists {}", blobKey(blobName));
         try {
             Cassandra.Client client =
                 CassandraClientFactory.getCassandraClient();
@@ -95,7 +95,7 @@ public AbstractCassandraBlobContainer(BlobPath path, CassandraBlobStore blobStor
     }
 
     @Override public boolean deleteBlob(String blobName) throws IOException {
-        logger.debug("deleteBlob blobKey={}", blobKey(blobName));
+        logger.debug("deleteBlob {}", blobKey(blobName));
         Cassandra.Client client =
             CassandraClientFactory.getCassandraClient();
         try {
@@ -142,7 +142,7 @@ public AbstractCassandraBlobContainer(BlobPath path, CassandraBlobStore blobStor
     }
 
     @Override public void readBlob(final String blobName, final ReadBlobListener listener) {
-        logger.debug("readBlob blobKey={}", blobKey(blobName));
+        logger.debug("readBlob {}", blobKey(blobName));
         blobStore.executor().execute(new Runnable() {
             @Override public void run() {
                 Cassandra.Client client = null;
@@ -172,13 +172,13 @@ private void readBlob(Cassandra.Client client, String blobName, ReadBlobListener
             ConsistencyLevel.QUORUM);
         Column column = columnOrSuperColumn.getColumn();
         byte[] blobData = column.getValue();
-        logger.debug("Read {}, {} bytes", blobKey(blobName), blobData.length);
+        logger.debug("Read {} bytes: {}", blobKey(blobName), blobData.length);
         listener.onPartial(blobData, 0, blobData.length);
         listener.onCompleted();
     }
 
     @Override public ImmutableMap<String, BlobMetaData> listBlobsByPrefix(@Nullable String blobNamePrefix) throws IOException {
-        logger.debug("listBlobsByPrefix blobNamePrefix={}", blobKey(blobNamePrefix));
+        logger.debug("listBlobsByPrefix {}", blobKey(blobNamePrefix));
 
         List<ColumnOrSuperColumn> columns;
         Cassandra.Client client = CassandraClientFactory.getCassandraClient();
@@ -216,7 +216,7 @@ private void readBlob(Cassandra.Client client, String blobName, ReadBlobListener
             Column column = columnOrSuperColumn.getColumn();
             String name = new String(column.getName(), utf8);
             long length = Integer.parseInt(new String(column.getValue(), utf8));
-            logger.debug("name: {}, length: {}", name, length);
+            logger.debug("name: {} length: {}", name, length);
             if (blobNamePrefix == null || name.startsWith(blobNamePrefix)) {
                 blobsBuilder.put(name, new PlainBlobMetaData(name, length));
             }

plugins/cassandra/src/main/java/org/elasticsearch/cassandra/blobstore/CassandraBlobStore.java

@@ -51,7 +51,7 @@ public CassandraBlobStore(Settings settings, Executor executor) {
 
         this.bufferSizeInBytes = (int) settings.getAsBytesSize("buffer_size", new ByteSizeValue(100, ByteSizeUnit.KB)).bytes();
 
-        logger.debug("CassandraBlobStore executor={}, bufferSizeInBytes={}", executor, bufferSizeInBytes);
+        logger.debug("CassandraBlobStore executor: {} bufferSizeInBytes: {}", executor, bufferSizeInBytes);
     }
 
     @Override public String toString() {
@@ -73,7 +73,7 @@ public int bufferSizeInBytes() {
     }
 
     @Override public void delete(BlobPath path) {
-        logger.debug("TODO delete path={}", path);
+        logger.debug("TODO delete {}", path);
         /* XXX TODO
         ObjectListing prevListing = null;
         while (true) {

plugins/cassandra/src/main/java/org/elasticsearch/cassandra/blobstore/CassandraImmutableBlobContainer.java

@@ -61,7 +61,7 @@ public CassandraImmutableBlobContainer(BlobPath path, CassandraBlobStore blobSto
         blobStore.executor().execute(new Runnable() {
             @Override public void run() {
                 try {
-                    logger.debug("writeBlob blobKey={}, sizeInBytes={}", blobKey(blobName), sizeInBytes);
+                    logger.debug("writeBlob {} sizeInBytes: {}", blobKey(blobName), sizeInBytes);
                     Cassandra.Client client =
                         CassandraClientFactory.getCassandraClient();
                     try {