Merge branch 'develop' into fix/fast-sync-stall

ethereum · Mar 14, 2017 · 53b430a · 53b430a
2 parents ce56df2 + c1fc129
commit 53b430a
Show file tree

Hide file tree

Showing 16 changed files with 137 additions and 637 deletions.
diff --git a/ethereumj-core/build.gradle b/ethereumj-core/build.gradle
@@ -139,8 +139,6 @@ dependencies {
     compile "com.typesafe:config:1.2.1"
     compile "com.googlecode.concurrent-locks:concurrent-locks:1.0.0"
 
-    compile "org.mapdb:mapdb:2.0-beta12"
-
     compile("com.googlecode.json-simple:json-simple:1.1.1") {
         exclude group: 'junit', module: 'junit'
     }

diff --git a/ethereumj-core/src/main/java/org/ethereum/config/CommonConfig.java b/ethereumj-core/src/main/java/org/ethereum/config/CommonConfig.java
@@ -5,8 +5,6 @@
 import org.ethereum.datasource.*;
 import org.ethereum.datasource.inmem.HashMapDB;
 import org.ethereum.datasource.leveldb.LevelDbDataSource;
-import org.ethereum.datasource.mapdb.MapDBFactory;
-import org.ethereum.datasource.mapdb.MapDBFactoryImpl;
 import org.ethereum.db.*;
 import org.ethereum.listener.EthereumListener;
 import org.ethereum.sync.FastSyncManager;
@@ -125,9 +123,7 @@ public DbSource<byte[]> keyValueDataSource(String name) {
         String dataSource = systemProperties().getKeyValueDataSource();
         try {
             DbSource<byte[]> dbSource;
-            if ("mapdb".equals(dataSource)) {
-                dbSource = mapDBFactory().createDataSource();
-            } else if ("inmem".equals(dataSource)) {
+            if ("inmem".equals(dataSource)) {
                 dbSource = new HashMapDB<>();
             } else {
                 dataSource = "leveldb";
@@ -249,7 +245,9 @@ public ParentBlockHeaderValidator parentHeaderValidator() {
 
     @Bean
     @Lazy
-    public MapDBFactory mapDBFactory() {
-        return new MapDBFactoryImpl();
+    public PeerSource peerSource() {
+        DbSource<byte[]> dbSource = keyValueDataSource("peers");
+        dbSources.add(dbSource);
+        return new PeerSource(dbSource);
     }
 }
diff --git a/ethereumj-core/src/main/java/org/ethereum/datasource/QuotientFilter.java b/ethereumj-core/src/main/java/org/ethereum/datasource/QuotientFilter.java
@@ -181,6 +181,11 @@ public QuotientFilter(int quotientBits, int remainderBits) {
         entries = 0;
     }
 
+    public QuotientFilter withMaxDuplicates(int maxDuplicates) {
+        MAX_DUPLICATES = maxDuplicates;
+        return this;
+    }
+
     /* Return QF[idx] in the lower bits. */
     long getElement(long idx) {
         long elt = 0;

diff --git a/ethereumj-core/src/main/java/org/ethereum/datasource/mapdb/MapDBDataSource.java b/ethereumj-core/src/main/java/org/ethereum/datasource/mapdb/MapDBDataSource.java
diff --git a/ethereumj-core/src/main/java/org/ethereum/datasource/mapdb/MapDBFactory.java b/ethereumj-core/src/main/java/org/ethereum/datasource/mapdb/MapDBFactory.java
diff --git a/ethereumj-core/src/main/java/org/ethereum/datasource/mapdb/MapDBFactoryImpl.java b/ethereumj-core/src/main/java/org/ethereum/datasource/mapdb/MapDBFactoryImpl.java
diff --git a/ethereumj-core/src/main/java/org/ethereum/datasource/mapdb/Serializers.java b/ethereumj-core/src/main/java/org/ethereum/datasource/mapdb/Serializers.java