fix: Rename querier2 to querier

Just some test helpers; there never was an `influxdb_iox run querier2`
command so no alias or test needed.

influxdb_iox/tests/end_to_end_cases/compactor.rs

@@ -12,7 +12,7 @@ async fn shard_id_greater_than_num_shards_is_invalid() {
 
     let ingester_config = TestConfig::new_ingester(&database_url);
     let router_config = TestConfig::new_router2(&ingester_config);
-    let querier_config = TestConfig::new_querier2(&ingester_config).with_querier_mem_pool_bytes(1);
+    let querier_config = TestConfig::new_querier(&ingester_config).with_querier_mem_pool_bytes(1);
     let compactor_config = TestConfig::new_compactor(&ingester_config).with_compactor_shards(
         2,   // num shards 2
         100, // and shard id > num shards; not valid
@@ -97,7 +97,7 @@ async fn sharded_compactor_0_always_compacts_partition_1() {
     // config, so use a non-shared minicluster here.
     let ingester_config = TestConfig::new_ingester(&database_url);
     let router_config = TestConfig::new_router2(&ingester_config);
-    let querier_config = TestConfig::new_querier2(&ingester_config).with_querier_mem_pool_bytes(1);
+    let querier_config = TestConfig::new_querier(&ingester_config).with_querier_mem_pool_bytes(1);
     let compactor_config = TestConfig::new_compactor(&ingester_config).with_compactor_shards(
         2, // num shards 2
         0, // shard ID 0, which will always get partition ID 1
@@ -180,7 +180,7 @@ async fn sharded_compactor_1_never_compacts_partition_1() {
     // config, so use a non-shared minicluster here.
     let ingester_config = TestConfig::new_ingester(&database_url);
     let router_config = TestConfig::new_router2(&ingester_config);
-    let querier_config = TestConfig::new_querier2(&ingester_config).with_querier_mem_pool_bytes(1);
+    let querier_config = TestConfig::new_querier(&ingester_config).with_querier_mem_pool_bytes(1);
     let compactor_config = TestConfig::new_compactor(&ingester_config).with_compactor_shards(
         2, // num shards 2
         1, // shard ID 1, which will never get partition ID 1

influxdb_iox/tests/end_to_end_cases/namespace.rs

@@ -14,7 +14,7 @@ async fn querier_namespace_client() {
 
     let ingester_config = TestConfig::new_ingester(&database_url);
     let router_config = TestConfig::new_router2(&ingester_config);
-    let querier_config = TestConfig::new_querier2(&ingester_config);
+    let querier_config = TestConfig::new_querier(&ingester_config);
 
     // Set up the cluster  ====================================
     let cluster = MiniCluster::new()

influxdb_iox/tests/end_to_end_cases/querier.rs

@@ -127,8 +127,8 @@ async fn basic_empty() {
     // Set up the cluster  ====================================
     let ingester_config = TestConfig::new_ingester(&database_url);
     let router_config = TestConfig::new_router2(&ingester_config);
-    // specially create a querier2 config that is NOT connected to the ingester
+    // specially create a querier config that is NOT connected to the ingester
-    let querier_config = TestConfig::new_querier2_without_ingester(&ingester_config);
+    let querier_config = TestConfig::new_querier_without_ingester(&ingester_config);
 
     let mut cluster = MiniCluster::new()
         .with_ingester(ingester_config)
@@ -198,8 +198,8 @@ async fn basic_no_ingester_connection() {
     // Set up the cluster  ====================================
     let ingester_config = TestConfig::new_ingester(&database_url);
     let router_config = TestConfig::new_router2(&ingester_config);
-    // specially create a querier2 config that is NOT connected to the ingester
+    // specially create a querier config that is NOT connected to the ingester
-    let querier_config = TestConfig::new_querier2_without_ingester(&ingester_config);
+    let querier_config = TestConfig::new_querier_without_ingester(&ingester_config);
 
     let mut cluster = MiniCluster::new()
         .with_ingester(ingester_config)
@@ -638,7 +638,7 @@ async fn oom_protection() {
     // Set up the cluster  ====================================
     let ingester_config = TestConfig::new_ingester(&database_url);
     let router_config = TestConfig::new_router2(&ingester_config);
-    let querier_config = TestConfig::new_querier2(&ingester_config).with_querier_mem_pool_bytes(1);
+    let querier_config = TestConfig::new_querier(&ingester_config).with_querier_mem_pool_bytes(1);
     let mut cluster = MiniCluster::new()
         .with_router(router_config)
         .await

influxdb_iox/tests/end_to_end_cases/querier/multi_ingester.rs

@@ -23,7 +23,7 @@ async fn basic_multi_ingesters() {
     let router_config =
         TestConfig::new_router2(&ingester_configs[0]).with_ingester_addresses(&ingester_addresses);
     let querier_config =
-        TestConfig::new_querier2(&ingester_configs[0]).with_ingester_addresses(&ingester_addresses);
+        TestConfig::new_querier(&ingester_configs[0]).with_ingester_addresses(&ingester_addresses);
 
     let mut cluster = MiniCluster::new();
     for ingester_config in ingester_configs {
@@ -108,7 +108,7 @@ async fn write_replication() {
         // Require both ingesters to get this write to be counted as a full write
         .with_rpc_write_replicas(NonZeroUsize::new(2).unwrap());
     let querier_config =
-        TestConfig::new_querier2(&ingester_configs[0]).with_ingester_addresses(&ingester_addresses);
+        TestConfig::new_querier(&ingester_configs[0]).with_ingester_addresses(&ingester_addresses);
 
     let mut cluster = MiniCluster::new();
     for ingester_config in ingester_configs {

test_helpers_end_to_end/src/config.rs

@@ -104,12 +104,12 @@ impl TestConfig {
         .with_new_wal()
     }
 
-    /// Create a minimal querier2 configuration from the specified ingester configuration, using
+    /// Create a minimal querier configuration from the specified ingester configuration, using
     /// the same dsn and object store, and pointing at the specified ingester.
-    pub fn new_querier2(ingester_config: &TestConfig) -> Self {
+    pub fn new_querier(ingester_config: &TestConfig) -> Self {
         assert_eq!(ingester_config.server_type(), ServerType::Ingester);
 
-        Self::new_querier2_without_ingester(ingester_config)
+        Self::new_querier_without_ingester(ingester_config)
             .with_ingester_addresses(&[ingester_config.ingester_base()])
     }
 
@@ -123,11 +123,11 @@ impl TestConfig {
         .with_existing_object_store(other)
     }
 
-    /// Create a minimal querier2 configuration from the specified ingester configuration, using
+    /// Create a minimal querier configuration from the specified ingester configuration, using
     /// the same dsn and object store, but without specifying the ingester addresses
-    pub fn new_querier2_without_ingester(ingester_config: &TestConfig) -> Self {
+    pub fn new_querier_without_ingester(ingester_config: &TestConfig) -> Self {
         Self::new(
-            ServerType::Querier2,
+            ServerType::Querier,
             ingester_config.dsn().to_owned(),
             ingester_config.catalog_schema_name(),
         )

test_helpers_end_to_end/src/mini_cluster.rs

@@ -199,7 +199,7 @@ impl MiniCluster {
     pub async fn create_non_shared2(database_url: String) -> Self {
         let ingester_config = TestConfig::new_ingester(&database_url);
         let router_config = TestConfig::new_router2(&ingester_config);
-        let querier_config = TestConfig::new_querier2(&ingester_config);
+        let querier_config = TestConfig::new_querier(&ingester_config);
         let compactor_config = TestConfig::new_compactor(&ingester_config);
 
         // Set up the cluster  ====================================
@@ -220,7 +220,7 @@ impl MiniCluster {
     pub async fn create_non_shared2_never_persist(database_url: String) -> Self {
         let ingester_config = TestConfig::new_ingester_never_persist(&database_url);
         let router_config = TestConfig::new_router2(&ingester_config);
-        let querier_config = TestConfig::new_querier2(&ingester_config);
+        let querier_config = TestConfig::new_querier(&ingester_config);
         let compactor_config = TestConfig::new_compactor(&ingester_config);
 
         // Set up the cluster  ====================================
@@ -247,7 +247,7 @@ impl MiniCluster {
         let router_config =
             TestConfig::new_router2(&ingester_config).with_single_tenancy(authz_addr.clone());
         let querier_config =
-            TestConfig::new_querier2(&ingester_config).with_single_tenancy(authz_addr);
+            TestConfig::new_querier(&ingester_config).with_single_tenancy(authz_addr);
         let compactor_config = TestConfig::new_compactor(&ingester_config);
 
         // Set up the cluster  ====================================

test_helpers_end_to_end/src/server_fixture.rs

@@ -208,7 +208,7 @@ impl Connections {
         };
 
         self.querier_grpc_connection = match server_type {
-            ServerType::AllInOne | ServerType::Querier2 => {
+            ServerType::AllInOne | ServerType::Querier => {
                 let client_base = test_config.addrs().querier_grpc_api().client_base();
                 Some(
                     grpc_channel(test_config, client_base.as_ref())
@@ -502,7 +502,7 @@ impl TestServer {
                         return;
                     }
                 }
-                ServerType::Querier2 => {
+                ServerType::Querier => {
                     if check_arrow_service_health(
                         server_type,
                         connections.querier_grpc_connection(),

test_helpers_end_to_end/src/server_type.rs

@@ -5,7 +5,7 @@ pub enum ServerType {
     AllInOne,
     Ingester,
     Router2,
-    Querier2,
+    Querier,
     Compactor,
 }
 
@@ -16,7 +16,7 @@ impl ServerType {
             Self::AllInOne => "all-in-one",
             Self::Ingester => "ingester",
             Self::Router2 => "router2",
-            Self::Querier2 => "querier",
+            Self::Querier => "querier",
             Self::Compactor => "compactor",
         }
     }
@@ -87,7 +87,7 @@ fn addr_envs(server_type: ServerType, addrs: &BindAddresses) -> Vec<(&'static st
                 addrs.ingester_grpc_api().bind_addr().to_string(),
             ),
         ],
-        ServerType::Querier2 => vec![
+        ServerType::Querier => vec![
             (
                 "INFLUXDB_IOX_BIND_ADDR",
                 addrs.router_http_api().bind_addr().to_string(),