sdfsdf

.github/pull_request_template.md

@@ -1,42 +1,20 @@
 <!-- Thank you for submitting a pull request! Find more information in our development guide at https://github.com/trinodb/trino/blob/master/.github/DEVELOPMENT.md and contact us on #dev in Slack. -->
-
+<!-- Provide an overview of the PR for maintainers and reviewers. -->
 ## Description
 
-<!-- Elaborate beyond the title of the PR as necessary to help the reviewers and maintainers.-->
-
-<!-- Answer the following questions to help reviewers and maintainers
-understand this PR's scope at a glance:
--->
-
-> Is this change a fix, improvement, new feature, refactoring, or other?
-
-> Is this a change to the core query engine, a connector, client library, or the SPI interfaces? (be specific)
-
-> How would you describe this change to a non-technical end user or system administrator?
-
-## Related issues, pull requests, and links
 
-<!-- List any issues fixed by this PR, and provide links to other related PRs, upstream release notes, and other useful resources. For example:
-* Fixes #issuenumber
-* Related documentation in #issuenumber
-* [Some release notes](http://usefulinfo.example.com)
--->
 
-<!-- The following sections are filled in by the maintainer with input from the contributor:
-Use :white_check_mark: or (x) to signal selection.
--->
+<!-- Provide a user-friendly explanation, keep it brief if it isn't user-visible. -->
+## Non-technical explanation
 
-## Documentation
 
-( ) No documentation is needed.
-( ) Sufficient documentation is included in this PR.
-( ) Documentation PR is available with #prnumber.
-( ) Documentation issue #issuenumber is filed, and can be handled later.
 
+<!-- Mark the appropriate option with an (x). Propose a release note if you can. -->
 ## Release notes
 
-( ) No release notes entries required.
-( ) Release notes entries required with the following suggested text:
+( ) This is not user-visible and no release notes are required.
+( ) Release notes are required, please propose a release note for me.
+( ) Release notes are required, with the following suggested text:
 
 ```markdown
 # Section

client/trino-cli/pom.xml

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

client/trino-cli/src/main/java/io/trino/cli/ClientOptions.java

@@ -39,7 +39,6 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Strings.nullToEmpty;
 import static io.trino.client.KerberosUtil.defaultCredentialCachePath;
-import static java.util.Collections.emptyMap;
 import static java.util.Locale.ENGLISH;
 import static java.util.Objects.requireNonNull;
 import static picocli.CommandLine.Option;
@@ -219,27 +218,25 @@ public String getKeyMap()
 
     public ClientSession toClientSession()
     {
-        return new ClientSession(
-                parseServer(server),
-                user,
-                sessionUser,
-                source,
-                Optional.ofNullable(traceToken),
-                parseClientTags(nullToEmpty(clientTags)),
-                clientInfo,
-                catalog,
-                schema,
-                null,
-                timeZone,
-                Locale.getDefault(),
-                toResourceEstimates(resourceEstimates),
-                toProperties(sessionProperties),
-                emptyMap(),
-                emptyMap(),
-                toExtraCredentials(extraCredentials),
-                null,
-                clientRequestTimeout,
-                disableCompression);
+        return ClientSession.builder()
+                .server(parseServer(server))
+                .principal(user)
+                .user(sessionUser)
+                .source(source)
+                .traceToken(Optional.ofNullable(traceToken))
+                .clientTags(parseClientTags(nullToEmpty(clientTags)))
+                .clientInfo(clientInfo)
+                .catalog(catalog)
+                .schema(schema)
+                .timeZone(timeZone)
+                .locale(Locale.getDefault())
+                .resourceEstimates(toResourceEstimates(resourceEstimates))
+                .properties(toProperties(sessionProperties))
+                .credentials(toExtraCredentials(extraCredentials))
+                .transactionId(null)
+                .clientRequestTimeout(clientRequestTimeout)
+                .compressionDisabled(disableCompression)
+                .build();
     }
 
     public static URI parseServer(String server)

client/trino-cli/src/main/java/io/trino/cli/Console.java

@@ -366,8 +366,8 @@ private static boolean process(
             // update catalog and schema if present
             if (query.getSetCatalog().isPresent() || query.getSetSchema().isPresent()) {
                 session = ClientSession.builder(session)
-                        .withCatalog(query.getSetCatalog().orElse(session.getCatalog()))
-                        .withSchema(query.getSetSchema().orElse(session.getSchema()))
+                        .catalog(query.getSetCatalog().orElse(session.getCatalog()))
+                        .schema(query.getSetSchema().orElse(session.getSchema()))
                         .build();
             }
 
@@ -379,35 +379,35 @@ private static boolean process(
             ClientSession.Builder builder = ClientSession.builder(session);
 
             if (query.getStartedTransactionId() != null) {
-                builder = builder.withTransactionId(query.getStartedTransactionId());
+                builder = builder.transactionId(query.getStartedTransactionId());
             }
 
             // update path if present
             if (query.getSetPath().isPresent()) {
-                builder = builder.withPath(query.getSetPath().get());
+                builder = builder.path(query.getSetPath().get());
             }
 
             // update session properties if present
             if (!query.getSetSessionProperties().isEmpty() || !query.getResetSessionProperties().isEmpty()) {
                 Map<String, String> sessionProperties = new HashMap<>(session.getProperties());
                 sessionProperties.putAll(query.getSetSessionProperties());
                 sessionProperties.keySet().removeAll(query.getResetSessionProperties());
-                builder = builder.withProperties(sessionProperties);
+                builder = builder.properties(sessionProperties);
             }
 
             // update session roles
             if (!query.getSetRoles().isEmpty()) {
                 Map<String, ClientSelectedRole> roles = new HashMap<>(session.getRoles());
                 roles.putAll(query.getSetRoles());
-                builder = builder.withRoles(roles);
+                builder = builder.roles(roles);
             }
 
             // update prepared statements if present
             if (!query.getAddedPreparedStatements().isEmpty() || !query.getDeallocatedPreparedStatements().isEmpty()) {
                 Map<String, String> preparedStatements = new HashMap<>(session.getPreparedStatements());
                 preparedStatements.putAll(query.getAddedPreparedStatements());
                 preparedStatements.keySet().removeAll(query.getDeallocatedPreparedStatements());
-                builder = builder.withPreparedStatements(preparedStatements);
+                builder = builder.preparedStatements(preparedStatements);
             }
 
             session = builder.build();

client/trino-cli/src/main/java/io/trino/cli/OutputHandler.java

@@ -94,7 +94,7 @@ public void processRows(StatementClient client)
                 if (row == END_TOKEN) {
                     break;
                 }
-                else if (row != null) {
+                if (row != null) {
                     rowBuffer.add(row);
                 }
             }

client/trino-cli/src/test/java/io/trino/cli/TestQueryRunner.java

@@ -14,8 +14,6 @@
 package io.trino.cli;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
 import io.airlift.json.JsonCodec;
 import io.airlift.units.Duration;
 import io.trino.client.ClientSession;
@@ -102,27 +100,19 @@ public void testCookie()
 
     static ClientSession createClientSession(MockWebServer server)
     {
-        return new ClientSession(
-                server.url("/").uri(),
-                Optional.of("user"),
-                Optional.empty(),
-                "source",
-                Optional.empty(),
-                ImmutableSet.of(),
-                "clientInfo",
-                "catalog",
-                "schema",
-                null,
-                ZoneId.of("America/Los_Angeles"),
-                Locale.ENGLISH,
-                ImmutableMap.of(),
-                ImmutableMap.of(),
-                ImmutableMap.of(),
-                ImmutableMap.of(),
-                ImmutableMap.of(),
-                null,
-                new Duration(2, MINUTES),
-                true);
+        return ClientSession.builder()
+                .server(server.url("/").uri())
+                .principal(Optional.of("user"))
+                .source("source")
+                .clientInfo("clientInfo")
+                .catalog("catalog")
+                .schema("schema")
+                .timeZone(ZoneId.of("America/Los_Angeles"))
+                .locale(Locale.ENGLISH)
+                .transactionId(null)
+                .clientRequestTimeout(new Duration(2, MINUTES))
+                .compressionDisabled(true)
+                .build();
     }
 
     static String createResults(MockWebServer server)

client/trino-client/pom.xml

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