feat(db): remove leveldb support for arm64

Author: halibobo1205

build.gradle

@@ -6,26 +6,40 @@ allprojects {
         springVersion = "5.3.39"
     }
 }
-
-static def isX86() {
-    def arch = System.getProperty("os.arch").toLowerCase()
-    return Architectures.X86_64.isAlias(arch) || Architectures.X86.isAlias(arch)
+def arch = System.getProperty("os.arch").toLowerCase()
+def javaVersion = JavaVersion.current()
+def isArm64 = Architectures.AARCH64.isAlias(arch)
+def archSource = isArm64 ? "arm" : "x86"
+
+ext.archInfo = [
+        name    : arch,
+        java    : javaVersion,
+        isArm64 : isArm64,
+        sourceSets: [
+            main: [
+                java: [
+                    srcDirs: ["src/main/java/common", "src/main/java/${archSource}"]
+                ]
+            ],
+            test: [
+                java: [
+                    srcDirs: ["src/test/java"]
+                ]
+            ]
+        ],
+        requires: [
+                JavaVersion: isArm64 ? JavaVersion.VERSION_17 : JavaVersion.VERSION_1_8,
+                RocksdbVersion: isArm64 ? '7.7.3' : '5.15.10'
+        ],
+        VMOptions: isArm64 ? "${rootDir}/gradle/jdk17/java-tron.vmoptions" : "${rootDir}/gradle/java-tron.vmoptions"
+]
+
+if (!archInfo.java.is(archInfo.requires.JavaVersion)) {
+    throw new GradleException("Java ${archInfo.requires.JavaVersion} is required for ${archInfo.name}. Detected version ${archInfo.java}")
 }
 
-static def isArm64() {
-    def arch = System.getProperty("os.arch").toLowerCase()
-    return new Architectures.KnownArchitecture("arm64", "aarch64").isAlias(arch)
-}
+println "Building for architecture: ${archInfo.name}, Java version: ${archInfo.java}"
 
-if (isArm64() && !JavaVersion.current().is(JavaVersion.VERSION_17)) {
-    throw new GradleException("Java 17 is required to build Java-Tron for arm64.\n" +
-            "  Detected version ${JavaVersion.current()}")
-}
-
-if (isX86() && !JavaVersion.current().isJava8()) {
-    throw new GradleException("Java 8 is required to build Java-Tron for x86.\n" +
-            "  Detected version ${JavaVersion.current()}")
-}
 
 subprojects {
     apply plugin: "jacoco"

chainbase/build.gradle

@@ -10,8 +10,6 @@ dependencies {
     api project(":common")
     api project(":crypto")
     api "org.fusesource.jansi:jansi:$jansiVersion"
-    api group: 'commons-io', name: 'commons-io', version: '2.18.0'
-    api 'io.github.tronprotocol:zksnark-java-sdk:1.0.0' exclude(group: 'commons-io', module: 'commons-io')
     api 'org.reflections:reflections:0.9.11'
 }
 

framework/build.gradle

@@ -116,6 +116,17 @@ test {
         destinationFile = file("$buildDir/jacoco/jacocoTest.exec")
         classDumpDir = file("$buildDir/jacoco/classpathdumps")
     }
+    if (rootProject.archInfo.isArm64) {
+        exclude { element ->
+            element.file.name.toLowerCase().contains('leveldb')
+        }
+        filter {
+            excludeTestsMatching '*.*leveldb*'
+            excludeTestsMatching '*.*Leveldb*'
+            excludeTestsMatching '*.*LevelDB*'
+            excludeTestsMatching '*.*LevelDb*'
+        }
+    }
     if (isWindows()) {
         exclude '**/ShieldedTransferActuatorTest.class'
         exclude '**/BackupDbUtilTest.class'
@@ -197,17 +208,8 @@ def createScript(project, mainClass, name) {
         }
     }
 }
-if (JavaVersion.current().is(JavaVersion.VERSION_17)) {
-    applicationDistribution.from("${project.rootDir}/gradle/jdk17/java-tron.vmoptions") {
-        into "bin"
-    }
-} else if (JavaVersion.current().isJava8()){
-    applicationDistribution.from("${project.rootDir}/gradle/java-tron.vmoptions") {
-        into "bin"
-    }
-} else {
-    throw new GradleException("Java 8 or Java 17 is supported to build Java-Tron.\n" +
-            "  Detected version ${JavaVersion.current()}")
+applicationDistribution.from(rootProject.archInfo.VMOptions) {
+    into "bin"
 }
 //distZip {
 //    doLast {

framework/src/main/resources/config.conf

@@ -5,7 +5,7 @@ net {
 
 storage {
   # Directory for storing persistent data
-  db.engine = "LEVELDB",
+  db.engine = "LEVELDB",  // deprecated for arm, because arm only support  "ROCKSDB".
   db.sync = false,
   db.directory = "database",
   index.directory = "index",
@@ -19,7 +19,7 @@ storage {
   # Otherwise, db configs will remain default and data will be stored in
   # the path of "output-directory" or which is set by "-d" ("--output-directory").
 
-  # setting can impove leveldb performance .... start
+  # setting can impove leveldb performance .... start, deprecated for arm
   # node: if this will increase process fds,you may be check your ulimit if 'too many open files' error occurs
   # see https://github.com/tronprotocol/tips/blob/master/tip-343.md for detail
   # if you find block sync has lower performance,you can try  this  settings
@@ -32,21 +32,21 @@ storage {
   #defaultL = {
   #  maxOpenFiles = 1000
   #}
-  # setting can impove leveldb performance .... end
+  # setting can impove leveldb performance .... end, deprecated for arm
 
   # Attention: name is a required field that must be set !!!
   properties = [
     //    {
     //      name = "account",
     //      path = "storage_directory_test",
-    //      createIfMissing = true,
+    //      createIfMissing = true, // deprecated for arm start
     //      paranoidChecks = true,
     //      verifyChecksums = true,
     //      compressionType = 1,        // compressed with snappy
     //      blockSize = 4096,           // 4  KB =         4 * 1024 B
     //      writeBufferSize = 10485760, // 10 MB = 10 * 1024 * 1024 B
     //      cacheSize = 10485760,       // 10 MB = 10 * 1024 * 1024 B
-    //      maxOpenFiles = 100
+    //      maxOpenFiles = 100 // deprecated for arm end
     //    },
     //    {
     //      name = "account-index",

gradle/verification-metadata.xml

@@ -551,35 +551,6 @@
             <sha256 value="cf8878e091c721ce2944d74979e9e38972019381781fcd6882f1562ba8d47e60" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.halibobor" name="leveldb" version="1.18.3">
-         <artifact name="leveldb-1.18.3.jar">
-            <sha256 value="0f722db29feb192377769555c73bc1a9bc6b81d31400957d596c645c957e45cc" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="leveldb-1.18.3.pom">
-            <sha256 value="4ae67f61cef4c5e2f460215f1b92832c5bc5a97c6c3d5b0219ddd20156143fd8" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.halibobor" name="leveldb-api" version="1.18.3">
-         <artifact name="leveldb-api-1.18.3.jar">
-            <sha256 value="3da4c1711f01e9087ca1cc58c55ac098d02c808d401d5595d084532ca227b101" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="leveldb-api-1.18.3.pom">
-            <sha256 value="825a008e567eb81d422581a567ba780b45a21ff0537e11d1fea9f49a3c332d33" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.halibobor" name="leveldb-project" version="1.18.3">
-         <artifact name="leveldb-project-1.18.3.pom">
-            <sha256 value="c908cfdc66a933a890ab0ae77ceb28676c995a9abbb15e4946a436ce1fc995b5" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.halibobor" name="leveldbjni-all" version="1.18.3">
-         <artifact name="leveldbjni-all-1.18.3.jar">
-            <sha256 value="83a72983b6a8e0b90449f7f1e9d56c9db54526288c21c93614c9c52b351fb232" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="leveldbjni-all-1.18.3.pom">
-            <sha256 value="2559bdc07dfda47215c6bad79a540566def47c2c110963e6e48402320530fd90" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.mchange" name="c3p0" version="0.9.5.4">
          <artifact name="c3p0-0.9.5.4.jar">
             <sha256 value="60cf2906cd6ad6771f514a3e848b74b3e3da99c1806f2a63c38e2dd8da5ef11f" origin="Generated by Gradle"/>

platform/build.gradle

@@ -1,54 +1,17 @@
-import org.gradle.nativeplatform.platform.internal.Architectures
-
 description = "platform – a distributed consensus arithmetic for blockchain."
 
-
-static def isX86() {
-    def arch = System.getProperty("os.arch").toLowerCase()
-    return Architectures.X86_64.isAlias(arch) || Architectures.X86.isAlias(arch)
-}
-
-static def isArm64() {
-    def arch = System.getProperty("os.arch").toLowerCase()
-    return new Architectures.KnownArchitecture("arm64", "aarch64").isAlias(arch)
-}
-
-if (isX86()) {
-    ext {
-        leveldbGroup = "org.fusesource.leveldbjni"
-        leveldbName = "leveldbjni-all"
-        leveldbVersion = "1.8"
-        rocksDBVersion = "5.15.10"
-    }
-} else if (isArm64()) {
-    ext {
-        leveldbGroup = "com.halibobor"
-        leveldbName = "leveldbjni-all"
-        leveldbVersion = "1.18.3"
-        rocksDBVersion = "7.7.3"
-    }
-} else {
-    throw new GradleException("Unsupported architecture: ${System.getProperty("os.arch")}")
-}
-
 sourceSets {
-    x86 {
-        java {
-            srcDirs 'src/main/java/x86', 'src/main/java/common'
-        }
+    main {
+        java.srcDirs = rootProject.archInfo.sourceSets.main.java.srcDirs
     }
-    arm {
-        java {
-            srcDirs 'src/main/java/arm', 'src/main/java/common'
-        }
+    test {
+        java.srcDirs = rootProject.archInfo.sourceSets.test.java.srcDirs
     }
 }
 
 dependencies {
-    api group: leveldbGroup, name: leveldbName, version: leveldbVersion
-    api group: 'org.rocksdb', name: 'rocksdbjni', version: rocksDBVersion
-}
-
-tasks.withType(JavaCompile).configureEach {
-    source = isX86() ? sourceSets.x86.java : sourceSets.arm.java
+    api group: 'org.fusesource.leveldbjni', name: 'leveldbjni-all', version: '1.8'
+    api group: 'org.rocksdb', name: 'rocksdbjni', version: "${rootProject.archInfo.requires.RocksdbVersion}"
+    api group: 'commons-io', name: 'commons-io', version: '2.18.0'
+    api 'io.github.tronprotocol:zksnark-java-sdk:1.0.0' exclude(group: 'commons-io', module: 'commons-io')
 }

platform/src/main/java/common/org/tron/common/arch/Arch.java

@@ -57,4 +57,10 @@ public static boolean isArm64() {
     String osArch = getOsArch();
     return osArch.contains("arm64") || osArch.contains("aarch64");
   }
+
+  public static void throwUnsupportedArm64Exception() {
+    if (isArm64()) {
+      throw new UnsupportedOperationException("unsupported on " + getOsArch() + " architecture");
+    }
+  }
 }

plugins/README.md

@@ -2,7 +2,7 @@
 
 This package contains a set of tools for TRON, the followings are the documentation for each tool.
 
-## DB Archive
+## DB Archive(Requires x86 + LevelDB)
 
 DB archive provides the ability to reformat the manifest according to the current `database`, parameters are compatible with the previous `ArchiveManifest`.
 
@@ -26,7 +26,7 @@ DB archive provides the ability to reformat the manifest according to the curren
 ```
 
 
-## DB Convert
+## DB Convert(Requires x86 + LevelDB)
 
 DB convert provides a helper which can convert LevelDB data to RocksDB data, parameters are compatible with previous `DBConvert`.
 
@@ -64,7 +64,7 @@ DB copy provides a helper which can copy LevelDB or RocksDB data quickly on the
   java -jar Toolkit.jar db cp  output-directory/database /tmp/databse
 ```
 
-## DB Lite
+## DB Lite(LevelDB unavailable on ARM)
 
 DB lite provides lite database, parameters are compatible with previous `LiteFullNodeTool`.
 
@@ -132,7 +132,7 @@ Execute move command.
   java -jar Toolkit.jar db mv -c main_net_config.conf -d /data/tron/output-directory
 ```
 
-## DB Root
+## DB Root(LevelDB unavailable on ARM)
 
 DB root provides a helper which can compute merkle root for tiny db.
 

plugins/build.gradle

@@ -20,6 +20,15 @@ configurations.getByName('checkstyleConfig') {
     transitive = false
 }
 
+sourceSets {
+    main {
+        java.srcDirs = rootProject.archInfo.sourceSets.main.java.srcDirs
+    }
+    test {
+        java.srcDirs = rootProject.archInfo.sourceSets.test.java.srcDirs
+    }
+}
+
 dependencies {
     //local libraries
     implementation fileTree(dir: 'libs', include: '*.jar')
@@ -29,12 +38,19 @@ dependencies {
     implementation group: 'com.typesafe', name: 'config', version: '1.3.2'
     implementation group: 'me.tongfei', name: 'progressbar', version: '0.9.3'
     implementation group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.69'
-    implementation 'com.halibobor:leveldbjni-all:1.18.3'
-    implementation 'com.halibobor:leveldb:1.18.3'
-    implementation project(":protocol")
-    implementation project(":platform"), {
-        exclude(group: 'org.fusesource.leveldbjni', module: 'leveldbjni-all')
+    if (rootProject.archInfo.isArm64) {
+        testRuntimeOnly group: 'org.fusesource.hawtjni', name: 'hawtjni-runtime', version: '1.18' // for test
+        implementation project(":platform")
+    } else {
+        implementation project(":platform"), {
+            exclude(group: 'org.fusesource.leveldbjni', module: 'leveldbjni-all')
+            exclude(group: 'io.github.tronprotocol', module: 'zksnark-java-sdk')
+            exclude(group: 'commons-io', module: 'commons-io')
+        }
+        implementation 'io.github.tronprotocol:leveldbjni-all:1.18.2'
+        implementation 'io.github.tronprotocol:leveldb:1.18.2'
     }
+    implementation project(":protocol")
 }
 
 check.dependsOn 'lint'
@@ -78,6 +94,17 @@ test {
         destinationFile = file("../framework/build/jacoco/jacocoTest1.exec")
         classDumpDir = file("$buildDir/jacoco/classpathdumps")
     }
+
+    if (rootProject.archInfo.isArm64) {
+        exclude 'org/tron/plugins/leveldb/**'
+        filter {
+            excludeTestsMatching '*.*leveldb*'
+            excludeTestsMatching '*.*Leveldb*'
+            excludeTestsMatching '*.*LevelDB*'
+            excludeTestsMatching '*.*LevelDb*'
+            excludeTestsMatching '*.*Archive*'
+        }
+    }
 }
 
 jacocoTestReport {
@@ -129,17 +156,8 @@ def createScript(project, mainClass, name) {
         }
     }
 }
-if (JavaVersion.current().is(JavaVersion.VERSION_17)) {
-    applicationDistribution.from("${project.rootDir}/gradle/jdk17/java-tron.vmoptions") {
-        into "bin"
-    }
-} else if (JavaVersion.current().isJava8()){
-    applicationDistribution.from("${project.rootDir}/gradle/java-tron.vmoptions") {
-        into "bin"
-    }
-} else {
-    throw new GradleException("Java 8 or Java 17 is supported to build Java-Tron.\n" +
-            "  Detected version ${JavaVersion.current()}")
+applicationDistribution.from(rootProject.archInfo.VMOptions) {
+    into "bin"
 }
 createScript(project, 'org.tron.plugins.ArchiveManifest', 'ArchiveManifest')
 createScript(project, 'org.tron.plugins.Toolkit', 'Toolkit')