From bdff4e88487717018490d10feabc8239f6357f94 Mon Sep 17 00:00:00 2001 From: "Carol (Nichols || Goulding)" Date: Thu, 10 Nov 2022 16:05:24 -0500 Subject: [PATCH] fix: Consistently use 'namespace' instead of 'database' in comments and other internal text --- README.md | 4 ++-- dml/src/lib.rs | 2 +- docs/cli.md | 2 +- docs/env.example | 2 +- docs/local_filesystems.md | 2 +- docs/observability.md | 11 +++++------ docs/sql.md | 2 +- docs/testing.md | 10 +++++----- .../protos/influxdata/iox/querier/v1/flight.proto | 2 +- influxdb_iox/src/commands/namespace/retention.rs | 5 +++-- influxdb_iox/src/commands/write.rs | 2 +- influxdb_iox/src/main.rs | 8 ++++---- influxdb_iox_client/src/client/flight/low_level.rs | 2 +- influxdb_iox_client/src/client/flight/mod.rs | 5 ++--- influxdb_iox_client/src/client/write.rs | 4 ++-- influxdb_storage_client/src/lib.rs | 7 +++---- iox_catalog/src/interface.rs | 2 +- iox_query/src/provider/adapter.rs | 2 +- ioxd_common/src/lib.rs | 5 ++--- ioxd_common/src/server_type/common_state.rs | 2 +- ioxd_router/src/lib.rs | 2 +- parquet_file/src/chunk.rs | 2 +- parquet_file/src/lib.rs | 2 +- querier/src/database.rs | 2 +- querier/src/namespace/mod.rs | 2 +- router/src/namespace_cache/memory.rs | 2 +- router/src/namespace_cache/metrics.rs | 4 ++-- router/src/namespace_cache/sharded_cache.rs | 2 +- router/src/server/http.rs | 4 ++-- schema/src/builder.rs | 2 +- schema/src/lib.rs | 2 +- schema/src/merge.rs | 2 +- test_helpers_end_to_end/src/lib.rs | 2 +- 33 files changed, 54 insertions(+), 57 deletions(-) diff --git a/README.md b/README.md index 25f1616240..351cc2be04 100644 --- a/README.md +++ b/README.md @@ -235,7 +235,7 @@ See [docs/testing.md] for more information Data can be written to InfluxDB IOx by sending [line protocol] format to the `/api/v2/write` endpoint or using the CLI. -For example, assuming you are running in local mode, this command will send data in the `test_fixtures/lineproto/metrics.lp` file to the `company_sensors` database. +For example, assuming you are running in local mode, this command will send data in the `test_fixtures/lineproto/metrics.lp` file to the `company_sensors` namespace. ```shell ./target/debug/influxdb_iox -vv write company_sensors test_fixtures/lineproto/metrics.lp --host http://localhost:8080 @@ -243,7 +243,7 @@ For example, assuming you are running in local mode, this command will send data Note that `--host http://localhost:8080` is required as the `/v2/api` endpoint is hosted on port `8080` while the default is the querier gRPC port `8082`. -To query the data stored in the `company_sensors` database: +To query the data stored in the `company_sensors` namespace: ```shell ./target/debug/influxdb_iox query company_sensors "SELECT * FROM cpu LIMIT 10" diff --git a/dml/src/lib.rs b/dml/src/lib.rs index 67125ce7bd..c9a2ecf421 100644 --- a/dml/src/lib.rs +++ b/dml/src/lib.rs @@ -186,7 +186,7 @@ impl From for DmlOperation { } } -/// A collection of writes to potentially multiple tables within the same database +/// A collection of writes to potentially multiple tables within the same namespace #[derive(Debug, Clone)] pub struct DmlWrite { /// The namespace being written to diff --git a/docs/cli.md b/docs/cli.md index 8207a77655..df5775b66b 100644 --- a/docs/cli.md +++ b/docs/cli.md @@ -62,7 +62,7 @@ Connected to IOx Server Set output format format to pretty Ready for commands. (Hint: try 'help;') > use 26f7e5a4b7be365b_917b97a92e883afc; -You are now in remote mode, querying database 26f7e5a4b7be365b_917b97a92e883afc +You are now in remote mode, querying namespace 26f7e5a4b7be365b_917b97a92e883afc 26f7e5a4b7be365b_917b97a92e883afc> select count(*) from cpu; +-----------------+ | COUNT(UInt8(1)) | diff --git a/docs/env.example b/docs/env.example index e95366ce70..e88aa35ba0 100644 --- a/docs/env.example +++ b/docs/env.example @@ -7,7 +7,7 @@ # The full list of available configuration values can be found by in # the command line help (e.g. `env: INFLUXDB_IOX_DB_DIR=`): # -# ./influxdb_iox run database --help +# ./influxdb_iox run --help # # # The identifier for the server. Used for writing to object storage and as diff --git a/docs/local_filesystems.md b/docs/local_filesystems.md index e53eb896ff..e4310c3702 100644 --- a/docs/local_filesystems.md +++ b/docs/local_filesystems.md @@ -18,6 +18,6 @@ The rationale for this assumption is to enable IOx to be operated in a container This configuration is used when running IOx on a "plain old server" operating at the edge as well as for local testing. -In this configuration, IOx assumes the contents of the local file system are preserved at least as long as the life of the IOx Database and that external measures are taken to backup or otherwise manage this. +In this configuration, IOx assumes the contents of the local file system are preserved at least as long as the life of the IOx instance and that external measures are taken to backup or otherwise manage this. In other words, unsurprisingly, when using the local filesystem as object storage, the durability of the data in IOx is tied to the durability of the filesystem. diff --git a/docs/observability.md b/docs/observability.md index 58daa10afa..f06bc61335 100644 --- a/docs/observability.md +++ b/docs/observability.md @@ -2,7 +2,7 @@ ## Background -Observability context is how a component exposes metrics, traces, logs, panics, etc... in a way that places them in the context of the wider system. Most commonly this might be the database name, but might also be the table name, chunk ID, etc... Crucially this information may not be relevant to the component's primary function, e.g. if we never needed to observe `Db` it wouldn't need to know the database name at all, as only `Server` would need to know +Observability context is how a component exposes metrics, traces, logs, panics, etc... in a way that places them in the context of the wider system. Most commonly this might be the namespace name, but might also be the table name, chunk ID, etc... Crucially this information may not be relevant to the component's primary function, e.g. if we never needed to observe `Db` it wouldn't need to know the namespace name at all, as only `Server` would need to know Broadly speaking there are 3 approaches to how to inject this context: @@ -12,14 +12,13 @@ Broadly speaking there are 3 approaches to how to inject this context: Effectively the 3 trade-off between "polluting" the object or the callsites. -To give a concrete example, from a purely logic perspective the catalog does not need to know the database name, only the path -to the object store. However, it is helpful for logs, metrics, etc... to be in terms of database name. +To give a concrete example, from a purely logic perspective the catalog does not need to know the namespace name, only the path to the object store. However, it is helpful for logs, metrics, etc... to be in terms of namespace name. The three approaches would therefore be -1. Inject database name on construction onto the catalog object -2. Inject metrics, logs, etc... wrappers that carry the database name context internally -3. Inject database name at every call site, either explicitly passing it as an argument, or implicitly by wrapping in a span, mapping the returned error, etc... +1. Inject namespace name on construction onto the catalog object +2. Inject metrics, logs, etc... wrappers that carry the namespace name context internally +3. Inject namespace name at every call site, either explicitly passing it as an argument, or implicitly by wrapping in a span, mapping the returned error, etc... ## Outcome diff --git a/docs/sql.md b/docs/sql.md index 977da2f6ec..9c3f07687a 100644 --- a/docs/sql.md +++ b/docs/sql.md @@ -131,7 +131,7 @@ In this section, IOx specific SQL tables, commands, and extensions are documente ## System Tables -In addition to the SQL standard `information_schema`, IOx contains several *system tables* that provide access to IOx specific information. The information in each system table is scoped to that particular database. Cross database queries are not possible due to the design of IOx's security model. +In addition to the SQL standard `information_schema`, IOx contains several *system tables* that provide access to IOx specific information. The information in each system table is scoped to that particular namespace. Cross namespace queries are not possible due to the design of IOx's security model. ### `system.queries` `system.queries` contains information about queries run against this IOx instance diff --git a/docs/testing.md b/docs/testing.md index 44253ff320..34fb7f2a92 100644 --- a/docs/testing.md +++ b/docs/testing.md @@ -88,14 +88,14 @@ set. ### Configuration differences when running the tests -When running `influxdb_iox run database`, you can pick one object store to use. When running the tests, -you can run them against all the possible object stores. There's still only one -`INFLUXDB_IOX_BUCKET` variable, though, so that will set the bucket name for all configured object -stores. Use the same bucket name when setting up the different services. +When running `influxdb_iox run`, you can pick one object store to use. When running the tests, you +can run them against all the possible object stores. There's still only one `INFLUXDB_IOX_BUCKET` +variable, though, so that will set the bucket name for all configured object stores. Use the same +bucket name when setting up the different services. Other than possibly configuring multiple object stores, configuring the tests to use the object store services is the same as configuring the server to use an object store service. See the output -of `influxdb_iox run database --help` for instructions. +of `influxdb_iox run --help` for instructions. ## InfluxDB 2 Client diff --git a/generated_types/protos/influxdata/iox/querier/v1/flight.proto b/generated_types/protos/influxdata/iox/querier/v1/flight.proto index 9c2aa93e0d..858f105e5a 100644 --- a/generated_types/protos/influxdata/iox/querier/v1/flight.proto +++ b/generated_types/protos/influxdata/iox/querier/v1/flight.proto @@ -4,7 +4,7 @@ option go_package = "github.com/influxdata/iox/querier/v1"; // Request body for ticket in "end-user to querier" flight requests. message ReadInfo { - // Namespace(/database) name. + // Namespace name. string namespace_name = 1; // SQL query. diff --git a/influxdb_iox/src/commands/namespace/retention.rs b/influxdb_iox/src/commands/namespace/retention.rs index e7b97aa141..68193c7b87 100644 --- a/influxdb_iox/src/commands/namespace/retention.rs +++ b/influxdb_iox/src/commands/namespace/retention.rs @@ -11,14 +11,15 @@ pub enum Error { ClientError(#[from] influxdb_iox_client::error::Error), } -/// Write data into the specified database +/// Update the specified namespace's data retention period #[derive(Debug, clap::Parser)] pub struct Config { /// The namespace to update the retention period for #[clap(action)] namespace: String, - /// Num of hours of the retention period of this namespace. Default is 0 representing infinite retention + /// Num of hours of the retention period of this namespace. Default is 0 representing infinite + /// retention #[clap(action, long, short = 'c', default_value = "0")] retention_hours: u32, } diff --git a/influxdb_iox/src/commands/write.rs b/influxdb_iox/src/commands/write.rs index 21d87f56b7..8af7401d2f 100644 --- a/influxdb_iox/src/commands/write.rs +++ b/influxdb_iox/src/commands/write.rs @@ -47,7 +47,7 @@ pub enum Error { pub type Result = std::result::Result; -/// Write data into the specified database +/// Write data into the specified namespace #[derive(Debug, clap::Parser)] pub struct Config { /// If specified, restricts the maxium amount of line protocol diff --git a/influxdb_iox/src/main.rs b/influxdb_iox/src/main.rs index 7c9679337c..5e817b45b3 100644 --- a/influxdb_iox/src/main.rs +++ b/influxdb_iox/src/main.rs @@ -115,9 +115,9 @@ Command are generally structured in the form: For example, a command such as the following shows all actions - available for database chunks, including get and list. + available for namespaces, including `list` and `retention`. - influxdb_iox database chunk --help + influxdb_iox namespace --help "# )] struct Config { @@ -184,13 +184,13 @@ enum Command { /// Various commands for compactor manipulation Compactor(Box), - /// Interrogate internal database data + /// Interrogate internal data Debug(commands::debug::Config), /// Initiate a read request to the gRPC storage service. Storage(commands::storage::Config), - /// Write data into the specified database + /// Write data into the specified namespace Write(commands::write::Config), /// Query the data with SQL diff --git a/influxdb_iox_client/src/client/flight/low_level.rs b/influxdb_iox_client/src/client/flight/low_level.rs index e7b498090b..be178d8093 100644 --- a/influxdb_iox_client/src/client/flight/low_level.rs +++ b/influxdb_iox_client/src/client/flight/low_level.rs @@ -110,7 +110,7 @@ where } } - /// Query the given database with the given SQL query, and return a [`PerformQuery`] instance + /// Query the given namespace with the given SQL query, and return a [`PerformQuery`] instance /// that streams low-level message results. pub async fn perform_query(&mut self, request: T) -> Result, Error> { PerformQuery::::new(self, request).await diff --git a/influxdb_iox_client/src/client/flight/mod.rs b/influxdb_iox_client/src/client/flight/mod.rs index 3b3e3c6044..0aa9fd18f3 100644 --- a/influxdb_iox_client/src/client/flight/mod.rs +++ b/influxdb_iox_client/src/client/flight/mod.rs @@ -21,8 +21,7 @@ pub use low_level::{Client as LowLevelClient, PerformQuery as LowLevelPerformQue use self::low_level::LowLevelMessage; -/// Error responses when querying an IOx database using the Arrow Flight gRPC -/// API. +/// Error responses when querying an IOx namespace using the Arrow Flight gRPC API. #[derive(Debug, Error)] pub enum Error { /// There were no FlightData messages returned when we expected to get one @@ -124,7 +123,7 @@ impl Client { } } - /// Query the given database with the given SQL query, and return a + /// Query the given namespace with the given SQL query, and return a /// [`PerformQuery`] instance that streams Arrow `RecordBatch` results. pub async fn perform_query(&mut self, request: ReadInfo) -> Result { PerformQuery::new(self, request).await diff --git a/influxdb_iox_client/src/client/write.rs b/influxdb_iox_client/src/client/write.rs index 4771970f11..12af2e037c 100644 --- a/influxdb_iox_client/src/client/write.rs +++ b/influxdb_iox_client/src/client/write.rs @@ -101,7 +101,7 @@ impl Client { /// Write the [LineProtocol] formatted string in `lp_data` to /// namespace `namespace`. /// - /// Returns the number of bytes which were written to the database + /// Returns the number of bytes which were written to the namespace. /// /// [LineProtocol]: https://docs.influxdata.com/influxdb/v2.0/reference/syntax/line-protocol/#data-types-and-format pub async fn write_lp( @@ -119,7 +119,7 @@ impl Client { /// individual lines (points) do not cross these strings /// /// Returns the number of bytes, in total, which were written to - /// the database + /// the namespace. /// /// [LineProtocol]: https://docs.influxdata.com/influxdb/v2.0/reference/syntax/line-protocol/#data-types-and-format pub async fn write_lp_stream( diff --git a/influxdb_storage_client/src/lib.rs b/influxdb_storage_client/src/lib.rs index 445622b248..4dc988621c 100644 --- a/influxdb_storage_client/src/lib.rs +++ b/influxdb_storage_client/src/lib.rs @@ -36,10 +36,9 @@ use ::generated_types::google::protobuf::*; use observability_deps::tracing::{debug, trace}; use std::num::NonZeroU64; -/// InfluxDB IOx deals with database names. The gRPC interface deals -/// with org_id and bucket_id represented as 16 digit hex -/// values. This struct manages creating the org_id, bucket_id, -/// and database names to be consistent with the implementation +/// InfluxDB IOx deals with namespace names. The gRPC interface deals with org_id and bucket_id +/// represented as 16 digit hex values. This struct manages creating the org_id, bucket_id, and +/// namespace names to be consistent with the implementation. #[derive(Debug, Clone)] pub struct OrgAndBucket { org_id: NonZeroU64, diff --git a/iox_catalog/src/interface.rs b/iox_catalog/src/interface.rs index e81ba8bd14..d42eeef469 100644 --- a/iox_catalog/src/interface.rs +++ b/iox_catalog/src/interface.rs @@ -416,7 +416,7 @@ pub trait ShardRepo: Send + Sync { } /// Functions for working with IOx partitions in the catalog. Note that these are how IOx splits up -/// data within a database, which is different than Kafka partitions. +/// data within a namespace, which is different than Kafka partitions. #[async_trait] pub trait PartitionRepo: Send + Sync { /// create or get a partition record for the given partition key, shard and table diff --git a/iox_query/src/provider/adapter.rs b/iox_query/src/provider/adapter.rs index cf143dcb57..6dab683085 100644 --- a/iox_query/src/provider/adapter.rs +++ b/iox_query/src/provider/adapter.rs @@ -15,7 +15,7 @@ use datafusion::physical_plan::{ }; use futures::Stream; -/// Database schema creation / validation errors. +/// Schema creation / validation errors. #[allow(clippy::enum_variant_names)] #[derive(Debug, Snafu)] pub enum Error { diff --git a/ioxd_common/src/lib.rs b/ioxd_common/src/lib.rs index a25307273a..84b7c03fe7 100644 --- a/ioxd_common/src/lib.rs +++ b/ioxd_common/src/lib.rs @@ -100,9 +100,8 @@ pub async fn http_listener(addr: SocketAddr) -> Result { Ok(listener) } -/// Instantiates the gRPC and optional HTTP listeners and returns a -/// Future that completes when these listeners, the Server, Databases, -/// etc... have all exited or the frontend_shutdown token is called. +/// Instantiates the gRPC and optional HTTP listeners and returns a `Future` that completes when +/// the listeners have all exited or the `frontend_shutdown` token is called. pub async fn serve( common_state: CommonServerState, frontend_shutdown: CancellationToken, diff --git a/ioxd_common/src/server_type/common_state.rs b/ioxd_common/src/server_type/common_state.rs index cd5c8d446e..f9129d2c16 100644 --- a/ioxd_common/src/server_type/common_state.rs +++ b/ioxd_common/src/server_type/common_state.rs @@ -11,7 +11,7 @@ pub enum CommonServerStateError { Tracing { source: trace_exporters::Error }, } -/// Common state used by all server types (e.g. `Database` and `Router`) +/// Common state used by all server types #[derive(Debug, Clone)] pub struct CommonServerState { run_config: RunConfig, diff --git a/ioxd_router/src/lib.rs b/ioxd_router/src/lib.rs index 4d64cdaead..bb710b8680 100644 --- a/ioxd_router/src/lib.rs +++ b/ioxd_router/src/lib.rs @@ -387,7 +387,7 @@ where .await? .for_each(|(ns, schema)| { let name = NamespaceName::try_from(ns.name) - .expect("cannot convert existing namespace name to database name"); + .expect("cannot convert existing namespace string to a `NamespaceName` instance"); cache.put_schema(name, schema); }); diff --git a/parquet_file/src/chunk.rs b/parquet_file/src/chunk.rs index 9a7ac76efd..d125f09ef2 100644 --- a/parquet_file/src/chunk.rs +++ b/parquet_file/src/chunk.rs @@ -20,7 +20,7 @@ pub struct ParquetChunk { /// Schema that goes with this table's parquet file schema: Arc, - /// Persists the parquet file within a database's relative path + /// Persists the parquet file within a namespace's relative path store: ParquetStorage, } diff --git a/parquet_file/src/lib.rs b/parquet_file/src/lib.rs index 427f40b26a..b35d705687 100644 --- a/parquet_file/src/lib.rs +++ b/parquet_file/src/lib.rs @@ -24,7 +24,7 @@ use data_types::{NamespaceId, ParquetFile, PartitionId, ShardId, TableId}; use object_store::path::Path; use uuid::Uuid; -/// Location of a Parquet file within a database's object store. +/// Location of a Parquet file within a namespace's object store. /// The exact format is an implementation detail and is subject to change. #[derive(Debug, Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd)] pub struct ParquetFilePath { diff --git a/querier/src/database.rs b/querier/src/database.rs index df269114f5..38185c0193 100644 --- a/querier/src/database.rs +++ b/querier/src/database.rs @@ -65,7 +65,7 @@ pub struct QuerierDatabase { /// /// This should be a 1-to-1 relation to the number of active queries. /// - /// If the same database is requested twice for different queries, it is counted twice. + /// If the same namespace is requested twice for different queries, it is counted twice. query_execution_semaphore: Arc, /// Sharder to determine which ingesters to query for a particular table and namespace. diff --git a/querier/src/namespace/mod.rs b/querier/src/namespace/mod.rs index 4580b8a2b9..66081e82a2 100644 --- a/querier/src/namespace/mod.rs +++ b/querier/src/namespace/mod.rs @@ -1,4 +1,4 @@ -//! Namespace within the whole database. +//! Namespace within the whole catalog. use crate::{ cache::{namespace::CachedNamespace, CatalogCache}, diff --git a/router/src/namespace_cache/memory.rs b/router/src/namespace_cache/memory.rs index 04390a1b29..db1c66a39b 100644 --- a/router/src/namespace_cache/memory.rs +++ b/router/src/namespace_cache/memory.rs @@ -35,7 +35,7 @@ mod tests { #[test] fn test_put_get() { - let ns = NamespaceName::new("test").expect("database name is valid"); + let ns = NamespaceName::new("test").expect("namespace name is valid"); let cache = Arc::new(MemoryNamespaceCache::default()); assert!(cache.get_schema(&ns).is_none()); diff --git a/router/src/namespace_cache/metrics.rs b/router/src/namespace_cache/metrics.rs index 5c04267e56..40bdcf662b 100644 --- a/router/src/namespace_cache/metrics.rs +++ b/router/src/namespace_cache/metrics.rs @@ -224,7 +224,7 @@ mod tests { #[test] fn test_put() { - let ns = NamespaceName::new("test").expect("database name is valid"); + let ns = NamespaceName::new("test").expect("namespace name is valid"); let registry = metric::Registry::default(); let cache = Arc::new(MemoryNamespaceCache::default()); let cache = Arc::new(InstrumentedCache::new(cache, ®istry)); @@ -356,7 +356,7 @@ mod tests { assert_eq!(cache.column_count.observe(), Observation::U64Gauge(11)); // Add a new namespace - let ns = NamespaceName::new("another").expect("database name is valid"); + let ns = NamespaceName::new("another").expect("namespace name is valid"); let schema = new_schema(&[10, 12, 9]); assert!(cache.put_schema(ns.clone(), schema).is_none()); assert_histogram_hit( diff --git a/router/src/namespace_cache/sharded_cache.rs b/router/src/namespace_cache/sharded_cache.rs index 4811221dc8..a94e48ed94 100644 --- a/router/src/namespace_cache/sharded_cache.rs +++ b/router/src/namespace_cache/sharded_cache.rs @@ -55,7 +55,7 @@ mod tests { .map(char::from) .collect::() .try_into() - .expect("generated invalid random database name") + .expect("generated invalid random namespace name") } fn schema_with_id(id: i64) -> NamespaceSchema { diff --git a/router/src/server/http.rs b/router/src/server/http.rs index 79dac16ad9..b040afd754 100644 --- a/router/src/server/http.rs +++ b/router/src/server/http.rs @@ -145,7 +145,7 @@ impl From<&DmlError> for StatusCode { } /// Errors returned when decoding the organisation / bucket information from a -/// HTTP request and deriving the database name from it. +/// HTTP request and deriving the namespace name from it. #[derive(Debug, Error)] pub enum OrgBucketError { /// The request contains no org/bucket destination information. @@ -156,7 +156,7 @@ pub enum OrgBucketError { #[error("failed to deserialize org/bucket/precision in request: {0}")] DecodeFail(#[from] serde::de::value::Error), - /// The provided org/bucket could not be converted into a database name. + /// The provided org/bucket could not be converted into a namespace name. #[error(transparent)] MappingFail(#[from] OrgBucketMappingError), } diff --git a/schema/src/builder.rs b/schema/src/builder.rs index 05704b6433..8a652c9d57 100644 --- a/schema/src/builder.rs +++ b/schema/src/builder.rs @@ -5,7 +5,7 @@ use snafu::{ResultExt, Snafu}; use super::{InfluxColumnType, InfluxFieldType, Schema, TIME_COLUMN_NAME}; -/// Database schema creation / validation errors. +/// Namespace schema creation / validation errors. #[derive(Debug, Snafu)] pub enum Error { #[snafu(display("Error validating schema: {}", source))] diff --git a/schema/src/lib.rs b/schema/src/lib.rs index d03db6e331..1f92ba3bdc 100644 --- a/schema/src/lib.rs +++ b/schema/src/lib.rs @@ -46,7 +46,7 @@ pub mod sort; pub use builder::SchemaBuilder; pub use projection::Projection; -/// Database schema creation / validation errors. +/// Namespace schema creation / validation errors. #[derive(Debug, Snafu)] pub enum Error { #[snafu(display( diff --git a/schema/src/merge.rs b/schema/src/merge.rs index 147eee2490..8b718da069 100644 --- a/schema/src/merge.rs +++ b/schema/src/merge.rs @@ -9,7 +9,7 @@ use crate::interner::SchemaInterner; use super::{InfluxColumnType, Schema}; -/// Database schema creation / validation errors. +/// Namespace schema creation / validation errors. #[derive(Debug, Snafu)] pub enum Error { #[snafu(display("No schemas found when building merged schema"))] diff --git a/test_helpers_end_to_end/src/lib.rs b/test_helpers_end_to_end/src/lib.rs index 180ffe9c7b..ca2ef263d4 100644 --- a/test_helpers_end_to_end/src/lib.rs +++ b/test_helpers_end_to_end/src/lib.rs @@ -26,7 +26,7 @@ pub use server_type::{AddAddrEnv, ServerType}; pub use steps::{FCustom, Step, StepTest, StepTestState}; pub use udp_listener::UdpCapture; -/// Return a random string suitable for use as a database name +/// Return a random string suitable for use as a namespace name pub fn rand_name() -> String { thread_rng() .sample_iter(&Alphanumeric)