Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rocksdb 7.2.2. #222

Merged
merged 1 commit into from
May 24, 2022
Merged

Rocksdb 7.2.2. #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion RELEASE-NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Add TLS support on MrPlow so MrPlow can use TLS to communicate with miners
* Add node_uri param for miners that supports TLS
* Add exploder api block_info_by_height
* Update jrocksdb to 6.29.5
* Update jrocksdb to 7.2.2

## 2.0

Expand Down
2 changes: 1 addition & 1 deletion WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ git_repository(
maven_install(
artifacts = [
"com.google.protobuf:protobuf-java:3.5.1",
"org.rocksdb:rocksdbjni:6.29.5",
"org.rocksdb:rocksdbjni:7.2.2",
"junit:junit:4.12",
"commons-codec:commons-codec:1.11",
"org.apache.commons:commons-math3:3.6.1",
Expand Down
2 changes: 1 addition & 1 deletion lib/src/db/rocksdb/RocksDBMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ public Map<ByteString, ByteString> getByPrefix(ByteString key, int max_reply, bo
}
finally
{
it.dispose();
//it.dispose();
}

return map;
Expand Down
2 changes: 1 addition & 1 deletion lib/src/db/rocksdb/RocksDBMapMutationSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public void remove(ByteString key, ByteString value)
try
{
ByteString w = getDBKey(key, value);
db.remove(jdb.getWriteOption(), w.toByteArray());
db.delete(jdb.getWriteOption(), w.toByteArray());
}
catch(RocksDBException e)
{
Expand Down
2 changes: 1 addition & 1 deletion lib/src/db/rocksdb/TrieDBRocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public void bulkSave(TreeMap<ByteString, TrieNode> updates)
TrieNode node = me.getValue();
if (node == null)
{
wb.remove(key.toByteArray());
wb.delete(key.toByteArray());
}
else
{
Expand Down
16 changes: 8 additions & 8 deletions maven_install.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"dependency_tree": {
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
"__INPUT_ARTIFACTS_HASH": 1780585425,
"__RESOLVED_ARTIFACTS_HASH": 873802082,
"__INPUT_ARTIFACTS_HASH": -1882998764,
"__RESOLVED_ARTIFACTS_HASH": -788011820,
"conflict_resolution": {
"com.google.protobuf:protobuf-java:3.5.1": "com.google.protobuf:protobuf-java:3.6.1"
},
Expand Down Expand Up @@ -472,16 +472,16 @@
"url": "https://repo1.maven.org/maven2/org/ow2/asm/asm/9.1/asm-9.1.jar"
},
{
"coord": "org.rocksdb:rocksdbjni:6.29.5",
"coord": "org.rocksdb:rocksdbjni:7.2.2",
"dependencies": [],
"directDependencies": [],
"file": "v1/https/repo1.maven.org/maven2/org/rocksdb/rocksdbjni/6.29.5/rocksdbjni-6.29.5.jar",
"file": "v1/https/repo1.maven.org/maven2/org/rocksdb/rocksdbjni/7.2.2/rocksdbjni-7.2.2.jar",
"mirror_urls": [
"https://repo1.maven.org/maven2/org/rocksdb/rocksdbjni/6.29.5/rocksdbjni-6.29.5.jar",
"https://maven.google.com/org/rocksdb/rocksdbjni/6.29.5/rocksdbjni-6.29.5.jar"
"https://repo1.maven.org/maven2/org/rocksdb/rocksdbjni/7.2.2/rocksdbjni-7.2.2.jar",
"https://maven.google.com/org/rocksdb/rocksdbjni/7.2.2/rocksdbjni-7.2.2.jar"
],
"sha256": "1661d654fe89e7c52d37d3b7ea63dd62045bf4f5a6ea8cd20618003663614bda",
"url": "https://repo1.maven.org/maven2/org/rocksdb/rocksdbjni/6.29.5/rocksdbjni-6.29.5.jar"
"sha256": "4e6ddbf48fcf7fd463423d10bc5edbc8c3e8b7d8161fc01de8c07de9c35492fa",
"url": "https://repo1.maven.org/maven2/org/rocksdb/rocksdbjni/7.2.2/rocksdbjni-7.2.2.jar"
},
{
"coord": "org.slf4j:slf4j-api:1.7.30",
Expand Down