فهرست منبع

[ledger-tool] Rename --target-db to --target-ledger (#6941)

Andrew Fitzgerald 4 ماه پیش
والد
کامیت
fe1ff006ca
3فایلهای تغییر یافته به همراه12 افزوده شده و 8 حذف شده
  1. 1 1
      ci/run-sanity.sh
  2. 10 6
      ledger-tool/src/blockstore.rs
  3. 1 1
      ledger-tool/tests/basic.rs

+ 1 - 1
ci/run-sanity.sh

@@ -62,7 +62,7 @@ do
   $solana_ledger_tool create-snapshot --ledger config/ledger "$snapshot_slot" config/snapshot-ledger
   cp config/ledger/genesis.tar.bz2 config/snapshot-ledger
   $solana_ledger_tool copy --ledger config/ledger \
-    --target-db config/snapshot-ledger --starting-slot "$snapshot_slot" --ending-slot "$latest_slot"
+    --target-ledger config/snapshot-ledger --starting-slot "$snapshot_slot" --ending-slot "$latest_slot"
 
   set -x
   $solana_ledger_tool --ledger config/snapshot-ledger slot "$latest_slot" --verbose --verbose \

+ 10 - 6
ledger-tool/src/blockstore.rs

@@ -327,11 +327,11 @@ pub fn blockstore_subcommands<'a, 'b>(hidden: bool) -> Vec<App<'a, 'b>> {
             .arg(&starting_slot_arg)
             .arg(&ending_slot_arg)
             .arg(
-                Arg::with_name("target_db")
-                    .long("target-db")
+                Arg::with_name("target_ledger")
+                    .long("target-ledger")
                     .value_name("DIR")
                     .takes_value(true)
-                    .help("Target db"),
+                    .help("Target ledger directory to write inner \"rocksdb\" within."),
             ),
         SubCommand::with_name("dead-slots")
             .about("Print all the dead slots in the ledger")
@@ -662,11 +662,15 @@ fn do_blockstore_process_command(ledger_path: &Path, matches: &ArgMatches<'_>) -
         ("copy", Some(arg_matches)) => {
             let starting_slot = value_t_or_exit!(arg_matches, "starting_slot", Slot);
             let ending_slot = value_t_or_exit!(arg_matches, "ending_slot", Slot);
-            let target_db = PathBuf::from(value_t_or_exit!(arg_matches, "target_db", String));
+            let target_ledger =
+                PathBuf::from(value_t_or_exit!(arg_matches, "target_ledger", String));
 
             let source = crate::open_blockstore(&ledger_path, arg_matches, AccessType::Secondary);
-            let target =
-                crate::open_blockstore(&target_db, arg_matches, AccessType::PrimaryForMaintenance);
+            let target = crate::open_blockstore(
+                &target_ledger,
+                arg_matches,
+                AccessType::PrimaryForMaintenance,
+            );
 
             for (slot, _meta) in source.slot_meta_iterator(starting_slot)? {
                 if slot > ending_slot {

+ 1 - 1
ledger-tool/tests/basic.rs

@@ -71,7 +71,7 @@ fn ledger_tool_copy_test() {
         "-l",
         ledger_path,
         "copy",
-        "--target-db",
+        "--target-ledger",
         target_ledger_path,
         "--ending-slot",
         &(LEDGER_TOOL_COPY_TEST_ENDING_SLOT).to_string(),