Enable postgres image variant injection

Author: yabsp

src/main/java/org/polypheny/simpleclient/executor/PolyphenyDbExecutor.java

@@ -122,13 +122,18 @@ default String deployMonetDb( boolean deployStoresUsingDocker ) throws ExecutorE
 
 
     default String deployPostgres( boolean deployStoresUsingDocker ) throws ExecutorException {
+        return deployPostgres( deployStoresUsingDocker, "pgvector & PostGIS" );
+    }
+
+
+    default String deployPostgres( boolean deployStoresUsingDocker, String imageVariant ) throws ExecutorException {
         String config;
         String name;
         if ( deployStoresUsingDocker ) {
             name = "postgres" + storeCounter.getAndIncrement();
             if ( PolyphenyVersionSwitch.getInstance().useNewAdapterDeployParameters ) {
                 int dockerInstanceId = getDockerInstanceId();
-                config = "{\"mode\":\"docker\",\"instanceId\":\"" + dockerInstanceId + "\",\"maxConnections\":\"25\"}";
+                config = "{\"mode\":\"docker\",\"instanceId\":\"" + dockerInstanceId + "\",\"maxConnections\":\"25\",\"imageVariant\":\"" + imageVariant + "\"}";
             } else {
                 config = "{\"port\":\"" + nextPort.getAndIncrement() + "\",\"maxConnections\":\"25\",\"password\":\"postgres\",\"mode\":\"docker\",\"instanceId\":\"0\"}";
             }
@@ -345,7 +350,7 @@ public PolyphenyDbInstance( PolyphenyControlConnector polyphenyControlConnector,
                             if ( !config.deployStoresUsingDocker ) {
                                 PostgresInstance.reset();
                             }
-                            executor.deployPostgres( config.deployStoresUsingDocker );
+                            executor.deployPostgres( config.deployStoresUsingDocker, config.postgresImageVariant );
                             break;
                         case "monetdb":
                             if ( !config.deployStoresUsingDocker ) {

src/main/java/org/polypheny/simpleclient/scenario/AbstractConfig.java

@@ -70,6 +70,7 @@ public abstract class AbstractConfig {
     public final boolean workloadMonitoringWarmup;
 
     public final int progressReportBase = 100;
+    public final String postgresImageVariant;
 
 
     protected AbstractConfig( String scenario, String system, Properties properties ) {
@@ -103,6 +104,7 @@ protected AbstractConfig( String scenario, String system, Properties properties
         workloadMonitoringExecutingWorkload = false;
         workloadMonitoringLoadingData = true;
         workloadMonitoringWarmup = true;
+        postgresImageVariant = getStringPropertyOrDefault( properties, "postgresImageVariant", "pgvector & PostGIS" );
 
         // This is hacky but ensures that VersionSwitch is initialized when running tasks from CLI.
         PolyphenyVersionSwitch.initialize( this );
@@ -150,6 +152,7 @@ protected AbstractConfig( String scenario, String system, Map<String, String> cd
         workloadMonitoringExecutingWorkload = Boolean.parseBoolean( cdlGetOrDefault( cdl, "workloadMonitoring", "false" ) );
         workloadMonitoringLoadingData = Boolean.parseBoolean( cdlGetOrDefault( cdl, "workloadMonitoringLoadingData", "false" ) );
         workloadMonitoringWarmup = Boolean.parseBoolean( cdlGetOrDefault( cdl, "workloadMonitoringWarmup", "true" ) );
+        postgresImageVariant = cdlGetOrDefault( cdl, "postgresImageVariant", "pgvector & PostGIS" );
     }
 
 
@@ -171,6 +174,12 @@ protected String getStringProperty( Properties properties, String name ) {
     }
 
 
+    protected String getStringPropertyOrDefault( Properties properties, String name, String defaultName ) {
+        String str = getProperty( properties, name );
+        return str == null ? defaultName : str;
+    }
+
+
     protected int getIntProperty( Properties properties, String name ) {
         String str = getProperty( properties, name );
         if ( str == null ) {

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

@@ -6,8 +6,11 @@ mode = polypheny
 dataStoreFeature = postgresql
 dataStoreMeta = hsqldb
 
+# Default, pgvector, PostGIS, pgvector & PostGIS
+postgresImageVariant = Default
+
 # False -> Does not create index
-useIndex = true
+useIndex = false
 
 # Query-time index parameters (direct-postgres path only, ignored on the Polypheny path).
 # ---------------------------------------------------------------------------------------