diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c130406c81e7..c82f70c66165 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -418,7 +418,6 @@ jobs:
- { modules: plugin/trino-hive }
- { modules: plugin/trino-hive, profile: test-parquet }
- { modules: plugin/trino-elasticsearch }
- - { modules: plugin/trino-elasticsearch, profile: test-stats }
- { modules: plugin/trino-mongodb }
- { modules: plugin/trino-kafka }
- { modules: plugin/trino-pinot }
diff --git a/plugin/trino-elasticsearch/pom.xml b/plugin/trino-elasticsearch/pom.xml
index 992890dd78ca..46ae2d91b1ba 100644
--- a/plugin/trino-elasticsearch/pom.xml
+++ b/plugin/trino-elasticsearch/pom.xml
@@ -400,48 +400,4 @@
-
-
-
- default
-
- true
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
-
-
-
- **/TestElasticsearchBackpressure*
-
-
-
-
-
-
-
-
- test-stats
-
- false
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
-
- **/TestElasticsearchBackpressure*
-
-
-
-
-
-
-
diff --git a/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/ElasticsearchQueryRunner.java b/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/ElasticsearchQueryRunner.java
index 592a87ad734d..7e01c4ed17c7 100644
--- a/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/ElasticsearchQueryRunner.java
+++ b/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/ElasticsearchQueryRunner.java
@@ -16,7 +16,6 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.net.HostAndPort;
import io.airlift.log.Logger;
-import io.trino.Session;
import io.trino.metadata.QualifiedObjectName;
import io.trino.plugin.jmx.JmxPlugin;
import io.trino.plugin.tpch.TpchPlugin;
@@ -53,11 +52,26 @@ public static DistributedQueryRunner createElasticsearchQueryRunner(
Map extraConnectorProperties,
int nodeCount)
throws Exception
+ {
+ return createElasticsearchQueryRunner(address, tables, extraProperties, extraConnectorProperties, nodeCount, "elasticsearch");
+ }
+
+ public static DistributedQueryRunner createElasticsearchQueryRunner(
+ HostAndPort address,
+ Iterable> tables,
+ Map extraProperties,
+ Map extraConnectorProperties,
+ int nodeCount,
+ String catalogName)
+ throws Exception
{
RestHighLevelClient client = null;
DistributedQueryRunner queryRunner = null;
try {
- queryRunner = DistributedQueryRunner.builder(createSession())
+ queryRunner = DistributedQueryRunner.builder(testSessionBuilder()
+ .setCatalog(catalogName)
+ .setSchema(TPCH_SCHEMA)
+ .build())
.setExtraProperties(extraProperties)
.setNodeCount(nodeCount)
.build();
@@ -70,7 +84,7 @@ public static DistributedQueryRunner createElasticsearchQueryRunner(
ElasticsearchConnectorFactory testFactory = new ElasticsearchConnectorFactory();
- installElasticsearchPlugin(address, queryRunner, testFactory, extraConnectorProperties);
+ installElasticsearchPlugin(address, queryRunner, catalogName, testFactory, extraConnectorProperties);
TestingTrinoClient trinoClient = queryRunner.getClient();
@@ -91,7 +105,12 @@ public static DistributedQueryRunner createElasticsearchQueryRunner(
}
}
- private static void installElasticsearchPlugin(HostAndPort address, QueryRunner queryRunner, ElasticsearchConnectorFactory factory, Map extraConnectorProperties)
+ private static void installElasticsearchPlugin(
+ HostAndPort address,
+ QueryRunner queryRunner,
+ String catalogName,
+ ElasticsearchConnectorFactory factory,
+ Map extraConnectorProperties)
{
queryRunner.installPlugin(new ElasticsearchPlugin(factory));
Map config = ImmutableMap.builder()
@@ -107,7 +126,7 @@ private static void installElasticsearchPlugin(HostAndPort address, QueryRunner
.putAll(extraConnectorProperties)
.buildOrThrow();
- queryRunner.createCatalog("elasticsearch", "elasticsearch", config);
+ queryRunner.createCatalog(catalogName, "elasticsearch", config);
}
private static void loadTpchTopic(RestHighLevelClient client, TestingTrinoClient trinoClient, TpchTable> table)
@@ -119,11 +138,6 @@ private static void loadTpchTopic(RestHighLevelClient client, TestingTrinoClient
LOG.info("Imported %s in %s", table.getTableName(), nanosSince(start).convertToMostSuccinctTimeUnit());
}
- public static Session createSession()
- {
- return testSessionBuilder().setCatalog("elasticsearch").setSchema(TPCH_SCHEMA).build();
- }
-
public static void main(String[] args)
throws Exception
{
diff --git a/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/TestElasticsearchBackpressure.java b/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/TestElasticsearchBackpressure.java
index 7cd0ff4bc86f..ac2304fa44d7 100644
--- a/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/TestElasticsearchBackpressure.java
+++ b/plugin/trino-elasticsearch/src/test/java/io/trino/plugin/elasticsearch/TestElasticsearchBackpressure.java
@@ -50,7 +50,9 @@ protected QueryRunner createQueryRunner()
ImmutableMap.of(),
// This test can only run on a single node, otherwise each node exports its own stats beans and they override each other
// You can only bind one such bean per JVM, so this causes problems with statistics being 0 despite backpressure handling
- 1);
+ 1,
+ // Use a unique catalog name to make sure JMX stats beans are unique and not affected by other tests
+ "elasticsearch-backpressure");
}
@AfterClass(alwaysRun = true)