Performance Improvement for Documents, Interval Adjustements, Adjustements for UI Logic and Various Fixes

.editorconfig

@@ -43,7 +43,6 @@ ij_csv_keep_indents_on_empty_lines = true
 ij_csv_wrap_long_lines = false
 
 [*.feature]
-indent_size = 2
 ij_continuation_indent_size = 8
 ij_visual_guides = none
 ij_gherkin_keep_indents_on_empty_lines = false
@@ -315,7 +314,6 @@ ij_java_wrap_first_method_in_call_chain = false
 ij_java_wrap_long_lines = false
 
 [*.less]
-indent_size = 2
 ij_continuation_indent_size = 8
 ij_visual_guides = none
 ij_less_align_closing_brace_with_properties = false
@@ -340,8 +338,6 @@ ij_less_use_double_quotes = true
 ij_less_value_alignment = 0
 
 [*.proto]
-indent_size = 2
-tab_width = 2
 ij_visual_guides = none
 ij_protobuf_keep_blank_lines_in_code = 2
 ij_protobuf_keep_indents_on_empty_lines = false
@@ -353,8 +349,6 @@ ij_protobuf_spaces_within_braces = false
 ij_protobuf_spaces_within_brackets = false
 
 [*.sass]
-indent_size = 2
-tab_width = 2
 ij_visual_guides = none
 ij_sass_align_closing_brace_with_properties = false
 ij_sass_blank_lines_around_nested_selector = 1
@@ -377,8 +371,6 @@ ij_sass_use_double_quotes = true
 ij_sass_value_alignment = 0
 
 [*.scss]
-indent_size = 2
-tab_width = 2
 ij_visual_guides = none
 ij_scss_align_closing_brace_with_properties = false
 ij_scss_blank_lines_around_nested_selector = 1
@@ -433,8 +425,6 @@ ij_xml_text_wrap = normal
 ij_xml_use_custom_settings = false
 
 [{*.bash,*.sh,*.zsh}]
-indent_size = 2
-tab_width = 2
 ij_visual_guides = none
 ij_shell_binary_ops_start_line = false
 ij_shell_keep_column_alignment_padding = false
@@ -812,8 +802,6 @@ ij_markdown_wrap_text_if_long = true
 ij_markdown_wrap_text_inside_blockquotes = true
 
 [{*.pb,*.textproto}]
-indent_size = 2
-tab_width = 2
 ij_visual_guides = none
 ij_prototext_keep_blank_lines_in_code = 2
 ij_prototext_keep_indents_on_empty_lines = false

config/src/main/java/org/polypheny/db/webui/ConfigService.java

@@ -23,6 +23,7 @@
 import io.javalin.Javalin;
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -78,9 +79,8 @@ private void configRoutes( final Javalin http ) {
         // Save changes from WebUi
         http.post( PREFIX + "/updateConfigs", ctx -> {
             log.trace( ctx.body() );
-            TypeReference<Map<String, Object>> typeRef = new TypeReference<>() {
-            };
-            Map<String, Object> changes = mapper.convertValue( ctx.body(), typeRef );
+            HashMap<String, Object> changes = mapper.readValue( ctx.body(), new TypeReference<>() { // we need explicit typing to force the correct map type
+            } );
             StringBuilder feedback = new StringBuilder();
             boolean allValid = true;
             for ( Map.Entry<String, Object> entry : changes.entrySet() ) {

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

@@ -55,6 +55,8 @@ public abstract class AbstractAdapterSetting {
     @Getter
     public List<DeploySetting> appliesTo;
 
+    public List<String> filenames = new ArrayList<>();
+
 
     public AbstractAdapterSetting( final AdapterSettingType type, final String name, final boolean canBeNull, final String subOf, final boolean required, final boolean modifiable, List<DeploySetting> appliesTo, String defaultValue, int position ) {
         this.type = type;
@@ -79,7 +81,7 @@ public AbstractAdapterSetting( final AdapterSettingType type, final String name,
      *
      * @param annotations collection of annotations
      * @param properties which are defined by the corresponding Adapter
-     * @return a map containing the available modes and the corresponding collections of AdapterSettings
+     * @return a collection containing the available modes and the corresponding collections of AdapterSettings
      */
     public static List<AbstractAdapterSetting> fromAnnotations( Annotation[] annotations, AdapterProperties properties ) {
         List<AbstractAdapterSetting> settings = new ArrayList<>();

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

@@ -59,8 +59,7 @@ public abstract class Adapter<ACatalog extends AdapterCatalog> implements Scanna
     private final AdapterProperties properties;
     protected final DeployMode deployMode;
     protected String deploymentId;
-    @Getter
-    private final String adapterName;
+    public final String adapterName;
     public final ACatalog adapterCatalog;
 
 

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

@@ -170,10 +170,7 @@ public ImmutableMap<String, DataSource<?>> getSources() {
     }
 
 
-
-
-
-    public Adapter<?> addAdapter( String adapterName, String uniqueName, AdapterType adapterType, DeployMode mode, Map<String, String> settings ) {
+    public Adapter<?> addAdapter( String adapterName, String uniqueName, long defaultNamespace, AdapterType adapterType, DeployMode mode, Map<String, String> settings ) {
         uniqueName = uniqueName.toLowerCase();
         if ( getAdapters().containsKey( uniqueName ) ) {
             throw new GenericRuntimeException( "There is already an adapter with this unique name" );
@@ -184,7 +181,7 @@ public Adapter<?> addAdapter( String adapterName, String uniqueName, AdapterType
 
         AdapterTemplate adapterTemplate = AdapterTemplate.fromString( adapterName, adapterType );
 
-        long adapterId = Catalog.getInstance().createAdapter( uniqueName, adapterName, adapterType, settings, mode );
+        long adapterId = Catalog.getInstance().createAdapter( uniqueName, adapterName, defaultNamespace, adapterType, settings, mode );
         try {
             Adapter<?> adapter = adapterTemplate.getDeployer().get( adapterId, uniqueName, settings );
             adapterByName.put( adapter.getUniqueName(), adapter );
@@ -209,7 +206,9 @@ public void removeAdapter( long adapterId ) {
         // Check if the store has any placements
         List<AllocationEntity> placements = Catalog.getInstance().getSnapshot().alloc().getEntitiesOnAdapter( logicalAdapter.id ).orElseThrow( () -> new GenericRuntimeException( "There is still data placed on this data store" ) );
         if ( !placements.isEmpty() ) {
-            throw new GenericRuntimeException( "There is still data placed on this data store" );
+            if ( adapterInstance instanceof DataStore<?> ) {
+                throw new GenericRuntimeException( "There is still data placed on this data store" );
+            }
         }
 
         // Shutdown store
@@ -264,4 +263,12 @@ public interface Function4<P1, P2, P3, R> {
 
     }
 
+
+    @FunctionalInterface
+    public interface Function5<P1, P2, P3, P4, R> {
+
+        R get( P1 p1, P2 p2, P3 p3, P4 p4 );
+
+    }
+
 }

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

@@ -52,21 +52,20 @@ public List<PhysicalEntity> createTable( Context context, LogicalTableWrapper lo
 
 
     @Override
-    public void restoreTable( AllocationTable alloc, List<PhysicalEntity> entities ) {
-        scannable.restoreTable( alloc, entities );
+    public void restoreTable( AllocationTable alloc, List<PhysicalEntity> entities, Context context ) {
+        scannable.restoreTable( alloc, entities, context );
     }
 
 
     @Override
-    public void restoreGraph( AllocationGraph alloc, List<PhysicalEntity> entities ) {
-        Scannable.restoreGraphSubstitute( scannable, alloc, entities );
+    public void restoreGraph( AllocationGraph alloc, List<PhysicalEntity> entities, Context context ) {
+        Scannable.restoreGraphSubstitute( scannable, alloc, entities, context );
     }
 
 
-
     @Override
-    public void restoreCollection( AllocationCollection alloc, List<PhysicalEntity> entities ) {
-        scannable.restoreCollection( alloc, entities );
+    public void restoreCollection( AllocationCollection alloc, List<PhysicalEntity> entities, Context context ) {
+        scannable.restoreCollection( alloc, entities, context );
     }
 
 
@@ -93,6 +92,7 @@ public AlgNode getGraphScan( long allocId, AlgBuilder builder ) {
         return Scannable.getGraphScanSubstitute( scannable, allocId, builder );
     }
 
+
     @Override
     public List<PhysicalEntity> createCollection( Context context, LogicalCollection logical, AllocationCollection allocation ) {
         return scannable.createCollection( context, logical, allocation );

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

@@ -56,20 +56,20 @@ public List<PhysicalEntity> createTable( Context context, LogicalTableWrapper lo
 
 
     @Override
-    public void restoreTable( AllocationTable alloc, List<PhysicalEntity> entities ) {
-        scannable.restoreTable( alloc, entities );
+    public void restoreTable( AllocationTable alloc, List<PhysicalEntity> entities, Context context ) {
+        scannable.restoreTable( alloc, entities, context );
     }
 
 
     @Override
-    public void restoreGraph( AllocationGraph alloc, List<PhysicalEntity> entities ) {
-        scannable.restoreGraph( alloc, entities );
+    public void restoreGraph( AllocationGraph alloc, List<PhysicalEntity> entities, Context context ) {
+        scannable.restoreGraph( alloc, entities, context );
     }
 
 
     @Override
-    public void restoreCollection( AllocationCollection alloc, List<PhysicalEntity> entities ) {
-        Scannable.restoreCollectionSubstitute( scannable, alloc, entities );
+    public void restoreCollection( AllocationCollection alloc, List<PhysicalEntity> entities, Context context ) {
+        Scannable.restoreCollectionSubstitute( scannable, alloc, entities, context );
     }
 
 

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

@@ -60,20 +60,20 @@ public List<PhysicalEntity> createTable( Context context, LogicalTableWrapper lo
 
 
     @Override
-    public void restoreTable( AllocationTable alloc, List<PhysicalEntity> entities ) {
-        scannable.restoreTable( alloc, entities );
+    public void restoreTable( AllocationTable alloc, List<PhysicalEntity> entities, Context context ) {
+        scannable.restoreTable( alloc, entities, context );
     }
 
 
     @Override
-    public void restoreGraph( AllocationGraph alloc, List<PhysicalEntity> entities ) {
-        Scannable.restoreGraphSubstitute( scannable, alloc, entities );
+    public void restoreGraph( AllocationGraph alloc, List<PhysicalEntity> entities, Context context ) {
+        Scannable.restoreGraphSubstitute( scannable, alloc, entities, context );
     }
 
 
     @Override
-    public void restoreCollection( AllocationCollection alloc, List<PhysicalEntity> entities ) {
-        Scannable.restoreCollectionSubstitute( scannable, alloc, entities );
+    public void restoreCollection( AllocationCollection alloc, List<PhysicalEntity> entities, Context context ) {
+        Scannable.restoreCollectionSubstitute( scannable, alloc, entities, context );
     }
 
 

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

@@ -81,12 +81,12 @@ static PhysicalEntity createSubstitutionEntity( Scannable scannable, Context con
     AdapterCatalog getCatalog();
 
 
-    static void restoreGraphSubstitute( Scannable scannable, AllocationGraph alloc, List<PhysicalEntity> entities ) {
+    static void restoreGraphSubstitute( Scannable scannable, AllocationGraph alloc, List<PhysicalEntity> entities, Context context ) {
         throw new GenericRuntimeException( "todo restore" );
     }
 
 
-    static void restoreCollectionSubstitute( Scannable scannable, AllocationCollection alloc, List<PhysicalEntity> entities ) {
+    static void restoreCollectionSubstitute( Scannable scannable, AllocationCollection alloc, List<PhysicalEntity> entities, Context context ) {
         throw new GenericRuntimeException( "todo restore" );
     }
 
@@ -148,13 +148,13 @@ static AlgNode getDocumentScanSubstitute( Scannable scannable, long allocId, Alg
     List<PhysicalEntity> createTable( Context context, LogicalTableWrapper logical, AllocationTableWrapper allocation );
 
 
-    void restoreTable( AllocationTable alloc, List<PhysicalEntity> entities );
+    void restoreTable( AllocationTable alloc, List<PhysicalEntity> entities, Context context );
 
 
-    void restoreGraph( AllocationGraph alloc, List<PhysicalEntity> entities );
+    void restoreGraph( AllocationGraph alloc, List<PhysicalEntity> entities, Context context );
 
 
-    void restoreCollection( AllocationCollection alloc, List<PhysicalEntity> entities );
+    void restoreCollection( AllocationCollection alloc, List<PhysicalEntity> entities, Context context );
 
 
     void dropTable( Context context, long allocId );

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

@@ -47,7 +47,6 @@ public class AdapterTemplate {
     public long id;
     public String description;
 
-
     public AdapterTemplate( long id, Class<?> clazz, String adapterName, List<AbstractAdapterSetting> settings, List<DeployMode> modes, String description, Function4<Long, String, Map<String, String>, Adapter<?>> deployer ) {
         this.id = id;
         this.adapterName = adapterName;