Skip to content

Commit 720172f

Browse files
committed
Rename ip to inner_product and update properties and README
1 parent 14e9cd1 commit 720172f

5 files changed

Lines changed: 21 additions & 16 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ nbdist/
257257
!/libs/PolySqlParser-1.0.jar
258258

259259
/results.csv
260+
/results-pg.csv
260261
/recall-groundtruth.csv
261262

262263
# humble video libraries

src/main/java/org/polypheny/simpleclient/scenario/vectorbench/queryBuilder/postgres/ddl/PgCreateRealFeatureIndex.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ private static String toOpClass( String metric ) {
5454
case "cosine" -> "vector_cosine_ops";
5555
case "l2" -> "vector_l2_ops";
5656
case "l1" -> "vector_l1_ops";
57-
case "ip" -> "vector_ip_ops";
57+
case "inner_product" -> "vector_ip_ops";
5858
default -> throw new IllegalArgumentException( "Provided metric is invalid: " + metric );
5959
};
6060
}

src/main/java/org/polypheny/simpleclient/scenario/vectorbench/queryBuilder/postgres/dql/PgSimpleKnnRealFeature.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ private static String toOperator( String metric ) {
5555
case "cosine" -> "<=>";
5656
case "l2" -> "<->";
5757
case "l1" -> "<+>";
58-
case "ip" -> "<#>";
58+
case "inner_product" -> "<#>";
5959
default -> throw new IllegalArgumentException( "Provided metric is invalid: " + metric );
6060
};
6161
}

src/main/java/org/polypheny/simpleclient/scenario/vectorbench/queryBuilder/postgres/dql/PgSimpleKnnRealFeatureFiltered.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ private static String toOperator( String metric ) {
5858
case "cosine" -> "<=>";
5959
case "l2" -> "<->";
6060
case "l1" -> "<+>";
61-
case "ip" -> "<#>";
61+
case "inner_product" -> "<#>";
6262
default -> throw new IllegalArgumentException( "Provided metric is invalid: " + metric );
6363
};
6464
}

src/main/resources/org/polypheny/simpleclient/scenario/vectorbench/vector.properties

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@ postgresImageVariant = Default
1111

1212
# true => DDL: REAL NOT NULL ARRAY(1,3)
1313
# false => DDL: REAL ARRAY(1,3)
14-
supportsNotNullArray=true
14+
# Note: Ignored by direct postgres path
15+
supportsNotNullArray = false
1516

1617
# False -> Does not create index
17-
useIndex = false
18+
# Note: When run in cli, vector index will not create indexes if set to false
19+
useIndex = true
1820

1921
# Query-time index parameters (direct-postgres path only, ignored on the Polypheny path).
2022
# ---------------------------------------------------------------------------------------
@@ -25,8 +27,9 @@ queryEfSearch = 40
2527
queryProbes = 1
2628
# ---------------------------------------------------------------------------------------
2729

28-
# Vector index settings, hnsw or ivfflat
29-
indexMethod = hnsw
30+
# Vector index settings,
31+
# Method: hnsw or ivfflat
32+
indexMethod = ivfflat
3033
# Only used for HNSW index
3134
indexM = 16
3235
indexEfConstruction = 64
@@ -45,7 +48,7 @@ progressReportBase = 100
4548
numberOfWarmUpIterations = 4
4649

4750
# Seeds
48-
# Note that when running using CLI and doing an index recall this should be turned off
51+
# Note: When running using CLI and doing an index recall this should be turned off
4952
useRandomSeeds = false
5053
randomSeedInsert = 46891971806236
5154
randomSeedQuery = 196033374268
@@ -65,21 +68,22 @@ numberOfMetadataKnnIntFeatureQueries = 0
6568
numberOfSimpleMetadataQueries = 10
6669

6770
# Real (float vector mapping)
68-
numberOfSimpleKnnRealFeatureQueries = 0
69-
numberOfSimpleKnnIdRealFeatureQueries = 0
70-
numberOfMetadataKnnRealFeatureQueries = 0
71+
numberOfSimpleKnnRealFeatureQueries = 10
72+
numberOfSimpleKnnIdRealFeatureQueries = 10
73+
numberOfMetadataKnnRealFeatureQueries = 10
7174
numberOfSimpleKnnRealCrossJoinQueries = 10
7275
numberOfMetadataKnnRealCrossJoinQueries = 10
73-
numberOfSimpleKnnRealFeatureFilteredQueries = 0
76+
numberOfSimpleKnnRealFeatureFilteredQueries = 10
7477

7578
# Boolean (bit vector mapping)
76-
numberOfSimpleKnnBooleanFeatureFilteredQueries = 0
77-
numberOfSimpleKnnBooleanFeatureQueries = 0
79+
numberOfSimpleKnnBooleanFeatureFilteredQueries = 10
80+
numberOfSimpleKnnBooleanFeatureQueries = 10
7881

7982

8083
limitKnnQueries = 10
81-
# L1, L2, COSINE, IP
84+
# L1, L2, COSINE, INNER_PRODUCT
8285
distanceNorm = L2
8386
# HAMMING, JACCARD
84-
booleanDistanceNorm = HAMMING
87+
booleanDistanceNorm = JACCARD
88+
# Note: When ivfflat is selected as indexMethod, JACCARD and L1 indexes are not created and the step is skipped.
8589

0 commit comments

Comments
 (0)