FMWK-266 Ignore null keys in schema builder (#38)

aerospike · Nov 29, 2023 · 659f49a · 659f49a
1 parent 4a86ab3
commit 659f49a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/src/main/java/com/aerospike/jdbc/schema/AerospikeSchemaBuilder.java b/src/main/java/com/aerospike/jdbc/schema/AerospikeSchemaBuilder.java
@@ -48,14 +48,16 @@ public static List<DataColumn> getSchema(SchemaTableName schemaTableName, IAeros
 
             client.scanAll(policy, schemaTableName.getSchemaName(), toSet(schemaTableName.getTableName()), (key, rec) -> {
                 Map<String, Object> bins = rec.bins;
-                bins.forEach((k, value) -> {
-                    logger.fine(() -> String.format("Bin: %s -> %s", k, value));
-                    int t = getBinType(value);
-                    if (t != 0) {
-                        columnHandles.put(k, new DataColumn(schemaTableName.getSchemaName(),
-                                schemaTableName.getTableName(), t, k, k));
-                    }
-                });
+                if (bins != null) {
+                    bins.forEach((k, value) -> {
+                        logger.fine(() -> String.format("Bin: %s -> %s", k, value));
+                        int t = getBinType(value);
+                        if (k != null && t != 0) {
+                            columnHandles.put(k, new DataColumn(schemaTableName.getSchemaName(),
+                                    schemaTableName.getTableName(), t, k, k));
+                        }
+                    });
+                }
             });
 
             List<DataColumn> columns = new ArrayList<>(columnHandles.values());

diff --git a/src/main/java/com/aerospike/jdbc/sql/AerospikeRecordResultSet.java b/src/main/java/com/aerospike/jdbc/sql/AerospikeRecordResultSet.java
@@ -8,7 +8,6 @@
 import java.math.BigDecimal;
 import java.sql.Statement;
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.logging.Logger;
 
@@ -56,7 +55,7 @@ public String getString(String columnLabel) {
         if (columnLabel.equals(defaultKeyName)) {
             return getUserKey().map(Value::toString).orElse(null);
         }
-        return getBin(columnLabel).map(Objects::toString).orElse(null);
+        return getBin(columnLabel).map(Object::toString).orElse(null);
     }
 
     @Override