Prepared statement definition for new queries

polypheny · Dec 3, 2020 · d29c396 · d29c396
1 parent 6710eb0
commit d29c396
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 9 deletions.
diff --git a/...java/org/polypheny/simpleclient/scenario/knnbench/queryBuilder/SimpleKnnIdIntFeature.java b/...java/org/polypheny/simpleclient/scenario/knnbench/queryBuilder/SimpleKnnIdIntFeature.java
@@ -6,6 +6,7 @@
 import java.util.Map;
 import java.util.Random;
 import kong.unirest.HttpRequest;
+import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.polypheny.simpleclient.query.CottontailQuery;
 import org.polypheny.simpleclient.query.CottontailQuery.QueryType;
 import org.polypheny.simpleclient.query.Query;
@@ -65,9 +66,9 @@ public synchronized Query getNewQuery() {
 
     private static class SimpleKnnIdIntFeatureQuery extends Query {
 
-        private static final String SQL_1 = "SELECT id FROM knn_intfeature ORDER BY distance(feature, ARRAY";
-        private static final String SQL_2 = ", '";
-        private static final String SQL_3 = "') ASC LIMIT ";
+        private static final String SQL_1 = "SELECT id FROM knn_intfeature ORDER BY distance(feature, ";
+        private static final String SQL_2 = ", ";
+        private static final String SQL_3 = ") ASC LIMIT ";
 
         private final Integer[] target;
         private final int limit;
@@ -84,7 +85,21 @@ public SimpleKnnIdIntFeatureQuery( Integer[] target, int limit, String norm ) {
 
         @Override
         public String getSql() {
-            return SQL_1 + Arrays.toString( target ) + SQL_2 + norm + SQL_3 + limit;
+            return SQL_1 + "ARRAY" + Arrays.toString( target ) + SQL_2 + "'" + norm + "'" + SQL_3 + limit;
+        }
+
+
+        @Override
+        public String getParameterizedSqlQuery() {
+            return SQL_1 + "?" + SQL_2 + "'" + norm + "'" + SQL_3 + limit;
+        }
+
+
+        @Override
+        public Map<Integer, ImmutablePair<DataTypes, Object>> getParameterValues() {
+            Map<Integer, ImmutablePair<DataTypes, Object>> map = new HashMap<>();
+            map.put( 1, new ImmutablePair<>( DataTypes.ARRAY_INT, target ) );
+            return map;
         }
 
 

diff --git a/...ava/org/polypheny/simpleclient/scenario/knnbench/queryBuilder/SimpleKnnIdRealFeature.java b/...ava/org/polypheny/simpleclient/scenario/knnbench/queryBuilder/SimpleKnnIdRealFeature.java
@@ -6,6 +6,7 @@
 import java.util.Map;
 import java.util.Random;
 import kong.unirest.HttpRequest;
+import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.polypheny.simpleclient.query.CottontailQuery;
 import org.polypheny.simpleclient.query.CottontailQuery.QueryType;
 import org.polypheny.simpleclient.query.Query;
@@ -14,7 +15,6 @@
 import org.vitrivr.cottontail.grpc.CottontailGrpc.Entity;
 import org.vitrivr.cottontail.grpc.CottontailGrpc.FloatVector;
 import org.vitrivr.cottontail.grpc.CottontailGrpc.From;
-import org.vitrivr.cottontail.grpc.CottontailGrpc.IntVector;
 import org.vitrivr.cottontail.grpc.CottontailGrpc.Knn;
 import org.vitrivr.cottontail.grpc.CottontailGrpc.Knn.Distance;
 import org.vitrivr.cottontail.grpc.CottontailGrpc.Projection;
@@ -66,9 +66,9 @@ public synchronized Query getNewQuery() {
 
     private static class SimpleKnnIdRealFeatureQuery extends Query {
 
-        private static final String SQL_1 = "SELECT id FROM knn_realfeature ORDER BY distance(feature, ARRAY";
-        private static final String SQL_2 = ", '";
-        private static final String SQL_3 = "') ASC LIMIT ";
+        private static final String SQL_1 = "SELECT id FROM knn_realfeature ORDER BY distance(feature, ";
+        private static final String SQL_2 = ", ";
+        private static final String SQL_3 = ") ASC LIMIT ";
 
         private final Float[] target;
         private final int limit;
@@ -85,7 +85,21 @@ public SimpleKnnIdRealFeatureQuery( Float[] target, int limit, String norm ) {
 
         @Override
         public String getSql() {
-            return SQL_1 + Arrays.toString( target ) + SQL_2 + norm + SQL_3 + limit;
+            return SQL_1 + "ARRAY" + Arrays.toString( target ) + SQL_2 + "'" + norm + "'" + SQL_3 + limit;
+        }
+
+
+        @Override
+        public String getParameterizedSqlQuery() {
+            return SQL_1 + "?" + SQL_2 + "'" + norm + "'" + SQL_3 + limit;
+        }
+
+
+        @Override
+        public Map<Integer, ImmutablePair<DataTypes, Object>> getParameterValues() {
+            Map<Integer, ImmutablePair<DataTypes, Object>> map = new HashMap<>();
+            map.put( 1, new ImmutablePair<>( DataTypes.ARRAY_REAL, target ) );
+            return map;
         }