FMWK-277 Set Aerospike client logger callback (#51)

aerospike · Dec 6, 2023 · c3325ab · c3325ab
1 parent 9406b48
commit c3325ab
Show file tree

Hide file tree

Showing 8 changed files with 91 additions and 31 deletions.
diff --git a/src/main/java/com/aerospike/jdbc/AerospikeDriver.java b/src/main/java/com/aerospike/jdbc/AerospikeDriver.java
@@ -1,10 +1,17 @@
 package com.aerospike.jdbc;
 
+import com.aerospike.client.Log;
+import com.aerospike.jdbc.util.AerospikeClientLogger;
+
 import java.sql.Connection;
 import java.sql.Driver;
 import java.sql.DriverPropertyInfo;
 import java.sql.SQLException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Objects;
+import java.util.Properties;
 import java.util.logging.Logger;
 
 import static java.util.stream.Collectors.toList;
@@ -19,6 +26,9 @@ public class AerospikeDriver implements Driver {
         } catch (SQLException e) {
             throw new ExceptionInInitializerError("Can not register AerospikeDriver");
         }
+        logger.info("Set callback for Java client logs");
+        Log.Callback asLoggerCallback = new AerospikeClientLogger();
+        Log.setCallback(asLoggerCallback);
     }
 
     public Connection connect(String url, Properties info) {

diff --git a/src/main/java/com/aerospike/jdbc/async/RecordSetBatchSequenceListener.java b/src/main/java/com/aerospike/jdbc/async/RecordSetBatchSequenceListener.java
@@ -6,8 +6,12 @@
 import com.aerospike.client.query.KeyRecord;
 import com.aerospike.jdbc.model.DriverPolicy;
 
+import java.util.logging.Logger;
+
 public class RecordSetBatchSequenceListener implements BatchSequenceListener {
 
+    private static final Logger logger = Logger.getLogger(RecordSetBatchSequenceListener.class.getName());
+
     private final RecordSet recordSet;
 
     public RecordSetBatchSequenceListener(DriverPolicy driverPolicy) {
@@ -31,6 +35,7 @@ public void onSuccess() {
 
     @Override
     public void onFailure(AerospikeException e) {
+        logger.warning(e::getMessage);
         recordSet.abort();
     }
 

diff --git a/src/main/java/com/aerospike/jdbc/async/RecordSetRecordSequenceListener.java b/src/main/java/com/aerospike/jdbc/async/RecordSetRecordSequenceListener.java
@@ -7,8 +7,12 @@
 import com.aerospike.client.query.KeyRecord;
 import com.aerospike.jdbc.model.DriverPolicy;
 
+import java.util.logging.Logger;
+
 public class RecordSetRecordSequenceListener implements RecordSequenceListener {
 
+    private static final Logger logger = Logger.getLogger(RecordSetRecordSequenceListener.class.getName());
+
     private final RecordSet recordSet;
 
     public RecordSetRecordSequenceListener(DriverPolicy driverPolicy) {
@@ -30,6 +34,7 @@ public void onSuccess() {
 
     @Override
     public void onFailure(AerospikeException exception) {
+        logger.warning(exception::getMessage);
         recordSet.abort();
     }
 

diff --git a/src/main/java/com/aerospike/jdbc/query/BaseQueryHandler.java b/src/main/java/com/aerospike/jdbc/query/BaseQueryHandler.java
@@ -1,5 +1,6 @@
 package com.aerospike.jdbc.query;
 
+import com.aerospike.client.AerospikeException;
 import com.aerospike.client.Bin;
 import com.aerospike.client.IAerospikeClient;
 import com.aerospike.client.Value;
@@ -12,11 +13,17 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import static java.util.Collections.emptyList;
 
 public abstract class BaseQueryHandler implements QueryHandler {
 
+    private static final Logger logger = Logger.getLogger(BaseQueryHandler.class.getName());
+
     protected final IAerospikeClient client;
     protected final Statement statement;
     protected final PolicyBuilder policyBuilder;
@@ -45,6 +52,21 @@ protected ListRecordSet emptyRecordSet(AerospikeQuery query) {
                 emptyList(), emptyList());
     }
 
+    protected Integer getUpdateCount(Future<Integer> updateCountFuture) {
+        try {
+            return updateCountFuture.get();
+        } catch (ExecutionException e) {
+            logger.log(Level.SEVERE, "Future computation failure", e.getCause());
+        } catch (InterruptedException e) {
+            logger.log(Level.SEVERE, "Thread was interrupted", e);
+        }
+        return 0;
+    }
+
+    protected void logAerospikeException(AerospikeException e) {
+        logger.log(Level.SEVERE, "Aerospike operation failure", e);
+    }
+
     private DriverConfiguration getConfiguration() {
         try {
             return ((AerospikeConnection) statement.getConnection()).getConfiguration();

diff --git a/src/main/java/com/aerospike/jdbc/query/DeleteQueryHandler.java b/src/main/java/com/aerospike/jdbc/query/DeleteQueryHandler.java
@@ -15,7 +15,6 @@
 import java.sql.ResultSet;
 import java.sql.Statement;
 import java.util.Collection;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Logger;
 
@@ -39,15 +38,11 @@ public Pair<ResultSet, Integer> execute(AerospikeQuery query) {
                 try {
                     client.delete(EventLoopProvider.getEventLoop(), listener, writePolicy, key);
                 } catch (AerospikeException e) {
-                    logger.warning("Error on database call: " + e.getMessage());
+                    logAerospikeException(e);
                     listener.onFailure(e);
                 }
             }
-            try {
-                return new Pair<>(emptyRecordSet(query), listener.getTotal().get());
-            } catch (InterruptedException | ExecutionException e) {
-                return new Pair<>(emptyRecordSet(query), 0);
-            }
+            return new Pair<>(emptyRecordSet(query), getUpdateCount(listener.getTotal()));
         } else {
             logger.info("DELETE scan");
             RecordSetRecordSequenceListener listener = new RecordSetRecordSequenceListener(config.getDriverPolicy());
@@ -63,8 +58,8 @@ public Pair<ResultSet, Integer> execute(AerospikeQuery query) {
                 try {
                     if (client.delete(deletePolicy, r.key))
                         count.incrementAndGet();
-                } catch (Exception e) {
-                    logger.warning("Failed to delete record: " + e.getMessage());
+                } catch (AerospikeException e) {
+                    logAerospikeException(e);
                 }
             });
 

diff --git a/src/main/java/com/aerospike/jdbc/query/InsertQueryHandler.java b/src/main/java/com/aerospike/jdbc/query/InsertQueryHandler.java
@@ -16,7 +16,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
-import java.util.concurrent.ExecutionException;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -56,15 +55,11 @@ public Pair<ResultSet, Integer> putConsecutively(AerospikeQuery query) {
             try {
                 client.put(EventLoopProvider.getEventLoop(), listener, writePolicy, key, bins);
             } catch (AerospikeException e) {
-                logger.severe("Error on database call: " + e.getMessage());
+                logAerospikeException(e);
                 listener.onFailure(e);
             }
         }
-        try {
-            return new Pair<>(emptyRecordSet(query), listener.getTotal().get());
-        } catch (InterruptedException | ExecutionException e) {
-            return new Pair<>(emptyRecordSet(query), 0);
-        }
+        return new Pair<>(emptyRecordSet(query), getUpdateCount(listener.getTotal()));
     }
 
     public Pair<ResultSet, Integer> putBatch(AerospikeQuery query) {
@@ -93,15 +88,11 @@ public Pair<ResultSet, Integer> putBatch(AerospikeQuery query) {
         try {
             client.operate(EventLoopProvider.getEventLoop(), listener, batchPolicy, batchRecords);
         } catch (AerospikeException e) {
-            logger.severe("Error on database call: " + e.getMessage());
+            // no error log as this completes the future exceptionally
             listener.onFailure(e);
         }
 
-        try {
-            return new Pair<>(emptyRecordSet(query), listener.getTotal().get());
-        } catch (InterruptedException | ExecutionException e) {
-            return new Pair<>(emptyRecordSet(query), 0);
-        }
+        return new Pair<>(emptyRecordSet(query), getUpdateCount(listener.getTotal()));
     }
 
     protected Bin[] buildBinArray(List<String> binNames, List<Object> values) {

diff --git a/src/main/java/com/aerospike/jdbc/query/UpdateQueryHandler.java b/src/main/java/com/aerospike/jdbc/query/UpdateQueryHandler.java
@@ -16,7 +16,6 @@
 import java.sql.ResultSet;
 import java.sql.Statement;
 import java.util.Collection;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Logger;
 
@@ -41,15 +40,11 @@ public Pair<ResultSet, Integer> execute(AerospikeQuery query) {
                 try {
                     client.put(EventLoopProvider.getEventLoop(), listener, writePolicy, key, bins);
                 } catch (AerospikeException e) {
-                    logger.warning("Error on database call: " + e.getMessage());
+                    logAerospikeException(e);
                     listener.onFailure(e);
                 }
             }
-            try {
-                return new Pair<>(emptyRecordSet(query), listener.getTotal().get());
-            } catch (InterruptedException | ExecutionException e) {
-                return new Pair<>(emptyRecordSet(query), 0);
-            }
+            return new Pair<>(emptyRecordSet(query), getUpdateCount(listener.getTotal()));
         } else {
             logger.info("UPDATE scan");
             RecordSetRecordSequenceListener listener = new RecordSetRecordSequenceListener(config.getDriverPolicy());
@@ -64,7 +59,7 @@ public Pair<ResultSet, Integer> execute(AerospikeQuery query) {
                     client.put(writePolicy, r.key, bins);
                     count.incrementAndGet();
                 } catch (AerospikeException e) {
-                    logger.warning("Failed to update record: " + e.getMessage());
+                    logAerospikeException(e);
                 }
             });
 

diff --git a/src/main/java/com/aerospike/jdbc/util/AerospikeClientLogger.java b/src/main/java/com/aerospike/jdbc/util/AerospikeClientLogger.java
@@ -0,0 +1,37 @@
+package com.aerospike.jdbc.util;
+
+import com.aerospike.client.Log;
+
+import java.util.logging.Logger;
+
+import static java.lang.String.format;
+
+public class AerospikeClientLogger implements Log.Callback {
+
+    private static final Logger logger = Logger.getLogger(AerospikeClientLogger.class.getName());
+
+    @Override
+    public void log(Log.Level level, String message) {
+        switch (level) {
+            case DEBUG:
+                logger.fine(message);
+                break;
+
+            case INFO:
+                logger.info(message);
+                break;
+
+            case WARN:
+                logger.warning(message);
+                break;
+
+            case ERROR:
+                logger.severe(message);
+                break;
+
+            default:
+                logger.warning(() -> format("Unexpected Aerospike client log level %s. Message: %s",
+                        level, message));
+        }
+    }
+}