New Locking, Various Bugfixes, UI Improvements

core/src/main/java/org/polypheny/db/algebra/AlgNode.java

@@ -37,6 +37,8 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.jetbrains.annotations.Nullable;
 import org.polypheny.db.algebra.core.Correlate;
 import org.polypheny.db.algebra.core.CorrelationId;
@@ -392,6 +394,13 @@ default boolean containsEntity() {
         return getInputs().stream().anyMatch( AlgNode::containsEntity );
     }
 
+    default Set<Entity> getEntities() {
+        if ( getEntity() != null ) {
+            return Set.of( getEntity() );
+        }
+        return getInputs().stream().map( AlgNode::getEntities ).reduce( ( a, b ) -> Stream.concat( a.stream(), b.stream() ).collect( Collectors.toSet() ) ).orElse( Set.of() );
+    }
+
     /**
      * Context of an algebra expression, for purposes of checking validity.
      */

core/src/main/java/org/polypheny/db/algebra/convert/ConverterImpl.java

@@ -70,7 +70,10 @@ protected ConverterImpl( AlgCluster cluster, AlgTraitDef<?> traitDef, AlgTraitSe
 
     @Override
     public AlgOptCost computeSelfCost( AlgPlanner planner, AlgMetadataQuery mq ) {
-        double dRows = mq.getTupleCount( getInput() );
+        Double dRows = mq.getTupleCount( getInput() );
+        if ( dRows == null ) {
+            dRows = Double.MAX_VALUE;
+        }
         double dIo = 0;
         return planner.getCostFactory().makeCost( dRows, dRows, dIo );
     }

core/src/main/java/org/polypheny/db/algebra/enumerable/common/EnumerableConditionalExecuteFalseRule.java

@@ -17,14 +17,14 @@
 package org.polypheny.db.algebra.enumerable.common;
 
 
-import lombok.SneakyThrows;
 import org.polypheny.db.algebra.AlgNode;
 import org.polypheny.db.algebra.convert.ConverterRule;
 import org.polypheny.db.algebra.core.AlgFactories;
 import org.polypheny.db.algebra.core.common.ConditionalExecute;
 import org.polypheny.db.algebra.core.common.ConditionalExecute.Condition;
 import org.polypheny.db.algebra.enumerable.EnumerableConvention;
 import org.polypheny.db.algebra.logical.common.LogicalConditionalExecute;
+import org.polypheny.db.catalog.exceptions.GenericRuntimeException;
 import org.polypheny.db.plan.Convention;
 
 
@@ -38,11 +38,14 @@ public EnumerableConditionalExecuteFalseRule() {
     }
 
 
-    @SneakyThrows
     @Override
     public AlgNode convert( AlgNode alg ) {
         ConditionalExecute ce = (ConditionalExecute) alg;
-        throw ce.getExceptionClass().getConstructor( String.class ).newInstance( ce.getExceptionMessage() );
+        try {
+            throw ce.getExceptionClass().getConstructor( String.class ).newInstance( ce.getExceptionMessage() );
+        } catch ( Exception e ) {
+            throw new GenericRuntimeException( e );
+        }
     }
 
-}
+}

core/src/main/java/org/polypheny/db/algebra/logical/common/LogicalConstraintEnforcer.java

@@ -247,6 +247,9 @@ public static EnforcementInformation getControl( LogicalTable table, Statement s
             constraints.add( pkc );
         }
 
+        // get new constraints
+        constraints.addAll( statement.getTransaction().getUsedConstraints( table.id ).stream().filter( c -> c.type != ConstraintType.FOREIGN ).toList() );
+
         AlgNode constrainedNode;
 
         //
@@ -397,7 +400,7 @@ public AlgNode accept( AlgShuttle shuttle ) {
     }
 
 
-    public record EnforcementInformation(AlgNode control, List<Class<? extends Exception>> errorClasses, List<String> errorMessages) {
+    public record EnforcementInformation( AlgNode control, List<Class<? extends Exception>> errorClasses, List<String> errorMessages ) {
 
         /**
          * {@link EnforcementInformation} holds all needed information regarding a constraint.

core/src/main/java/org/polypheny/db/algebra/operators/OperatorName.java

@@ -1456,4 +1456,4 @@ public enum OperatorName {
             MQL_LT,
             MQL_LTE
     );
-}
+}

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

@@ -37,6 +37,7 @@
 import org.polypheny.db.catalog.logistic.ForeignKeyOption;
 import org.polypheny.db.catalog.logistic.IndexType;
 import org.polypheny.db.languages.QueryLanguage;
+import org.polypheny.db.transaction.Statement;
 import org.polypheny.db.type.PolyType;
 import org.polypheny.db.type.entity.PolyValue;
 
@@ -178,7 +179,7 @@ public interface LogicalRelationalCatalog extends LogicalCatalog {
      * @param columnId The id of the column
      * @param type The type of the default value
      * @param defaultValue True if the column should allow null values, false if not.
-     * @return
+     * @return LogicalColumn
      */
     LogicalColumn setDefaultValue( long columnId, PolyType type, PolyValue defaultValue );
 
@@ -195,8 +196,9 @@ public interface LogicalRelationalCatalog extends LogicalCatalog {
      *
      * @param tableId The id of the table
      * @param columnIds The id of key which will be part of the primary keys
+     * @param statement The statement used to attach constraint enforcement on commit
      */
-    void addPrimaryKey( long tableId, List<Long> columnIds );
+    void addPrimaryKey( long tableId, List<Long> columnIds, Statement statement );
 
 
     /**
@@ -218,8 +220,9 @@ public interface LogicalRelationalCatalog extends LogicalCatalog {
      * @param tableId The id of the table
      * @param constraintName The name of the constraint
      * @param columnIds A list of column ids
+     * @param statement The statement to attach the constraint checks on commit
      */
-    void addUniqueConstraint( long tableId, String constraintName, List<Long> columnIds );
+    void addUniqueConstraint( long tableId, String constraintName, List<Long> columnIds, Statement statement );
 
 
     /**
@@ -229,8 +232,9 @@ public interface LogicalRelationalCatalog extends LogicalCatalog {
      * @param constraintName The name of the constraint
      * @param columnIds A list of column ids
      * @param type The type of the constraint
+     * @param statement
      */
-    void addConstraint( long tableId, String constraintName, List<Long> columnIds, ConstraintType type );
+    long addConstraint( long tableId, String constraintName, List<Long> columnIds, ConstraintType type, Statement statement );
 
     /**
      * Deletes the specified primary key (including the entry in the key table). If there is an index on this key, make sure to delete it first.

core/src/main/java/org/polypheny/db/catalog/entity/LogicalConstraint.java

@@ -23,13 +23,14 @@
 import lombok.EqualsAndHashCode;
 import lombok.NonNull;
 import lombok.Value;
+import org.jetbrains.annotations.NotNull;
 import org.polypheny.db.catalog.entity.logical.LogicalKey;
 import org.polypheny.db.catalog.logistic.ConstraintType;
 
 
 @EqualsAndHashCode
 @Value
-public class LogicalConstraint implements Serializable {
+public class LogicalConstraint implements Serializable, Comparable<LogicalConstraint> {
 
     @Serialize
     public long id;
@@ -57,4 +58,12 @@ public LogicalConstraint(
     }
 
 
+    @Override
+    public int compareTo( @NotNull LogicalConstraint o ) {
+        if ( this == o ) {
+            return 0;
+        }
+        return Long.compare( id, o.id );
+    }
+
 }

core/src/main/java/org/polypheny/db/catalog/entity/logical/LogicalForeignKey.java

@@ -26,7 +26,6 @@
 import lombok.EqualsAndHashCode;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
 import lombok.Value;
 import org.polypheny.db.catalog.Catalog;
 import org.polypheny.db.catalog.entity.PolyObject;
@@ -152,7 +151,6 @@ public static class LogicalForeignKeyField implements PolyObject {
         private final String foreignKeyFieldName;
 
 
-        @SneakyThrows
         @Override
         public PolyValue[] getParameterArray() {
             return Catalog.snapshot()
@@ -163,7 +161,7 @@ public PolyValue[] getParameterArray() {
         }
 
 
-        public record PrimitiveCatalogForeignKeyColumn(String pktableCat, String pktableSchem, String pktableName, String pkcolumnName, String fktableCat, String fktableSchem, String fktableName, String fkcolumnName, int keySeq, Integer updateRule, Integer deleteRule, String fkName, String pkName, Integer deferrability) {
+        public record PrimitiveCatalogForeignKeyColumn( String pktableCat, String pktableSchem, String pktableName, String pkcolumnName, String fktableCat, String fktableSchem, String fktableName, String fkcolumnName, int keySeq, Integer updateRule, Integer deleteRule, String fkName, String pkName, Integer deferrability ) {
 
         }
 

core/src/main/java/org/polypheny/db/catalog/impl/logical/RelationalCatalog.java

@@ -62,6 +62,7 @@
 import org.polypheny.db.catalog.snapshot.Snapshot;
 import org.polypheny.db.catalog.util.CatalogEvent;
 import org.polypheny.db.languages.QueryLanguage;
+import org.polypheny.db.transaction.Statement;
 import org.polypheny.db.type.PolySerializable;
 import org.polypheny.db.type.PolyType;
 import org.polypheny.db.type.entity.PolyValue;
@@ -217,9 +218,8 @@ public void deleteTable( long tableId ) {
 
     @Override
     public void setPrimaryKey( long tableId, @Nullable Long keyId ) {
-        LogicalTable oldTable = tables.get( tableId );
         // we temporarily can remove the primary, to clean-up old primaries before adding a new one
-        tables.put( tableId, oldTable.toBuilder().primaryKey( keyId ).build() );
+        tables.computeIfPresent( tableId, ( k, oldTable ) -> oldTable.toBuilder().primaryKey( keyId ).build() );
 
         if ( keyId != null ) {
             keys.put( keyId, new LogicalPrimaryKey( keys.get( keyId ) ) );
@@ -371,18 +371,15 @@ public void deleteDefaultValue( long columnId ) {
 
 
     @Override
-    public void addPrimaryKey( long tableId, List<Long> columnIds ) {
+    public void addPrimaryKey( long tableId, List<Long> columnIds, Statement statement ) {
         if ( columnIds.stream().anyMatch( id -> columns.get( id ).nullable ) ) {
             throw new GenericRuntimeException( "Primary key is not allowed to use nullable columns." );
         }
 
-        // TODO: Check if the current values are unique
-
         // Check if there is already a primary key defined for this table and if so, delete it.
         LogicalTable table = tables.get( tableId );
 
         if ( table.primaryKey != null ) {
-            // CatalogCombinedKey combinedKey = getCombinedKey( table.primaryKey );
             if ( getKeyUniqueCount( table.primaryKey ) == 1 && isForeignKey( table.primaryKey ) ) {
                 // This primary key is the only constraint for the uniqueness of this key.
                 throw new GenericRuntimeException( "This key is referenced by at least one foreign key which requires this key to be unique. To drop this primary key, first drop the foreign keys or create a unique constraint." );
@@ -394,8 +391,8 @@ public void addPrimaryKey( long tableId, List<Long> columnIds ) {
         }
         long keyId = getOrAddKey( tableId, columnIds, EnforcementTime.ON_QUERY );
         setPrimaryKey( tableId, keyId );
+
         change( CatalogEvent.PRIMARY_KEY_CREATED, tableId, keyId );
-        tables.get( tableId );
     }
 
 
@@ -507,7 +504,7 @@ public void addForeignKey( long tableId, List<Long> columnIds, long referencesTa
 
 
     @Override
-    public void addUniqueConstraint( long tableId, String constraintName, List<Long> columnIds ) {
+    public void addUniqueConstraint( long tableId, String constraintName, List<Long> columnIds, Statement statement ) {
         long keyId = getOrAddKey( tableId, columnIds, EnforcementTime.ON_QUERY );
         // Check if there is already a unique constraint
         List<LogicalConstraint> logicalConstraints = constraints.values().stream()
@@ -516,20 +513,23 @@ public void addUniqueConstraint( long tableId, String constraintName, List<Long>
         if ( !logicalConstraints.isEmpty() ) {
             throw new GenericRuntimeException( "There is already a unique constraint!" );
         }
-        addConstraint( tableId, constraintName, columnIds, ConstraintType.UNIQUE );
+        long id = addConstraint( tableId, constraintName, columnIds, ConstraintType.UNIQUE, statement );
+        statement.getTransaction().addNewConstraint( tableId, constraints.get( id ) );
     }
 
 
     @Override
-    public void addConstraint( long tableId, String constraintName, List<Long> columnIds, ConstraintType type ) {
+    public long addConstraint( long tableId, String constraintName, List<Long> columnIds, ConstraintType type, Statement statement ) {
         long keyId = getOrAddKey( tableId, columnIds, EnforcementTime.ON_QUERY );
 
         long id = idBuilder.getNewConstraintId();
+        LogicalConstraint constraint = new LogicalConstraint( id, keyId, type, constraintName, Objects.requireNonNull( keys.get( keyId ) ) );
         synchronized ( this ) {
-            constraints.put( id, new LogicalConstraint( id, keyId, type, constraintName, Objects.requireNonNull( keys.get( keyId ) ) ) );
+            constraints.put( id, constraint );
             change( CatalogEvent.CONSTRAINT_CREATED, null, id );
         }
-        tables.get( tableId );
+        statement.getTransaction().addNewConstraint( tableId, constraint );
+        return id;
     }
 
 

core/src/main/java/org/polypheny/db/config/RuntimeConfig.java

@@ -505,6 +505,11 @@ public enum RuntimeConfig {
             "runtime/serialization",
             "How big the buffersize for catalog objects should be.",
             200000,
+            ConfigType.INTEGER ),
+    LOCKING_MAX_TIMEOUT_SECONDS(
+            "runtime/maxTimeout",
+            "How long a transactions should wait for a lock until it is aborted",
+            30,
             ConfigType.INTEGER );
 
 

core/src/main/java/org/polypheny/db/ddl/DdlManager.java

@@ -476,7 +476,7 @@ public static DdlManager getInstance() {
     /**
      * Adds a new constraint to a table
      */
-    public abstract void createConstraint( ConstraintInformation information, long namespaceId, List<Long> columnIds, long tableId );
+    public abstract void createConstraint( ConstraintInformation information, long namespaceId, List<Long> columnIds, long tableId, Statement statement );
 
     /**
      * Drop a NAMESPACE

core/src/main/java/org/polypheny/db/functions/TemporalFunctions.java

@@ -17,9 +17,12 @@
 package org.polypheny.db.functions;
 
 import java.sql.Timestamp;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.util.Date;
 import java.util.TimeZone;
 import org.apache.calcite.linq4j.function.NonDeterministic;
+import org.jetbrains.annotations.NotNull;
 import org.polypheny.db.adapter.DataContext;
 import org.polypheny.db.nodes.TimeUnitRange;
 import org.polypheny.db.type.entity.PolyInterval;
@@ -38,6 +41,7 @@
 public class TemporalFunctions {
 
     public static final TimeZone LOCAL_TZ = TimeZone.getDefault();
+    public static final String TIMEZONE = System.getProperty( "user.timezone" );
 
 
     @SuppressWarnings("unused")
@@ -477,8 +481,8 @@ public static Integer toIntOptional( java.util.Date v, TimeZone timeZone ) {
     @NonDeterministic
     @SuppressWarnings("unused")
     public static PolyTimestamp currentTimestamp( DataContext root ) {
-        // Cast required for JDK 1.6.
-        return PolyTimestamp.of( (long) DataContext.Variable.CURRENT_TIMESTAMP.get( root ) );
+        Date date = new Date();
+        return PolyTimestamp.of( date.getTime() + timeZone( root ).getRawOffset() );
     }
 
 
@@ -508,17 +512,18 @@ public static PolyDate currentDate( DataContext root ) {
         if ( time < 0 ) {
             --date;
         }
-        return PolyDate.of( date );
+        return PolyDate.ofDays( date );
     }
 
 
     /**
      * SQL {@code LOCAL_TIMESTAMP} function.
      */
+    @NotNull
     @NonDeterministic
-    public static long localTimestamp( DataContext root ) {
-        // Cast required for JDK 1.6.
-        return DataContext.Variable.LOCAL_TIMESTAMP.get( root );
+    public static PolyTimestamp localTimestamp( DataContext root ) {
+        ZonedDateTime now = ZonedDateTime.now( ZoneId.of( TIMEZONE ) );
+        return PolyTimestamp.of( (now.toEpochSecond() + now.getOffset().getTotalSeconds()) * DateTimeUtils.MILLIS_PER_SECOND );
     }
 
 
@@ -528,13 +533,14 @@ public static long localTimestamp( DataContext root ) {
     @SuppressWarnings("unused")
     @NonDeterministic
     public static PolyTime localTime( DataContext root ) {
-        return PolyTime.of( (int) (localTimestamp( root ) % DateTimeUtils.MILLIS_PER_DAY) );
+        ZonedDateTime now = ZonedDateTime.now( ZoneId.of( TIMEZONE ) );
+        return PolyTime.of( ((now.toEpochSecond() + now.getOffset().getTotalSeconds()) * DateTimeUtils.MILLIS_PER_SECOND) % DateTimeUtils.MILLIS_PER_DAY );
     }
 
 
     @NonDeterministic
     public static TimeZone timeZone( DataContext root ) {
-        return DataContext.Variable.TIME_ZONE.get( root );
+        return TimeZone.getTimeZone( TIMEZONE );
     }
 
 

core/src/main/java/org/polypheny/db/languages/LanguageManager.java

@@ -241,7 +241,6 @@ private static void cancelTransaction( @Nullable Transaction transaction ) {
 
     public List<ExecutedContext> anyQuery( QueryContext context ) {
         List<ImplementationContext> prepared = anyPrepareQuery( context, context.getTransactions().get( context.getTransactions().size() - 1 ) );
-
         List<ExecutedContext> executedContexts = new ArrayList<>();
 
         for ( ImplementationContext implementation : prepared ) {