fix conflict

Author: lvs007

build.gradle

@@ -116,6 +116,8 @@ dependencies {
 
     compile "org.iq80.leveldb:leveldb:0.7"
 
+    compile group: 'org.rocksdb', name: 'rocksdbjni', version: '5.15.10'
+
     compile group: leveldbGroup, name: leveldbName, version: leveldbVersion
 
     compile "org.apache.commons:commons-collections4:4.0"

src/main/java/org/tron/common/application/ApplicationImpl.java

@@ -68,6 +68,7 @@ public void startup() {
   @Override
   public void shutdown() {
     logger.info("******** begin to shutdown ********");
+    //p2pNode.shutDown();
     synchronized (dbManager.getRevokingStore()) {
       closeRevokingStore();
       closeAllStore();
@@ -124,6 +125,7 @@ private void closeConnection() {
   }
 
   private void closeRevokingStore() {
+    logger.info("******** begin to closeRevokingStore ********");
     dbManager.getRevokingStore().shutdown();
   }
 

src/main/java/org/tron/common/storage/BatchSourceInterRocks.java

@@ -0,0 +1,23 @@
+package org.tron.common.storage;
+
+import java.util.Map;
+import org.rocksdb.WriteOptions;
+
+
+public interface BatchSourceInterRocks<K, V> extends SourceInterRocks<K, V> {
+
+
+  void updateByBatch(Map<K, V> rows);
+
+  void updateByBatch(Map<K, V> rows, WriteOptions writeOptions);
+
+  void putData(K key, V val);
+
+  V getData(K key);
+
+
+  void deleteData(K key);
+
+  boolean flush();
+
+}

src/main/java/org/tron/common/storage/DBSettings.java

@@ -0,0 +1,40 @@
+package org.tron.common.storage;
+
+
+public class DBSettings {
+
+  public static final DBSettings DEFAULT = new DBSettings()
+      .withMaxThreads(1)
+      .withMaxOpenFiles(-1);
+
+  int maxOpenFiles;
+  int maxThreads;
+
+  private DBSettings() {
+  }
+
+  public static DBSettings newInstance() {
+    DBSettings settings = new DBSettings();
+    settings.maxOpenFiles = DEFAULT.maxOpenFiles;
+    settings.maxThreads = DEFAULT.maxThreads;
+    return settings;
+  }
+
+  public int getMaxOpenFiles() {
+    return maxOpenFiles;
+  }
+
+  public DBSettings withMaxOpenFiles(int maxOpenFiles) {
+    this.maxOpenFiles = maxOpenFiles;
+    return this;
+  }
+
+  public int getMaxThreads() {
+    return maxThreads;
+  }
+
+  public DBSettings withMaxThreads(int maxThreads) {
+    this.maxThreads = maxThreads;
+    return this;
+  }
+}

src/main/java/org/tron/common/storage/DbSourceInterRocks.java

@@ -0,0 +1,25 @@
+package org.tron.common.storage;
+
+import java.util.Set;
+
+public interface DbSourceInterRocks<V> extends BatchSourceInterRocks<byte[], V> {
+
+  String getDBName();
+
+  void setDBName(String name);
+
+  void initDB();
+
+  boolean isAlive();
+
+  void closeDB();
+
+  void resetDb();
+
+  Set<byte[]> allKeys() throws RuntimeException;
+
+  Set<byte[]> allValues() throws RuntimeException;
+
+  long getTotal() throws RuntimeException;
+
+}

src/main/java/org/tron/common/storage/SourceInterRocks.java

@@ -0,0 +1,19 @@
+package org.tron.common.storage;
+
+
+import org.rocksdb.WriteOptions;
+
+public interface SourceInterRocks<K, V> {
+
+  void putData(K key, V val);
+
+  void putData(K k, V v, WriteOptions options);
+
+  V getData(K key);
+
+  void deleteData(K key);
+
+  void deleteData(K k, WriteOptions options);
+
+  boolean flush();
+}