fixes #902

1. Fix for #902 2. Updated test log4j2 config 3. Added stress tests
nitrite · Feb 16, 2024 · 029d5cf · 029d5cf
1 parent 28750a6
commit 029d5cf
Show file tree

Hide file tree

Showing 22 changed files with 292 additions and 41 deletions.
diff --git a/nitrite-jackson-mapper/pom.xml b/nitrite-jackson-mapper/pom.xml
@@ -70,7 +70,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
+            <artifactId>log4j-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j2-impl</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/nitrite-jackson-mapper/src/test/resources/log4j2.xml b/nitrite-jackson-mapper/src/test/resources/log4j2.xml
@@ -14,17 +14,17 @@
   ~ limitations under the License.
   -->
 
-<Configuration status="ERROR" name="nitrite" monitorInterval="5">
+<Configuration status="OFF" name="nitrite" monitorInterval="5">
     <Appenders>
         <Console name="Console" target="SYSTEM_OUT">
             <PatternLayout pattern="%d %p %c{1.} [%t] %m%n"/>
         </Console>
     </Appenders>
     <Loggers>
-        <Root level="ERROR">
+        <Root level="OFF">
             <AppenderRef ref="Console"/>
         </Root>
-        <Logger name="org.dizitart" level="ERROR" additivity="false">
+        <Logger name="org.dizitart" level="OFF" additivity="false">
             <AppenderRef ref="Console"/>
         </Logger>
     </Loggers>

diff --git a/nitrite-mvstore-adapter/pom.xml b/nitrite-mvstore-adapter/pom.xml
@@ -70,7 +70,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
+            <artifactId>log4j-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j2-impl</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/nitrite-mvstore-adapter/src/test/java/org/dizitart/no2/integration/NitriteStressTest.java b/nitrite-mvstore-adapter/src/test/java/org/dizitart/no2/integration/NitriteStressTest.java
@@ -21,6 +21,7 @@
 import jakarta.xml.bind.annotation.XmlSchemaType;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.time.StopWatch;
 import org.dizitart.no2.Nitrite;
 import org.dizitart.no2.collection.Document;
 import org.dizitart.no2.collection.DocumentCursor;
@@ -35,18 +36,18 @@
 import org.dizitart.no2.repository.annotations.Id;
 import org.dizitart.no2.repository.annotations.Index;
 import org.dizitart.no2.repository.annotations.Indices;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.*;
 import uk.co.jemos.podam.api.PodamFactory;
 import uk.co.jemos.podam.api.PodamFactoryImpl;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
+import java.util.UUID;
 import java.util.concurrent.atomic.AtomicLong;
 
+import static org.dizitart.no2.collection.UpdateOptions.updateOptions;
+import static org.dizitart.no2.filters.FluentFilter.where;
 import static org.dizitart.no2.integration.TestUtil.*;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -109,6 +110,57 @@ public void stressTest() {
         assertEquals(counter, size);
     }
 
+    @Test
+    @Ignore
+    public void testIssue902() {
+        NitriteCollection nitriteCollection = db.getCollection("testIssue902");
+        nitriteCollection.createIndex(IndexOptions.indexOptions(IndexType.NON_UNIQUE), "name");
+        nitriteCollection.createIndex(IndexOptions.indexOptions(IndexType.NON_UNIQUE), "age");
+        nitriteCollection.createIndex(IndexOptions.indexOptions(IndexType.NON_UNIQUE), "address");
+        nitriteCollection.createIndex(IndexOptions.indexOptions(IndexType.NON_UNIQUE), "email");
+        nitriteCollection.createIndex(IndexOptions.indexOptions(IndexType.NON_UNIQUE), "phone");
+        nitriteCollection.createIndex(IndexOptions.indexOptions(IndexType.NON_UNIQUE), "dateOfBirth");
+        nitriteCollection.createIndex(IndexOptions.indexOptions(IndexType.NON_UNIQUE), "company");
+        nitriteCollection.createIndex(IndexOptions.indexOptions(IndexType.NON_UNIQUE), "balance");
+        nitriteCollection.createIndex(IndexOptions.indexOptions(IndexType.NON_UNIQUE), "isActive");
+        nitriteCollection.createIndex(IndexOptions.indexOptions(IndexType.UNIQUE), "guid");
+        nitriteCollection.createIndex(IndexOptions.indexOptions(IndexType.NON_UNIQUE), "index");
+
+        for (int i = 0; i < 10; i++) {
+            StopWatch stopWatch = new StopWatch();
+            stopWatch.start();
+            for (int j = 0; j < 30000; j++) {
+                Document document = Document.createDocument();
+                document.put("name", "name" + j);
+                document.put("age", j);
+                document.put("address", "address" + j);
+                document.put("email", "email" + j);
+                document.put("phone", "phone" + j);
+                document.put("dateOfBirth", "dateOfBirth" + j);
+                document.put("company", "company" + j);
+                document.put("balance", j);
+                document.put("isActive", true);
+                document.put("guid", UUID.randomUUID().toString());
+                document.put("index", j);
+                nitriteCollection.insert(document);
+            }
+            stopWatch.stop();
+            log.error("Time taken to insert 30000 records: " + stopWatch.getTime());
+        }
+
+        if (db.hasUnsavedChanges()) {
+            db.commit();
+        }
+
+        Document updatedDocument = Document.createDocument("unrelatedField", "unrelatedValue");
+        StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+        nitriteCollection.update(where("balance").eq(200000), updatedDocument, updateOptions(false));
+        stopWatch.stop();
+
+        log.error("Time taken to update 1 record: " + stopWatch.getTime());
+    }
+
     @Test
     public void testIssue41() {
         collection.createIndex(IndexOptions.indexOptions(IndexType.NON_UNIQUE), "number");

diff --git a/nitrite-mvstore-adapter/src/test/resources/log4j2.xml b/nitrite-mvstore-adapter/src/test/resources/log4j2.xml
@@ -14,17 +14,17 @@
   ~ limitations under the License.
   -->
 
-<Configuration status="ERROR" name="nitrite" monitorInterval="5">
+<Configuration status="OFF" name="nitrite" monitorInterval="5">
     <Appenders>
         <Console name="Console" target="SYSTEM_OUT">
             <PatternLayout pattern="%d %p %c{1.} [%t] %m%n"/>
         </Console>
     </Appenders>
     <Loggers>
-        <Root level="ERROR">
+        <Root level="OFF">
             <AppenderRef ref="Console"/>
         </Root>
-        <Logger name="org.dizitart" level="ERROR" additivity="false">
+        <Logger name="org.dizitart" level="OFF" additivity="false">
             <AppenderRef ref="Console"/>
         </Logger>
     </Loggers>

diff --git a/nitrite-rocksdb-adapter/pom.xml b/nitrite-rocksdb-adapter/pom.xml
@@ -74,7 +74,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
+            <artifactId>log4j-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j2-impl</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/nitrite-rocksdb-adapter/src/test/java/org/dizitart/no2/integration/NitriteStressTest.java b/nitrite-rocksdb-adapter/src/test/java/org/dizitart/no2/integration/NitriteStressTest.java
@@ -21,6 +21,7 @@
 import jakarta.xml.bind.annotation.XmlSchemaType;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.time.StopWatch;
 import org.dizitart.no2.Nitrite;
 import org.dizitart.no2.collection.Document;
 import org.dizitart.no2.collection.DocumentCursor;
@@ -35,18 +36,18 @@
 import org.dizitart.no2.repository.annotations.Id;
 import org.dizitart.no2.repository.annotations.Index;
 import org.dizitart.no2.repository.annotations.Indices;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.*;
 import uk.co.jemos.podam.api.PodamFactory;
 import uk.co.jemos.podam.api.PodamFactoryImpl;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
+import java.util.UUID;
 import java.util.concurrent.atomic.AtomicLong;
 
+import static org.dizitart.no2.collection.UpdateOptions.updateOptions;
+import static org.dizitart.no2.filters.FluentFilter.where;
 import static org.dizitart.no2.integration.TestUtil.*;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -108,6 +109,57 @@ public void stressTest() {
         assertEquals(counter, size);
     }
 
+    @Test
+    @Ignore
+    public void testIssue902() {
+        NitriteCollection nitriteCollection = db.getCollection("testIssue902");
+        nitriteCollection.createIndex(IndexOptions.indexOptions(IndexType.NON_UNIQUE), "name");
+        nitriteCollection.createIndex(IndexOptions.indexOptions(IndexType.NON_UNIQUE), "age");
+        nitriteCollection.createIndex(IndexOptions.indexOptions(IndexType.NON_UNIQUE), "address");
+        nitriteCollection.createIndex(IndexOptions.indexOptions(IndexType.NON_UNIQUE), "email");
+        nitriteCollection.createIndex(IndexOptions.indexOptions(IndexType.NON_UNIQUE), "phone");
+        nitriteCollection.createIndex(IndexOptions.indexOptions(IndexType.NON_UNIQUE), "dateOfBirth");
+        nitriteCollection.createIndex(IndexOptions.indexOptions(IndexType.NON_UNIQUE), "company");
+        nitriteCollection.createIndex(IndexOptions.indexOptions(IndexType.NON_UNIQUE), "balance");
+        nitriteCollection.createIndex(IndexOptions.indexOptions(IndexType.NON_UNIQUE), "isActive");
+        nitriteCollection.createIndex(IndexOptions.indexOptions(IndexType.UNIQUE), "guid");
+        nitriteCollection.createIndex(IndexOptions.indexOptions(IndexType.NON_UNIQUE), "index");
+
+        for (int i = 0; i < 10; i++) {
+            StopWatch stopWatch = new StopWatch();
+            stopWatch.start();
+            for (int j = 0; j < 3000; j++) {
+                Document document = Document.createDocument();
+                document.put("name", "name" + j);
+                document.put("age", j);
+                document.put("address", "address" + j);
+                document.put("email", "email" + j);
+                document.put("phone", "phone" + j);
+                document.put("dateOfBirth", "dateOfBirth" + j);
+                document.put("company", "company" + j);
+                document.put("balance", j);
+                document.put("isActive", true);
+                document.put("guid", UUID.randomUUID().toString());
+                document.put("index", j);
+                nitriteCollection.insert(document);
+            }
+            stopWatch.stop();
+            log.error("Time taken to insert 30000 records: " + stopWatch.getTime());
+        }
+
+        if (db.hasUnsavedChanges()) {
+            db.commit();
+        }
+
+        Document updatedDocument = Document.createDocument("unrelatedField", "unrelatedValue");
+        StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+        nitriteCollection.update(where("balance").eq(200000), updatedDocument, updateOptions(false));
+        stopWatch.stop();
+
+        log.error("Time taken to update 1 record: " + stopWatch.getTime());
+    }
+
     @Test
     public void testIssue41() {
         collection.createIndex(IndexOptions.indexOptions(IndexType.NON_UNIQUE), "number");

diff --git a/nitrite-rocksdb-adapter/src/test/resources/log4j2.xml b/nitrite-rocksdb-adapter/src/test/resources/log4j2.xml
@@ -14,17 +14,17 @@
   ~ limitations under the License.
   -->
 
-<Configuration status="ERROR" name="nitrite" monitorInterval="5">
+<Configuration status="OFF" name="nitrite" monitorInterval="5">
     <Appenders>
         <Console name="Console" target="SYSTEM_OUT">
             <PatternLayout pattern="%d %p %c{1.} [%t] %m%n"/>
         </Console>
     </Appenders>
     <Loggers>
-        <Root level="ERROR">
+        <Root level="OFF">
             <AppenderRef ref="Console"/>
         </Root>
-        <Logger name="org.dizitart" level="ERROR" additivity="false">
+        <Logger name="org.dizitart" level="OFF" additivity="false">
             <AppenderRef ref="Console"/>
         </Logger>
     </Loggers>

diff --git a/nitrite-spatial/pom.xml b/nitrite-spatial/pom.xml
@@ -62,6 +62,21 @@
             <artifactId>nitrite-mvstore-adapter</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j2-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/nitrite-spatial/src/test/resources/log4j2.xml b/nitrite-spatial/src/test/resources/log4j2.xml
@@ -0,0 +1,31 @@
+<!--
+  ~ Copyright (c) 2017-2020. Nitrite author or authors.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<Configuration status="OFF" name="nitrite" monitorInterval="5">
+    <Appenders>
+        <Console name="Console" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d %p %c{1.} [%t] %m%n"/>
+        </Console>
+    </Appenders>
+    <Loggers>
+        <Root level="OFF">
+            <AppenderRef ref="Console"/>
+        </Root>
+        <Logger name="org.dizitart" level="OFF" additivity="false">
+            <AppenderRef ref="Console"/>
+        </Logger>
+    </Loggers>
+</Configuration>
diff --git a/nitrite-support/pom.xml b/nitrite-support/pom.xml
@@ -73,6 +73,21 @@
             <artifactId>snakeyaml</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j2-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/nitrite-support/src/test/resources/log4j2.xml b/nitrite-support/src/test/resources/log4j2.xml
@@ -14,17 +14,17 @@
   ~ limitations under the License.
   -->
 
-<Configuration status="ERROR" name="nitrite" monitorInterval="5">
+<Configuration status="OFF" name="nitrite" monitorInterval="5">
     <Appenders>
         <Console name="Console" target="SYSTEM_OUT">
             <PatternLayout pattern="%d %p %c{1.} [%t] %m%n"/>
         </Console>
     </Appenders>
     <Loggers>
-        <Root level="ERROR">
+        <Root level="OFF">
             <AppenderRef ref="Console"/>
         </Root>
-        <Logger name="org.dizitart" level="ERROR" additivity="false">
+        <Logger name="org.dizitart" level="OFF" additivity="false">
             <AppenderRef ref="Console"/>
         </Logger>
     </Loggers>

diff --git a/nitrite/pom.xml b/nitrite/pom.xml
@@ -69,7 +69,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
+            <artifactId>log4j-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j2-impl</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>