Skip to content

Commit 6e339c2

Browse files
committed
move property and storage from framework to common
1 parent e028333 commit 6e339c2

File tree

4 files changed

+55
-4
lines changed

4 files changed

+55
-4
lines changed

common/build.gradle

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,30 @@ version '1.0.0'
66

77
sourceCompatibility = 1.8
88

9+
// Dependency versions
10+
// ---------------------------------------
11+
12+
def leveldbVersion = "1.8"
13+
// --------------------------------------
14+
15+
static def isWindows() {
16+
return org.gradle.internal.os.OperatingSystem.current().isWindows()
17+
}
18+
19+
if (isWindows()) {
20+
ext {
21+
leveldbGroup = "org.ethereum"
22+
leveldbName = "leveldbjni-all"
23+
leveldbVersion = "1.18.3"
24+
}
25+
} else {
26+
ext {
27+
leveldbGroup = "org.fusesource.leveldbjni"
28+
leveldbName = "leveldbjni-all"
29+
leveldbVersion = "1.8"
30+
}
31+
}
32+
933
repositories {
1034
mavenCentral()
1135
}
@@ -20,5 +44,6 @@ dependencies {
2044
compile group: 'commons-codec', name: 'commons-codec', version: '1.11'
2145
compile group: 'com.beust', name: 'jcommander', version: '1.72'
2246
compile group: 'com.typesafe', name: 'config', version: '1.3.2'
47+
compile group: leveldbGroup, name: leveldbName, version: leveldbVersion
2348
compile project(":protocol")
2449
}
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package org.tron.common.utils;
2+
import org.iq80.leveldb.CompressionType;
3+
import org.iq80.leveldb.Options;
4+
5+
6+
public class DbOptionalsUtils {
7+
public static final CompressionType DEFAULT_COMPRESSION_TYPE = CompressionType.SNAPPY;
8+
public static final int DEFAULT_BLOCK_SIZE = 4 * 1024;
9+
public static final int DEFAULT_WRITE_BUFFER_SIZE = 10 * 1024 * 1024;
10+
public static final long DEFAULT_CACHE_SIZE = 10 * 1024 * 1024L;
11+
public static final int DEFAULT_MAX_OPEN_FILES = 100;
12+
13+
public static Options createDefaultDbOptions() {
14+
Options dbOptions = new Options();
15+
16+
dbOptions.createIfMissing(true);
17+
dbOptions.paranoidChecks(true);
18+
dbOptions.verifyChecksums(true);
19+
20+
dbOptions.compressionType(DEFAULT_COMPRESSION_TYPE);
21+
dbOptions.blockSize(DEFAULT_BLOCK_SIZE);
22+
dbOptions.writeBufferSize(DEFAULT_WRITE_BUFFER_SIZE);
23+
dbOptions.cacheSize(DEFAULT_CACHE_SIZE);
24+
dbOptions.maxOpenFiles(DEFAULT_MAX_OPEN_FILES);
25+
26+
return dbOptions;
27+
}
28+
}

framework/src/main/java/org/tron/core/config/args/Storage.java renamed to common/src/main/java/org/tron/core/config/args/Storage.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515

1616
package org.tron.core.config.args;
1717

18-
import static org.tron.common.utils.StorageUtils.DEFAULT_COMPRESSION_TYPE;
19-
2018
import com.typesafe.config.Config;
2119
import com.typesafe.config.ConfigObject;
2220
import java.io.File;
@@ -29,7 +27,7 @@
2927
import org.iq80.leveldb.Options;
3028
import org.tron.common.utils.FileUtil;
3129
import org.tron.common.utils.Property;
32-
import org.tron.common.utils.StorageUtils;
30+
import org.tron.common.utils.DbOptionalsUtils;
3331

3432
/**
3533
* Custom storage configurations
@@ -192,7 +190,7 @@ private static Property createProperty(final ConfigObject conf) {
192190
}
193191

194192
// Check, get and set fields of Options
195-
Options dbOptions = StorageUtils.createDefaultDbOptions();
193+
Options dbOptions = DbOptionalsUtils.createDefaultDbOptions();
196194

197195
if (conf.containsKey(CREATE_IF_MISSING_CONFIG_KEY)) {
198196
dbOptions.createIfMissing(

0 commit comments

Comments
 (0)