From 6ce4ce93ba0fdbcb4e9c1a7688d16c84c3a927af Mon Sep 17 00:00:00 2001 From: Krzysztof Sobolewski Date: Wed, 2 Jun 2021 15:49:20 +0200 Subject: [PATCH 1/4] Remove write-only object from PluginManager This is a leftover from commit 967735d550cfef2bd909c7ce54c80d4c098e83c2. --- .../src/main/java/io/trino/server/PluginManager.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/core/trino-main/src/main/java/io/trino/server/PluginManager.java b/core/trino-main/src/main/java/io/trino/server/PluginManager.java index 55f6aa567913..02975121bd56 100644 --- a/core/trino-main/src/main/java/io/trino/server/PluginManager.java +++ b/core/trino-main/src/main/java/io/trino/server/PluginManager.java @@ -91,7 +91,6 @@ public class PluginManager private final BlockEncodingManager blockEncodingManager; private final HandleResolver handleResolver; private final AtomicBoolean pluginsLoading = new AtomicBoolean(); - private final AtomicBoolean pluginsLoaded = new AtomicBoolean(); @Inject public PluginManager( @@ -137,8 +136,6 @@ public void loadPlugins() pluginsProvider.loadPlugins(this::loadPlugin, PluginManager::createClassLoader); typeRegistry.verifyTypes(); - - pluginsLoaded.set(true); } private void loadPlugin(String plugin, Supplier createClassLoader) From 17d260e32cf9ebdc6174bc6eb2326325737c2f36 Mon Sep 17 00:00:00 2001 From: Krzysztof Sobolewski Date: Wed, 2 Jun 2021 15:54:30 +0200 Subject: [PATCH 2/4] Remove obsolete field Obsoleted by commit 6335320bad14e1cc1c54ca3bd1be9db37e24bb89. --- .../legacy/storage/organization/ShardCompactionManager.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/organization/ShardCompactionManager.java b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/organization/ShardCompactionManager.java index 3f144bf5576e..8b5e37af19ef 100644 --- a/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/organization/ShardCompactionManager.java +++ b/plugin/trino-raptor-legacy/src/main/java/io/trino/plugin/raptor/legacy/storage/organization/ShardCompactionManager.java @@ -64,7 +64,6 @@ public class ShardCompactionManager private final ScheduledExecutorService compactionDiscoveryService = newScheduledThreadPool(1, daemonThreadsNamed("shard-compaction-discovery")); private final AtomicBoolean discoveryStarted = new AtomicBoolean(); - private final AtomicBoolean shutdown = new AtomicBoolean(); private final MetadataDao metadataDao; private final ShardOrganizer organizer; @@ -141,7 +140,6 @@ public void shutdown() if (!compactionEnabled) { return; } - shutdown.set(true); compactionDiscoveryService.shutdown(); } From 1e8950692c9d5f44b1dccd4f84192c3c7d9f496e Mon Sep 17 00:00:00 2001 From: Krzysztof Sobolewski Date: Wed, 2 Jun 2021 16:02:52 +0200 Subject: [PATCH 3/4] Remove write-only objects from TestDbResourceGroupConfigurationManager It seems that they were never read from. --- .../db/TestDbResourceGroupConfigurationManager.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/plugin/trino-resource-group-managers/src/test/java/io/trino/plugin/resourcegroups/db/TestDbResourceGroupConfigurationManager.java b/plugin/trino-resource-group-managers/src/test/java/io/trino/plugin/resourcegroups/db/TestDbResourceGroupConfigurationManager.java index 3c24a7fd123e..6d35b321794f 100644 --- a/plugin/trino-resource-group-managers/src/test/java/io/trino/plugin/resourcegroups/db/TestDbResourceGroupConfigurationManager.java +++ b/plugin/trino-resource-group-managers/src/test/java/io/trino/plugin/resourcegroups/db/TestDbResourceGroupConfigurationManager.java @@ -35,7 +35,6 @@ import java.util.List; import java.util.Optional; import java.util.concurrent.ThreadLocalRandom; -import java.util.concurrent.atomic.AtomicBoolean; import java.util.regex.Pattern; import static com.google.common.util.concurrent.MoreExecutors.directExecutor; @@ -115,11 +114,9 @@ public void testConfiguration() dao.insertResourceGroup(2, "sub", "2MB", 4, 3, 3, null, 5, null, null, null, 1L, ENVIRONMENT); dao.insertSelector(2, 1, null, null, null, null, null, null); DbResourceGroupConfigurationManager manager = new DbResourceGroupConfigurationManager(listener -> {}, new DbResourceGroupConfig(), daoProvider.get(), ENVIRONMENT); - AtomicBoolean exported = new AtomicBoolean(); - InternalResourceGroup global = new InternalResourceGroup("global", (group, export) -> exported.set(export), directExecutor()); + InternalResourceGroup global = new InternalResourceGroup("global", (group, export) -> {}, directExecutor()); manager.configure(global, new SelectionContext<>(global.getId(), new ResourceGroupIdTemplate("global"))); assertEqualsResourceGroup(global, "1MB", 1000, 100, 100, WEIGHTED, DEFAULT_WEIGHT, true, Duration.ofHours(1), Duration.ofDays(1)); - exported.set(false); InternalResourceGroup sub = global.getOrCreateSubGroup("sub"); manager.configure(sub, new SelectionContext<>(sub.getId(), new ResourceGroupIdTemplate("global.sub"))); assertEqualsResourceGroup(sub, "2MB", 4, 3, 3, FAIR, 5, false, Duration.ofMillis(Long.MAX_VALUE), Duration.ofMillis(Long.MAX_VALUE)); @@ -195,8 +192,7 @@ public void testReconfig() dao.insertResourceGroupsGlobalProperties("cpu_quota_period", "1h"); DbResourceGroupConfigurationManager manager = new DbResourceGroupConfigurationManager(listener -> {}, new DbResourceGroupConfig(), daoProvider.get(), ENVIRONMENT); manager.start(); - AtomicBoolean exported = new AtomicBoolean(); - InternalResourceGroup global = new InternalResourceGroup("global", (group, export) -> exported.set(export), directExecutor()); + InternalResourceGroup global = new InternalResourceGroup("global", (group, export) -> {}, directExecutor()); manager.configure(global, new SelectionContext<>(global.getId(), new ResourceGroupIdTemplate("global"))); InternalResourceGroup globalSub = global.getOrCreateSubGroup("sub"); manager.configure(globalSub, new SelectionContext<>(globalSub.getId(), new ResourceGroupIdTemplate("global.sub"))); From 31f8caa04f4e66c479539d4fb60ac1fac9faa10c Mon Sep 17 00:00:00 2001 From: Krzysztof Sobolewski Date: Wed, 2 Jun 2021 16:06:49 +0200 Subject: [PATCH 4/4] Remove write-only object from TrinoStatement It was never read from, and the `setEscapeProcessing` call has no effect on Trino `Statement`s. --- .../src/main/java/io/trino/jdbc/TrinoStatement.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/trino-jdbc/src/main/java/io/trino/jdbc/TrinoStatement.java b/client/trino-jdbc/src/main/java/io/trino/jdbc/TrinoStatement.java index 9cf4caba2de2..95cd63729fae 100644 --- a/client/trino-jdbc/src/main/java/io/trino/jdbc/TrinoStatement.java +++ b/client/trino-jdbc/src/main/java/io/trino/jdbc/TrinoStatement.java @@ -43,7 +43,6 @@ public class TrinoStatement private final AtomicLong maxRows = new AtomicLong(); private final AtomicInteger queryTimeoutSeconds = new AtomicInteger(); private final AtomicInteger fetchSize = new AtomicInteger(); - private final AtomicBoolean escapeProcessing = new AtomicBoolean(true); private final AtomicBoolean closeOnCompletion = new AtomicBoolean(); private final AtomicReference connection; private final Consumer onClose; @@ -161,7 +160,8 @@ public void setEscapeProcessing(boolean enable) throws SQLException { checkOpen(); - escapeProcessing.set(enable); + // Escape processing is not implemented. JDBC mandates that escapes processing is enabled by default, + // so throwing here doesn't make sense. } @Override