Skip to content
Open
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
74 changes: 37 additions & 37 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion crates/bin/ampctl/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ anyhow.workspace = true
clap.workspace = true
common = { path = "../../core/common" }
console = "0.16.1"
dataset-store = { path = "../../core/dataset-store" }
amp-dataset-store = { path = "../../core/dataset-store" }
datasets-common = { path = "../../core/datasets-common" }
dump = { path = "../../core/dump" }
eth-beacon-datasets = { path = "../../extractors/eth-beacon" }
Expand Down
12 changes: 6 additions & 6 deletions crates/bin/ampctl/src/cmd/manifest/generate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

use std::path::PathBuf;

use dataset_store::DatasetKind;
use amp_dataset_store::DatasetKind;
use datasets_common::manifest::{ArrowSchema, Field, TableSchema};
use monitoring::logging;

Expand Down Expand Up @@ -96,7 +96,7 @@ where
let kind = kind.into();

let dataset_bytes = match kind {
dataset_store::DatasetKind::EvmRpc => {
DatasetKind::EvmRpc => {
let tables = evm_rpc_datasets::tables::all(&network)
.iter()
.map(|table| {
Expand All @@ -114,7 +114,7 @@ where
};
serde_json::to_vec_pretty(&manifest).map_err(Error::Serialization)?
}
dataset_store::DatasetKind::Solana => {
DatasetKind::Solana => {
let tables = solana_datasets::tables::all(&network)
.iter()
.map(|table| {
Expand All @@ -132,7 +132,7 @@ where
};
serde_json::to_vec_pretty(&manifest).map_err(Error::Serialization)?
}
dataset_store::DatasetKind::EthBeacon => {
DatasetKind::EthBeacon => {
let tables = eth_beacon_datasets::all_tables(network.clone())
.iter()
.map(|table| {
Expand All @@ -150,7 +150,7 @@ where
};
serde_json::to_vec_pretty(&manifest).map_err(Error::Serialization)?
}
dataset_store::DatasetKind::Firehose => {
DatasetKind::Firehose => {
let tables = firehose_datasets::evm::tables::all(&network)
.iter()
.map(|table| {
Expand All @@ -169,7 +169,7 @@ where
};
serde_json::to_vec_pretty(&manifest).map_err(Error::Serialization)?
}
dataset_store::DatasetKind::Derived => {
DatasetKind::Derived => {
return Err(Error::DerivedNotSupported);
}
};
Expand Down
2 changes: 1 addition & 1 deletion crates/bin/ampd/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ common = { path = "../../core/common" }
config = { path = "../../config" }
console-subscriber = { version = "0.4.1", default-features = false, optional = true }
controller = { path = "../../services/controller" }
dataset-store = { path = "../../core/dataset-store" }
amp-dataset-store = { path = "../../core/dataset-store" }
metadata-db = { path = "../../core/metadata-db" }
monitoring = { path = "../../core/monitoring" }
server = { path = "../../services/server" }
Expand Down
6 changes: 3 additions & 3 deletions crates/bin/ampd/src/controller_cmd.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
use std::{net::SocketAddr, sync::Arc};

use amp_dataset_store::{
DatasetStore, manifests::DatasetManifestsStore, providers::ProviderConfigsStore,
};
use amp_object_store::ObjectStoreCreationError;
use common::{BoxError, store::Store};
use config::Config as CommonConfig;
use controller::config::Config;
use dataset_store::{
DatasetStore, manifests::DatasetManifestsStore, providers::ProviderConfigsStore,
};
use monitoring::telemetry::metrics::Meter;

/// Run the controller service (Admin API server)
Expand Down
6 changes: 3 additions & 3 deletions crates/bin/ampd/src/server_cmd.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
use std::sync::Arc;

use amp_dataset_store::{
DatasetStore, manifests::DatasetManifestsStore, providers::ProviderConfigsStore,
};
use amp_object_store::ObjectStoreCreationError;
use common::{BoxError, store::Store};
use config::{Addrs, Config as CommonConfig};
use dataset_store::{
DatasetStore, manifests::DatasetManifestsStore, providers::ProviderConfigsStore,
};
use monitoring::telemetry::metrics::Meter;
use server::config::Config as ServerConfig;

Expand Down
6 changes: 3 additions & 3 deletions crates/bin/ampd/src/solo_cmd.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
use std::{future::Future, pin::Pin, sync::Arc};

use amp_dataset_store::{
DatasetStore, manifests::DatasetManifestsStore, providers::ProviderConfigsStore,
};
use amp_object_store::ObjectStoreCreationError;
use common::{BoxError, store::Store};
use config::Config as CommonConfig;
use dataset_store::{
DatasetStore, manifests::DatasetManifestsStore, providers::ProviderConfigsStore,
};
use monitoring::telemetry::metrics::Meter;

use crate::{controller_cmd, server_cmd, worker_cmd};
Expand Down
6 changes: 3 additions & 3 deletions crates/bin/ampd/src/worker_cmd.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
use amp_dataset_store::{
DatasetStore, manifests::DatasetManifestsStore, providers::ProviderConfigsStore,
};
use amp_object_store::ObjectStoreCreationError;
use common::store::Store;
use config::Config;
use dataset_store::{
DatasetStore, manifests::DatasetManifestsStore, providers::ProviderConfigsStore,
};
use monitoring::telemetry::metrics::Meter;
use worker::node_id::NodeId;

Expand Down
2 changes: 1 addition & 1 deletion crates/core/dataset-store/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "dataset-store"
name = "amp-dataset-store"
edition.workspace = true
version.workspace = true
license-file.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/core/dump/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ async-stream.workspace = true
metadata-db = { path = "../metadata-db" }
common = { path = "../common" }
datafusion.workspace = true
dataset-store = { path = "../dataset-store" }
amp-dataset-store = { path = "../dataset-store" }
datasets-derived = { path = "../datasets-derived" }
datasets-common = { path = "../datasets-common" }
futures.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/core/dump/src/derived_dataset.rs
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ pub enum Error {
///
/// The manifest is required to determine table definitions and SQL queries.
#[error("Failed to get derived manifest")]
GetDerivedManifest(#[source] dataset_store::GetDerivedManifestError),
GetDerivedManifest(#[source] amp_dataset_store::GetDerivedManifestError),

/// Failed to dump individual table
///
Expand Down
2 changes: 1 addition & 1 deletion crates/core/dump/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

use std::sync::Arc;

use amp_dataset_store::{DatasetKind, DatasetStore};
use common::{
catalog::physical::PhysicalTable,
parquet::file::properties::WriterProperties as ParquetWriterProperties,
store::Store as DataStore,
};
use dataset_store::{DatasetKind, DatasetStore};
use datasets_common::hash_reference::HashReference;
use metadata_db::{MetadataDb, NotificationMultiplexerHandle};

Expand Down
2 changes: 1 addition & 1 deletion crates/core/dump/src/raw_dataset.rs
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ pub enum Error {
/// - Manifest not registered in metadata database
/// - Network connectivity issues to provider
#[error("Failed to get blockchain client for dataset")]
GetClient(#[source] dataset_store::GetClientError),
GetClient(#[source] amp_dataset_store::GetClientError),

/// Failed to resolve end block number
///
Expand Down
2 changes: 1 addition & 1 deletion crates/core/dump/src/streaming_query.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use std::{
};

use alloy::{hex::ToHexExt as _, primitives::BlockHash};
use amp_dataset_store::DatasetStore;
use common::{
BlockNum, BoxError, Dataset, DetachedLogicalPlan, LogicalCatalog, PlanningContext,
QueryContext, SPECIAL_BLOCK_NUM, Store,
Expand All @@ -19,7 +20,6 @@ use common::{
sql_str::SqlStr,
};
use datafusion::{common::cast::as_fixed_size_binary_array, error::DataFusionError};
use dataset_store::DatasetStore;
use datasets_common::{
hash::Hash, name::Name, partial_reference::PartialReference, revision::Revision,
};
Expand Down
2 changes: 1 addition & 1 deletion crates/core/monitoring/src/logging.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ const AMP_CRATES: &[&str] = &[
"admin_api",
"admin_client",
"amp_client",
"amp_dataset_store",
"amp_object_store",
"ampcc",
"ampctl",
Expand All @@ -77,7 +78,6 @@ const AMP_CRATES: &[&str] = &[
"common",
"config",
"controller",
"dataset_store",
"datasets_common",
"datasets_derived",
"datasets_raw",
Expand Down
Loading
Loading