Merge branch 'main' into develop

anidotnet · anidotnet · commit af1b6f8f2c95 · 2025-08-05T00:08:08.000+05:30
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -105,7 +105,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: graalvm/setup-graalvm@v1.2.8
+      - uses: graalvm/setup-graalvm@v1.3.5
         with:
           java-version: ${{ matrix.java }}
           distribution: 'graalvm-community'
diff --git a/nitrite-jackson-mapper/src/main/java/org/dizitart/no2/mapper/jackson/modules/NitriteIdSerializer.java b/nitrite-jackson-mapper/src/main/java/org/dizitart/no2/mapper/jackson/modules/NitriteIdSerializer.java
@@ -35,8 +35,6 @@ protected NitriteIdSerializer() {
 
     @Override
     public void serialize(NitriteId value, JsonGenerator gen, SerializerProvider provider) throws IOException {
-        if (value.getIdValue() != null) {
-            gen.writeString(value.getIdValue());
-        }
+        gen.writeString(Long.toString(value.getIdValue()));
     }
 }
diff --git a/nitrite-mvstore-adapter/src/main/java/org/dizitart/no2/mvstore/NitriteMVRTreeMap.java b/nitrite-mvstore-adapter/src/main/java/org/dizitart/no2/mvstore/NitriteMVRTreeMap.java
@@ -43,8 +43,8 @@ class NitriteMVRTreeMap<Key extends BoundingBox, Value> implements NitriteRTree<
 
     @Override
     public void add(Key key, NitriteId nitriteId) {
-        if (nitriteId != null && nitriteId.getIdValue() != null) {
-            MVSpatialKey spatialKey = getKey(key, Long.parseLong(nitriteId.getIdValue()));
+        if (nitriteId != null) {
+            MVSpatialKey spatialKey = getKey(key, nitriteId.getIdValue());
             MVStore.TxCounter txCounter = mvStore.registerVersionUsage();
             try {
                 mvMap.add(spatialKey, key);
@@ -56,8 +56,8 @@ public void add(Key key, NitriteId nitriteId) {
 
     @Override
     public void remove(Key key, NitriteId nitriteId) {
-        if (nitriteId != null && nitriteId.getIdValue() != null) {
-            MVSpatialKey spatialKey = getKey(key, Long.parseLong(nitriteId.getIdValue()));
+        if (nitriteId != null) {
+            MVSpatialKey spatialKey = getKey(key, nitriteId.getIdValue());
             MVStore.TxCounter txCounter = mvStore.registerVersionUsage();
             try {
                 mvMap.remove(spatialKey);
diff --git a/nitrite-native-tests/pom.xml b/nitrite-native-tests/pom.xml
@@ -21,8 +21,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <assertj.version>3.27.3</assertj.version>
-        <junit.version>5.11.4</junit.version>
-        <native-build-tools-plugin.version>0.10.4</native-build-tools-plugin.version>
+        <junit.version>5.12.2</junit.version>
+        <native-build-tools-plugin.version>0.10.6</native-build-tools-plugin.version>
     </properties>
 
     <dependencyManagement>
diff --git a/nitrite-rocksdb-adapter/src/main/java/org/dizitart/no2/rocksdb/RocksDBRTree.java b/nitrite-rocksdb-adapter/src/main/java/org/dizitart/no2/rocksdb/RocksDBRTree.java
@@ -46,17 +46,17 @@ public RocksDBRTree(RocksDBMap<SpatialKey, Key> backingMap) {
     @Override
     public void add(Key key, NitriteId nitriteId) {
         checkOpened();
-        if (nitriteId != null && nitriteId.getIdValue() != null) {
-            SpatialKey spatialKey = getKey(key, Long.parseLong(nitriteId.getIdValue()));
+        if (nitriteId != null) {
+            SpatialKey spatialKey = getKey(key, nitriteId.getIdValue());
             backingMap.put(spatialKey, key);
         }
     }
 
     @Override
     public void remove(Key key, NitriteId nitriteId) {
         checkOpened();
-        if (nitriteId != null && nitriteId.getIdValue() != null) {
-            SpatialKey spatialKey = getKey(key, Long.parseLong(nitriteId.getIdValue()));
+        if (nitriteId != null) {
+            SpatialKey spatialKey = getKey(key, nitriteId.getIdValue());
             backingMap.remove(spatialKey);
         }
     }
diff --git a/nitrite-rocksdb-adapter/src/main/java/org/dizitart/no2/rocksdb/formatter/NitriteSerializers.java b/nitrite-rocksdb-adapter/src/main/java/org/dizitart/no2/rocksdb/formatter/NitriteSerializers.java
@@ -34,7 +34,7 @@ private static class NitriteIdSerializer extends ComparableKeySerializer<Nitrite
 
         @Override
         protected void writeKeyInternal(Kryo kryo, Output output, NitriteId object) {
-            output.writeString(object.getIdValue());
+            output.writeString(Long.toString(object.getIdValue()));
         }
 
         @Override
diff --git a/nitrite/src/main/java/org/dizitart/no2/collection/NitriteDocument.java b/nitrite/src/main/java/org/dizitart/no2/collection/NitriteDocument.java
@@ -103,20 +103,29 @@ public <T> T get(String field, Class<T> type) {
 
     @Override
     public NitriteId getId() {
-        String id;
+        long id;
+        Object retrievedId = null;
         try {
             // if _id field is not populated already, create a new id
             // and set, otherwise return the existing id
             if (!containsKey(DOC_ID)) {
                 id = newId().getIdValue();
                 super.put(DOC_ID, id);
             } else {
-                id = (String) get(DOC_ID);
+               retrievedId = get(DOC_ID);
+               id = (long) get(DOC_ID);
             }
 
             // create a nitrite id instance from the string value
             return createId(id);
         } catch (ClassCastException cce) {
+            if (retrievedId != null && retrievedId instanceof String) {
+                try {
+                    return createId((String) retrievedId);
+                } catch (InvalidIdException ide) {
+                    // fall through to throw InvalidIdException below
+                }
+            }
             throw new InvalidIdException("Invalid _id found " + get(DOC_ID));
         }
     }
diff --git a/nitrite/src/main/java/org/dizitart/no2/collection/NitriteId.java b/nitrite/src/main/java/org/dizitart/no2/collection/NitriteId.java
@@ -47,18 +47,18 @@ public final class NitriteId implements Comparable<NitriteId>, Serializable {
     private static final long serialVersionUID = 1477462375L;
     private static final SnowflakeIdGenerator generator = new SnowflakeIdGenerator();
 
-    /**
-     *  Gets the underlying value of the NitriteId.
-     *  <p>
-     *  The value is a string representation of a 64bit integer number.
-     */
-    private String idValue;
+    /** The underlying value of the NitriteId. */
+    private long idValue;
 
     private NitriteId() {
-        this.idValue = Long.toString(generator.getId());
+        this.idValue = generator.getId();
     }
 
     private NitriteId(String value) {
+        this.idValue = Long.parseLong(value);
+    }
+
+    private NitriteId(long value) {
         this.idValue = value;
     }
 
@@ -84,6 +84,17 @@ public static NitriteId createId(String value) {
         return new NitriteId(value);
     }
 
+    /**
+     * Creates a {@link NitriteId} from a {@code long} value.
+     *
+     * @param value the value
+     * @return the {@link NitriteId}
+     */
+    public static NitriteId createId(long value) {
+        validId(value);
+        return new NitriteId(value);
+    }
+
     /**
      * Validates a value to be used as {@link NitriteId}.
      * <p>
@@ -106,26 +117,19 @@ public static boolean validId(Object value) {
 
     @Override
     public int compareTo(NitriteId other) {
-        if (other.idValue == null) {
-            throw new InvalidIdException("Cannot compare with null id");
-        }
-
-        return Long.compare(Long.parseLong(idValue), Long.parseLong(other.idValue));
+        return Long.compare(idValue, other.idValue);
     }
 
     @Override
     public String toString() {
-        if (idValue != null) {
-            return ID_PREFIX + idValue + ID_SUFFIX;
-        }
-        return "";
+        return ID_PREFIX + idValue + ID_SUFFIX;
     }
 
     private void writeObject(ObjectOutputStream stream) throws IOException {
-        stream.writeUTF(idValue);
+        stream.writeUTF(Long.toString(idValue));
     }
 
     private void readObject(ObjectInputStream stream) throws IOException {
-        idValue = stream.readUTF();
+        idValue = Long.parseLong(stream.readUTF());
     }
 }
diff --git a/nitrite/src/main/java/org/dizitart/no2/collection/operation/ReadOperations.java b/nitrite/src/main/java/org/dizitart/no2/collection/operation/ReadOperations.java
@@ -135,7 +135,7 @@ private RecordStream<Pair<NitriteId, Document>> findSuitableStream(FindPlan find
             // and or single filter
             if (findPlan.getByIdFilter() != null) {
                 FieldBasedFilter byIdFilter = findPlan.getByIdFilter();
-                NitriteId nitriteId = NitriteId.createId((String) byIdFilter.getValue());
+                NitriteId nitriteId = NitriteId.createId((long) byIdFilter.getValue());
                 if (nitriteMap.containsKey(nitriteId)) {
                     Document document = nitriteMap.get(nitriteId);
                     rawStream = RecordStream.single(pair(nitriteId, document));
diff --git a/nitrite/src/main/java/org/dizitart/no2/filters/StringFilter.java b/nitrite/src/main/java/org/dizitart/no2/filters/StringFilter.java
@@ -23,6 +23,8 @@
  * @since 1.0
  */
 public abstract class StringFilter extends ComparableFilter {
+    private final StringFilterHelper helper = new StringFilterHelper();
+
     /**
      * Instantiates a new String filter.
      *
@@ -41,4 +43,15 @@ protected StringFilter(String field, String value) {
     public String getStringValue() {
         return (String) getValue();
     }
+
+    /**
+     * Converts an object to a string safely.
+     * @param obj the object to convert
+     * @return the string representation, or empty if null
+     */
+    protected String toStringValue(Object obj) {
+        return helper.toStringValue(obj);
+    }
+
+    public abstract boolean applyOnString(String value);
 }
diff --git a/nitrite/src/main/java/org/dizitart/no2/filters/StringFilterHelper.java b/nitrite/src/main/java/org/dizitart/no2/filters/StringFilterHelper.java
@@ -0,0 +1,7 @@
+package org.dizitart.no2.filters;
+
+public class StringFilterHelper {
+    public String toStringValue(Object obj) {
+        return obj != null ? obj.toString() : "";
+    }
+}
diff --git a/nitrite/src/main/java/org/dizitart/no2/filters/TextFilter.java b/nitrite/src/main/java/org/dizitart/no2/filters/TextFilter.java
@@ -48,24 +48,34 @@ public class TextFilter extends StringFilter {
         super(field, value);
     }
 
+    @Override
+    public boolean applyOnString(String value) {
+        String searchString = (String) this.getValue();
+        if (searchString.startsWith("*") || searchString.endsWith("*")) {
+            searchString = searchString.replace("*", "");
+        }
+        return value.toLowerCase().contains(searchString.toLowerCase());
+    }
+
+    /**
+     * Applies this filter to a document, checking if the specified field contains the search string.
+     *
+     * @param element the document pair to filter
+     * @return true if the field value contains the search string (case-insensitive), false otherwise
+     * @throws FilterException if the field is not a string
+     */
     @Override
     public boolean apply(Pair<NitriteId, Document> element) {
         notNull(getField(), "field cannot be null");
         notNull(getStringValue(), "search term cannot be null");
-        String searchString = getStringValue();
         Object docValue = element.getSecond().get(getField());
 
         if (!(docValue instanceof String)) {
             throw new FilterException("Text filter can not be applied on non string field " + getField());
         }
 
         String docString = (String) docValue;
-
-        if (searchString.startsWith("*") || searchString.endsWith("*")) {
-            searchString = searchString.replace("*", "");
-        }
-
-        return docString.toLowerCase().contains(searchString.toLowerCase());
+        return applyOnString(docString);
     }
 
     @Override
@@ -194,4 +204,5 @@ private LinkedHashSet<NitriteId> sortedIdsByScore(Map<NitriteId, Integer> unsort
     public List<?> applyOnIndex(IndexMap indexMap) {
         return null;
     }
+
 }
diff --git a/nitrite/src/main/java/org/dizitart/no2/migration/MigrationManager.java b/nitrite/src/main/java/org/dizitart/no2/migration/MigrationManager.java
@@ -48,29 +48,37 @@ public MigrationManager(Nitrite nitrite) {
      */
     public void doMigrate() {
         if (isMigrationNeeded()) {
-            Integer existingVersion = storeMetadata.getSchemaVersion();
-            Integer incomingVersion = nitriteConfig.getSchemaVersion();
-
-            Queue<Migration> migrationPath = findMigrationPath(existingVersion, incomingVersion);
-            if (migrationPath == null || migrationPath.isEmpty()) {
-                // close the database
-                try {
-                    database.close();
-                } catch (Exception e) {
-                    throw new NitriteIOException("Failed to close the database", e);
-                }
+            Integer currentVersion = storeMetadata.getSchemaVersion();
+            Integer targetVersion = nitriteConfig.getSchemaVersion();
+
+            Queue<Migration> migrationPath = findMigrationPath(currentVersion, targetVersion);
+            boolean hasValidPath = migrationPath != null && !migrationPath.isEmpty();
 
-                throw new MigrationException("Schema version mismatch, no migration path found from version "
-                    + storeMetadata.getSchemaVersion() + " to " + nitriteConfig.getSchemaVersion());
+            if (!hasValidPath) {
+                closeDatabaseAndThrowException( currentVersion, targetVersion);
             }
+            executeMigrationPath(migrationPath);
+        }
+    }
 
-            int length = migrationPath.size();
-            for (int i = 0; i < length; i++) {
-                Migration migration = migrationPath.poll();
-                if (migration != null) {
-                    Queue<MigrationStep> migrationSteps = migration.steps();
-                    executeMigrationSteps(migrationSteps);
-                }
+    private void closeDatabaseAndThrowException(Integer currentVersion, Integer targetVersion) {
+        // close the database
+        try {
+            database.close();
+        } catch (Exception e) {
+            throw new NitriteIOException("Failed to close the database", e);
+        }
+        throw new MigrationException("Schema version mismatch, no migration path found from version "
+            + currentVersion + " to " + targetVersion);
+    }
+
+    private void executeMigrationPath(Queue<Migration> migrationPath) {
+        int pathLength = migrationPath.size();
+        for (int i = 0; i < pathLength; i++) {
+            Migration migration = migrationPath.poll();
+            if (migration != null) {
+                Queue<MigrationStep> migrationSteps = migration.steps();
+                executeMigrationSteps(migrationSteps);
             }
         }
     }
diff --git a/nitrite/src/main/java/org/dizitart/no2/store/memory/InMemoryRTree.java b/nitrite/src/main/java/org/dizitart/no2/store/memory/InMemoryRTree.java
@@ -39,17 +39,17 @@ public InMemoryRTree(String mapName, NitriteStore<?> nitriteStore) {
     @Override
     public void add(Key key, NitriteId nitriteId) {
         checkOpened();
-        if (nitriteId != null && nitriteId.getIdValue() != null) {
-            SpatialKey spatialKey = getKey(key, Long.parseLong(nitriteId.getIdValue()));
+        if (nitriteId != null) {
+            SpatialKey spatialKey = getKey(key, nitriteId.getIdValue());
             backingMap.put(spatialKey, key);
         }
     }
 
     @Override
     public void remove(Key key, NitriteId nitriteId) {
         checkOpened();
-        if (nitriteId != null && nitriteId.getIdValue() != null) {
-            SpatialKey spatialKey = getKey(key, Long.parseLong(nitriteId.getIdValue()));
+        if (nitriteId != null) {
+            SpatialKey spatialKey = getKey(key, nitriteId.getIdValue());
             backingMap.remove(spatialKey);
         }
     }
diff --git a/nitrite/src/main/java/org/dizitart/no2/transaction/TransactionalRTree.java b/nitrite/src/main/java/org/dizitart/no2/transaction/TransactionalRTree.java
@@ -26,16 +26,16 @@ public TransactionalRTree(NitriteRTree<Key, Value> primary) {
 
     @Override
     public void add(Key key, NitriteId nitriteId) {
-        if (nitriteId != null && nitriteId.getIdValue() != null) {
-            SpatialKey spatialKey = getKey(key, Long.parseLong(nitriteId.getIdValue()));
+        if (nitriteId != null) {
+            SpatialKey spatialKey = getKey(key, nitriteId.getIdValue());
             map.put(spatialKey, key);
         }
     }
 
     @Override
     public void remove(Key key, NitriteId nitriteId) {
-        if (nitriteId != null && nitriteId.getIdValue() != null) {
-            SpatialKey spatialKey = getKey(key, Long.parseLong(nitriteId.getIdValue()));
+        if (nitriteId != null) {
+            SpatialKey spatialKey = getKey(key, nitriteId.getIdValue());
             map.remove(spatialKey);
         }
     }
diff --git a/nitrite/src/test/java/org/dizitart/no2/collection/NitriteDocumentTest.java b/nitrite/src/test/java/org/dizitart/no2/collection/NitriteDocumentTest.java
@@ -56,8 +56,8 @@ public void testGet4() {
     @Test
     public void testGetId() {
         NitriteDocument nitriteDocument = new NitriteDocument();
-        nitriteDocument.putIfAbsent("_id", "42");
-        assertEquals("42", nitriteDocument.getId().getIdValue());
+        nitriteDocument.putIfAbsent("_id", 42L);
+        assertEquals(42L, nitriteDocument.getId().getIdValue());
     }
 
     @Test
diff --git a/nitrite/src/test/java/org/dizitart/no2/collection/NitriteIdTest.java b/nitrite/src/test/java/org/dizitart/no2/collection/NitriteIdTest.java
diff --git a/nitrite/src/test/java/org/dizitart/no2/filters/FilterTest.java b/nitrite/src/test/java/org/dizitart/no2/filters/FilterTest.java
diff --git a/pom.xml b/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,6 @@ protected NitriteIdSerializer() {`
`35`	`35`
`36`	`36`	`@Override`
`37`	`37`	`public void serialize(NitriteId value, JsonGenerator gen, SerializerProvider provider) throws IOException {`
`38`		`- if (value.getIdValue() != null) {`
`39`		`- gen.writeString(value.getIdValue());`
`40`		`- }`
	`38`	`+ gen.writeString(Long.toString(value.getIdValue()));`
`41`	`39`	`}`
`42`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,17 +46,17 @@ public RocksDBRTree(RocksDBMap<SpatialKey, Key> backingMap) {`
`46`	`46`	`@Override`
`47`	`47`	`public void add(Key key, NitriteId nitriteId) {`
`48`	`48`	`checkOpened();`
`49`		`- if (nitriteId != null && nitriteId.getIdValue() != null) {`
`50`		`- SpatialKey spatialKey = getKey(key, Long.parseLong(nitriteId.getIdValue()));`
	`49`	`+ if (nitriteId != null) {`
	`50`	`+ SpatialKey spatialKey = getKey(key, nitriteId.getIdValue());`
`51`	`51`	`backingMap.put(spatialKey, key);`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`@Override`
`56`	`56`	`public void remove(Key key, NitriteId nitriteId) {`
`57`	`57`	`checkOpened();`
`58`		`- if (nitriteId != null && nitriteId.getIdValue() != null) {`
`59`		`- SpatialKey spatialKey = getKey(key, Long.parseLong(nitriteId.getIdValue()));`
	`58`	`+ if (nitriteId != null) {`
	`59`	`+ SpatialKey spatialKey = getKey(key, nitriteId.getIdValue());`
`60`	`60`	`backingMap.remove(spatialKey);`
`61`	`61`	`}`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ private static class NitriteIdSerializer extends ComparableKeySerializer<Nitrite`
`34`	`34`
`35`	`35`	`@Override`
`36`	`36`	`protected void writeKeyInternal(Kryo kryo, Output output, NitriteId object) {`
`37`		`- output.writeString(object.getIdValue());`
	`37`	`+ output.writeString(Long.toString(object.getIdValue()));`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`@Override`