added missing existing transactions and statements for webui updates …

…to fix media update and insert, speed up

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

@@ -31,6 +31,7 @@
 import lombok.Getter;
 import lombok.Value;
 import lombok.experimental.SuperBuilder;
+import org.jetbrains.annotations.Nullable;
 import org.polypheny.db.algebra.AlgCollation;
 import org.polypheny.db.algebra.AlgNode;
 import org.polypheny.db.algebra.type.AlgDataType;
@@ -215,10 +216,15 @@ public void deleteTable( long tableId ) {
 
 
     @Override
-    public void setPrimaryKey( long tableId, Long keyId ) {
-        tables.put( tableId, tables.get( tableId ).toBuilder().primaryKey( keyId ).build() );
+    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() );
+
+        if ( keyId != null ) {
+            keys.put( keyId, new LogicalPrimaryKey( keys.get( keyId ) ) );
+        }
 
-        keys.put( keyId, new LogicalPrimaryKey( keys.get( keyId ) ) );
         change( CatalogEvent.PRIMARY_KEY_CREATED, tableId, keyId );
     }
 

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

@@ -84,7 +84,7 @@ public static void removeQueryLanguage( String name ) {
 
 
     public List<ImplementationContext> anyPrepareQuery( QueryContext context, Transaction transaction ) {
-        return anyPrepareQuery( context, transaction.createStatement() );
+        return anyPrepareQuery( context, context.getStatement() != null ? context.getStatement() : transaction.createStatement() );
     }
 
 

core/src/main/java/org/polypheny/db/processing/QueryContext.java

@@ -78,6 +78,7 @@ public class QueryContext {
     // we can have mixed transactions, which have ddls and dmls, as long as we commit instantly for ddls,
     // we have to open a new transaction for the next statement, so we need to keep track of all transactions (in theory only the last one is needed)
     @Builder.Default
+    @NonFinal
     List<Transaction> transactions = new ArrayList<>();
 
 
@@ -120,8 +121,10 @@ public Optional<Node> getQueryNode() {
 
 
     public <T extends QueryContext> T addTransaction( Transaction transaction ) {
+        transactions = new ArrayList<>( transactions );
         transactions.add( transaction );
         return (T) this;
     }
 
+
 }

core/src/main/java/org/polypheny/db/type/entity/PolyLong.java

@@ -29,7 +29,7 @@
 import io.activej.serializer.def.SimpleSerializerDef;
 import java.math.BigDecimal;
 import java.math.MathContext;
-import java.util.Objects;
+import lombok.EqualsAndHashCode;
 import lombok.Value;
 import org.apache.calcite.linq4j.tree.Expression;
 import org.apache.calcite.linq4j.tree.Expressions;
@@ -42,6 +42,7 @@
 import org.polypheny.db.type.entity.category.PolyNumber;
 import org.polypheny.db.type.entity.numerical.PolyBigDecimal;
 
+@EqualsAndHashCode(callSuper = false)
 @Value
 public class PolyLong extends PolyNumber {
 
@@ -207,15 +208,9 @@ public Object toJava() {
     }
 
 
-    @Override
-    public int hashCode() {
-        return Objects.hash( super.hashCode(), value );
-    }
-
-
     @Override
     public String toString() {
-        return value.toString();
+        return value == null ? null : value.toString();
     }
 
 

core/src/main/java/org/polypheny/db/type/entity/PolyString.java

@@ -88,12 +88,12 @@ public static PolyString ofNullable( String value ) {
 
     @Override
     public @Nullable String toJson() {
-        return value == null ? JsonToken.VALUE_NULL.asString() : value;
+        return value == null ? JsonToken.VALUE_NULL.asString() : value.replace( "\"", "\\\"" );
     }
 
 
     public @Nullable String toQuotedJson() {
-        return value == null ? JsonToken.VALUE_NULL.asString() : "\"" + value + "\"";
+        return value == null ? JsonToken.VALUE_NULL.asString() : "\"" + value.replace( "\"", "\\\"" ) + "\"";
     }
 
 

core/src/main/java/org/polypheny/db/type/entity/numerical/PolyInteger.java

@@ -28,7 +28,7 @@
 import io.activej.serializer.def.SimpleSerializerDef;
 import java.math.BigDecimal;
 import java.math.MathContext;
-import java.util.Objects;
+import lombok.EqualsAndHashCode;
 import lombok.Value;
 import org.apache.calcite.linq4j.tree.Expression;
 import org.apache.calcite.linq4j.tree.Expressions;
@@ -40,6 +40,7 @@
 import org.polypheny.db.type.entity.PolyValue;
 import org.polypheny.db.type.entity.category.PolyNumber;
 
+@EqualsAndHashCode(callSuper = false)
 @Value
 public class PolyInteger extends PolyNumber {
 
@@ -117,12 +118,6 @@ public Expression asExpression() {
     }
 
 
-    @Override
-    public int hashCode() {
-        return Objects.hash( super.hashCode(), value );
-    }
-
-
     @Override
     public int compareTo( @NotNull PolyValue o ) {
         if ( !o.isNumber() ) {

dbms/src/main/java/org/polypheny/db/ddl/DdlManagerImpl.java

@@ -775,11 +775,20 @@ public void createPrimaryKey( LogicalTable table, List<String> columnNames, Stat
 
         LogicalPrimaryKey oldPk = catalog.getSnapshot().rel().getPrimaryKey( table.primaryKey ).orElse( null );
 
-        List<Long> columnIds = new LinkedList<>();
+        List<Long> columnIds = new ArrayList<>();
         for ( String columnName : columnNames ) {
             LogicalColumn logicalColumn = catalog.getSnapshot().rel().getColumn( table.id, columnName ).orElseThrow();
             columnIds.add( logicalColumn.id );
         }
+
+        if ( oldPk != null && oldPk.key.fieldIds.containsAll( columnIds ) && columnIds.contains( oldPk.key.fieldIds ) ) {
+            return;
+        }
+
+        if ( oldPk != null ) {
+            dropConstraint( table, ConstraintType.PRIMARY.name() );
+        }
+
         catalog.getLogicalRel( table.namespaceId ).addPrimaryKey( table.id, columnIds );
         catalog.getLogicalRel( table.namespaceId ).addConstraint( table.id, ConstraintType.PRIMARY.name(), columnIds, ConstraintType.PRIMARY );
 

webui/src/main/java/org/polypheny/db/webui/Crud.java

@@ -291,6 +291,7 @@ RelationalResult getTable( final UIRequest request ) {
                 QueryContext.builder()
                         .query( query.toString() )
                         .language( language )
+                        .transactions( List.of( transaction ) )
                         .origin( transaction.getOrigin() )
                         .batch( request.noLimit ? -1 : getPageSize() )
                         .transactionManager( transactionManager )
@@ -934,6 +935,8 @@ void updateTuple( final Context ctx ) throws ServletException, IOException {
         Result<?, ?> result = LanguageCrud.anyQueryResult(
                 QueryContext.builder()
                         .query( query )
+                        .statement( statement )
+                        .transactions( List.of( transaction ) )
                         .language( language )
                         .origin( ORIGIN )
                         .transactionManager( transactionManager )

webui/src/main/java/org/polypheny/db/webui/WebSocket.java

@@ -181,7 +181,7 @@ public void onMessage( final WsMessageContext ctx ) {
                                             .language( QueryLanguage.from( "cypher" ) )
                                             .origin( POLYPHENY_UI )
                                             .batch( uiRequest.noLimit ? -1 : crud.getPageSize() )
-                                            .namespaceId( namespace == null ? Catalog.defaultNamespaceId : namespace.id )
+                                            .namespaceId( namespace.id )
                                             .transactionManager( crud.getTransactionManager() )
                                             .informationTarget( i -> i.setSession( ctx.session ) )
                                             .build(), uiRequest ).get( 0 );