From 52598d3bca3c63a9563dba2e5b2fa775cc2e9cbd Mon Sep 17 00:00:00 2001
From: Zoltan Haindrich <kirk@rxd.hu>
Date: Tue, 21 May 2024 12:02:44 +0000
Subject: [PATCH] some stuff

---
 .../java/org/apache/druid/storage/s3/S3StorageDruidModule.java | 3 +++
 .../src/main/java/org/apache/druid/quidem/DiscovertModule.java | 1 +
 .../src/main/java/org/apache/druid/quidem/Launcher.java        | 3 ++-
 .../main/java/org/apache/druid/quidem/QuidemCaptureModule.java | 1 +
 .../org/apache/druid/sql/calcite/planner/PlannerFactory.java   | 2 +-
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3StorageDruidModule.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3StorageDruidModule.java
index 3747088aeb6..7eaceb22364 100644
--- a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3StorageDruidModule.java
+++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3StorageDruidModule.java
@@ -24,6 +24,7 @@ import com.amazonaws.ClientConfigurationFactory;
 import com.amazonaws.Protocol;
 import com.amazonaws.auth.AWSCredentialsProvider;
 import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration;
+import com.amazonaws.regions.Regions;
 import com.amazonaws.services.s3.AmazonS3Client;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 import com.fasterxml.jackson.core.Version;
@@ -141,8 +142,10 @@ public class S3StorageDruidModule implements DruidModule
         .withClientConfiguration(S3Utils.setProxyConfig(configuration, proxyConfig).withProtocol(protocol))
         .withChunkedEncodingDisabled(clientConfig.isDisableChunkedEncoding())
         .withPathStyleAccessEnabled(clientConfig.isEnablePathStyleAccess())
+        .withRegion(Regions.US_WEST_2)
         .withForceGlobalBucketAccessEnabled(clientConfig.isForceGlobalBucketAccessEnabled());
 
+
     if (StringUtils.isNotEmpty(endpointConfig.getUrl())) {
       amazonS3ClientBuilder.setEndpointConfiguration(
           new EndpointConfiguration(endpointConfig.getUrl(), endpointConfig.getSigningRegion())
diff --git a/integration-tests/src/main/java/org/apache/druid/quidem/DiscovertModule.java b/integration-tests/src/main/java/org/apache/druid/quidem/DiscovertModule.java
index 94bb2b1d2a5..d4de2cd0c8b 100644
--- a/integration-tests/src/main/java/org/apache/druid/quidem/DiscovertModule.java
+++ b/integration-tests/src/main/java/org/apache/druid/quidem/DiscovertModule.java
@@ -51,6 +51,7 @@ public class DiscovertModule extends AbstractModule {
       return null;
     }
 
+
     @Provides
     @LazySingleton
     public Properties getProps() {
diff --git a/integration-tests/src/main/java/org/apache/druid/quidem/Launcher.java b/integration-tests/src/main/java/org/apache/druid/quidem/Launcher.java
index f63f2bfe9e2..8068974b539 100644
--- a/integration-tests/src/main/java/org/apache/druid/quidem/Launcher.java
+++ b/integration-tests/src/main/java/org/apache/druid/quidem/Launcher.java
@@ -99,7 +99,8 @@ public class Launcher
       chk1();
       chkStatus();
 
-      lifecycle.stop();
+      lifecycle.join();
+//      lifecycle.stop();
     } else {
 
     }
diff --git a/integration-tests/src/main/java/org/apache/druid/quidem/QuidemCaptureModule.java b/integration-tests/src/main/java/org/apache/druid/quidem/QuidemCaptureModule.java
index f041bc286b5..5e2f2c0f139 100644
--- a/integration-tests/src/main/java/org/apache/druid/quidem/QuidemCaptureModule.java
+++ b/integration-tests/src/main/java/org/apache/druid/quidem/QuidemCaptureModule.java
@@ -30,5 +30,6 @@ public class QuidemCaptureModule implements Module
   public void configure(Binder binder)
   {
     Jerseys.addResource(binder, QuidemCapture.class);
+//    Hook.CONVERTED.add(null)
   }
 }
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerFactory.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerFactory.java
index a5cdc028e7f..e862394ce77 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerFactory.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerFactory.java
@@ -112,7 +112,7 @@ public class PlannerFactory extends PlannerToolbox
         queryContext,
         hook
     );
-
+    
     return new DruidPlanner(buildFrameworkConfig(context), context, engine, hook);
   }