fix(jdbc-sink): fill exception error message if it is null (#15261)

risingwavelabs · Feb 26, 2024 · 461f454 · 461f454
1 parent f4da2e8
commit 461f454
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/...nnector-service/src/main/java/com/risingwave/connector/JniSinkWriterResponseObserver.java b/...nnector-service/src/main/java/com/risingwave/connector/JniSinkWriterResponseObserver.java
@@ -41,11 +41,12 @@ public void onNext(ConnectorServiceProto.SinkWriterStreamResponse response) {
 
     @Override
     public void onError(Throwable throwable) {
-        if (!Binding.sendSinkWriterErrorToChannel(this.responseTxPtr, throwable.getMessage())) {
+        LOG.error("JniSinkWriterHandler onError: ", throwable);
+        var errMsg = throwable.getMessage() == null ? "unknown error" : throwable.getMessage();
+        if (!Binding.sendSinkWriterErrorToChannel(this.responseTxPtr, errMsg)) {
             LOG.warn("unable to send error: {}", throwable.getMessage());
         }
         this.success = false;
-        LOG.error("JniSinkWriterHandler onError: ", throwable);
     }
 
     @Override

diff --git a/.../connector-node/risingwave-sink-jdbc/src/main/java/com/risingwave/connector/JDBCSink.java b/.../connector-node/risingwave-sink-jdbc/src/main/java/com/risingwave/connector/JDBCSink.java
@@ -64,7 +64,11 @@ public JDBCSink(JDBCSinkConfig config, TableSchema tableSchema) {
                 var columnName = tableSchema.getColumnNames()[columnIdx];
                 columnSqlTypes[columnIdx] = columnTypeMapping.get(columnName);
             }
-            LOG.info("columnSqlTypes: {}", Arrays.toString(columnSqlTypes));
+            LOG.info(
+                    "schema = {}, table = {}: columnSqlTypes = {}",
+                    config.getSchemaName(),
+                    config.getTableName(),
+                    Arrays.toString(columnSqlTypes));
 
             if (factory.isPresent()) {
                 this.jdbcDialect = factory.get().create(columnSqlTypes);
@@ -105,7 +109,11 @@ private static Map<String, Integer> getColumnTypeMapping(
                             String.format(ERROR_REPORT_TEMPLATE, e.getSQLState(), e.getMessage()))
                     .asRuntimeException();
         }
-        LOG.info("detected column type mapping {}", columnTypeMap);
+        LOG.info(
+                "schema = {}, table = {}: detected column type mapping = {}",
+                schemaName,
+                tableName,
+                columnTypeMap);
         return columnTypeMap;
     }
 
@@ -123,7 +131,11 @@ private static List<String> getPkColumnNames(
                             String.format(ERROR_REPORT_TEMPLATE, e.getSQLState(), e.getMessage()))
                     .asRuntimeException();
         }
-        LOG.info("detected pk column {}", pkColumnNames);
+        LOG.info(
+                "schema = {}, table = {}: detected pk column = {}",
+                schemaName,
+                tableName,
+                pkColumnNames);
         return pkColumnNames;
     }