fix #106

nitrite · Aug 26, 2018 · d2a4fb6 · d2a4fb6
1 parent 7841eb9
commit d2a4fb6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/nitrite/src/main/java/org/dizitart/no2/NitriteContext.java b/nitrite/src/main/java/org/dizitart/no2/NitriteContext.java
@@ -28,6 +28,7 @@
 import org.dizitart.no2.mapper.JacksonMapper;
 import org.dizitart.no2.mapper.NitriteMapper;
 import org.dizitart.no2.util.ExecutorUtils;
+import org.dizitart.no2.util.StringUtils;
 
 import java.util.HashSet;
 import java.util.Map;
@@ -36,6 +37,7 @@
 import java.util.concurrent.ScheduledExecutorService;
 
 import static org.dizitart.no2.util.ExecutorUtils.shutdownAndAwaitTermination;
+import static org.dizitart.no2.util.ObjectUtils.isObjectStore;
 
 /**
  * Represents a readonly view of all contextual information of a nitrite database.
@@ -174,6 +176,18 @@ public Set<Module> getRegisteredModules() {
         return new HashSet<>(jacksonModule);
     }
 
+    public void dropCollection(String name) {
+        if (!StringUtils.isNullOrEmpty(name)) {
+            if (isObjectStore(name)) {
+                repositoryRegistry.remove(name);
+            } else {
+                collectionRegistry.remove(name);
+            }
+        }
+    }
+
+
+
     void shutdown() {
         shutdownAndAwaitTermination(scheduledWorkerPool, 5);
         shutdownAndAwaitTermination(workerPool, 5);

diff --git a/nitrite/src/main/java/org/dizitart/no2/internals/NitriteService.java b/nitrite/src/main/java/org/dizitart/no2/internals/NitriteService.java
@@ -377,6 +377,7 @@ WriteResultImpl remove(Filter filter, RemoveOptions removeOptions) {
      */
     void dropCollection() {
         indexingService.dropAllIndices();
+        nitriteContext.dropCollection(mapStore.getName());
         mapStore.getStore().removeMap(mapStore);
     }