From d794b2a7da63e3a66659452001ffa2bb5b1870c5 Mon Sep 17 00:00:00 2001 From: Piotr Findeisen Date: Fri, 21 Apr 2023 17:49:06 +0200 Subject: [PATCH 1/7] Shutdown Kinesis connector --- .../java/io/trino/plugin/kinesis/KinesisConnector.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisConnector.java b/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisConnector.java index 77d49e7105a2..336c122669de 100644 --- a/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisConnector.java +++ b/plugin/trino-kinesis/src/main/java/io/trino/plugin/kinesis/KinesisConnector.java @@ -15,6 +15,7 @@ import com.google.common.collect.ImmutableList; import com.google.inject.Inject; +import io.airlift.bootstrap.LifeCycleManager; import io.trino.spi.connector.Connector; import io.trino.spi.connector.ConnectorMetadata; import io.trino.spi.connector.ConnectorRecordSetProvider; @@ -33,6 +34,7 @@ public class KinesisConnector implements Connector { + private final LifeCycleManager lifeCycleManager; private final KinesisMetadata metadata; private final KinesisSplitManager splitManager; private final KinesisRecordSetProvider recordSetProvider; @@ -41,11 +43,13 @@ public class KinesisConnector @Inject public KinesisConnector( + LifeCycleManager lifeCycleManager, KinesisMetadata metadata, KinesisSplitManager splitManager, KinesisRecordSetProvider recordSetProvider, KinesisSessionProperties properties) { + this.lifeCycleManager = requireNonNull(lifeCycleManager, "lifeCycleManager is null"); this.metadata = requireNonNull(metadata, "metadata is null"); this.splitManager = requireNonNull(splitManager, "splitManager is null"); this.recordSetProvider = requireNonNull(recordSetProvider, "recordSetProvider is null"); @@ -82,4 +86,10 @@ public List> getSessionProperties() { return propertyList; } + + @Override + public void shutdown() + { + lifeCycleManager.stop(); + } } From 66d9aaf9747a78cc0d2e24925f9c636342b7264a Mon Sep 17 00:00:00 2001 From: Piotr Findeisen Date: Fri, 21 Apr 2023 17:49:26 +0200 Subject: [PATCH 2/7] Shutdown memory connector --- .../java/io/trino/plugin/memory/MemoryConnector.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryConnector.java b/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryConnector.java index 9d16a455bdb3..365f4783a9bb 100644 --- a/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryConnector.java +++ b/plugin/trino-memory/src/main/java/io/trino/plugin/memory/MemoryConnector.java @@ -13,6 +13,7 @@ */ package io.trino.plugin.memory; +import io.airlift.bootstrap.LifeCycleManager; import io.trino.spi.connector.Connector; import io.trino.spi.connector.ConnectorMetadata; import io.trino.spi.connector.ConnectorPageSinkProvider; @@ -24,9 +25,12 @@ import javax.inject.Inject; +import static java.util.Objects.requireNonNull; + public class MemoryConnector implements Connector { + private final LifeCycleManager lifeCycleManager; private final MemoryMetadata metadata; private final MemorySplitManager splitManager; private final MemoryPageSourceProvider pageSourceProvider; @@ -34,11 +38,13 @@ public class MemoryConnector @Inject public MemoryConnector( + LifeCycleManager lifeCycleManager, MemoryMetadata metadata, MemorySplitManager splitManager, MemoryPageSourceProvider pageSourceProvider, MemoryPageSinkProvider pageSinkProvider) { + this.lifeCycleManager = requireNonNull(lifeCycleManager, "lifeCycleManager is null"); this.metadata = metadata; this.splitManager = splitManager; this.pageSourceProvider = pageSourceProvider; @@ -74,4 +80,10 @@ public ConnectorPageSinkProvider getPageSinkProvider() { return pageSinkProvider; } + + @Override + public void shutdown() + { + lifeCycleManager.stop(); + } } From fa8bdea4e9b6ddb864fb33a9b7c699d0256e80f7 Mon Sep 17 00:00:00 2001 From: Piotr Findeisen Date: Fri, 21 Apr 2023 17:49:38 +0200 Subject: [PATCH 3/7] Shutdown Redis connector --- .../java/io/trino/plugin/redis/RedisConnector.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisConnector.java b/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisConnector.java index d9a1ec63d2eb..1e8c77fdd6ad 100644 --- a/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisConnector.java +++ b/plugin/trino-redis/src/main/java/io/trino/plugin/redis/RedisConnector.java @@ -13,6 +13,7 @@ */ package io.trino.plugin.redis; +import io.airlift.bootstrap.LifeCycleManager; import io.trino.spi.connector.Connector; import io.trino.spi.connector.ConnectorMetadata; import io.trino.spi.connector.ConnectorRecordSetProvider; @@ -33,6 +34,7 @@ public class RedisConnector implements Connector { + private final LifeCycleManager lifeCycleManager; private final RedisMetadata metadata; private final RedisSplitManager splitManager; @@ -40,10 +42,12 @@ public class RedisConnector @Inject public RedisConnector( + LifeCycleManager lifeCycleManager, RedisMetadata metadata, RedisSplitManager splitManager, RedisRecordSetProvider recordSetProvider) { + this.lifeCycleManager = requireNonNull(lifeCycleManager, "lifeCycleManager is null"); this.metadata = requireNonNull(metadata, "metadata is null"); this.splitManager = requireNonNull(splitManager, "splitManager is null"); this.recordSetProvider = requireNonNull(recordSetProvider, "recordSetProvider is null"); @@ -73,4 +77,10 @@ public ConnectorRecordSetProvider getRecordSetProvider() { return recordSetProvider; } + + @Override + public void shutdown() + { + lifeCycleManager.stop(); + } } From 2331c3484fcb0573eb7c89d6bb4417e11f77346e Mon Sep 17 00:00:00 2001 From: Piotr Findeisen Date: Fri, 21 Apr 2023 17:48:21 +0200 Subject: [PATCH 4/7] Shutdown BigQuery connector --- .../io/trino/plugin/bigquery/BigQueryConnector.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryConnector.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryConnector.java index 86c992c3b497..b6720bf610d9 100644 --- a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryConnector.java +++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryConnector.java @@ -13,6 +13,7 @@ */ package io.trino.plugin.bigquery; +import io.airlift.bootstrap.LifeCycleManager; import io.trino.plugin.base.classloader.ClassLoaderSafeConnectorMetadata; import io.trino.plugin.base.session.SessionPropertiesProvider; import io.trino.spi.connector.Connector; @@ -37,6 +38,7 @@ public class BigQueryConnector implements Connector { + private final LifeCycleManager lifeCycleManager; private final BigQueryTransactionManager transactionManager; private final BigQuerySplitManager splitManager; private final BigQueryPageSourceProvider pageSourceProvider; @@ -46,6 +48,7 @@ public class BigQueryConnector @Inject public BigQueryConnector( + LifeCycleManager lifeCycleManager, BigQueryTransactionManager transactionManager, BigQuerySplitManager splitManager, BigQueryPageSourceProvider pageSourceProvider, @@ -53,6 +56,7 @@ public BigQueryConnector( Set connectorTableFunctions, Set sessionPropertiesProviders) { + this.lifeCycleManager = requireNonNull(lifeCycleManager, "lifeCycleManager is null"); this.transactionManager = requireNonNull(transactionManager, "transactionManager is null"); this.splitManager = requireNonNull(splitManager, "splitManager is null"); this.pageSourceProvider = requireNonNull(pageSourceProvider, "pageSourceProvider is null"); @@ -116,4 +120,10 @@ public List> getSessionProperties() { return sessionProperties; } + + @Override + public void shutdown() + { + lifeCycleManager.stop(); + } } From 0bdde1474328b6cfcaaedbfda71da2b99e6e4f91 Mon Sep 17 00:00:00 2001 From: Piotr Findeisen Date: Fri, 21 Apr 2023 17:54:54 +0200 Subject: [PATCH 5/7] Remove unused constructor --- .../io/trino/connector/system/SystemConnector.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/core/trino-main/src/main/java/io/trino/connector/system/SystemConnector.java b/core/trino-main/src/main/java/io/trino/connector/system/SystemConnector.java index 41018abbbbe2..1871c8f4717b 100644 --- a/core/trino-main/src/main/java/io/trino/connector/system/SystemConnector.java +++ b/core/trino-main/src/main/java/io/trino/connector/system/SystemConnector.java @@ -19,12 +19,10 @@ import io.trino.spi.connector.ConnectorSession; import io.trino.spi.connector.ConnectorSplitManager; import io.trino.spi.connector.ConnectorTransactionHandle; -import io.trino.spi.connector.SystemTable; import io.trino.spi.transaction.IsolationLevel; import io.trino.transaction.InternalConnector; import io.trino.transaction.TransactionId; -import java.util.Set; import java.util.function.Function; import static java.util.Objects.requireNonNull; @@ -37,14 +35,6 @@ public class SystemConnector private final ConnectorPageSourceProvider pageSourceProvider; private final Function transactionHandleFunction; - public SystemConnector( - InternalNodeManager nodeManager, - Set tables, - Function transactionHandleFunction) - { - this(nodeManager, new StaticSystemTablesProvider(tables), transactionHandleFunction); - } - public SystemConnector( InternalNodeManager nodeManager, SystemTablesProvider tables, From 04359d4607a5ed83494d60e7a755c97193bd7e93 Mon Sep 17 00:00:00 2001 From: Piotr Findeisen Date: Sat, 22 Apr 2023 21:44:24 +0200 Subject: [PATCH 6/7] empty From 3d5e52537b7657695a353604005dc7f5aafa9fb6 Mon Sep 17 00:00:00 2001 From: Piotr Findeisen Date: Mon, 24 Apr 2023 11:06:52 +0200 Subject: [PATCH 7/7] empty