Update Airbase to version 127

trinodb · Jun 22, 2022 · 3b47a34 · 3b47a34
1 parent 288be0a
commit 3b47a34
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/...n/src/test/java/io/trino/operator/aggregation/listagg/TestListaggAggregationFunction.java b/...n/src/test/java/io/trino/operator/aggregation/listagg/TestListaggAggregationFunction.java
@@ -22,7 +22,6 @@
 import io.trino.spi.block.VariableWidthBlockBuilder;
 import io.trino.sql.analyzer.TypeSignatureProvider;
 import io.trino.sql.tree.QualifiedName;
-import org.testcontainers.shaded.org.apache.commons.lang.StringUtils;
 import org.testng.annotations.Test;
 
 import java.util.List;
@@ -82,7 +81,7 @@ public void testInputEmptyState()
     @Test
     public void testInputOverflowOverflowFillerTooLong()
     {
-        String overflowFillerTooLong = StringUtils.repeat(".", 65_537);
+        String overflowFillerTooLong = ".".repeat(65_537);
 
         SingleListaggAggregationState state = new SingleListaggAggregationState();
 

diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestListagg.java b/core/trino-main/src/test/java/io/trino/sql/query/TestListagg.java
@@ -19,7 +19,6 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
-import org.testcontainers.shaded.org.apache.commons.lang.StringUtils;
 
 import static io.trino.spi.StandardErrorCode.EXCEEDED_FUNCTION_MEMORY_LIMIT;
 import static io.trino.spi.block.PageBuilderStatus.DEFAULT_MAX_PAGE_SIZE_IN_BYTES;
@@ -330,7 +329,7 @@ public void testListaggQueryWithOrderingAndGrouping()
     @Test
     public void testListaggQueryOverflowError()
     {
-        String tooLargeValue = StringUtils.repeat("a", DEFAULT_MAX_PAGE_SIZE_IN_BYTES);
+        String tooLargeValue = "a".repeat(DEFAULT_MAX_PAGE_SIZE_IN_BYTES);
         assertThatThrownBy(() -> assertions.query(
                 "SELECT LISTAGG(value, ',' ON OVERFLOW ERROR) WITHIN GROUP (ORDER BY value) " +
                         "FROM (VALUES '" + tooLargeValue + "','Trino') t(value) "))
@@ -342,7 +341,7 @@ public void testListaggQueryOverflowError()
     @Test
     public void testListaggQueryOverflowErrorGrouping()
     {
-        String tooLargeValue = StringUtils.repeat("a", DEFAULT_MAX_PAGE_SIZE_IN_BYTES);
+        String tooLargeValue = "a".repeat(DEFAULT_MAX_PAGE_SIZE_IN_BYTES);
         assertThatThrownBy(() -> assertions.query(
                 "SELECT id, LISTAGG(value, ',' ON OVERFLOW ERROR) WITHIN GROUP (ORDER BY value) " +
                         "FROM (VALUES " +
@@ -360,7 +359,7 @@ public void testListaggQueryOverflowErrorGrouping()
     @Test
     public void testListaggQueryOverflowTruncateWithoutCountAndWithoutOverflowFiller()
     {
-        String largeValue = StringUtils.repeat("a", DEFAULT_MAX_PAGE_SIZE_IN_BYTES - 6);
+        String largeValue = "a".repeat(DEFAULT_MAX_PAGE_SIZE_IN_BYTES - 6);
         assertThat(assertions.query(
                 "SELECT LISTAGG(value, ',' ON OVERFLOW TRUNCATE WITHOUT COUNT) WITHIN GROUP (ORDER BY value) " +
                         "FROM (VALUES '" + largeValue + "', 'trino', 'rocks') t(value) "))
@@ -370,7 +369,7 @@ public void testListaggQueryOverflowTruncateWithoutCountAndWithoutOverflowFiller
     @Test
     public void testListaggQueryOverflowTruncateWithCountAndWithOverflowFiller()
     {
-        String largeValue = StringUtils.repeat("a", DEFAULT_MAX_PAGE_SIZE_IN_BYTES - 12);
+        String largeValue = "a".repeat(DEFAULT_MAX_PAGE_SIZE_IN_BYTES - 12);
         assertThat(assertions.query(
                 "SELECT LISTAGG(value, ',' ON OVERFLOW TRUNCATE '.....' WITH COUNT) WITHIN GROUP (ORDER BY value) " +
                         "FROM (VALUES '" + largeValue + "', 'trino', 'sql', 'everything') t(value) "))
@@ -380,7 +379,7 @@ public void testListaggQueryOverflowTruncateWithCountAndWithOverflowFiller()
     @Test
     public void testListaggQueryGroupingOverflowTruncateWithCountAndWithOverflowFiller()
     {
-        String largeValue = StringUtils.repeat("a", DEFAULT_MAX_PAGE_SIZE_IN_BYTES - 12);
+        String largeValue = "a".repeat(DEFAULT_MAX_PAGE_SIZE_IN_BYTES - 12);
         assertThat(assertions.query(
                 "SELECT id, LISTAGG(value, ',' ON OVERFLOW TRUNCATE '.....' WITH COUNT) WITHIN GROUP (ORDER BY value) " +
                         "FROM (VALUES " +

diff --git a/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/TestingPhoenixServer.java b/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/TestingPhoenixServer.java
@@ -19,7 +19,6 @@
 import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.MiniHBaseCluster;
 import org.apache.hadoop.hbase.zookeeper.MiniZooKeeperCluster;
-import org.apache.phoenix.shaded.org.apache.zookeeper.server.ZooKeeperServer;
 
 import javax.annotation.concurrent.GuardedBy;
 
@@ -79,7 +78,7 @@ private TestingPhoenixServer()
         // keep references to prevent GC from resetting the log levels
         apacheLogger = java.util.logging.Logger.getLogger("org.apache");
         apacheLogger.setLevel(Level.SEVERE);
-        zookeeperLogger = java.util.logging.Logger.getLogger(ZooKeeperServer.class.getName());
+        zookeeperLogger = java.util.logging.Logger.getLogger("org.apache.phoenix.shaded.org.apache.zookeeper.server.ZooKeeperServer");
         zookeeperLogger.setLevel(Level.OFF);
         securityLogger = java.util.logging.Logger.getLogger("SecurityLogger.org.apache");
         securityLogger.setLevel(Level.SEVERE);

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.airlift</groupId>
         <artifactId>airbase</artifactId>
-        <version>126</version>
+        <version>127</version>
     </parent>
 
     <groupId>io.trino</groupId>