hummingbird
/
jdchain
Not watched
2
0
Fork 0
Code
Releases 31 Wiki Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain
Browse Source

source/fix rocksdb compile error in windows

tags/1.1.2^2
liuyuanmu 5 years ago
parent
d5e4262ada
commit
58918bffb4
5 changed files with 7 additions and 8 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -0
      source/manager/manager-model/pom.xml
  2. +1
    -1
      source/pom.xml
  3. +1
    -1
      source/storage/storage-composite/pom.xml
  4. +2
    -1
      source/storage/storage-rocksdb/pom.xml
  5. +2
    -5
      source/storage/storage-rocksdb/src/main/java/com/jd/blockchain/storage/service/impl/rocksdb/RocksDBConnectionFactory.java

+ 1
- 0
source/manager/manager-model/pom.xml View File

@@ -65,6 +65,7 @@
<dependency> <dependency>
<groupId>org.rocksdb</groupId> <groupId>org.rocksdb</groupId>
<artifactId>rocksdbjni</artifactId> <artifactId>rocksdbjni</artifactId>
<version>${rocksdb.version}</version>
</dependency> </dependency>


<dependency> <dependency>


+ 1
- 1
source/pom.xml View File

@@ -67,7 +67,7 @@
<disruptor.version>3.3.6</disruptor.version> <disruptor.version>3.3.6</disruptor.version>
<kryo.version>3.0.1</kryo.version> <kryo.version>3.0.1</kryo.version>
<jedis.version>2.9.0</jedis.version> <jedis.version>2.9.0</jedis.version>
<rocksdb.version>5.15.10</rocksdb.version>
<rocksdb.version>6.3.6</rocksdb.version>
<zookeeper.version>3.4.6</zookeeper.version> <zookeeper.version>3.4.6</zookeeper.version>
<javaparser.version>3.5.12</javaparser.version> <javaparser.version>3.5.12</javaparser.version>
<ehcache.version>3.5.3</ehcache.version> <ehcache.version>3.5.3</ehcache.version>


+ 1
- 1
source/storage/storage-composite/pom.xml View File

@@ -56,7 +56,7 @@
<!--<dependency> <!--<dependency>
<groupId>org.rocksdb</groupId> <groupId>org.rocksdb</groupId>
<artifactId>rocksdbjni</artifactId> <artifactId>rocksdbjni</artifactId>
<version>5.15.10</version>
<version>${rocksdb.version}</version>
</dependency>--> </dependency>-->
<!--<dependency> <!--<dependency>
<groupId>redis.clients</groupId> <groupId>redis.clients</groupId>


+ 2
- 1
source/storage/storage-rocksdb/pom.xml View File

@@ -25,6 +25,7 @@
<dependency> <dependency>
<groupId>org.rocksdb</groupId> <groupId>org.rocksdb</groupId>
<artifactId>rocksdbjni</artifactId> <artifactId>rocksdbjni</artifactId>
<version>${rocksdb.version}</version>
</dependency> </dependency>


<dependency> <dependency>
@@ -38,7 +39,7 @@
<!-- <dependency> <!-- <dependency>
<groupId>org.rocksdb</groupId> <groupId>org.rocksdb</groupId>
<artifactId>rocksdbjni-osx</artifactId> <artifactId>rocksdbjni-osx</artifactId>
<version>5.15.10</version>
<version>${rocksdb.version}</version>
</dependency> --> </dependency> -->
</dependencies> </dependencies>
</project> </project>

+ 2
- 5
source/storage/storage-rocksdb/src/main/java/com/jd/blockchain/storage/service/impl/rocksdb/RocksDBConnectionFactory.java View File

@@ -26,7 +26,7 @@ public class RocksDBConnectionFactory implements DbConnectionFactory {
public static final String URI_SCHEME = "rocksdb"; public static final String URI_SCHEME = "rocksdb";


public static final Pattern URI_PATTER = Pattern public static final Pattern URI_PATTER = Pattern
.compile("^\\w+\\://(/)?\\w+(/.*)*$");
.compile("^\\w+\\://(/)?\\w+(\\:)?([/\\\\].*)*$");


private Map<String, RocksDBConnection> connections = new ConcurrentHashMap<>(); private Map<String, RocksDBConnection> connections = new ConcurrentHashMap<>();


@@ -40,7 +40,7 @@ public class RocksDBConnectionFactory implements DbConnectionFactory {
if (!URI_PATTER.matcher(dbConnectionString).matches()) { if (!URI_PATTER.matcher(dbConnectionString).matches()) {
throw new IllegalArgumentException("Illegal format of rocksdb connection string!"); throw new IllegalArgumentException("Illegal format of rocksdb connection string!");
} }
URI dbUri = URI.create(dbConnectionString);
URI dbUri = URI.create(dbConnectionString.replace("\\", "/"));
if (!support(dbUri.getScheme())) { if (!support(dbUri.getScheme())) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
String.format("Not supported db connection string with scheme \"%s\"!", dbUri.getScheme())); String.format("Not supported db connection string with scheme \"%s\"!", dbUri.getScheme()));
@@ -49,9 +49,6 @@ public class RocksDBConnectionFactory implements DbConnectionFactory {
String uriHead = dbPrefix(); String uriHead = dbPrefix();
int beginIndex = dbConnectionString.indexOf(uriHead); int beginIndex = dbConnectionString.indexOf(uriHead);
String dbPath = dbConnectionString.substring(beginIndex + uriHead.length()); String dbPath = dbConnectionString.substring(beginIndex + uriHead.length());
if (!dbPath.startsWith(File.separator)) {
dbPath = File.separator + dbPath;
}


RocksDBConnection conn = connections.get(dbPath); RocksDBConnection conn = connections.get(dbPath);
if (conn != null) { if (conn != null) {


Write Preview
Loading…
Cancel
Save