Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
284 changes: 0 additions & 284 deletions src/ore/src/lgbytes.rs

This file was deleted.

6 changes: 0 additions & 6 deletions src/ore/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,6 @@ pub mod hint;
pub mod id_gen;
pub mod iter;
pub mod lex;
#[cfg_attr(
nightly_doc_features,
doc(cfg(all(feature = "bytes", feature = "region")))
)]
#[cfg(all(feature = "bytes", feature = "region", feature = "tracing"))]
pub mod lgbytes;
#[cfg_attr(nightly_doc_features, doc(cfg(feature = "metrics")))]
#[cfg(feature = "metrics")]
pub mod metrics;
Expand Down
1 change: 0 additions & 1 deletion src/persist-cli/src/maelstrom/txn_list_append_multi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,6 @@ impl Service for TransactorService {
blob_uri,
Box::new(config.clone()),
metrics.s3_blob.clone(),
Arc::clone(&config.configs),
)
.await
.expect("blob_uri should be valid");
Expand Down
1 change: 0 additions & 1 deletion src/persist-cli/src/maelstrom/txn_list_append_single.rs
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,6 @@ impl Service for TransactorService {
blob_uri,
Box::new(config.clone()),
metrics.s3_blob.clone(),
Arc::clone(&config.configs),
)
.await
.expect("blob_uri should be valid");
Expand Down
1 change: 0 additions & 1 deletion src/persist-client/src/cache.rs
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,6 @@ impl PersistClientCache {
x.key(),
Box::new(self.cfg.clone()),
self.metrics.s3_blob.clone(),
Arc::clone(&self.cfg.configs),
)
.await?;
let blob = retry_external(&self.metrics.retries.external.blob_open, || {
Expand Down
9 changes: 2 additions & 7 deletions src/persist-client/src/cli/args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,8 @@ pub(super) async fn make_blob(
commit: bool,
metrics: Arc<Metrics>,
) -> anyhow::Result<Arc<dyn Blob>> {
let blob = BlobConfig::try_from(
blob_uri,
Box::new(cfg.clone()),
metrics.s3_blob.clone(),
Arc::clone(&cfg.configs),
)
.await?;
let blob =
BlobConfig::try_from(blob_uri, Box::new(cfg.clone()), metrics.s3_blob.clone()).await?;
let blob = blob.clone().open().await?;
let blob = if commit {
blob
Expand Down
7 changes: 1 addition & 6 deletions src/persist-client/src/internal/metrics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,7 @@ impl Metrics {
move || start.elapsed().as_secs_f64(),
);
let s3_blob = S3BlobMetrics::new(registry);
let columnar = ColumnarMetrics::new(
registry,
&s3_blob.lgbytes,
Arc::clone(&cfg.configs),
cfg.is_cc_active,
);
let columnar = ColumnarMetrics::new(registry);
Metrics {
blob: vecs.blob_metrics(),
consensus: vecs.consensus_metrics(),
Expand Down
Loading
Loading