From d163ac32a430e871f52e3a08ebc42858d4b4c335 Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Sun, 22 Oct 2023 11:44:35 -0400 Subject: [PATCH 01/20] Testing PR --- src/adapter/src/coord/sequencer/inner.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/adapter/src/coord/sequencer/inner.rs b/src/adapter/src/coord/sequencer/inner.rs index b087d61b897ce..385146e354189 100644 --- a/src/adapter/src/coord/sequencer/inner.rs +++ b/src/adapter/src/coord/sequencer/inner.rs @@ -18,6 +18,7 @@ use std::time::{Duration, Instant}; use anyhow::anyhow; use futures::future::BoxFuture; use itertools::Itertools; +use log::warn; use maplit::btreeset; use mz_cloud_resources::VpcEndpointConfig; use mz_compute_types::dataflows::{DataflowDesc, DataflowDescription, IndexDesc}; @@ -225,6 +226,7 @@ impl Coordinator { if_not_exists_ids, } = self.create_source_inner(session, plans).await?; + // test commit match self.catalog_transact(Some(session), ops).await { Ok(()) => { let mut source_ids = Vec::with_capacity(sources.len()); From bb45307ea657aecc0d0b97e9c097b2bedfb00ab7 Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Sun, 22 Oct 2023 11:56:45 -0400 Subject: [PATCH 02/20] no message --- src/adapter/src/coord/sequencer/inner.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/adapter/src/coord/sequencer/inner.rs b/src/adapter/src/coord/sequencer/inner.rs index 385146e354189..ed4def2847e6e 100644 --- a/src/adapter/src/coord/sequencer/inner.rs +++ b/src/adapter/src/coord/sequencer/inner.rs @@ -226,7 +226,7 @@ impl Coordinator { if_not_exists_ids, } = self.create_source_inner(session, plans).await?; - // test commit + warn!("Logging test"); match self.catalog_transact(Some(session), ops).await { Ok(()) => { let mut source_ids = Vec::with_capacity(sources.len()); From aa1b3f49873f0a741a413ab3898e0d373f0d8ea2 Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Sun, 22 Oct 2023 12:07:12 -0400 Subject: [PATCH 03/20] no message --- src/adapter/src/coord/sequencer/inner.rs | 1 - src/adapter/src/coord/sequencer/linked_cluster.rs | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/adapter/src/coord/sequencer/inner.rs b/src/adapter/src/coord/sequencer/inner.rs index ed4def2847e6e..0e9f344c4a2f6 100644 --- a/src/adapter/src/coord/sequencer/inner.rs +++ b/src/adapter/src/coord/sequencer/inner.rs @@ -226,7 +226,6 @@ impl Coordinator { if_not_exists_ids, } = self.create_source_inner(session, plans).await?; - warn!("Logging test"); match self.catalog_transact(Some(session), ops).await { Ok(()) => { let mut source_ids = Vec::with_capacity(sources.len()); diff --git a/src/adapter/src/coord/sequencer/linked_cluster.rs b/src/adapter/src/coord/sequencer/linked_cluster.rs index 15a9230e01c59..5af69b31a2390 100644 --- a/src/adapter/src/coord/sequencer/linked_cluster.rs +++ b/src/adapter/src/coord/sequencer/linked_cluster.rs @@ -202,6 +202,7 @@ impl Coordinator { // `catalog_transact`, both from the catalog state and from the // controller. The new replicas will be in the catalog state, and // need to be recreated in the controller. + warn!("Logging test"); let replicas: Vec<_> = cluster .replicas() .map(|r| (r.cluster_id, r.replica_id)) From 5ff17a73f43fae56212ba31fc886298abb07ea7f Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Sun, 22 Oct 2023 12:11:30 -0400 Subject: [PATCH 04/20] no message --- src/adapter/src/coord/sequencer/linked_cluster.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/adapter/src/coord/sequencer/linked_cluster.rs b/src/adapter/src/coord/sequencer/linked_cluster.rs index 5af69b31a2390..b673f6c71705b 100644 --- a/src/adapter/src/coord/sequencer/linked_cluster.rs +++ b/src/adapter/src/coord/sequencer/linked_cluster.rs @@ -19,12 +19,14 @@ use mz_repr::GlobalId; use mz_sql::catalog::CatalogCluster; use mz_sql::names::QualifiedItemName; use mz_sql::plan::SourceSinkClusterConfig; +use tracing::{event, warn, Level}; use crate::catalog::{self, ClusterConfig, ClusterVariant, LINKED_CLUSTER_REPLICA_NAME}; use crate::coord::Coordinator; use crate::error::AdapterError; use crate::session::Session; + impl Coordinator { /// Generates the catalog operations to create a linked cluster for the /// source or sink with the given name. From 05bd7201b7ce465407f415a7c661ebf0bfdeb86a Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Sun, 22 Oct 2023 12:34:47 -0400 Subject: [PATCH 05/20] no message --- src/adapter/src/coord/sequencer/inner.rs | 1 - src/adapter/src/coord/sequencer/linked_cluster.rs | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/adapter/src/coord/sequencer/inner.rs b/src/adapter/src/coord/sequencer/inner.rs index 0e9f344c4a2f6..b087d61b897ce 100644 --- a/src/adapter/src/coord/sequencer/inner.rs +++ b/src/adapter/src/coord/sequencer/inner.rs @@ -18,7 +18,6 @@ use std::time::{Duration, Instant}; use anyhow::anyhow; use futures::future::BoxFuture; use itertools::Itertools; -use log::warn; use maplit::btreeset; use mz_cloud_resources::VpcEndpointConfig; use mz_compute_types::dataflows::{DataflowDesc, DataflowDescription, IndexDesc}; diff --git a/src/adapter/src/coord/sequencer/linked_cluster.rs b/src/adapter/src/coord/sequencer/linked_cluster.rs index b673f6c71705b..97e9280a7a4d4 100644 --- a/src/adapter/src/coord/sequencer/linked_cluster.rs +++ b/src/adapter/src/coord/sequencer/linked_cluster.rs @@ -204,7 +204,7 @@ impl Coordinator { // `catalog_transact`, both from the catalog state and from the // controller. The new replicas will be in the catalog state, and // need to be recreated in the controller. - warn!("Logging test"); + // warn!("Logging test"); let replicas: Vec<_> = cluster .replicas() .map(|r| (r.cluster_id, r.replica_id)) From 144dcd36c82defb14a7e45511d96e68deb6f133d Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Sun, 22 Oct 2023 12:35:46 -0400 Subject: [PATCH 06/20] no message --- src/adapter/src/coord/sequencer/linked_cluster.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/adapter/src/coord/sequencer/linked_cluster.rs b/src/adapter/src/coord/sequencer/linked_cluster.rs index 97e9280a7a4d4..b673f6c71705b 100644 --- a/src/adapter/src/coord/sequencer/linked_cluster.rs +++ b/src/adapter/src/coord/sequencer/linked_cluster.rs @@ -204,7 +204,7 @@ impl Coordinator { // `catalog_transact`, both from the catalog state and from the // controller. The new replicas will be in the catalog state, and // need to be recreated in the controller. - // warn!("Logging test"); + warn!("Logging test"); let replicas: Vec<_> = cluster .replicas() .map(|r| (r.cluster_id, r.replica_id)) From c8edae2d06532de8bd7863eecd13bd605067d908 Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Sun, 22 Oct 2023 12:36:24 -0400 Subject: [PATCH 07/20] no message --- src/adapter/src/coord/sequencer/linked_cluster.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/adapter/src/coord/sequencer/linked_cluster.rs b/src/adapter/src/coord/sequencer/linked_cluster.rs index b673f6c71705b..97e9280a7a4d4 100644 --- a/src/adapter/src/coord/sequencer/linked_cluster.rs +++ b/src/adapter/src/coord/sequencer/linked_cluster.rs @@ -204,7 +204,7 @@ impl Coordinator { // `catalog_transact`, both from the catalog state and from the // controller. The new replicas will be in the catalog state, and // need to be recreated in the controller. - warn!("Logging test"); + // warn!("Logging test"); let replicas: Vec<_> = cluster .replicas() .map(|r| (r.cluster_id, r.replica_id)) From f81f4f83ef9ea49bdf4342af8f52535f71228e95 Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Wed, 25 Oct 2023 10:15:12 -0400 Subject: [PATCH 08/20] test ff detection --- src/adapter/src/coord/sequencer/linked_cluster.rs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/adapter/src/coord/sequencer/linked_cluster.rs b/src/adapter/src/coord/sequencer/linked_cluster.rs index 97e9280a7a4d4..6945eb37650ab 100644 --- a/src/adapter/src/coord/sequencer/linked_cluster.rs +++ b/src/adapter/src/coord/sequencer/linked_cluster.rs @@ -212,4 +212,11 @@ impl Coordinator { self.create_cluster_replicas(&replicas).await; } } + + pub fn my_func_test( + scx: &StatementContext + ) -> Result { + scx.require_feature_flag(&crate::session::vars::ENABLE_ASSERT_NOT_NULL)?; + Ok() + } } From e9994f584c52045bdafc38f1fa7db68b2d2be164 Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Fri, 27 Oct 2023 08:51:08 -0400 Subject: [PATCH 09/20] no message --- .gitignore | 2 +- src/adapter/src/coord/sequencer/linked_cluster.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5222879eb6173..79afa9b710794 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ # many different editing tools: # # https://github.com/github/gitignore/tree/master/Global - +.idea/ /target /target-ra /target-xcompile diff --git a/src/adapter/src/coord/sequencer/linked_cluster.rs b/src/adapter/src/coord/sequencer/linked_cluster.rs index 6945eb37650ab..8a3c1c4a1d544 100644 --- a/src/adapter/src/coord/sequencer/linked_cluster.rs +++ b/src/adapter/src/coord/sequencer/linked_cluster.rs @@ -216,7 +216,7 @@ impl Coordinator { pub fn my_func_test( scx: &StatementContext ) -> Result { - scx.require_feature_flag(&crate::session::vars::ENABLE_ASSERT_NOT_NULL)?; + //scx.require_feature_flag(&crate::session::vars::ENABLE_ASSERT_NOT_NULL)?; Ok() } } From cf536ade836b23a2366ecae68b5a6a14344c08d3 Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Fri, 27 Oct 2023 08:52:25 -0400 Subject: [PATCH 10/20] test --- src/adapter/src/coord/sequencer/linked_cluster.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/adapter/src/coord/sequencer/linked_cluster.rs b/src/adapter/src/coord/sequencer/linked_cluster.rs index 8a3c1c4a1d544..4a5483a26e91b 100644 --- a/src/adapter/src/coord/sequencer/linked_cluster.rs +++ b/src/adapter/src/coord/sequencer/linked_cluster.rs @@ -204,7 +204,7 @@ impl Coordinator { // `catalog_transact`, both from the catalog state and from the // controller. The new replicas will be in the catalog state, and // need to be recreated in the controller. - // warn!("Logging test"); + let replicas: Vec<_> = cluster .replicas() .map(|r| (r.cluster_id, r.replica_id)) @@ -216,7 +216,8 @@ impl Coordinator { pub fn my_func_test( scx: &StatementContext ) -> Result { - //scx.require_feature_flag(&crate::session::vars::ENABLE_ASSERT_NOT_NULL)?; + warn!("Logging test"); + scx.require_feature_flag(&crate::session::vars::ENABLE_ASSERT_NOT_NULL)?; Ok() } } From cd8ce4f137ffcec62ee6915b258b45e54c863e82 Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Fri, 27 Oct 2023 08:53:19 -0400 Subject: [PATCH 11/20] test --- src/adapter/src/coord/sequencer/linked_cluster.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/adapter/src/coord/sequencer/linked_cluster.rs b/src/adapter/src/coord/sequencer/linked_cluster.rs index 4a5483a26e91b..4b11b754e50c9 100644 --- a/src/adapter/src/coord/sequencer/linked_cluster.rs +++ b/src/adapter/src/coord/sequencer/linked_cluster.rs @@ -216,8 +216,8 @@ impl Coordinator { pub fn my_func_test( scx: &StatementContext ) -> Result { - warn!("Logging test"); - scx.require_feature_flag(&crate::session::vars::ENABLE_ASSERT_NOT_NULL)?; + //warn!("Logging test"); + //scx.require_feature_flag(&crate::session::vars::ENABLE_ASSERT_NOT_NULL)?; Ok() } } From 0bc5cf849bb3ed7b543979558035764469f833e1 Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Fri, 27 Oct 2023 08:56:37 -0400 Subject: [PATCH 12/20] test --- src/adapter/src/coord/sequencer/linked_cluster.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/adapter/src/coord/sequencer/linked_cluster.rs b/src/adapter/src/coord/sequencer/linked_cluster.rs index 4b11b754e50c9..128c2b8f95ddc 100644 --- a/src/adapter/src/coord/sequencer/linked_cluster.rs +++ b/src/adapter/src/coord/sequencer/linked_cluster.rs @@ -217,7 +217,7 @@ impl Coordinator { scx: &StatementContext ) -> Result { //warn!("Logging test"); - //scx.require_feature_flag(&crate::session::vars::ENABLE_ASSERT_NOT_NULL)?; + scx.require_feature_flag(&crate::session::vars::ENABLE_ASSERT_NOT_NULL)?; Ok() } } From a21c14057c4cc5e506b8cbf834120eae653fffa5 Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Fri, 27 Oct 2023 09:00:49 -0400 Subject: [PATCH 13/20] testing --- src/adapter/src/coord/sequencer/linked_cluster.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/adapter/src/coord/sequencer/linked_cluster.rs b/src/adapter/src/coord/sequencer/linked_cluster.rs index 128c2b8f95ddc..4b11b754e50c9 100644 --- a/src/adapter/src/coord/sequencer/linked_cluster.rs +++ b/src/adapter/src/coord/sequencer/linked_cluster.rs @@ -217,7 +217,7 @@ impl Coordinator { scx: &StatementContext ) -> Result { //warn!("Logging test"); - scx.require_feature_flag(&crate::session::vars::ENABLE_ASSERT_NOT_NULL)?; + //scx.require_feature_flag(&crate::session::vars::ENABLE_ASSERT_NOT_NULL)?; Ok() } } From 095e37f5c6cb81b46ebe5b166fb1d81a1e4c6a04 Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Fri, 27 Oct 2023 09:54:54 -0400 Subject: [PATCH 14/20] testing --- src/adapter/src/coord/sequencer/linked_cluster.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/adapter/src/coord/sequencer/linked_cluster.rs b/src/adapter/src/coord/sequencer/linked_cluster.rs index 4b11b754e50c9..128c2b8f95ddc 100644 --- a/src/adapter/src/coord/sequencer/linked_cluster.rs +++ b/src/adapter/src/coord/sequencer/linked_cluster.rs @@ -217,7 +217,7 @@ impl Coordinator { scx: &StatementContext ) -> Result { //warn!("Logging test"); - //scx.require_feature_flag(&crate::session::vars::ENABLE_ASSERT_NOT_NULL)?; + scx.require_feature_flag(&crate::session::vars::ENABLE_ASSERT_NOT_NULL)?; Ok() } } From a67fe3227078ebac025bd06a9df8d432793b9e68 Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Tue, 31 Oct 2023 13:10:23 -0400 Subject: [PATCH 15/20] no message --- src/adapter/src/coord/sequencer/linked_cluster.rs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/adapter/src/coord/sequencer/linked_cluster.rs b/src/adapter/src/coord/sequencer/linked_cluster.rs index 128c2b8f95ddc..e0638dc3e21ee 100644 --- a/src/adapter/src/coord/sequencer/linked_cluster.rs +++ b/src/adapter/src/coord/sequencer/linked_cluster.rs @@ -221,3 +221,13 @@ impl Coordinator { Ok() } } + +#[cfg(test)] +mod tests { + use super::*; + + #[mz_ore::test] + fn simple_test() { + assert_eq!(2 + 2, 4); + } +} \ No newline at end of file From bf7810f6a15af440611da9db9c9ec4a261fcbe2b Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Tue, 31 Oct 2023 13:14:02 -0400 Subject: [PATCH 16/20] no message --- test/restart/mzcompose.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/restart/mzcompose.py b/test/restart/mzcompose.py index 52ad7b7186454..647cb29cf1db1 100644 --- a/test/restart/mzcompose.py +++ b/test/restart/mzcompose.py @@ -371,10 +371,10 @@ def workflow_bound_size_mz_status_history(c: Composition) -> None: service="testdrive_no_reset", input=dedent( """ - > SELECT COUNT(*) > 7 FROM mz_internal.mz_source_status_history + > SELECT COUNT(*) > 8 FROM mz_internal.mz_source_status_history true - > SELECT COUNT(*) > 7 FROM mz_internal.mz_sink_status_history + > SELECT COUNT(*) > 8 FROM mz_internal.mz_sink_status_history true """ ), From 33419f848b522c260b95c5d0dbfd8af656543fd9 Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Tue, 31 Oct 2023 16:44:33 -0400 Subject: [PATCH 17/20] no message --- src/adapter/src/coord/sequencer/linked_cluster.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/adapter/src/coord/sequencer/linked_cluster.rs b/src/adapter/src/coord/sequencer/linked_cluster.rs index e0638dc3e21ee..9188114e1278f 100644 --- a/src/adapter/src/coord/sequencer/linked_cluster.rs +++ b/src/adapter/src/coord/sequencer/linked_cluster.rs @@ -217,7 +217,7 @@ impl Coordinator { scx: &StatementContext ) -> Result { //warn!("Logging test"); - scx.require_feature_flag(&crate::session::vars::ENABLE_ASSERT_NOT_NULL)?; + //scx.require_feature_flag(&crate::session::vars::ENABLE_ASSERT_NOT_NULL)?; Ok() } } From d84da6e0f76c9467ab8e90ec7dda47c45fce0ac1 Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Sun, 5 Nov 2023 12:24:34 -0500 Subject: [PATCH 18/20] test commit --- src/adapter/src/coord/sequencer/linked_cluster.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/adapter/src/coord/sequencer/linked_cluster.rs b/src/adapter/src/coord/sequencer/linked_cluster.rs index 9188114e1278f..e0638dc3e21ee 100644 --- a/src/adapter/src/coord/sequencer/linked_cluster.rs +++ b/src/adapter/src/coord/sequencer/linked_cluster.rs @@ -217,7 +217,7 @@ impl Coordinator { scx: &StatementContext ) -> Result { //warn!("Logging test"); - //scx.require_feature_flag(&crate::session::vars::ENABLE_ASSERT_NOT_NULL)?; + scx.require_feature_flag(&crate::session::vars::ENABLE_ASSERT_NOT_NULL)?; Ok() } } From c5973cacf037ca556a82b9b6cfc7ae4fd46be1e6 Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Sun, 5 Nov 2023 12:25:53 -0500 Subject: [PATCH 19/20] test commit --- src/adapter/src/coord/sequencer/linked_cluster.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/adapter/src/coord/sequencer/linked_cluster.rs b/src/adapter/src/coord/sequencer/linked_cluster.rs index e0638dc3e21ee..9188114e1278f 100644 --- a/src/adapter/src/coord/sequencer/linked_cluster.rs +++ b/src/adapter/src/coord/sequencer/linked_cluster.rs @@ -217,7 +217,7 @@ impl Coordinator { scx: &StatementContext ) -> Result { //warn!("Logging test"); - scx.require_feature_flag(&crate::session::vars::ENABLE_ASSERT_NOT_NULL)?; + //scx.require_feature_flag(&crate::session::vars::ENABLE_ASSERT_NOT_NULL)?; Ok() } } From 936b49a9e87857a1634fc3c4a74eab07793d07cd Mon Sep 17 00:00:00 2001 From: Mark Greene Date: Sun, 5 Nov 2023 12:52:39 -0500 Subject: [PATCH 20/20] test commit --- src/adapter/src/coord/sequencer/linked_cluster.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/adapter/src/coord/sequencer/linked_cluster.rs b/src/adapter/src/coord/sequencer/linked_cluster.rs index 9188114e1278f..e0638dc3e21ee 100644 --- a/src/adapter/src/coord/sequencer/linked_cluster.rs +++ b/src/adapter/src/coord/sequencer/linked_cluster.rs @@ -217,7 +217,7 @@ impl Coordinator { scx: &StatementContext ) -> Result { //warn!("Logging test"); - //scx.require_feature_flag(&crate::session::vars::ENABLE_ASSERT_NOT_NULL)?; + scx.require_feature_flag(&crate::session::vars::ENABLE_ASSERT_NOT_NULL)?; Ok() } }