Cassandra logs entire blobKey instead of just the blobName.

Author: Tom May

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

@@ -71,7 +71,7 @@ public AbstractCassandraBlobContainer(BlobPath path, CassandraBlobStore blobStor
     }
 
     @Override public boolean blobExists(String blobName) {
-        logger.debug("TODO blobExists blobName={}", blobName);
+        logger.debug("TODO blobExists blobKey={}", blobKey(blobName));
         try {
             Cassandra.Client client =
                 CassandraClientFactory.getCassandraClient();
@@ -91,7 +91,7 @@ public AbstractCassandraBlobContainer(BlobPath path, CassandraBlobStore blobStor
     }
 
     @Override public boolean deleteBlob(String blobName) throws IOException {
-        logger.debug("deleteBlob blobName={}", blobName);
+        logger.debug("deleteBlob blobKey={}", blobKey(blobName));
         Cassandra.Client client =
             CassandraClientFactory.getCassandraClient();
         try {
@@ -115,7 +115,7 @@ public AbstractCassandraBlobContainer(BlobPath path, CassandraBlobStore blobStor
     }
 
     @Override public void readBlob(final String blobName, final ReadBlobListener listener) {
-        logger.debug("readBlob blobName={}", blobName);
+        logger.debug("readBlob blobKey={}", blobKey(blobName));
         blobStore.executor().execute(new Runnable() {
             @Override public void run() {
                 Cassandra.Client client = null;
@@ -145,13 +145,13 @@ private void readBlob(Cassandra.Client client, String blobName, ReadBlobListener
             ConsistencyLevel.QUORUM);
         Column column = columnOrSuperColumn.getColumn();
         byte[] blobData = column.getValue();
-        logger.debug("Read {}, {} bytes", 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={}", blobNamePrefix);
+        logger.debug("listBlobsByPrefix blobNamePrefix={}", blobKey(blobNamePrefix));
 
         List<ColumnOrSuperColumn> columns;
         Cassandra.Client client = CassandraClientFactory.getCassandraClient();

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

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