Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #5549 from influxdata/alamb/guilio-python-main 

chore: changed `iox_shared` to `iox-shared`
pull/24376/head
Luke Bond 2022-09-06 17:16:40 +01:00 committed by GitHub
parent adeacf416c a280acb860
commit 16f1b40efd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
import/src/aggregate_tsm_schema/update_catalog.rs
View File

@ -494,7 +494,7 @@ mod tests {
.repositories() .repositories()
.await .await
.topics() .topics()
.create_or_get("iox_shared") .create_or_get("iox-shared")
.await .await
.expect("topic created"); .expect("topic created");
let (connection, _join_handle, _requests) = create_test_shard_service(MapToShardResponse { let (connection, _join_handle, _requests) = create_test_shard_service(MapToShardResponse {
@ -524,8 +524,8 @@ mod tests {
let agg_schema: AggregateTSMSchema = json.try_into().unwrap(); let agg_schema: AggregateTSMSchema = json.try_into().unwrap();
update_iox_catalog( update_iox_catalog(
&agg_schema, &agg_schema,
"iox_shared", "iox-shared",
Some("iox_shared"), Some("iox-shared"),
Some("inf"), Some("inf"),
Arc::clone(&catalog), Arc::clone(&catalog),
connection, connection,
@ -580,7 +580,7 @@ mod tests {
.await .await
.expect("started transaction"); .expect("started transaction");
txn.topics() txn.topics()
.create_or_get("iox_shared") .create_or_get("iox-shared")
.await .await
.expect("topic created"); .expect("topic created");
let (connection, _join_handle, _requests) = create_test_shard_service(MapToShardResponse { let (connection, _join_handle, _requests) = create_test_shard_service(MapToShardResponse {
@ -644,8 +644,8 @@ mod tests {
let agg_schema: AggregateTSMSchema = json.try_into().unwrap(); let agg_schema: AggregateTSMSchema = json.try_into().unwrap();
update_iox_catalog( update_iox_catalog(
&agg_schema, &agg_schema,
"iox_shared", "iox-shared",
Some("iox_shared"), Some("iox-shared"),
Some("inf"), Some("inf"),
Arc::clone(&catalog), Arc::clone(&catalog),
connection, connection,
@ -685,7 +685,7 @@ mod tests {
.await .await
.expect("started transaction"); .expect("started transaction");
txn.topics() txn.topics()
.create_or_get("iox_shared") .create_or_get("iox-shared")
.await .await
.expect("topic created"); .expect("topic created");
let (connection, _join_handle, _requests) = create_test_shard_service(MapToShardResponse { let (connection, _join_handle, _requests) = create_test_shard_service(MapToShardResponse {
@ -742,8 +742,8 @@ mod tests {
let agg_schema: AggregateTSMSchema = json.try_into().unwrap(); let agg_schema: AggregateTSMSchema = json.try_into().unwrap();
let err = update_iox_catalog( let err = update_iox_catalog(
&agg_schema, &agg_schema,
"iox_shared", "iox-shared",
Some("iox_shared"), Some("iox-shared"),
Some("inf"), Some("inf"),
Arc::clone(&catalog), Arc::clone(&catalog),
connection, connection,
@ -766,7 +766,7 @@ mod tests {
.await .await
.expect("started transaction"); .expect("started transaction");
txn.topics() txn.topics()
.create_or_get("iox_shared") .create_or_get("iox-shared")
.await .await
.expect("topic created"); .expect("topic created");
let (connection, _join_handle, _requests) = create_test_shard_service(MapToShardResponse { let (connection, _join_handle, _requests) = create_test_shard_service(MapToShardResponse {
@ -822,8 +822,8 @@ mod tests {
let agg_schema: AggregateTSMSchema = json.try_into().unwrap(); let agg_schema: AggregateTSMSchema = json.try_into().unwrap();
let err = update_iox_catalog( let err = update_iox_catalog(
&agg_schema, &agg_schema,
"iox_shared", "iox-shared",
Some("iox_shared"), Some("iox-shared"),
Some("inf"), Some("inf"),
Arc::clone(&catalog), Arc::clone(&catalog),
connection, connection,
@ -845,7 +845,7 @@ mod tests {
.repositories() .repositories()
.await .await
.topics() .topics()
.create_or_get("iox_shared") .create_or_get("iox-shared")
.await .await
.expect("topic created"); .expect("topic created");
let (connection, _join_handle, _requests) = create_test_shard_service(MapToShardResponse { let (connection, _join_handle, _requests) = create_test_shard_service(MapToShardResponse {
@ -875,7 +875,7 @@ mod tests {
let agg_schema: AggregateTSMSchema = json.try_into().unwrap(); let agg_schema: AggregateTSMSchema = json.try_into().unwrap();
let err = update_iox_catalog( let err = update_iox_catalog(
&agg_schema, &agg_schema,
"iox_shared", "iox-shared",
None, None,
Some("inf"), Some("inf"),
Arc::clone(&catalog), Arc::clone(&catalog),
@ -895,7 +895,7 @@ mod tests {
.repositories() .repositories()
.await .await
.topics() .topics()
.create_or_get("iox_shared") .create_or_get("iox-shared")
.await .await
.expect("topic created"); .expect("topic created");
let (connection, _join_handle, _requests) = create_test_shard_service(MapToShardResponse { let (connection, _join_handle, _requests) = create_test_shard_service(MapToShardResponse {
@ -925,7 +925,7 @@ mod tests {
let agg_schema: AggregateTSMSchema = json.try_into().unwrap(); let agg_schema: AggregateTSMSchema = json.try_into().unwrap();
let err = update_iox_catalog( let err = update_iox_catalog(
&agg_schema, &agg_schema,
"iox_shared", "iox-shared",
Some("iox-shared"), Some("iox-shared"),
None, None,
Arc::clone(&catalog), Arc::clone(&catalog),
@ -945,7 +945,7 @@ mod tests {
.repositories() .repositories()
.await .await
.topics() .topics()
.create_or_get("iox_shared") .create_or_get("iox-shared")
.await .await
.expect("topic created"); .expect("topic created");
let (connection, _join_handle, requests) = create_test_shard_service(MapToShardResponse { let (connection, _join_handle, requests) = create_test_shard_service(MapToShardResponse {
@ -984,8 +984,8 @@ mod tests {
let agg_schema: AggregateTSMSchema = json.try_into().unwrap(); let agg_schema: AggregateTSMSchema = json.try_into().unwrap();
update_iox_catalog( update_iox_catalog(
&agg_schema, &agg_schema,
"iox_shared", "iox-shared",
Some("iox_shared"), Some("iox-shared"),
Some("inf"), Some("inf"),
Arc::clone(&catalog), Arc::clone(&catalog),
connection, connection,

4
influxdb_iox/src/commands/remote/partition.rs
View File

@ -225,9 +225,9 @@ pub async fn command(connection: Connection, config: Config) -> Result<(), Error
} }
} }
const TOPIC_NAME: &str = "iox_shared"; const TOPIC_NAME: &str = "iox-shared";
const SHARD_INDEX: ShardIndex = ShardIndex::new(0); const SHARD_INDEX: ShardIndex = ShardIndex::new(0);
const QUERY_POOL: &str = "iox_shared"; const QUERY_POOL: &str = "iox-shared";
// loads the protobuf namespace schema returned from a remote IOx server into the passed in // loads the protobuf namespace schema returned from a remote IOx server into the passed in
// catalog. It does this based on namespace, table, and column names, not IDs. It also inserts // catalog. It does this based on namespace, table, and column names, not IDs. It also inserts

4
querier/src/cache/read_buffer.rs vendored
View File

@ -205,7 +205,7 @@ async fn read_buffer_chunk_from_stream(
let schema = stream.schema(); let schema = stream.schema();
// create "global" metric object, so that we don't blow up prometheus w/ too many metrics // create "global" metric object, so that we don't blow up prometheus w/ too many metrics
let metrics = ChunkMetrics::new(metric_registry, "iox_shared"); let metrics = ChunkMetrics::new(metric_registry, "iox-shared");
let mut builder = read_buffer::RBChunkBuilder::new(schema).with_metrics(metrics); let mut builder = read_buffer::RBChunkBuilder::new(schema).with_metrics(metrics);
@ -516,7 +516,7 @@ mod tests {
.get_instrument("read_buffer_row_group_total") .get_instrument("read_buffer_row_group_total")
.unwrap(); .unwrap();
let v = g let v = g
.get_observer(&Attributes::from(&[("db_name", "iox_shared")])) .get_observer(&Attributes::from(&[("db_name", "iox-shared")]))
.unwrap() .unwrap()
.fetch(); .fetch();

8
service_grpc_catalog/src/lib.rs
View File

@ -133,10 +133,10 @@ mod tests {
let metrics = Arc::new(metric::Registry::default()); let metrics = Arc::new(metric::Registry::default());
let catalog = Arc::new(MemCatalog::new(metrics)); let catalog = Arc::new(MemCatalog::new(metrics));
let mut repos = catalog.repositories().await; let mut repos = catalog.repositories().await;
let topic = repos.topics().create_or_get("iox_shared").await.unwrap(); let topic = repos.topics().create_or_get("iox-shared").await.unwrap();
let pool = repos let pool = repos
.query_pools() .query_pools()
.create_or_get("iox_shared") .create_or_get("iox-shared")
.await .await
.unwrap(); .unwrap();
let shard = repos let shard = repos
@ -210,10 +210,10 @@ mod tests {
let metrics = Arc::new(metric::Registry::default()); let metrics = Arc::new(metric::Registry::default());
let catalog = Arc::new(MemCatalog::new(metrics)); let catalog = Arc::new(MemCatalog::new(metrics));
let mut repos = catalog.repositories().await; let mut repos = catalog.repositories().await;
let topic = repos.topics().create_or_get("iox_shared").await.unwrap(); let topic = repos.topics().create_or_get("iox-shared").await.unwrap();
let pool = repos let pool = repos
.query_pools() .query_pools()
.create_or_get("iox_shared") .create_or_get("iox-shared")
.await .await
.unwrap(); .unwrap();
let shard = repos let shard = repos

4
service_grpc_object_store/src/lib.rs
View File

@ -112,10 +112,10 @@ mod tests {
let metrics = Arc::new(metric::Registry::default()); let metrics = Arc::new(metric::Registry::default());
let catalog = Arc::new(MemCatalog::new(metrics)); let catalog = Arc::new(MemCatalog::new(metrics));
let mut repos = catalog.repositories().await; let mut repos = catalog.repositories().await;
let topic = repos.topics().create_or_get("iox_shared").await.unwrap(); let topic = repos.topics().create_or_get("iox-shared").await.unwrap();
let pool = repos let pool = repos
.query_pools() .query_pools()
.create_or_get("iox_shared") .create_or_get("iox-shared")
.await .await
.unwrap(); .unwrap();
let shard = repos let shard = repos