Lock the Polypheny Home Directory

config/src/main/java/org/polypheny/db/util/PolyphenyHomeDirManager.java

@@ -19,7 +19,10 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileLock;
 import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -39,10 +42,11 @@ public class PolyphenyHomeDirManager {
 
     private static PolyphenyHomeDirManager INSTANCE = null;
 
-    private File root;
+    private final File root;
     private File home;
     private final List<File> dirs = new ArrayList<>();
     private final List<File> deleteOnExit = new ArrayList<>();
+    private final FileLock lock; // Reference so the lock is not released
     @Getter
     private static RunMode mode;
 
@@ -73,6 +77,18 @@ private PolyphenyHomeDirManager() {
             }
         }
 
+        File lockFile = registerNewFile( ".lock" );
+        try {
+            FileChannel fileChannel = FileChannel.open( lockFile.toPath(), StandardOpenOption.CREATE, StandardOpenOption.WRITE );
+            Optional<FileLock> fileLock = Optional.ofNullable( fileChannel.tryLock() );
+            if ( fileLock.isPresent() ) {
+                lock = fileLock.get();
+            } else {
+                throw new RuntimeException( "There is already another Polypheny instance running in this directory" );
+            }
+        } catch ( IOException e ) {
+            throw new RuntimeException( "Failed to open lockfile", e );
+        }
         Runtime.getRuntime().addShutdownHook( new Thread( () -> {
             for ( File file : deleteOnExit ) {
                 if ( file.exists() ) {
@@ -103,16 +119,16 @@ private String getPrefix() {
     }
 
 
-    private boolean probeCreatingFolder( File file ) {
+    private static boolean probeCreatingFolder( File file ) {
         if ( file.isFile() ) {
             return false;
         }
 
         boolean couldCreate = true;
-        if ( !home.exists() ) {
-            couldCreate = home.mkdirs();
+        if ( !file.exists() ) {
+            couldCreate = file.mkdirs();
         }
-        return couldCreate && home.canWrite();
+        return couldCreate && file.canWrite();
     }
 
 

core/src/main/java/org/polypheny/db/adapter/DataSource.java

@@ -92,7 +92,7 @@ public static JsonSerializer<DataSource<?>> getSerializer() {
             jsonSource.addProperty( "uniqueName", src.getUniqueName() );
             jsonSource.addProperty( "adapterName", src.getAdapterName() );
             jsonSource.add( "adapterSettings", context.serialize( AbstractAdapterSetting.serializeSettings( src.getAvailableSettings( src.getClass() ), src.getCurrentSettings() ) ) );
-            jsonSource.add( "currentSettings", context.serialize( src.getCurrentSettings() ) );
+            jsonSource.add( "settings", context.serialize( src.getCurrentSettings() ) );
             jsonSource.add( "dataReadOnly", context.serialize( src.isDataReadOnly() ) );
             jsonSource.addProperty( "type", src.getAdapterType().name() );
             return jsonSource;

core/src/main/java/org/polypheny/db/adapter/DataStore.java

@@ -78,7 +78,7 @@ public static JsonSerializer<DataStore<?>> getSerializer() {
             JsonObject jsonStore = new JsonObject();
             jsonStore.addProperty( "adapterId", src.getAdapterId() );
             jsonStore.add( "adapterSettings", context.serialize( AbstractAdapterSetting.serializeSettings( src.getAvailableSettings( src.getClass() ), src.getCurrentSettings() ) ) );
-            jsonStore.add( "currentSettings", context.serialize( src.getCurrentSettings() ) );
+            jsonStore.add( "settings", context.serialize( src.getCurrentSettings() ) );
             jsonStore.addProperty( "adapterName", src.getAdapterName() );
             jsonStore.addProperty( "uniqueName", src.getUniqueName() );
             jsonStore.addProperty( "type", src.getAdapterType().name() );

core/src/main/java/org/polypheny/db/adapter/index/Index.java

@@ -21,7 +21,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 import lombok.Getter;
 import org.polypheny.db.PolyImplementation;
 import org.polypheny.db.ResultIterator;
@@ -97,7 +96,7 @@ public void rebuild( final Transaction transaction ) {
         }
         final AlgNode scan = builder
                 .relScan( table )
-                .project( cols.stream().map( builder::field ).collect( Collectors.toList() ) )
+                .project( cols.stream().map( builder::field ).toList() )
                 .build();
         final QueryProcessor processor = statement.getQueryProcessor();
         final PolyImplementation implementation = processor.prepareQuery( AlgRoot.of( scan, Kind.SELECT ), false );

core/src/main/java/org/polypheny/db/adapter/index/IndexManager.java

@@ -26,7 +26,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
-import java.util.stream.Collectors;
 import org.polypheny.db.adapter.DataStore.IndexMethodModel;
 import org.polypheny.db.adapter.index.Index.IndexFactory;
 import org.polypheny.db.catalog.Catalog;
@@ -223,7 +222,7 @@ public Index getIndex( LogicalNamespace schema, LogicalTable table, List<String>
     public List<Index> getIndices( LogicalNamespace schema, LogicalTable table ) {
         return this.indexById.values().stream()
                 .filter( index -> index.schema.equals( schema ) && index.table.equals( table ) )
-                .collect( Collectors.toList() );
+                .toList();
     }
 
 

core/src/main/java/org/polypheny/db/algebra/core/document/DocumentProject.java

@@ -92,8 +92,8 @@ public RexNode asSingleProject() {
         // null key is replaceRoot
         nodes.add(
                 builder.makeLiteral(
-                        PolyList.copyOf( includes.keySet().stream().filter( Objects::nonNull ).map( v -> PolyList.copyOf( Arrays.stream( v.split( "\\." ) ).map( PolyString::of ).collect( Collectors.toList() ) ) )
-                                .collect( Collectors.toList() ) ),
+                        PolyList.copyOf( includes.keySet().stream().filter( Objects::nonNull ).map( v -> PolyList.copyOf( Arrays.stream( v.split( "\\." ) ).map( PolyString::of ).toList() ) )
+                                .toList() ),
                         builder.getTypeFactory().createArrayType( builder.getTypeFactory().createPolyType( PolyType.CHAR, 255 ), -1 ), PolyType.ARRAY ) );
         nodes.addAll( includes.entrySet().stream().filter( o -> Objects.nonNull( o.getKey() ) ).map( Entry::getValue ).toList() );
 
@@ -115,7 +115,7 @@ public RexNode asSingleProject() {
                             builder.getTypeFactory().createArrayType(
                                     builder.getTypeFactory().createArrayType( builder.getTypeFactory().createPolyType( PolyType.CHAR, 255 ), -1 ),
                                     -1 ),
-                            excludes.stream().map( value -> PolyList.of( Arrays.stream( value.split( "\\." ) ).map( PolyString::of ).collect( Collectors.toList() ) ) ).collect( Collectors.toList() ) ) );
+                            excludes.stream().map( value -> PolyList.of( Arrays.stream( value.split( "\\." ) ).map( PolyString::of ).toList() ) ).collect( Collectors.toList() ) ) );
         }
 
         return doc;

core/src/main/java/org/polypheny/db/algebra/core/lpg/LpgMatch.java

@@ -18,7 +18,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 import lombok.Getter;
 import org.polypheny.db.algebra.AlgNode;
 import org.polypheny.db.algebra.SingleAlg;
@@ -85,12 +84,12 @@ public NodeType getNodeType() {
 
     @Override
     public AlgNode accept( RexShuttle shuttle ) {
-        List<RexNode> exp = this.matches.stream().map( m -> (RexNode) m ).collect( Collectors.toList() );
+        List<RexNode> exp = this.matches.stream().map( m -> (RexNode) m ).toList();
         List<RexNode> exps = shuttle.apply( exp );
         if ( exp == exps ) {
             return this;
         }
-        return new LogicalLpgMatch( getCluster(), traitSet, input, exps.stream().map( e -> (RexCall) e ).collect( Collectors.toList() ), names );
+        return new LogicalLpgMatch( getCluster(), traitSet, input, exps.stream().map( e -> (RexCall) e ).toList(), names );
     }
 
 }

core/src/main/java/org/polypheny/db/algebra/core/lpg/LpgProject.java

@@ -18,7 +18,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 import lombok.Getter;
 import org.polypheny.db.algebra.AlgNode;
 import org.polypheny.db.algebra.SingleAlg;
@@ -89,7 +88,7 @@ protected AlgDataType deriveRowType() {
 
     @Override
     public AlgNode accept( RexShuttle shuttle ) {
-        List<RexNode> exp = this.projects.stream().map( p -> (RexNode) p ).collect( Collectors.toList() );
+        List<RexNode> exp = this.projects.stream().map( p -> (RexNode) p ).toList();
         List<RexNode> exps = shuttle.apply( exp );
         if ( exp == exps ) {
             return this;

core/src/main/java/org/polypheny/db/algebra/core/relational/RelScan.java

@@ -21,7 +21,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import lombok.NonNull;
 import org.polypheny.db.algebra.AlgInput;
@@ -92,7 +91,7 @@ public AlgDataType deriveRowType() {
      * Returns an identity projection for the given table.
      */
     public static ImmutableList<Integer> identity( Entity entity ) {
-        return ImmutableList.copyOf( IntStream.range( 0, entity.getTupleType().getFieldCount() ).boxed().collect( Collectors.toList() ) );
+        return ImmutableList.copyOf( IntStream.range( 0, entity.getTupleType().getFieldCount() ).boxed().toList() );
     }
 
 

core/src/main/java/org/polypheny/db/algebra/enumerable/EnumerableAlgImplementor.java

@@ -53,7 +53,6 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import lombok.Getter;
 import org.apache.calcite.linq4j.Enumerable;
@@ -140,7 +139,7 @@ public ClassDeclaration implementRoot( EnumerableAlg rootAlg, EnumerableAlg.Pref
         if ( contextCounter < 0 ) {
             // If the context was not set by ContextSwitcher we only need the initial one
             Statement assign = Expressions.declare( Modifier.FINAL, DataContext.ROOT, DataContext.INITIAL_ROOT );
-            block = Expressions.block( Stream.concat( Stream.of( assign ), block.statements.stream() ).collect( Collectors.toList() ) );
+            block = Expressions.block( Stream.concat( Stream.of( assign ), block.statements.stream() ).toList() );
         }
 
         // add values
@@ -516,4 +515,3 @@ public void go( EnumerableAlg.Result result ) {
     }
 
 }
-

core/src/main/java/org/polypheny/db/algebra/enumerable/EnumerableStreamer.java

@@ -19,7 +19,6 @@
 
 import java.lang.reflect.Modifier;
 import java.util.List;
-import java.util.stream.Collectors;
 import org.apache.calcite.linq4j.Enumerable;
 import org.apache.calcite.linq4j.function.Function;
 import org.apache.calcite.linq4j.function.Function0;
@@ -91,7 +90,7 @@ public Result implement( EnumerableAlgImplementor implementor, Prefer pref ) {
                 Expressions.constant( DataContext.ROOT ),
                 builder.append( builder.newName( "query" + System.nanoTime() ), query.block() ),
                 exp,
-                Expressions.constant( getLeft().getTupleType().getFields().stream().map( f -> f.getType().getPolyType() ).collect( Collectors.toList() ) ) );
+                Expressions.constant( getLeft().getTupleType().getFields().stream().map( f -> f.getType().getPolyType() ).toList() ) );
 
         builder.add( Expressions.return_( null, builder.append( "test", transformContext ) ) );
 

core/src/main/java/org/polypheny/db/catalog/Catalog.java

@@ -132,7 +132,7 @@ public static void afterInit( Runnable action ) {
 
     public abstract AllocationGraphCatalog getAllocGraph( long namespaceId );
 
-    public abstract <S extends AdapterCatalog> Optional<S> getAdapterCatalog( long id );
+    public abstract Optional<AdapterCatalog> getAdapterCatalog( long id );
 
     public abstract void addStoreSnapshot( AdapterCatalog snapshot );
 

core/src/main/java/org/polypheny/db/catalog/IdBuilder.java

@@ -27,9 +27,6 @@ public class IdBuilder {
     @Serialize
     public AtomicLong snapshotId;
 
-    @Serialize
-    public AtomicLong namespaceId;
-
     @Serialize
     public AtomicLong entityId;
 
@@ -99,14 +96,12 @@ private IdBuilder() {
                 new AtomicLong( 0 ),
                 new AtomicLong( 0 ),
                 new AtomicLong( 0 ),
-                new AtomicLong( 0 ),
                 new AtomicLong( 0 ) );
     }
 
 
     public IdBuilder(
             @Deserialize("snapshotId") AtomicLong snapshotId,
-            @Deserialize("namespaceId") AtomicLong namespaceId,
             @Deserialize("entityId") AtomicLong entityId,
             @Deserialize("fieldId") AtomicLong fieldId,
             @Deserialize("userId") AtomicLong userId,
@@ -122,7 +117,6 @@ public IdBuilder(
             @Deserialize("partitionId") AtomicLong partitionId,
             @Deserialize("placementId") AtomicLong placementId ) {
         this.snapshotId = snapshotId;
-        this.namespaceId = namespaceId;
         this.entityId = entityId;
         this.fieldId = fieldId;
 
@@ -157,11 +151,6 @@ public long getNewFieldId() {
     }
 
 
-    public long getNewNamespaceId() {
-        return namespaceId.getAndIncrement();
-    }
-
-
     public long getNewUserId() {
         return userId.getAndIncrement();
     }
@@ -224,7 +213,6 @@ public long getNewAdapterTemplateId() {
 
     public synchronized void restore( IdBuilder idBuilder ) {
         this.snapshotId.set( idBuilder.snapshotId.longValue() );
-        this.namespaceId.set( idBuilder.namespaceId.longValue() );
         this.entityId.set( idBuilder.entityId.longValue() );
         this.fieldId.set( idBuilder.fieldId.longValue() );
 

core/src/main/java/org/polypheny/db/catalog/catalogs/AdapterCatalog.java

@@ -33,7 +33,6 @@
 import lombok.experimental.NonFinal;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.calcite.linq4j.tree.Expression;
-import org.apache.calcite.linq4j.tree.Expressions;
 import org.polypheny.db.catalog.Catalog;
 import org.polypheny.db.catalog.entity.allocation.AllocationEntity;
 import org.polypheny.db.catalog.entity.physical.PhysicalEntity;
@@ -90,7 +89,7 @@ public AdapterCatalog(
 
 
     public Expression asExpression() {
-        return Expressions.call( Catalog.CATALOG_EXPRESSION, "getAdapterCatalog", Expressions.constant( adapterId ) );
+        return Catalog.PHYSICAL_EXPRESSION.apply( adapterId );
     }
 
 

core/src/main/java/org/polypheny/db/catalog/catalogs/DocAdapterCatalog.java

@@ -21,9 +21,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.SortedSet;
-import java.util.stream.Collectors;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
 import lombok.Value;
 import org.polypheny.db.catalog.IdBuilder;
 import org.polypheny.db.catalog.entity.allocation.AllocationCollection;
@@ -41,7 +39,6 @@
 import org.polypheny.db.catalog.entity.physical.PhysicalTable;
 import org.polypheny.db.util.Pair;
 
-@Getter
 @EqualsAndHashCode(callSuper = true)
 @Value
 public class DocAdapterCatalog extends AdapterCatalog {
@@ -57,7 +54,7 @@ public void renameLogicalColumn( long id, String newFieldName ) {
         List<PhysicalColumn> updates = new ArrayList<>();
         for ( PhysicalField field : fields.values() ) {
             if ( field.id == id ) {
-                updates.add( field.unwrap( PhysicalColumn.class ).orElseThrow().toBuilder().logicalName( newFieldName ).build() );
+                updates.add( field.unwrapOrThrow( PhysicalColumn.class ).toBuilder().logicalName( newFieldName ).build() );
             }
         }
         for ( PhysicalColumn u : updates ) {
@@ -77,7 +74,7 @@ public DocAdapterCatalog(
 
 
     public <T extends PhysicalEntity> T fromAllocation( long id, Class<T> clazz ) {
-        return getPhysicalsFromAllocs( id ).get( 0 ).unwrap( clazz ).orElseThrow();
+        return getPhysicalsFromAllocs( id ).get( 0 ).unwrapOrThrow( clazz );
     }
 
 
@@ -98,7 +95,7 @@ public void addColumn( PhysicalColumn column ) {
 
 
     public PhysicalColumn getColumn( long columnId, long allocId ) {
-        return fields.get( Pair.of( allocId, columnId ) ).unwrap( PhysicalColumn.class ).orElseThrow();
+        return fields.get( Pair.of( allocId, columnId ) ).unwrapOrThrow( PhysicalColumn.class );
     }
 
 
@@ -119,6 +116,7 @@ public PhysicalColumn updateColumnType( long allocId, LogicalColumn newCol ) {
         return column;
     }
 
+
     public PhysicalTable createTable(
             String namespaceName,
             String tableName,
@@ -129,7 +127,7 @@ public PhysicalTable createTable(
             AllocationTableWrapper wrapper ) {
         AllocationTable allocation = wrapper.table;
         List<AllocationColumn> columns = wrapper.columns;
-        List<PhysicalColumn> pColumns = columns.stream().map( c -> new PhysicalColumn( columnNames.get( c.columnId ), logical.id, allocation.id, allocation.adapterId, c.position, logicalColumns.get( c.columnId ) ) ).collect( Collectors.toList() );
+        List<PhysicalColumn> pColumns = columns.stream().map( c -> new PhysicalColumn( columnNames.get( c.columnId ), logical.id, allocation.id, allocation.adapterId, c.position, logicalColumns.get( c.columnId ) ) ).toList();
         long physicalId = IdBuilder.getInstance().getNewPhysicalId();
         PhysicalTable table = new PhysicalTable( physicalId, allocation.id, allocation.logicalId, tableName, pColumns, logical.namespaceId, namespaceName, pkIds, allocation.adapterId );
         pColumns.forEach( this::addColumn );