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

Jump to bottom

Cherry-pick commit to stop warn logs from DB API #13722

Merged
merged 3 commits into from
Jun 17, 2024
Merged

Cherry-pick commit to stop warn logs from DB API #13722

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e75283
return none if non exist
areshand Jun 10, 2024
ece4581
remove uncessary import after cherry-pick
areshand Jun 16, 2024
4ac946e
update the single node perf benchmark due to unrelated changes
areshand Jun 17, 2024
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
16 changes: 8 additions & 8 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions api/types/src/convert.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,7 @@ impl<'a, S: StateView> MoveConverter<'a, S> {
use aptos_types::transaction::Transaction::*;
let aux_data = self
.db
.get_transaction_auxiliary_data_by_version(data.version)
.ok();
.get_transaction_auxiliary_data_by_version(data.version)?;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a case where a transaction will never parse because of this? Or I guess it looks like it wouldn't work before

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no as I know of

let info = self.into_transaction_info(
data.version,
&data.info,
Expand Down
4 changes: 2 additions & 2 deletions storage/aptosdb/src/db/aptosdb_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,11 @@ fn test_get_transaction_auxiliary_data() {
put_transaction_auxiliary_data(&db, 0, &txns);
assert_eq!(
db.get_transaction_auxiliary_data_by_version(0).unwrap(),
aux_1
Some(aux_1)
);
assert_eq!(
db.get_transaction_auxiliary_data_by_version(1).unwrap(),
aux_2
Some(aux_2)
);
}

Expand Down
4 changes: 2 additions & 2 deletions storage/aptosdb/src/db/include/aptosdb_reader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ impl DbReader for AptosDB {
fn get_transaction_auxiliary_data_by_version(
&self,
version: Version,
) -> Result<TransactionAuxiliaryData> {
) -> Result<Option<TransactionAuxiliaryData>> {
gauged_api("get_transaction_auxiliary_data_by_version", || {
self.error_if_ledger_pruned("Transaction", version)?;
self.ledger_db
Expand Down Expand Up @@ -256,7 +256,7 @@ impl DbReader for AptosDB {
let events = self.ledger_db.event_db().get_events_by_version(version)?;
let write_set = self.ledger_db.write_set_db().get_write_set(version)?;
let txn = self.ledger_db.transaction_db().get_transaction(version)?;
let auxiliary_data = self.ledger_db.transaction_auxiliary_data_db().get_transaction_auxiliary_data(version).unwrap_or_default();
let auxiliary_data = self.ledger_db.transaction_auxiliary_data_db().get_transaction_auxiliary_data(version)?.unwrap_or_default();
let txn_output = TransactionOutput::new(
write_set,
events,
Expand Down
13 changes: 3 additions & 10 deletions storage/aptosdb/src/ledger_db/transaction_auxiliary_data_db.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use crate::{
utils::iterators::ExpectContinuousVersions,
};
use aptos_schemadb::{ReadOptions, SchemaBatch, DB};
use aptos_storage_interface::{AptosDbError, Result};
use aptos_storage_interface::Result;
use aptos_types::transaction::{TransactionAuxiliaryData, Version};
use std::{path::Path, sync::Arc};

Expand Down Expand Up @@ -45,15 +45,8 @@ impl TransactionAuxiliaryDataDb {
pub(crate) fn get_transaction_auxiliary_data(
&self,
version: Version,
) -> Result<TransactionAuxiliaryData> {
self.db
.get::<TransactionAuxiliaryDataSchema>(&version)?
.ok_or_else(|| {
AptosDbError::NotFound(format!(
"No Transaction Auxiliary Data at version {}",
version
))
})
) -> Result<Option<TransactionAuxiliaryData>> {
self.db.get::<TransactionAuxiliaryDataSchema>(&version)
}

/// Returns an iterator that yields `num_transaction_infos` transaction infos starting from
Expand Down
2 changes: 1 addition & 1 deletion storage/storage-interface/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ pub trait DbReader: Send + Sync {
fn get_transaction_auxiliary_data_by_version(
&self,
version: Version,
) -> Result<TransactionAuxiliaryData>;
) -> Result<Option<TransactionAuxiliaryData>>;

/// See [AptosDB::get_first_txn_version].
///
Expand Down
Loading