[rename] some in storage

leipurr · Mar 12, 2022 · 5a8c1b1 · 5a8c1b1
1 parent 8215d03
commit 5a8c1b1
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 31 deletions.
diff --git a/storage/aptosdb/src/metrics.rs b/storage/aptosdb/src/metrics.rs
@@ -12,7 +12,7 @@ pub static DIEM_STORAGE_LEDGER: Lazy<IntGaugeVec> = Lazy::new(|| {
         // metric name
         "aptos_storage_ledger",
         // metric description
-        "Diem storage ledger counters",
+        "Aptos storage ledger counters",
         // metric labels (dimensions)
         &["type"]
     )
@@ -22,15 +22,15 @@ pub static DIEM_STORAGE_LEDGER: Lazy<IntGaugeVec> = Lazy::new(|| {
 pub static DIEM_STORAGE_COMMITTED_TXNS: Lazy<IntCounter> = Lazy::new(|| {
     register_int_counter!(
         "aptos_storage_committed_txns",
-        "Diem storage committed transactions"
+        "Aptos storage committed transactions"
     )
     .unwrap()
 });
 
 pub static DIEM_STORAGE_LATEST_TXN_VERSION: Lazy<IntGauge> = Lazy::new(|| {
     register_int_gauge!(
         "aptos_storage_latest_transaction_version",
-        "Diem storage latest transaction version"
+        "Aptos storage latest transaction version"
     )
     .unwrap()
 });
@@ -60,13 +60,13 @@ pub static DIEM_STORAGE_LATEST_ACCOUNT_COUNT: Lazy<IntGauge> = Lazy::new(|| {
 });
 
 pub static DIEM_STORAGE_PRUNE_WINDOW: Lazy<IntGauge> = Lazy::new(|| {
-    register_int_gauge!("aptos_storage_prune_window", "Diem storage prune window").unwrap()
+    register_int_gauge!("aptos_storage_prune_window", "Aptos storage prune window").unwrap()
 });
 
 pub static DIEM_STORAGE_PRUNER_LEAST_READABLE_STATE_VERSION: Lazy<IntGauge> = Lazy::new(|| {
     register_int_gauge!(
         "aptos_storage_pruner_least_readable_state_version",
-        "Diem storage pruner least readable state version"
+        "Aptos storage pruner least readable state version"
     )
     .unwrap()
 });
@@ -76,7 +76,7 @@ pub static DIEM_STORAGE_API_LATENCY_SECONDS: Lazy<HistogramVec> = Lazy::new(|| {
         // metric name
         "aptos_storage_api_latency_seconds",
         // metric description
-        "Diem storage api latency in seconds",
+        "Aptos storage api latency in seconds",
         // metric labels (dimensions)
         &["api_name", "result"]
     )

diff --git a/storage/backup/backup-cli/src/bin/db-backup.rs b/storage/backup/backup-cli/src/bin/db-backup.rs
@@ -24,7 +24,7 @@ use backup_cli::{
 };
 
 #[derive(StructOpt)]
-#[structopt(about = "Diem backup tool.")]
+#[structopt(about = "Ledger backup tool.")]
 enum Command {
     #[structopt(about = "Manually run one shot commands.")]
     OneShot(OneShotCommand),
@@ -34,7 +34,7 @@ enum Command {
 
 #[derive(StructOpt)]
 enum OneShotCommand {
-    #[structopt(about = "Query the backup service builtin in the local Diem node.")]
+    #[structopt(about = "Query the backup service builtin in the local node.")]
     Query(OneShotQueryType),
     #[structopt(about = "Do a one shot backup.")]
     Backup(OneShotBackupOpt),
@@ -43,7 +43,7 @@ enum OneShotCommand {
 #[derive(StructOpt)]
 enum OneShotQueryType {
     #[structopt(
-        about = "Queries the latest epoch, committed version and synced version of the local Diem \
+        about = "Queries the latest epoch, committed version and synced version of the local \
         node, via the backup service within it."
     )]
     NodeState(OneShotQueryNodeStateOpt),

diff --git a/storage/backup/backup-cli/src/coordinators/backup.rs b/storage/backup/backup-cli/src/coordinators/backup.rs
@@ -96,7 +96,7 @@ impl BackupCoordinator {
         }
     }
     pub async fn run(&self) -> Result<()> {
-        // Connect to both the local Diem node and the backup storage.
+        // Connect to both the local node and the backup storage.
         let backup_state = metadata::cache::sync_and_load(
             &self.metadata_cache_opt,
             Arc::clone(&self.storage),
@@ -174,7 +174,7 @@ impl BackupCoordinator {
                 }
             }
             Err(e) => warn!(
-                "Failed pulling DbState from local Diem node: {}. Will keep trying.",
+                "Failed pulling DbState from local node: {}. Will keep trying.",
                 e
             ),
         };

diff --git a/storage/jellyfish-merkle/src/metrics.rs b/storage/jellyfish-merkle/src/metrics.rs
@@ -7,23 +7,23 @@ use once_cell::sync::Lazy;
 pub static DIEM_JELLYFISH_LEAF_ENCODED_BYTES: Lazy<IntCounter> = Lazy::new(|| {
     register_int_counter!(
         "aptos_jellyfish_leaf_encoded_bytes",
-        "Diem jellyfish leaf encoded bytes in total"
+        "Aptos jellyfish leaf encoded bytes in total"
     )
     .unwrap()
 });
 
 pub static DIEM_JELLYFISH_INTERNAL_ENCODED_BYTES: Lazy<IntCounter> = Lazy::new(|| {
     register_int_counter!(
         "aptos_jellyfish_internal_encoded_bytes",
-        "Diem jellyfish total internal nodes encoded in bytes"
+        "Aptos jellyfish total internal nodes encoded in bytes"
     )
     .unwrap()
 });
 
 pub static DIEM_JELLYFISH_STORAGE_READS: Lazy<IntCounter> = Lazy::new(|| {
     register_int_counter!(
         "aptos_jellyfish_storage_reads",
-        "Diem jellyfish reads from storage"
+        "Aptos jellyfish reads from storage"
     )
     .unwrap()
 });
diff --git a/storage/schemadb/src/lib.rs b/storage/schemadb/src/lib.rs
@@ -5,7 +5,7 @@
 
 //! This library implements a schematized DB on top of [RocksDB](https://rocksdb.org/). It makes
 //! sure all data passed in and out are structured according to predefined schemas and prevents
-//! access to raw keys and values. This library also enforces a set of Diem specific DB options,
+//! access to raw keys and values. This library also enforces a set of specific DB options,
 //! like custom comparators and schema-to-column-family mapping.
 //!
 //! It requires that different kinds of key-value pairs be stored in separate column
@@ -269,7 +269,7 @@ impl DB {
 
     /// Open db as secondary.
     /// This allows to read the DB in another process while it's already opened for read / write in
-    /// one (e.g. a Diem Node)
+    /// one (e.g. a Node)
     /// https://github.com/facebook/rocksdb/blob/493f425e77043cc35ea2d89ee3c4ec0274c700cb/include/rocksdb/db.h#L176-L222
     pub fn open_as_secondary<P: AsRef<Path>>(
         primary_path: P,

diff --git a/storage/schemadb/src/metrics.rs b/storage/schemadb/src/metrics.rs
@@ -11,7 +11,7 @@ pub static DIEM_SCHEMADB_ITER_LATENCY_SECONDS: Lazy<HistogramVec> = Lazy::new(||
         // metric name
         "aptos_schemadb_iter_latency_seconds",
         // metric description
-        "Diem schemadb iter latency in seconds",
+        "Aptos schemadb iter latency in seconds",
         // metric labels (dimensions)
         &["cf_name"]
     )
@@ -23,7 +23,7 @@ pub static DIEM_SCHEMADB_ITER_BYTES: Lazy<HistogramVec> = Lazy::new(|| {
         // metric name
         "aptos_schemadb_iter_bytes",
         // metric description
-        "Diem schemadb iter size in bytess",
+        "Aptos schemadb iter size in bytess",
         // metric labels (dimensions)
         &["cf_name"]
     )
@@ -35,7 +35,7 @@ pub static DIEM_SCHEMADB_GET_LATENCY_SECONDS: Lazy<HistogramVec> = Lazy::new(||
         // metric name
         "aptos_schemadb_get_latency_seconds",
         // metric description
-        "Diem schemadb get latency in seconds",
+        "Aptos schemadb get latency in seconds",
         // metric labels (dimensions)
         &["cf_name"]
     )
@@ -47,7 +47,7 @@ pub static DIEM_SCHEMADB_GET_BYTES: Lazy<HistogramVec> = Lazy::new(|| {
         // metric name
         "aptos_schemadb_get_bytes",
         // metric description
-        "Diem schemadb get call returned data size in bytes",
+        "Aptos schemadb get call returned data size in bytes",
         // metric labels (dimensions)
         &["cf_name"]
     )
@@ -59,7 +59,7 @@ pub static DIEM_SCHEMADB_BATCH_COMMIT_LATENCY_SECONDS: Lazy<HistogramVec> = Lazy
         // metric name
         "aptos_schemadb_batch_commit_latency_seconds",
         // metric description
-        "Diem schemadb schema batch commit latency in seconds",
+        "Aptos schemadb schema batch commit latency in seconds",
         // metric labels (dimensions)
         &["db_name"]
     )
@@ -71,7 +71,7 @@ pub static DIEM_SCHEMADB_BATCH_COMMIT_BYTES: Lazy<HistogramVec> = Lazy::new(|| {
         // metric name
         "aptos_schemadb_batch_commit_bytes",
         // metric description
-        "Diem schemadb schema batch commit size in bytes",
+        "Aptos schemadb schema batch commit size in bytes",
         // metric labels (dimensions)
         &["db_name"]
     )
@@ -83,7 +83,7 @@ pub static DIEM_SCHEMADB_PUT_BYTES: Lazy<HistogramVec> = Lazy::new(|| {
         // metric name
         "aptos_schemadb_put_bytes",
         // metric description
-        "Diem schemadb put call puts data size in bytes",
+        "Aptos schemadb put call puts data size in bytes",
         // metric labels (dimensions)
         &["cf_name"]
     )
@@ -93,25 +93,25 @@ pub static DIEM_SCHEMADB_PUT_BYTES: Lazy<HistogramVec> = Lazy::new(|| {
 pub static DIEM_SCHEMADB_DELETES: Lazy<IntCounterVec> = Lazy::new(|| {
     register_int_counter_vec!(
         "aptos_storage_deletes",
-        "Diem storage delete calls",
+        "Aptos storage delete calls",
         &["cf_name"]
     )
     .unwrap()
 });
 
 pub static DIEM_SCHEMADB_RANGE_DELETES: Lazy<IntCounterVec> = Lazy::new(|| {
     register_int_counter_vec!(
-        "diem_storage_range_deletes",
-        "Diem storage range delete calls",
+        "aptos_storage_range_deletes",
+        "Aptos storage range delete calls",
         &["cf_name"]
     )
     .unwrap()
 });
 
 pub static DIEM_SCHEMADB_INCLUSIVE_RANGE_DELETES: Lazy<IntCounterVec> = Lazy::new(|| {
     register_int_counter_vec!(
-        "diem_storage_range_inclusive_deletes",
-        "Diem storage range inclusive delete calls",
+        "aptos_storage_range_inclusive_deletes",
+        "Aptos storage range inclusive delete calls",
         &["cf_name"]
     )
     .unwrap()
@@ -122,7 +122,7 @@ pub static DIEM_SCHEMADB_BATCH_PUT_LATENCY_SECONDS: Lazy<HistogramVec> = Lazy::n
         // metric name
         "aptos_schemadb_batch_put_latency_seconds",
         // metric description
-        "Diem schemadb schema batch put latency in seconds",
+        "Aptos schemadb schema batch put latency in seconds",
         // metric labels (dimensions)
         &["db_name"]
     )

diff --git a/storage/storage-interface/src/lib.rs b/storage/storage-interface/src/lib.rs
@@ -180,7 +180,7 @@ pub enum Order {
 }
 
 /// Trait that is implemented by a DB that supports certain public (to client) read APIs
-/// expected of a Diem DB
+/// expected of a Aptos DB
 #[allow(unused_variables)]
 pub trait DbReader: Send + Sync {
     /// See [`AptosDB::get_epoch_ending_ledger_infos`].
@@ -567,7 +567,7 @@ impl MoveStorage for &dyn DbReader {
 }
 
 /// Trait that is implemented by a DB that supports certain public (to client) write APIs
-/// expected of a Diem DB. This adds write APIs to DbReader.
+/// expected of a Aptos DB. This adds write APIs to DbReader.
 #[allow(unused_variables)]
 pub trait DbWriter: Send + Sync {
     /// Persist transactions. Called by the executor module when either syncing nodes or committing