blob handling is too slow #235

abstratt · Sep 5, 2017 · d5734e8 · d5734e8
1 parent 5c66a31
commit d5734e8
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 21 deletions.
diff --git a/runtime/com.abstratt.kirra.tests.mdd.runtime/META-INF/MANIFEST.MF b/runtime/com.abstratt.kirra.tests.mdd.runtime/META-INF/MANIFEST.MF
@@ -13,6 +13,8 @@ Import-Package: com.abstratt.kirra.auth,
  com.abstratt.nodestore,
  com.abstratt.nodestore.jdbc,
  com.abstratt.nodestore.inmemory,
+ com.abstratt.blobstore,
+ com.abstratt.simpleblobstore,
  com.abstratt.resman,
  javax.servlet,
  javax.servlet.http,

diff --git a/...ra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/RepositoryServiceTests.java b/...ra.tests.mdd.runtime/src/com/abstratt/kirra/tests/mdd/runtime/RepositoryServiceTests.java
@@ -1,11 +1,8 @@
 package com.abstratt.kirra.tests.mdd.runtime;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
 import org.eclipse.core.runtime.CoreException;
 
+import com.abstratt.blobstore.IBlobStoreCatalog;
 import com.abstratt.kirra.Repository;
 import com.abstratt.kirra.SchemaManagement;
 import com.abstratt.mdd.core.IRepository;
@@ -16,6 +13,10 @@
 import com.abstratt.pluginutils.ISharedContextRunnable;
 import com.abstratt.resman.Resource;
 
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
 public class RepositoryServiceTests extends AbstractRepositoryBuildingTests {
 
     public static Test suite() {
@@ -36,6 +37,7 @@ public Object runInContext(IRepository context) {
                 current.getFeature(SchemaManagement.class);
                 current.getFeature(Repository.class);
                 current.getFeature(INodeStoreCatalog.class);
+                current.getFeature(IBlobStoreCatalog.class);
                 return null;
             }
         });

diff --git a/runtime/com.abstratt.mdd.core.tests.runtime/META-INF/MANIFEST.MF b/runtime/com.abstratt.mdd.core.tests.runtime/META-INF/MANIFEST.MF
@@ -6,6 +6,8 @@ Bundle-Version: 2.2.201606.qualifier
 Require-Bundle: com.abstratt.mdd.runtime.core;visibility:=reexport,
  com.abstratt.mdd.frontend.textuml.core,
  com.abstratt.mdd.core.tests.harness;visibility:=reexport,
+ com.abstratt.blobstore,
+ com.abstratt.simpleblobstore,
  com.abstratt.nodestore,
  com.abstratt.nodestore.jdbc,
  com.abstratt.nodestore.inmemory, 

diff --git a/....mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/AbstractRuntimeTests.java b/....mdd.core.tests.runtime/src/com/abstratt/mdd/core/tests/runtime/AbstractRuntimeTests.java
@@ -5,8 +5,6 @@
 import java.util.Map.Entry;
 import java.util.Properties;
 
-import junit.framework.TestCase;
-
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Classifier;
@@ -25,8 +23,8 @@
 import com.abstratt.mdd.core.tests.harness.AbstractRepositoryBuildingTests;
 import com.abstratt.mdd.core.util.FeatureUtils;
 import com.abstratt.nodestore.INodeStoreCatalog;
-import com.abstratt.nodestore.INodeStoreFactory;
-import com.abstratt.nodestore.NodeStores;
+
+import junit.framework.TestCase;
 
 public class AbstractRuntimeTests extends AbstractRepositoryBuildingTests {
 
@@ -141,10 +139,6 @@ protected SchemaManagement getKirraSchema() {
         return RepositoryService.DEFAULT.getCurrentResource().getFeature(SchemaManagement.class);
     }
 
-    protected INodeStoreFactory getNodeStoreFactory() {
-        return NodeStores.get().getDefaultFactory();
-    }
-
     protected Map<String, Object> getNodeStoreSettings() {
         return new HashMap<String, Object>();
     }

diff --git a/...com.abstratt.simpleblobstore/src/com/abstratt/simpleblobstore/SimpleBlobStoreCatalog.java b/...com.abstratt.simpleblobstore/src/com/abstratt/simpleblobstore/SimpleBlobStoreCatalog.java
@@ -50,14 +50,6 @@ public void setEnvironment(String environment) {
         this.environment = environment;
     }
 
-    public void init() {
-        try {
-            Files.createDirectories(getBasePath());
-        } catch (IOException e) {
-            throw new BlobStoreException(e);
-        }
-    }
-
     private Path getBasePath() {
         return REPOSITORY_ROOT.resolve(catalogName).resolve(environment);
     }

diff --git a/...om.abstratt.simpleblobstore/src/com/abstratt/simpleblobstore/SimpleBlobStoreProvider.java b/...om.abstratt.simpleblobstore/src/com/abstratt/simpleblobstore/SimpleBlobStoreProvider.java
@@ -13,7 +13,6 @@ public void activateContext(Resource<?> resource) {
         TaskModeSelector taskModeSelector = resource.getFeature(TaskModeSelector.class);
         String environment = taskModeSelector.getEnvironment().toLowerCase();
         blobStoreCatalog.setEnvironment(environment);
-        blobStoreCatalog.init();
     }
 
     @Override