-
Notifications
You must be signed in to change notification settings - Fork 1.7k
fix(config): remove ineffective RocksDB table setters #6944
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.
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
Open
bladehan1
wants to merge
1
commit into
tronprotocol:develop
Choose a base branch
from
bladehan1:feature/remove_unverified_rocksdb_config
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+78
−9
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
common/src/test/java/org/tron/common/setting/RocksDbSettingsTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /* | ||
| * java-tron is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * java-tron is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package org.tron.common.setting; | ||
|
|
||
| import static org.junit.Assert.assertTrue; | ||
|
|
||
| import java.nio.charset.StandardCharsets; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.util.Comparator; | ||
| import java.util.stream.Stream; | ||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import org.junit.rules.TemporaryFolder; | ||
| import org.rocksdb.Options; | ||
| import org.rocksdb.RocksDB; | ||
|
|
||
| public class RocksDbSettingsTest { | ||
|
|
||
| @Rule | ||
| public TemporaryFolder temporaryFolder = new TemporaryFolder(); | ||
|
|
||
| @Test | ||
| public void shouldKeepNativeBlockTableDefaults() throws Exception { | ||
| Path database = temporaryFolder.newFolder("rocksdb").toPath(); | ||
|
|
||
| try (Options options = RocksDbSettings.getOptionsByDbName("test")) { | ||
| try (RocksDB ignored = RocksDB.open(options, database.toString())) { | ||
| // Opening the DB materializes the table factory and persists its native settings. | ||
| } | ||
| } | ||
|
|
||
| Path optionsFile; | ||
| try (Stream<Path> files = Files.list(database)) { | ||
| optionsFile = files | ||
| .filter(path -> path.getFileName().toString().startsWith("OPTIONS-")) | ||
| .max(Comparator.comparing(path -> path.getFileName().toString())) | ||
| .orElseThrow(() -> new AssertionError("RocksDB OPTIONS file not found")); | ||
| } | ||
| String nativeOptions = new String(Files.readAllBytes(optionsFile), StandardCharsets.UTF_8); | ||
|
|
||
| assertTrue(nativeOptions.contains("block_size=4096")); | ||
| assertTrue(nativeOptions.contains("pin_l0_filter_and_index_blocks_in_cache=false")); | ||
| assertTrue(nativeOptions.contains("filter_policy=nullptr")); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[NIT] Remove
options.setTableFormatConfig(new BlockBasedTableConfig());?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Retain an entry point for modifying the configuration; this is a change that will require separate verification in the future.