Version 1.3.6-beta

1. Update LevelDB version. 2. Delete the BiMap data structure. 3. Optimize code.
artbits · Feb 14, 2024 · 6a69bed · 6a69bed
1 parent eec79e6
commit 6a69bed
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 102 deletions.
diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.github.artbits:quickio:1.3.5'
+    implementation 'com.github.artbits:quickio:1.3.6-beta'
 }
 ```
 Maven:
@@ -41,7 +41,7 @@ Maven:
 <dependency>
     <groupId>com.github.artbits</groupId>
     <artifactId>quickio</artifactId>
-    <version>1.3.5</version>
+    <version>1.3.6-beta</version>
 </dependency>
 ```
 
@@ -111,6 +111,7 @@ Optional.ofNullable(file).ifPresent(f -> QuickIO.println(f.getPath()));
     + [Tin - File storage](/src/test/java/apis/TinExample.java)
 + Thanks: 
     + [LevelDB](https://github.com/dain/leveldb)
+    + [LevelDB-Beta](https://github.com/artbits/leveldb-beta)
     + [Protostuff](https://github.com/protostuff/protostuff)
 
 

diff --git a/build.gradle b/build.gradle
@@ -8,10 +8,12 @@ version '0.0.1'
 
 repositories {
     maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' }
+    maven { url 'https://www.jitpack.io' }
 }
 
 dependencies {
-    implementation 'org.iq80.leveldb:leveldb:0.12'
+//    implementation 'org.iq80.leveldb:leveldb:0.12'
+    implementation 'com.github.artbits:leveldb-beta:1.0.0'
     implementation 'io.protostuff:protostuff-core:1.8.0'
     implementation 'io.protostuff:protostuff-runtime:1.8.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.0'

diff --git a/src/main/java/com/github/artbits/quickio/core/EngineIO.java b/src/main/java/com/github/artbits/quickio/core/EngineIO.java
@@ -16,7 +16,7 @@
 
 package com.github.artbits.quickio.core;
 
-import org.iq80.leveldb.WriteBatch;
+import org.iq80.leveldb.api.WriteBatch;
 
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;

diff --git a/src/main/java/com/github/artbits/quickio/core/EngineLevel.java b/src/main/java/com/github/artbits/quickio/core/EngineLevel.java
@@ -17,7 +17,7 @@
 package com.github.artbits.quickio.core;
 
 import com.github.artbits.quickio.exception.QIOException;
-import org.iq80.leveldb.*;
+import org.iq80.leveldb.api.*;
 import org.iq80.leveldb.impl.Iq80DBFactory;
 
 import java.io.File;

diff --git a/src/main/java/com/github/artbits/quickio/core/Indexer.java b/src/main/java/com/github/artbits/quickio/core/Indexer.java
@@ -18,7 +18,7 @@
 
 import com.github.artbits.quickio.annotations.Index;
 import com.github.artbits.quickio.exception.QIOException;
-import org.iq80.leveldb.WriteBatch;
+import org.iq80.leveldb.api.WriteBatch;
 
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;

diff --git a/src/main/java/com/github/artbits/quickio/core/QCollection.java b/src/main/java/com/github/artbits/quickio/core/QCollection.java
@@ -19,8 +19,7 @@
 import com.github.artbits.quickio.api.Collection;
 import com.github.artbits.quickio.api.FindOptions;
 import com.github.artbits.quickio.exception.QIOException;
-import com.google.common.util.concurrent.AtomicDouble;
-import org.iq80.leveldb.DBException;
+import org.iq80.leveldb.api.DBException;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -395,19 +394,23 @@ public BigDecimal sum(String fieldName) {
 
     @Override
     public Double average(String fieldName, Predicate<T> predicate) {
-        AtomicDouble sum = new AtomicDouble(0);
+        AtomicReference<BigDecimal> sum = new AtomicReference<>();
         AtomicLong count = new AtomicLong(0);
         engine.iteration((key, value) -> {
             T t = Codec.decode(value, clazz);
             if (t != null) {
                 if (predicate != null && !predicate.test(t)) {
                     return;
                 }
-                sum.addAndGet(new ReflectObject<>(t).getBigDecimalValue(fieldName).doubleValue());
+                if (sum.get() == null) {
+                    sum.set(new ReflectObject<>(t).getBigDecimalValue(fieldName));
+                } else {
+                    sum.set(sum.get().add(new ReflectObject<>(t).getBigDecimalValue(fieldName)));
+                }
                 count.incrementAndGet();
             }
         });
-        return sum.get() / count.get();
+        return sum.get().doubleValue() / count.get();
     }
 
 

diff --git a/src/main/java/com/github/artbits/quickio/struct/BiMap.java b/src/main/java/com/github/artbits/quickio/struct/BiMap.java
diff --git a/src/test/java/apis/KVExample.java b/src/test/java/apis/KVExample.java
@@ -3,7 +3,6 @@
 import com.github.artbits.quickio.api.KV;
 import com.github.artbits.quickio.core.Config;
 import com.github.artbits.quickio.core.QuickIO;
-import com.github.artbits.quickio.struct.BiMap;
 import org.junit.jupiter.api.Test;
 
 import java.util.Objects;
@@ -81,21 +80,4 @@ void foreach_apis() {
         });
     }
 
-
-    @Test
-    void bimap_struct() {
-        BiMap citiesMap = new BiMap<Integer, String>()
-                .put(1, "Beijing")
-                .put(2, "Shanghai")
-                .put(3, "Canton")
-                .put(4, "Shenzhen");
-
-        kv.write("cities", citiesMap);
-
-        BiMap<Integer, String> map = kv.read("cities", new BiMap<>());
-        map.forEach((key, value) -> QuickIO.println("%d = %s", key, value));
-
-        QuickIO.println("%d = %s", map.getKey("Beijing"), map.getValue(1));
-    }
-
 }