Fix all example workloads

2024-12-22 15:13:41 -06:00 · 2024-10-03 17:01:39 -04:00 · 2024-10-03 17:01:39 -04:00 · d65408555a
commit d65408555a
parent ccc15da0f0
12 changed files with 77 additions and 34 deletions
--- a/.run/qdrant_batch_upsert_points_glove_25.run.xml
+++ b/.run/qdrant_batch_upsert_points_glove_25.run.xml
@ -0,0 +1,14 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="qdrant_batch_upsert_points_glove_25" type="JarApplication" folderName="Qdrant">
+    <extension name="software.aws.toolkits.jetbrains.core.execution.JavaAwsConnectionExtension">
+      <option name="credential" />
+      <option name="region" />
+      <option name="useCurrentConnection" value="false" />
+    </extension>
+    <option name="JAR_PATH" value="$PROJECT_DIR$/nb5/target/nb5.jar" />
+    <option name="PROGRAM_PARAMETERS" value="qdrant_vectors_live qdrant_vectors.rampup_batch dimensions=25 testsize=10000 trainsize=1 batch_size=10 dataset=glove-25-angular filetype=hdf5 collection=glove_25 similarity_function=1 qdranthost=ded78a51-8370-47d8-adb0-6147f0fcbba2.us-east4-0.gcp.cloud.qdrant.io token_file=./apikey grpc_port=6334 --progress console:1s -v --add-labels &quot;dimensions:25,dataset=glove-25&quot; --add-labels=&quot;target:qdrant,instance:vectors,vendor:qdrant_v191&quot; --report-prompush-to https://vector-perf.feat.apps.paas.datastax.com:8427/api/v1/import/prometheus/metrics/job/nosqlbench/instance/vectors --annotators &quot;[{'type':'log','level':'info'},{'type':'grafana','baseurl':'https://vector-perf.feat.apps.paas.datastax.com/'}]&quot; --report-interval 10 --show-stacktraces --logs-max 5" />
+    <option name="WORKING_DIRECTORY" value="$ProjectFileDir$/local/qdrant" />
+    <option name="ALTERNATIVE_JRE_PATH" value="jdk21" />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.run/spanner_schema_database_create.run.xml
+++ b/.run/spanner_schema_database_create.run.xml
@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="spanner_schema_database_create" type="JarApplication" folderName="Google Spanner">
+    <extension name="software.aws.toolkits.jetbrains.core.execution.JavaAwsConnectionExtension">
+      <option name="credential" />
+      <option name="region" />
+      <option name="useCurrentConnection" value="false" />
+    </extension>
+    <option name="JAR_PATH" value="$PROJECT_DIR$/nb5/target/nb5.jar" />
+    <option name="PROGRAM_PARAMETERS" value="create_database_ddl default.create_db_ddl project_id=stratperf instance_id=perftest-spanner database_id=baselines1 service_account_file=./stratperf-068083077315.json --progress console:1s -vv --add-labels=&quot;target:spanner,instance:vectors,vendor:gcp&quot; --report-prompush-to https://vector-perf.feat.apps.paas.datastax.com:8427/api/v1/import/prometheus/metrics/job/nosqlbench/instance/vectors --annotators &quot;[{'type':'log','level':'info'},{'type':'grafana','baseurl':'https://vector-perf.feat.apps.paas.datastax.com/'}]&quot; --report-interval 10 --show-stacktraces --logs-max 5" />
+    <option name="WORKING_DIRECTORY" value="$ProjectFileDir$/local/google_spanner" />
+    <option name="ALTERNATIVE_JRE_PATH" value="jdk21" />
+    <envs>
+      <env name="GOOGLE_APPLICATION_CREDENTIALS" value="$ProjectFileDir$/local/google_spanner/stratperf-068083077315.json" />
+    </envs>
+    <method v="2" />
+  </configuration>
+</component>
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@ -851,6 +851,11 @@
                    <artifactId>maven-deploy-plugin</artifactId>
                    <version>3.0.0</version>
                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>versions-maven-plugin</artifactId>
+                    <version>2.17.1</version>
+                </plugin>
            </plugins>
        </pluginManagement>
    </build>
--- a/nb-adapters/adapter-gcp-spanner/src/main/resources/activities/create_database_ddl.yaml
+++ b/nb-adapters/adapter-gcp-spanner/src/main/resources/activities/create_database_ddl.yaml
@ -1,6 +1,6 @@
 scenarios:
  default:
-    create_db_ddl: run driver=spanner tags==blocks:schema_db service_account_file=TEMPLATE(service_account_file)
+    create_db_ddl: run driver=spanner tags==block:schema_db service_account_file=TEMPLATE(service_account_file)
      project_id=TEMPLATE(project_id) instance_id=TEMPLATE(instance_id) database_id=TEMPLATE(database_id) cycles=1

 blocks:
--- a/nb-adapters/adapter-gcp-spanner/src/main/resources/activities/drop_database_ddl.yaml
+++ b/nb-adapters/adapter-gcp-spanner/src/main/resources/activities/drop_database_ddl.yaml
@ -1,6 +1,6 @@
 scenarios:
  default:
-    create_db_ddl: run driver=spanner tags==blocks:schema_drop_db service_account_file=TEMPLATE(service_account_file)
+    drop_db_ddl: run driver=spanner tags==block:schema_drop_db service_account_file=TEMPLATE(service_account_file)
      project_id=TEMPLATE(project_id) instance_id=TEMPLATE(instance_id) database_id=TEMPLATE(database_id) cycles=1

 blocks:
--- a/nb-adapters/adapter-gcp-spanner/src/main/resources/activities/execute_index_ddl.yaml
+++ b/nb-adapters/adapter-gcp-spanner/src/main/resources/activities/execute_index_ddl.yaml
@ -1,6 +1,6 @@
 scenarios:
  default:
-    execute_ddl: run driver=spanner tags==blocks:execute_ddl service_account_file=TEMPLATE(service_account_file)
+    execute_ddl: run driver=spanner tags==block:execute_ddl service_account_file=TEMPLATE(service_account_file)
      project_id=TEMPLATE(project_id) instance_id=TEMPLATE(instance_id) database_id=TEMPLATE(database_id) cycles=1

 # https://cloud.google.com/spanner/docs/reference/standard-sql/data-definition-language#vector_index_option_list
--- a/nb-adapters/adapter-gcp-spanner/src/main/resources/activities/execute_queryvector_dml.yaml
+++ b/nb-adapters/adapter-gcp-spanner/src/main/resources/activities/execute_queryvector_dml.yaml
@ -1,6 +1,6 @@
 scenarios:
  default:
-    execute_dml: run driver=spanner tags==blocks:execute_dml service_account_file=TEMPLATE(service_account_file)
+    execute_dml: run driver=spanner tags==block:execute_dml service_account_file=TEMPLATE(service_account_file)
      project_id=TEMPLATE(project_id) instance_id=TEMPLATE(instance_id) database_id=TEMPLATE(database_id) cycles=TEMPLATE(cycles)

 bindings:
--- a/nb-adapters/adapter-gcp-spanner/src/main/resources/activities/execute_table_ddl.yaml
+++ b/nb-adapters/adapter-gcp-spanner/src/main/resources/activities/execute_table_ddl.yaml
@ -1,6 +1,6 @@
 scenarios:
  default:
-    execute_ddl: run driver=spanner tags==blocks:execute_ddl service_account_file=TEMPLATE(service_account_file)
+    execute_ddl: run driver=spanner tags==block:execute_ddl service_account_file=TEMPLATE(service_account_file)
      project_id=TEMPLATE(project_id) instance_id=TEMPLATE(instance_id) database_id=TEMPLATE(database_id) cycles=1

 blocks:
--- a/nb-adapters/adapter-gcp-spanner/src/main/resources/activities/insert_vector.yaml
+++ b/nb-adapters/adapter-gcp-spanner/src/main/resources/activities/insert_vector.yaml
@ -1,7 +1,7 @@
 scenarios:
  default:
    insert_vector: >-
-      run driver=spanner tags==blocks:insert_vector service_account_file=TEMPLATE(service_account_file)
+      run driver=spanner tags==block:insert_vector service_account_file=TEMPLATE(service_account_file)
      project_id=TEMPLATE(project_id) instance_id=TEMPLATE(instance_id) database_id=TEMPLATE(database_id) cycles=TEMPLATE(cycles)

 bindings:
--- a/nb-adapters/nb-adapters-included/pom.xml
+++ b/nb-adapters/nb-adapters-included/pom.xml
@ -74,7 +74,7 @@
        <profile>
            <id>adapter-cqld4-include</id>
            <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
            </activation>
            <dependencies>
                <dependency>
@ -102,7 +102,7 @@
        <profile>
            <id>adapter-http-include</id>
            <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
            </activation>
            <dependencies>
                <dependency>
@ -130,7 +130,7 @@
        <profile>
            <id>adapter-tcp-include</id>
            <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
            </activation>
            <dependencies>
                <dependency>
@ -144,7 +144,7 @@
        <profile>
            <id>adapter-dataapi-include</id>
            <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
            </activation>
            <dependencies>
                <dependency>
@ -158,7 +158,7 @@
        <profile>
            <id>adapter-dynamodb-include</id>
            <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
            </activation>
            <dependencies>
                <dependency>
@ -172,7 +172,7 @@
        <profile>
            <id>adapter-mongodb-include</id>
            <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
            </activation>
            <dependencies>
                <dependency>
@ -186,7 +186,7 @@
        <profile>
            <id>adapter-pulsar-include</id>
            <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
            </activation>
            <dependencies>
                <dependency>
@ -200,7 +200,7 @@
        <profile>
            <id>adapter-s4j-include</id>
            <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
            </activation>
            <dependencies>
                <dependency>
@ -214,7 +214,7 @@
        <profile>
            <id>adapter-neo4j-include</id>
            <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
            </activation>
            <dependencies>
                <dependency>
@ -228,7 +228,7 @@
        <profile>
            <id>adapter-kafka-include</id>
            <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
            </activation>
            <dependencies>
                <dependency>
@ -242,7 +242,7 @@
        <profile>
            <id>adapter-amqp-include</id>
            <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
            </activation>
            <dependencies>
                <dependency>
@ -256,7 +256,7 @@
        <profile>
            <id>adapter-qdrant-include</id>
            <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
            </activation>
            <dependencies>
                <dependency>
@ -270,7 +270,7 @@
        <profile>
            <id>adapter-weaviate-include</id>
            <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
            </activation>
            <dependencies>
                <dependency>
@ -284,7 +284,7 @@
        <profile>
            <id>adapter-azure-aisearch-include</id>
            <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
            </activation>
            <dependencies>
                <dependency>
--- a/nb-adapters/pom.xml
+++ b/nb-adapters/pom.xml
@ -57,7 +57,7 @@
        <profile>
            <id>adapter-cqld4-module</id>
            <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
            </activation>
            <modules>
                <module>adapter-cqld4</module>
@ -77,7 +77,7 @@
        <profile>
            <id>adapter-http-module</id>
            <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
            </activation>
            <modules>
                <module>adapter-http</module>
@ -97,7 +97,7 @@
        <profile>
            <id>adapter-tcp-module</id>
            <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
            </activation>
            <modules>
                <module>adapter-tcp</module>
@ -107,7 +107,7 @@
        <profile>
            <id>adapter-dynamodb-module</id>
            <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
            </activation>
            <modules>
                <module>adapter-dynamodb</module>
@ -117,7 +117,7 @@
        <profile>
            <id>adapter-mongodb-module</id>
            <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
            </activation>
            <modules>
                <module>adapter-mongodb</module>
@ -127,7 +127,7 @@
        <profile>
            <id>adapter-neo4j-module</id>
            <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
            </activation>
            <modules>
                <module>adapter-neo4j</module>
@ -137,7 +137,7 @@
        <profile>
            <id>adapter-pulsar-module</id>
            <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
            </activation>
            <modules>
                <module>adapter-pulsar</module>
@ -147,7 +147,7 @@
        <profile>
            <id>adapter-s4j-module</id>
            <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
            </activation>
            <modules>
                <module>adapter-s4j</module>
@ -157,7 +157,7 @@
        <profile>
            <id>adapter-kafka-module</id>
            <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
            </activation>
            <modules>
                <module>adapter-kafka</module>
@ -167,7 +167,7 @@
        <profile>
            <id>adapter-amqp-module</id>
            <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
            </activation>
            <modules>
                <module>adapter-amqp</module>
@ -177,7 +177,7 @@
        <profile>
            <id>adapter-dataapi-module</id>
            <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
            </activation>
            <modules>
                <module>adapter-dataapi</module>
@ -187,7 +187,7 @@
        <profile>
            <id>adapter-qdrant-module</id>
            <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
            </activation>
            <modules>
                <module>adapter-qdrant</module>
@ -197,7 +197,7 @@
        <profile>
            <id>adapter-weaviate-module</id>
            <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
            </activation>
            <modules>
                <module>adapter-weaviate</module>
@ -207,7 +207,7 @@
        <profile>
            <id>adapter-azure-aisearch-module</id>
            <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
            </activation>
            <modules>
                <module>adapter-azure-aisearch</module>
--- a/pom.xml
+++ b/pom.xml
@ -99,6 +99,13 @@
                            </rules>
                        </configuration>
                    </plugin>
+                    <!-- https://www.baeldung.com/maven-dependency-latest-version -->
+                    <!-- Display available upgrade -> mvn versions:display-dependency-updates -->
+                    <!-- Upgrade dependencies -> mvn versions:use-latest-versions -->
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>versions-maven-plugin</artifactId>
+                    </plugin>
                </plugins>
            </build>
        </profile>