findinpath: Support OR-ed condition in Delta checkpoint iterator

.github/DEVELOPMENT.md

@@ -26,22 +26,26 @@ A typical pull request should strive to contain a single logical change (but not
 necessarily a single commit). Unrelated changes should generally be extracted
 into their own PRs.
 
-If a pull request does consist of multiple commits, it is expected that every
-prefix of it is correct. That is, there might be preparatory commits at the 
-bottom of the stack that don't bring any value by themselves, but none of the
-commits should introduce an error that is fixed by some future commit. Every
-commit should build and pass all tests.
-
-Commit messages and history are also important, as they are used by other
-developers to keep track of the motivation behind changes. Keep logical diffs
-grouped together in separate commits, and order commits in a way that explains
-the progress of the changes. Rewriting and reordering commits may be a necessary
-part of the PR review process as the code changes. Mechanical changes (like
-refactoring and renaming)should be separated from logical and functional
-changes. E.g. deduplicating code or extracting helper methods should happen in a
-separate commit from the commit where new features or behavior is introduced.
-This makes reviewing the code much easier and reduces the chance of introducing
-unintended changes in behavior.
+If a pull request contains a stack of more than one commit, then
+popping any number of commits from the top of the stack, should not
+break the PR, ie. every commit should build and pass all tests.
+
+Commit messages and history are important as well, because they are
+used by other developers to keep track of the motivation behind
+changes. Keep logical diffs grouped together in separate commits and
+order commits in a way that explains by itself the evolution of the
+change. Rewriting and reordering commits is a natural part of the
+review process. Mechanical changes like refactoring, renaming, removing
+duplication, extracting helper methods, static imports should be kept
+separated from logical and functional changes like adding a new feature
+or modifying code behaviour. This makes reviewing the code much easier
+and reduces the chance of introducing unintended changes in behavior.
+
+Whenever in doubt on splitting a change into a separate commit, ask
+yourself the following question: if all other work in the PR needs to
+be reverted after merging to master for some objective reason (eg. a
+bug has been discovered), is it worth keeping that commit still in
+master.
 
 ## Code Style
 

.github/bin/s3/setup-empty-s3-bucket.sh

@@ -38,6 +38,9 @@ echo "The AWS S3 bucket ${S3_BUCKET_IDENTIFIER} in the region ${AWS_REGION} exis
 
 echo "Tagging the AWS S3 bucket ${S3_BUCKET_IDENTIFIER} with TTL tags"
 
+# "test" environment tag is needed so that the bucket gets cleaned up by the daily AWS resource cleanup job in case the
+# temporary bucket is not properly cleaned up by delete-s3-bucket.sh. The ttl tag tells the AWS resource cleanup job
+# when the bucket is expired and should be cleaned up
 aws s3api put-bucket-tagging \
   --bucket "${S3_BUCKET_IDENTIFIER}" \
-  --tagging "TagSet=[{Key=ttl,Value=${S3_BUCKET_TTL}}]"
+  --tagging "TagSet=[{Key=environment,Value=test},{Key=ttl,Value=${S3_BUCKET_TTL}}]"

client/trino-cli/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>430-SNAPSHOT</version>
+        <version>431-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

client/trino-client/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>430-SNAPSHOT</version>
+        <version>431-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -111,6 +111,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>

client/trino-client/src/main/java/io/trino/client/ClientCapabilities.java

@@ -23,5 +23,7 @@ public enum ClientCapabilities
     //   time(p) without time zone
     //   interval X(p1) to Y(p2)
     // When this capability is not set, the server returns datetime types with precision = 3
-    PARAMETRIC_DATETIME;
+    PARAMETRIC_DATETIME,
+    // Whether clients support the session authorization set/reset feature
+    SESSION_AUTHORIZATION;
 }

client/trino-client/src/test/java/io/trino/client/TestClientTypeSignature.java

@@ -18,7 +18,7 @@
 import io.airlift.json.JsonCodecFactory;
 import io.airlift.json.ObjectMapperProvider;
 import io.trino.spi.type.StandardTypes;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 

client/trino-client/src/test/java/io/trino/client/TestFixJsonDataUtils.java

@@ -18,7 +18,7 @@
 import io.trino.spi.type.RowType;
 import io.trino.spi.type.TypeSignature;
 import io.trino.spi.type.TypeSignatureParameter;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Base64;
 import java.util.List;

client/trino-client/src/test/java/io/trino/client/TestIntervalDayTime.java

@@ -13,7 +13,7 @@
  */
 package io.trino.client;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.client.IntervalDayTime.formatMillis;
 import static io.trino.client.IntervalDayTime.parseMillis;

client/trino-client/src/test/java/io/trino/client/TestIntervalYearMonth.java

@@ -13,7 +13,7 @@
  */
 package io.trino.client;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.client.IntervalYearMonth.formatMonths;
 import static io.trino.client.IntervalYearMonth.parseMonths;

client/trino-client/src/test/java/io/trino/client/TestJsonCodec.java

@@ -14,7 +14,7 @@
 package io.trino.client;
 
 import com.fasterxml.jackson.core.JsonParseException;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
 

client/trino-client/src/test/java/io/trino/client/TestProtocolHeaders.java

@@ -14,7 +14,7 @@
 package io.trino.client;
 
 import com.google.common.collect.ImmutableSet;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 

client/trino-client/src/test/java/io/trino/client/TestQueryResults.java

@@ -16,7 +16,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.StreamReadConstraints;
 import com.google.common.base.Strings;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static io.trino.client.JsonCodec.jsonCodec;
 import static java.lang.String.format;

client/trino-client/src/test/java/io/trino/client/TestRetry.java

@@ -20,9 +20,10 @@
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.SocketPolicy;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.IOException;
 import java.net.URI;
@@ -42,23 +43,24 @@
 import static java.net.HttpURLConnection.HTTP_OK;
 import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 import static org.testng.Assert.assertTrue;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestRetry
 {
     private MockWebServer server;
     private static final JsonCodec<QueryResults> QUERY_RESULTS_CODEC = jsonCodec(QueryResults.class);
 
-    @BeforeMethod(alwaysRun = true)
+    @BeforeEach
     public void setup()
             throws Exception
     {
         server = new MockWebServer();
         server.start();
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void teardown()
             throws IOException
     {

client/trino-client/src/test/java/io/trino/client/TestServerInfo.java

@@ -15,7 +15,7 @@
 
 import io.airlift.json.JsonCodec;
 import io.airlift.units.Duration;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 

client/trino-client/src/test/java/io/trino/client/auth/external/TestExternalAuthentication.java

@@ -14,7 +14,7 @@
 package io.trino.client.auth.external;
 
 import io.trino.client.ClientException;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;

client/trino-client/src/test/java/io/trino/client/auth/external/TestExternalAuthenticator.java

@@ -21,8 +21,10 @@
 import okhttp3.Response;
 import org.assertj.core.api.ListAssert;
 import org.assertj.core.api.ThrowableAssert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -51,13 +53,14 @@
 import static java.util.concurrent.Executors.newCachedThreadPool;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_CLASS)
 public class TestExternalAuthenticator
 {
     private static final ExecutorService executor = newCachedThreadPool(daemonThreadsNamed(TestExternalAuthenticator.class.getName() + "-%d"));
 
-    @AfterClass(alwaysRun = true)
+    @AfterAll
     public void shutDownThreadPool()
     {
         executor.shutdownNow();
@@ -158,7 +161,8 @@ public void testReAuthenticationAfterRejectingToken()
                 .containsExactly("Bearer second-token");
     }
 
-    @Test(timeOut = 2000)
+    @Test
+    @Timeout(2)
     public void testAuthenticationFromMultipleThreadsWithLocallyStoredToken()
     {
         MockTokenPoller tokenPoller = new MockTokenPoller()
@@ -184,7 +188,8 @@ public void testAuthenticationFromMultipleThreadsWithLocallyStoredToken()
         assertThat(redirectHandler.getRedirectionCount()).isEqualTo(4);
     }
 
-    @Test(timeOut = 2000)
+    @Test
+    @Timeout(2)
     public void testAuthenticationFromMultipleThreadsWithCachedToken()
     {
         MockTokenPoller tokenPoller = new MockTokenPoller()
@@ -208,7 +213,8 @@ public void testAuthenticationFromMultipleThreadsWithCachedToken()
         assertThat(redirectHandler.getRedirectionCount()).isEqualTo(1);
     }
 
-    @Test(timeOut = 2000)
+    @Test
+    @Timeout(2)
     public void testAuthenticationFromMultipleThreadsWithCachedTokenAfterAuthenticateFails()
     {
         MockTokenPoller tokenPoller = new MockTokenPoller()
@@ -235,7 +241,8 @@ public void testAuthenticationFromMultipleThreadsWithCachedTokenAfterAuthenticat
         assertThat(redirectHandler.getRedirectionCount()).isEqualTo(2);
     }
 
-    @Test(timeOut = 2000)
+    @Test
+    @Timeout(2)
     public void testAuthenticationFromMultipleThreadsWithCachedTokenAfterAuthenticateTimesOut()
     {
         MockRedirectHandler redirectHandler = new MockRedirectHandler()
@@ -255,7 +262,8 @@ public void testAuthenticationFromMultipleThreadsWithCachedTokenAfterAuthenticat
         assertThat(redirectHandler.getRedirectionCount()).isEqualTo(1);
     }
 
-    @Test(timeOut = 2000)
+    @Test
+    @Timeout(2)
     public void testAuthenticationFromMultipleThreadsWithCachedTokenAfterAuthenticateIsInterrupted()
             throws Exception
     {

client/trino-client/src/test/java/io/trino/client/auth/external/TestHttpTokenPoller.java

@@ -18,9 +18,10 @@
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.RecordedRequest;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -37,8 +38,9 @@
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD;
 
-@Test(singleThreaded = true)
+@TestInstance(PER_METHOD)
 public class TestHttpTokenPoller
 {
     private static final String TOKEN_PATH = "/v1/authentications/sso/test/token";
@@ -47,7 +49,7 @@ public class TestHttpTokenPoller
     private TokenPoller tokenPoller;
     private MockWebServer server;
 
-    @BeforeMethod(alwaysRun = true)
+    @BeforeEach
     public void setup()
             throws Exception
     {
@@ -59,7 +61,7 @@ public void setup()
                 .build());
     }
 
-    @AfterMethod(alwaysRun = true)
+    @AfterEach
     public void teardown()
             throws IOException
     {

client/trino-client/src/test/java/io/trino/client/uri/TestTrinoUri.java

@@ -13,7 +13,7 @@
  */
 package io.trino.client.uri;
 
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.net.URI;
 import java.sql.SQLException;
@@ -184,11 +184,12 @@ public void testInvalidUrls()
                 "Connection property assumeLiteralNamesInMetadataCallsForNonConformingClients cannot be set if assumeLiteralUnderscoreInMetadataCallsForNonConformingClients is enabled");
     }
 
-    @Test(expectedExceptions = SQLException.class, expectedExceptionsMessageRegExp = "Connection property user value is empty")
+    @Test
     public void testEmptyUser()
-            throws Exception
     {
-        TrinoUri.create("trino://localhost:8080?user=", new Properties());
+        assertThatThrownBy(() -> TrinoUri.create("trino://localhost:8080?user=", new Properties()))
+                .isInstanceOf(SQLException.class)
+                .hasMessage("Connection property user value is empty");
     }
 
     @Test

client/trino-jdbc/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>430-SNAPSHOT</version>
+        <version>431-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

core/trino-grammar/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>430-SNAPSHOT</version>
+        <version>431-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

core/trino-main/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.trino</groupId>
         <artifactId>trino-root</artifactId>
-        <version>430-SNAPSHOT</version>
+        <version>431-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>