Skip to content

Commit ee53043

Browse files
peaseeJeadiesgrebnov
authored
fix: Remove Cayenne Catalog from catalog registration (spiceai#10914)
* fix: Remove Cayenne Catalog from catalog registration * fix: Ignore cayenne catalog tests --------- Co-authored-by: Jack Eadie <jack@spice.ai> Co-authored-by: Sergei Grebnov <sergei.grebnov@gmail.com>
1 parent b4b9fdf commit ee53043

3 files changed

Lines changed: 29 additions & 15 deletions

File tree

‎crates/runtime/src/catalogconnector/mod.rs‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -275,16 +275,6 @@ pub async fn register_all() {
275275
),
276276
);
277277

278-
#[cfg(not(windows))]
279-
registry.insert(
280-
cayenne::PREFIX.to_string(),
281-
CatalogConnectorFactory::new(
282-
cayenne::CayenneCatalogConnector::new_connector,
283-
cayenne::PREFIX,
284-
cayenne::PARAMETERS,
285-
),
286-
);
287-
288278
#[cfg(feature = "adbc")]
289279
registry.insert(
290280
adbc::PREFIX.to_string(),
@@ -552,11 +542,6 @@ mod tests {
552542
guard.contains_key(oracle::PREFIX),
553543
"oracle should be registered"
554544
);
555-
#[cfg(not(windows))]
556-
assert!(
557-
guard.contains_key(cayenne::PREFIX),
558-
"cayenne should be registered"
559-
);
560545
}
561546

562547
// Verify factory metadata for a known connector

‎crates/runtime/tests/cayenne_catalog_ddl/mod.rs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ fn make_cayenne_catalog(catalog_name: &str, data_dir: &str, metadata_dir: &str)
115115
// =============================================================================
116116

117117
#[tokio::test]
118+
#[ignore = "Cayenne catalog connector removed from registry"]
118119
async fn cayenne_catalog_ddl_create_insert_update_delete() -> Result<(), String> {
119120
let _tracing = init_tracing(Some("integration=debug,info"));
120121
register_test_connectors().await;
@@ -422,6 +423,7 @@ async fn cayenne_catalog_ddl_create_insert_update_delete() -> Result<(), String>
422423
// =============================================================================
423424

424425
#[tokio::test]
426+
#[ignore = "Cayenne catalog connector removed from registry"]
425427
async fn cayenne_catalog_ddl_create_if_not_exists() -> Result<(), String> {
426428
let _tracing = init_tracing(Some("integration=debug,info"));
427429
register_test_connectors().await;
@@ -506,6 +508,7 @@ async fn cayenne_catalog_ddl_create_if_not_exists() -> Result<(), String> {
506508
// =============================================================================
507509

508510
#[tokio::test]
511+
#[ignore = "Cayenne catalog connector removed from registry"]
509512
async fn cayenne_catalog_ddl_multiple_tables() -> Result<(), String> {
510513
let _tracing = init_tracing(Some("integration=debug,info"));
511514
register_test_connectors().await;
@@ -659,6 +662,7 @@ async fn cayenne_catalog_ddl_multiple_tables() -> Result<(), String> {
659662
// =============================================================================
660663

661664
#[tokio::test]
665+
#[ignore = "Cayenne catalog connector removed from registry"]
662666
async fn cayenne_catalog_ddl_drop_table() -> Result<(), String> {
663667
let _tracing = init_tracing(Some("integration=debug,info"));
664668
register_test_connectors().await;
@@ -753,6 +757,7 @@ async fn cayenne_catalog_ddl_drop_table() -> Result<(), String> {
753757
// =============================================================================
754758

755759
#[tokio::test]
760+
#[ignore = "Cayenne catalog connector removed from registry"]
756761
async fn cayenne_catalog_ddl_primary_key_upsert() -> Result<(), String> {
757762
let _tracing = init_tracing(Some("integration=debug,info"));
758763
register_test_connectors().await;
@@ -946,6 +951,7 @@ async fn cayenne_catalog_ddl_primary_key_upsert() -> Result<(), String> {
946951
// =============================================================================
947952

948953
#[tokio::test]
954+
#[ignore = "Cayenne catalog connector removed from registry"]
949955
async fn cayenne_catalog_ddl_multiple_schemas() -> Result<(), String> {
950956
let _tracing = init_tracing(Some("integration=debug,info"));
951957
register_test_connectors().await;
@@ -1070,6 +1076,7 @@ async fn cayenne_catalog_ddl_multiple_schemas() -> Result<(), String> {
10701076
// =============================================================================
10711077

10721078
#[tokio::test]
1079+
#[ignore = "Cayenne catalog connector removed from registry"]
10731080
async fn cayenne_catalog_merge_into() -> Result<(), String> {
10741081
let _tracing = init_tracing(Some("integration=debug,info"));
10751082
register_test_connectors().await;
@@ -1328,6 +1335,7 @@ async fn cayenne_catalog_merge_into() -> Result<(), String> {
13281335
// =============================================================================
13291336

13301337
#[tokio::test]
1338+
#[ignore = "Cayenne catalog connector removed from registry"]
13311339
async fn cayenne_catalog_merge_partition_key_differs_from_join_key() -> Result<(), String> {
13321340
let _tracing = init_tracing(Some("integration=debug,info"));
13331341
register_test_connectors().await;
@@ -1452,6 +1460,7 @@ async fn cayenne_catalog_merge_partition_key_differs_from_join_key() -> Result<(
14521460
// =============================================================================
14531461

14541462
#[tokio::test]
1463+
#[ignore = "Cayenne catalog connector removed from registry"]
14551464
async fn cayenne_catalog_merge_composite_on_key() -> Result<(), String> {
14561465
let _tracing = init_tracing(Some("integration=debug,info"));
14571466
register_test_connectors().await;
@@ -1589,6 +1598,7 @@ async fn cayenne_catalog_merge_composite_on_key() -> Result<(), String> {
15891598
/// but source only matches (US,A) and (EU,B). The unmatched rows (US,B) and (EU,A)
15901599
/// must be preserved unchanged.
15911600
#[tokio::test]
1601+
#[ignore = "Cayenne catalog connector removed from registry"]
15921602
async fn cayenne_catalog_merge_composite_key_no_cross_product() -> Result<(), String> {
15931603
let _tracing = init_tracing(Some("integration=debug,info"));
15941604
register_test_connectors().await;
@@ -1718,6 +1728,7 @@ async fn cayenne_catalog_merge_composite_key_no_cross_product() -> Result<(), St
17181728
// =============================================================================
17191729

17201730
#[tokio::test]
1731+
#[ignore = "Cayenne catalog connector removed from registry"]
17211732
async fn cayenne_catalog_merge_duplicate_source_keys_rejected() -> Result<(), String> {
17221733
let _tracing = init_tracing(Some("integration=debug,info"));
17231734
register_test_connectors().await;
@@ -1837,6 +1848,7 @@ async fn cayenne_catalog_merge_duplicate_source_keys_rejected() -> Result<(), St
18371848
// → executor forwarding path; this test covers the direct TableProvider::update
18381849
// call.
18391850
#[tokio::test]
1851+
#[ignore = "Cayenne catalog connector removed from registry"]
18401852
async fn cayenne_catalog_ddl_update() -> Result<(), String> {
18411853
let _tracing = init_tracing(Some("integration=debug,info"));
18421854
register_test_connectors().await;
@@ -2004,6 +2016,7 @@ async fn cayenne_catalog_ddl_update() -> Result<(), String> {
20042016
//
20052017
// Distinct SQL parse path from `WHERE true`.
20062018
#[tokio::test]
2019+
#[ignore = "Cayenne catalog connector removed from registry"]
20072020
async fn cayenne_catalog_ddl_dml_no_where() -> Result<(), String> {
20082021
let _tracing = init_tracing(Some("integration=debug,info"));
20092022
register_test_connectors().await;
@@ -2094,6 +2107,7 @@ async fn cayenne_catalog_ddl_dml_no_where() -> Result<(), String> {
20942107
// partition pruning. This test uses `PARTITION BY region` and filters on
20952108
// `sku` to exercise the no-pruning path.
20962109
#[tokio::test]
2110+
#[ignore = "Cayenne catalog connector removed from registry"]
20972111
async fn cayenne_catalog_ddl_dml_non_partition_filter() -> Result<(), String> {
20982112
let _tracing = init_tracing(Some("integration=debug,info"));
20992113
register_test_connectors().await;
@@ -2209,6 +2223,7 @@ async fn cayenne_catalog_ddl_dml_non_partition_filter() -> Result<(), String> {
22092223
// All other DML tests except the MERGE ones use `PARTITION BY id BIGINT`.
22102224
// This test exercises INSERT/UPDATE/DELETE on a string-partitioned table.
22112225
#[tokio::test]
2226+
#[ignore = "Cayenne catalog connector removed from registry"]
22122227
async fn cayenne_catalog_ddl_string_partition_dml() -> Result<(), String> {
22132228
let _tracing = init_tracing(Some("integration=debug,info"));
22142229
register_test_connectors().await;
@@ -2327,6 +2342,7 @@ async fn cayenne_catalog_ddl_string_partition_dml() -> Result<(), String> {
23272342
// =============================================================================
23282343

23292344
#[tokio::test]
2345+
#[ignore = "Cayenne catalog connector removed from registry"]
23302346
async fn cayenne_catalog_rejected_without_distributed_mode() -> Result<(), String> {
23312347
let _tracing = init_tracing(Some("integration=debug,info"));
23322348
register_test_connectors().await;

‎crates/runtime/tests/cluster/distributed_cayenne_catalog.rs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ where
167167
/// 6. DROP TABLE and verify it is inaccessible, then re-create
168168
#[tokio::test(flavor = "multi_thread")]
169169
#[cfg(not(target_os = "windows"))]
170+
#[ignore = "Cayenne catalog connector removed from registry"]
170171
async fn test_distributed_cayenne_ddl_lifecycle() -> Result<(), anyhow::Error> {
171172
let _tracing = init_tracing(Some("integration=debug,info"));
172173

@@ -554,6 +555,7 @@ async fn ddl_lifecycle_drop(harness: &ClusterHarness) -> Result<(), anyhow::Erro
554555
/// - Aggregations over `JOINed` data are correct
555556
#[tokio::test(flavor = "multi_thread")]
556557
#[cfg(not(target_os = "windows"))]
558+
#[ignore = "Cayenne catalog connector removed from registry"]
557559
async fn test_distributed_cayenne_multi_table_join() -> Result<(), anyhow::Error> {
558560
let _tracing = init_tracing(Some("integration=debug,info"));
559561

@@ -715,6 +717,7 @@ async fn multi_table_join_verify(harness: &ClusterHarness) -> Result<(), anyhow:
715717
/// Also tests same-named tables in different schemas to verify namespace correctness.
716718
#[tokio::test(flavor = "multi_thread")]
717719
#[cfg(not(target_os = "windows"))]
720+
#[ignore = "Cayenne catalog connector removed from registry"]
718721
async fn test_distributed_cayenne_schema_isolation() -> Result<(), anyhow::Error> {
719722
let _tracing = init_tracing(Some("integration=debug,info"));
720723

@@ -872,6 +875,7 @@ async fn schema_isolation_verify(harness: &ClusterHarness) -> Result<(), anyhow:
872875
/// - DELETE on PK tables works correctly
873876
#[tokio::test(flavor = "multi_thread")]
874877
#[cfg(not(target_os = "windows"))]
878+
#[ignore = "Cayenne catalog connector removed from registry"]
875879
async fn test_distributed_cayenne_primary_key_upsert() -> Result<(), anyhow::Error> {
876880
let _tracing = init_tracing(Some("integration=debug,info"));
877881

@@ -1073,6 +1077,7 @@ async fn pk_upsert_delete(harness: &ClusterHarness) -> Result<(), anyhow::Error>
10731077
/// - WHERE IS NULL / IS NOT NULL filtering
10741078
#[tokio::test(flavor = "multi_thread")]
10751079
#[cfg(not(target_os = "windows"))]
1080+
#[ignore = "Cayenne catalog connector removed from registry"]
10761081
async fn test_distributed_cayenne_null_handling_and_aggregations() -> Result<(), anyhow::Error> {
10771082
let _tracing = init_tracing(Some("integration=debug,info"));
10781083

@@ -1127,6 +1132,7 @@ async fn test_distributed_cayenne_null_handling_and_aggregations() -> Result<(),
11271132
// `cayenne_catalog_ddl/mod.rs`.
11281133
#[tokio::test(flavor = "multi_thread")]
11291134
#[cfg(not(target_os = "windows"))]
1135+
#[ignore = "Cayenne catalog connector removed from registry"]
11301136
async fn test_distributed_cayenne_merge_basic() -> Result<(), anyhow::Error> {
11311137
let _tracing = init_tracing(Some("integration=debug,info"));
11321138

@@ -1261,6 +1267,7 @@ async fn test_distributed_cayenne_merge_basic() -> Result<(), anyhow::Error> {
12611267
// must preserve unmatched rows the same way.
12621268
#[tokio::test(flavor = "multi_thread")]
12631269
#[cfg(not(target_os = "windows"))]
1270+
#[ignore = "Cayenne catalog connector removed from registry"]
12641271
async fn test_distributed_cayenne_merge_composite_key_no_cross_product() -> Result<(), anyhow::Error>
12651272
{
12661273
let _tracing = init_tracing(Some("integration=debug,info"));
@@ -1393,6 +1400,7 @@ async fn test_distributed_cayenne_merge_composite_key_no_cross_product() -> Resu
13931400
// =============================================================================
13941401
#[tokio::test(flavor = "multi_thread")]
13951402
#[cfg(not(target_os = "windows"))]
1403+
#[ignore = "Cayenne catalog connector removed from registry"]
13961404
async fn test_distributed_cayenne_merge_zero_match() -> Result<(), anyhow::Error> {
13971405
let _tracing = init_tracing(Some("integration=debug,info"));
13981406

@@ -1505,6 +1513,7 @@ async fn test_distributed_cayenne_merge_zero_match() -> Result<(), anyhow::Error
15051513
// `cayenne_catalog_merge_duplicate_source_keys_rejected` test.
15061514
#[tokio::test(flavor = "multi_thread")]
15071515
#[cfg(not(target_os = "windows"))]
1516+
#[ignore = "Cayenne catalog connector removed from registry"]
15081517
async fn test_distributed_cayenne_merge_duplicate_source_keys_rejected() -> Result<(), anyhow::Error>
15091518
{
15101519
let _tracing = init_tracing(Some("integration=debug,info"));
@@ -1614,6 +1623,7 @@ async fn test_distributed_cayenne_merge_duplicate_source_keys_rejected() -> Resu
16141623
// =============================================================================
16151624
#[tokio::test(flavor = "multi_thread")]
16161625
#[cfg(not(target_os = "windows"))]
1626+
#[ignore = "Cayenne catalog connector removed from registry"]
16171627
async fn test_distributed_cayenne_string_partition_dml() -> Result<(), anyhow::Error> {
16181628
let _tracing = init_tracing(Some("integration=debug,info"));
16191629

@@ -1740,6 +1750,7 @@ async fn test_distributed_cayenne_string_partition_dml() -> Result<(), anyhow::E
17401750
// yet support no-predicate delete-all on PK-less Cayenne tables.
17411751
#[tokio::test(flavor = "multi_thread")]
17421752
#[cfg(not(target_os = "windows"))]
1753+
#[ignore = "Cayenne catalog connector removed from registry"]
17431754
async fn test_distributed_cayenne_dml_no_where() -> Result<(), anyhow::Error> {
17441755
let _tracing = init_tracing(Some("integration=debug,info"));
17451756

@@ -1832,6 +1843,7 @@ async fn test_distributed_cayenne_dml_no_where() -> Result<(), anyhow::Error> {
18321843
// scheduler to forward the predicate to every partition/executor.
18331844
#[tokio::test(flavor = "multi_thread")]
18341845
#[cfg(not(target_os = "windows"))]
1846+
#[ignore = "Cayenne catalog connector removed from registry"]
18351847
async fn test_distributed_cayenne_dml_non_partition_filter() -> Result<(), anyhow::Error> {
18361848
let _tracing = init_tracing(Some("integration=debug,info"));
18371849

@@ -2059,6 +2071,7 @@ async fn null_agg_filters(harness: &ClusterHarness) -> Result<(), anyhow::Error>
20592071
/// 4. Verify the 2nd executor registered and the cluster can still query the table
20602072
#[tokio::test(flavor = "multi_thread")]
20612073
#[cfg(not(target_os = "windows"))]
2074+
#[ignore = "Cayenne catalog connector removed from registry"]
20622075
async fn test_distributed_cayenne_late_join_ddl_replay() -> Result<(), anyhow::Error> {
20632076
let _tracing = init_tracing(Some("integration=debug,info"));
20642077

0 commit comments

Comments
 (0)