Merge pull request #1 from aerospike/develop

v1.2.0

pom.xml

@@ -11,7 +11,7 @@
     <name>aerospike-jdbc</name>
     <description>A JDBC driver for the Aerospike database</description>
     <url>https://github.com/aerospike/aerospike-jdbc</url>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
 
     <properties>
         <skipTests>true</skipTests>
@@ -25,9 +25,9 @@
         <maven-gpg-plugin.version>1.5</maven-gpg-plugin.version>
         <maven-shade-plugin.version>3.1.1</maven-shade-plugin.version>
 
-        <aerospike-client.version>5.0.5</aerospike-client.version>
-        <netty.version>4.1.58.Final</netty.version>
-        <jackson.version>2.12.0</jackson.version>
+        <aerospike-client.version>5.1.0</aerospike-client.version>
+        <netty.version>4.1.63.Final</netty.version>
+        <jackson.version>2.12.3</jackson.version>
         <presto-parser.version>347</presto-parser.version>
     </properties>
 

src/main/java/com/aerospike/jdbc/AerospikeConnection.java

@@ -1,13 +1,12 @@
 package com.aerospike.jdbc;
 
 import com.aerospike.client.AerospikeClient;
-import com.aerospike.client.Host;
 import com.aerospike.client.IAerospikeClient;
 import com.aerospike.client.policy.Policy;
 import com.aerospike.jdbc.sql.SimpleWrapper;
 import com.aerospike.jdbc.sql.type.ByteArrayBlob;
 import com.aerospike.jdbc.sql.type.StringClob;
-import com.aerospike.jdbc.util.ConnectionParametersParser;
+import com.aerospike.jdbc.util.URLParser;
 
 import java.sql.*;
 import java.util.Map;
@@ -26,9 +25,7 @@ public class AerospikeConnection implements Connection, SimpleWrapper {
 
     private static final Logger logger = Logger.getLogger(AerospikeConnection.class.getName());
 
-    private static final ConnectionParametersParser parser = new ConnectionParametersParser();
     private final String url;
-    private final Properties props;
     private final IAerospikeClient client;
     private volatile boolean readOnly = false;
     private final Properties clientInfo = new Properties();
@@ -39,10 +36,11 @@ public class AerospikeConnection implements Connection, SimpleWrapper {
 
     public AerospikeConnection(String url, Properties props) {
         this.url = url;
-        this.props = props;
-        Host[] hosts = parser.hosts(url);
-        client = new AerospikeClient(parser.policy(url, props), hosts);
-        schema.set(parser.schema(url)); // namespace
+        URLParser.parseUrl(url, props);
+        client = new AerospikeClient(
+                URLParser.getClientPolicy(), URLParser.getHosts()
+        );
+        schema.set(URLParser.getSchema()); // namespace
     }
 
     @Override
@@ -99,7 +97,7 @@ public boolean isClosed() {
     @Override
     public DatabaseMetaData getMetaData() {
         logger.info("getMetaData request");
-        return new AerospikeDatabaseMetadata(url, props, client, this);
+        return new AerospikeDatabaseMetadata(url, client, this);
     }
 
     @Override

src/main/java/com/aerospike/jdbc/AerospikeDatabaseMetadata.java

@@ -7,11 +7,16 @@
 import com.aerospike.jdbc.schema.AerospikeSchemaBuilder;
 import com.aerospike.jdbc.sql.ListRecordSet;
 import com.aerospike.jdbc.sql.SimpleWrapper;
-import com.aerospike.jdbc.util.ConnectionParametersParser;
+import com.aerospike.jdbc.util.URLParser;
 
 import java.io.IOException;
 import java.io.StringReader;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.RowIdLifetime;
+import java.sql.SQLException;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
@@ -34,7 +39,6 @@ public class AerospikeDatabaseMetadata implements DatabaseMetaData, SimpleWrappe
 
     private static final Logger logger = Logger.getLogger(AerospikeDatabaseMetadata.class.getName());
 
-    private final static ConnectionParametersParser parser = new ConnectionParametersParser();
     private final String url;
     private final Properties clientInfo;
 
@@ -47,11 +51,11 @@ public class AerospikeDatabaseMetadata implements DatabaseMetaData, SimpleWrappe
     private final Map<String, Collection<String>> tables = new ConcurrentHashMap<>();
     private final Map<String, Collection<IndexInfo>> indices = new ConcurrentHashMap<>();
 
-    public AerospikeDatabaseMetadata(String url, Properties info, IAerospikeClient client, Connection connection) {
+    public AerospikeDatabaseMetadata(String url, IAerospikeClient client, Connection connection) {
         logger.info("Init AerospikeDatabaseMetadata");
         AerospikeSchemaBuilder.cleanSchemaCache();
         this.url = url;
-        clientInfo = parser.clientInfo(url, info);
+        clientInfo = URLParser.getClientInfo();
         this.connection = connection;
         infoPolicy = client.getInfoPolicyDefault();
 

src/main/java/com/aerospike/jdbc/AerospikePreparedStatement.java

@@ -12,7 +12,12 @@
 import com.aerospike.jdbc.util.IOUtils;
 import io.prestosql.sql.parser.ParsingOptions;
 
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
 import java.math.BigDecimal;
 import java.net.URL;
 import java.sql.*;
@@ -22,7 +27,7 @@
 import java.util.Optional;
 import java.util.logging.Logger;
 
-import static com.aerospike.jdbc.util.PreparedStatementUtil.parseParameters;
+import static com.aerospike.jdbc.util.PreparedStatement.parseParameters;
 import static io.prestosql.sql.parser.ParsingOptions.DecimalLiteralTreatment.AS_DOUBLE;
 import static java.lang.String.format;
 
@@ -54,7 +59,7 @@ public ResultSet executeQuery() {
     }
 
     @Override
-    public int executeUpdate() throws SQLException {
+    public int executeUpdate() {
         logger.info("AerospikePreparedStatement executeUpdate");
         return super.executeUpdate(sql);
     }

src/main/java/com/aerospike/jdbc/AerospikeStatement.java

@@ -72,8 +72,9 @@ private AerospikeQuery parseQuery(String sql) {
     }
 
     @Override
-    public int executeUpdate(String sql) throws SQLException {
-        throw new SQLFeatureNotSupportedException("Update is not supported");
+    public int executeUpdate(String sql) {
+        executeQuery(sql);
+        return updateCount;
     }
 
     @Override

src/main/java/com/aerospike/jdbc/query/BaseQueryHandler.java

@@ -10,7 +10,6 @@
 import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 
 import static java.util.Collections.emptyList;
 
@@ -28,7 +27,8 @@ protected Bin[] getBins(AerospikeQuery query) {
         List<Bin> bins = new ArrayList<>();
         List<String> columns = query.getColumns();
         for (int i = 0; i < columns.size(); i++) {
-            bins.add(new Bin(IOUtils.stripQuotes(columns.get(i)), getBinValue(query.getValues().get(i))));
+            bins.add(new Bin(IOUtils.stripQuotes(columns.get(i)),
+                    getBinValue(query.getValues().get(i))));
         }
         return bins.toArray(new Bin[0]);
     }
@@ -45,7 +45,11 @@ protected Value getBinValue(String strValue) {
             return new Value.DoubleValue(Double.parseDouble(strValue));
         } catch (NumberFormatException ignore) {
         }
-        if (strValue.toLowerCase(Locale.ENGLISH).equals("null")) {
+        if (strValue.equalsIgnoreCase("true") ||
+                strValue.equalsIgnoreCase("false")) {
+            return Value.get(Boolean.parseBoolean(strValue));
+        }
+        if (strValue.equalsIgnoreCase("null")) {
             return Value.NULL;
         }
         return Value.get(strValue);

src/main/java/com/aerospike/jdbc/query/DeleteQueryHandler.java

@@ -2,7 +2,6 @@
 
 import com.aerospike.client.IAerospikeClient;
 import com.aerospike.client.Key;
-import com.aerospike.client.Value;
 import com.aerospike.client.policy.ScanPolicy;
 import com.aerospike.client.policy.WritePolicy;
 import com.aerospike.jdbc.model.AerospikeQuery;
@@ -33,7 +32,7 @@ public Pair<ResultSet, Integer> execute(AerospikeQuery query) {
         Object keyObject = ExpressionBuilder.fetchPrimaryKey(query.getWhere());
         final WritePolicy writePolicy = buildWritePolicy(query);
         if (Objects.nonNull(keyObject)) {
-            Key key = new Key(query.getSchema(), query.getTable(), Value.get(keyObject));
+            Key key = new Key(query.getSchema(), query.getTable(), getBinValue(keyObject.toString()));
             int count = client.delete(writePolicy, key) ? 1 : 0;
 
             return new Pair<>(emptyRecordSet(query), count);

src/main/java/com/aerospike/jdbc/query/ExpressionBuilder.java

@@ -1,6 +1,5 @@
 package com.aerospike.jdbc.query;
 
-import com.aerospike.client.Value;
 import com.aerospike.client.exp.Exp;
 import com.aerospike.client.query.RegexFlag;
 import com.aerospike.jdbc.model.OpType;
@@ -17,14 +16,10 @@ public final class ExpressionBuilder {
     private ExpressionBuilder() {
     }
 
-    public static Value fetchPrimaryKey(WhereExpression whereExpression) {
+    public static Object fetchPrimaryKey(WhereExpression whereExpression) {
         if (Objects.nonNull(whereExpression) && !whereExpression.isWrapper()) {
             if (whereExpression.getColumn().equals(defaultKeyName)) {
-                Object value = whereExpression.getValue();
-                if (isStringValue(value.toString())) {
-                    return Value.get(stripQuotes(value.toString()));
-                }
-                return Value.get(value);
+                return whereExpression.getValue();
             }
         }
         return null;

src/main/java/com/aerospike/jdbc/query/PolicyBuilder.java

@@ -5,6 +5,7 @@
 import com.aerospike.client.policy.ScanPolicy;
 import com.aerospike.client.policy.WritePolicy;
 import com.aerospike.jdbc.model.AerospikeQuery;
+import com.aerospike.jdbc.util.URLParser;
 
 import java.util.Objects;
 
@@ -14,7 +15,7 @@ private PolicyBuilder() {
     }
 
     public static ScanPolicy buildScanPolicy(AerospikeQuery query) {
-        ScanPolicy scanPolicy = new ScanPolicy();
+        ScanPolicy scanPolicy = new ScanPolicy(URLParser.getScanPolicy());
         scanPolicy.maxRecords = Objects.isNull(query.getLimit()) ? 0 : query.getLimit();
         Exp expression = ExpressionBuilder.buildExp(query.getWhere());
         scanPolicy.filterExp = Objects.isNull(expression) ? null : Exp.build(expression);
@@ -28,7 +29,7 @@ public static ScanPolicy buildScanNoBinDataPolicy(AerospikeQuery query) {
     }
 
     public static WritePolicy buildWritePolicy(AerospikeQuery query) {
-        WritePolicy writePolicy = new WritePolicy();
+        WritePolicy writePolicy = new WritePolicy(URLParser.getWritePolicy());
         writePolicy.sendKey = true;
         return writePolicy;
     }

src/main/java/com/aerospike/jdbc/query/SelectQueryHandler.java

@@ -43,12 +43,12 @@ public SelectQueryHandler(IAerospikeClient client, Statement statement) {
     @Override
     public Pair<ResultSet, Integer> execute(AerospikeQuery query) {
         columns = AerospikeSchemaBuilder.getSchema(query.getSchemaTable(), client);
-        Value pk = ExpressionBuilder.fetchPrimaryKey(query.getWhere());
+        Object keyObject = ExpressionBuilder.fetchPrimaryKey(query.getWhere());
         Pair<ResultSet, Integer> result;
         if (isCount(query)) {
             result = executeCountQuery(query);
-        } else if (Objects.nonNull(pk)) {
-            result = executeSelectByPrimaryKey(query, pk);
+        } else if (Objects.nonNull(keyObject)) {
+            result = executeSelectByPrimaryKey(query, getBinValue(keyObject.toString()));
         } else {
             result = executeScanQuery(query);
         }

src/main/java/com/aerospike/jdbc/query/UpdateQueryHandler.java

@@ -4,7 +4,6 @@
 import com.aerospike.client.Bin;
 import com.aerospike.client.IAerospikeClient;
 import com.aerospike.client.Key;
-import com.aerospike.client.Value;
 import com.aerospike.client.policy.ScanPolicy;
 import com.aerospike.client.policy.WritePolicy;
 import com.aerospike.jdbc.model.AerospikeQuery;
@@ -36,7 +35,7 @@ public Pair<ResultSet, Integer> execute(AerospikeQuery query) {
         final Bin[] bins = getBins(query);
         final WritePolicy writePolicy = buildUpdateOnlyPolicy(query);
         if (Objects.nonNull(keyObject)) {
-            Key key = new Key(query.getSchema(), query.getTable(), Value.get(keyObject));
+            Key key = new Key(query.getSchema(), query.getTable(), getBinValue(keyObject.toString()));
             try {
                 client.put(writePolicy, key, bins);
             } catch (AerospikeException e) {