Remove deprecated api settings (#1433)

Author: mzitnik

.github/workflows/build.yml

@@ -179,7 +179,7 @@ jobs:
       matrix:
         # most recent LTS releases as well as latest stable builds
         # https://github.com/ClickHouse/ClickHouse/pulls?q=is%3Aopen+is%3Apr+label%3Arelease
-        clickhouse: ["22.3", "22.8", "23.3", "latest"]
+        clickhouse: ["22.8", "23.3", "23.7", "latest"]
       fail-fast: false
     timeout-minutes: 15
     name: Java client + CH ${{ matrix.clickhouse }}
@@ -234,7 +234,7 @@ jobs:
     needs: compile
     strategy:
       matrix:
-        clickhouse: ["22.3", "22.8", "23.3", "latest"]
+        clickhouse: ["22.8", "23.3", "23.7", "latest"]
         # here http, http_client and apache_http_client represent different value of http_connection_provider
         protocol: ["http", "http_client", "apache_http_client", "grpc"]
       fail-fast: false
@@ -293,7 +293,7 @@ jobs:
     needs: compile
     strategy:
       matrix:
-        clickhouse: ["22.3", "22.8", "23.3", "latest"]
+        clickhouse: ["22.8", "23.3", "23.7", "latest"]
         # grpc is not fully supported, and http_client and apache_http_client do not work in CI environment(due to limited threads?)
         protocol: ["http"]
         r2dbc: ["1.0.0.RELEASE", "0.9.1.RELEASE"]

CHANGELOG.md

@@ -3,6 +3,8 @@
 * ClickHouseByteBuffer can no longer be extended
 * rename ClickHouseByteUtils methods by removing LE suffix
 * change default databaseTerm from schema to catalog
+* remove deprecated API load, dump and connect
+* remove use_no_proxy settings
 
 ### New Features
 * Adding new proxy support [#1338](https://github.com/ClickHouse/clickhouse-java/issues/1338)

clickhouse-benchmark/src/main/java/com/clickhouse/benchmark/client/ClientState.java

@@ -92,7 +92,7 @@ public void doSetup(ServerState serverState) throws ClickHouseException {
                 "create table if not exists system.test_insert(id String, i Nullable(UInt64), s Nullable(String), t Nullable(DateTime))engine=Memory" };
 
         for (String sql : sqls) {
-            try (ClickHouseResponse resp = client.connect(server).query(sql).executeAndWait()) {
+            try (ClickHouseResponse resp = client.read(server).query(sql).executeAndWait()) {
 
             }
         }
@@ -102,7 +102,7 @@ public void doSetup(ServerState serverState) throws ClickHouseException {
     public void doTearDown(ServerState serverState) throws ClickHouseException {
         dispose();
 
-        try (ClickHouseResponse resp = client.connect(server).query("truncate table system.test_insert")
+        try (ClickHouseResponse resp = client.read(server).query("truncate table system.test_insert")
                 .executeAndWait()) {
 
         } finally {
@@ -161,7 +161,7 @@ public int getRandomNumber() {
     }
 
     public ClickHouseRequest<?> newRequest() {
-        return client.connect(server);
+        return client.read(server);
     }
 
     public void consume(Blackhole blackhole, Future<ClickHouseResponse> future) throws InterruptedException {

clickhouse-cli-client/src/main/java/com/clickhouse/client/cli/ClickHouseCommandLineClient.java

@@ -29,7 +29,7 @@ public class ClickHouseCommandLineClient extends AbstractClient<ClickHouseComman
 
     @Override
     protected boolean checkHealth(ClickHouseNode server, int timeout) {
-        try (ClickHouseCommandLine cli = getConnection(connect(server).query("SELECT 1"));
+        try (ClickHouseCommandLine cli = getConnection(read(server).query("SELECT 1"));
                 ClickHouseCommandLineResponse response = new ClickHouseCommandLineResponse(getConfig(), cli)) {
             return response.firstRecord().getValue(0).asInteger() == 1;
         } catch (Exception e) {

clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseClient.java

@@ -364,29 +364,6 @@ static CompletableFuture<ClickHouseResponseSummary> dump(ClickHouseNode server,
         return dump(server, tableOrQuery, ClickHouseFile.of(file, compression, format));
     }
 
-    /**
-     * Dumps a table or query result from server into a file. File will be
-     * created/overwrited as needed.
-     *
-     * @param server       non-null server to connect to
-     * @param tableOrQuery table name or a select query
-     * @param format       output format to use
-     * @param compression  compression algorithm to use
-     * @param file         output file
-     * @return non-null future object to get result
-     * @throws IllegalArgumentException if any of server, tableOrQuery, and output
-     *                                  is null
-     * @throws CompletionException      when error occurred during execution
-     * @deprecated will be dropped in 0.5, please use
-     *             {@link #dump(ClickHouseNode, String, String, ClickHouseCompression, ClickHouseFormat)}
-     *             instead
-     */
-    @Deprecated
-    static CompletableFuture<ClickHouseResponseSummary> dump(ClickHouseNode server, String tableOrQuery,
-            ClickHouseFormat format, ClickHouseCompression compression, String file) {
-        return dump(server, tableOrQuery, file, compression, format);
-    }
-
     /**
      * Dumps a table or query result from server into output stream.
      *
@@ -438,31 +415,6 @@ static CompletableFuture<ClickHouseResponseSummary> dump(ClickHouseNode server,
         });
     }
 
-    /**
-     * Dumps a table or query result from server into output stream.
-     *
-     * @param server       non-null server to connect to
-     * @param tableOrQuery table name or a select query
-     * @param format       output format to use, null means
-     *                     {@link ClickHouseFormat#TabSeparated}
-     * @param compression  compression algorithm to use, null means
-     *                     {@link ClickHouseCompression#NONE}
-     * @param output       output stream, which will be closed automatically at the
-     *                     end of the call
-     * @return future object to get result
-     * @throws IllegalArgumentException if any of server, tableOrQuery, and output
-     *                                  is null
-     * @throws CompletionException      when error occurred during execution
-     * @deprecated will be dropped in 0.5, please use
-     *             {@link #dump(ClickHouseNode, String, OutputStream, ClickHouseCompression, ClickHouseFormat)}
-     *             instead
-     */
-    @Deprecated
-    static CompletableFuture<ClickHouseResponseSummary> dump(ClickHouseNode server, String tableOrQuery,
-            ClickHouseFormat format, ClickHouseCompression compression, OutputStream output) {
-        return dump(server, tableOrQuery, output, compression, format);
-    }
-
     /**
      * Loads data from the given pass-thru stream into a table. Pass
      * {@link com.clickhouse.data.ClickHouseFile} to load data from a file, which
@@ -543,50 +495,6 @@ static CompletableFuture<ClickHouseResponseSummary> load(ClickHouseNode server,
         return load(server, table, ClickHouseFile.of(file, compression, format));
     }
 
-    /**
-     * Loads data from a file into table using specified format and compression
-     * algorithm.
-     *
-     * @param server      non-null server to connect to
-     * @param table       non-null target table
-     * @param format      input format to use
-     * @param compression compression algorithm to use
-     * @param file        file to load
-     * @return future object to get result
-     * @throws IllegalArgumentException if any of server, table, and input is null
-     * @throws CompletionException      when error occurred during execution
-     * @deprecated will be dropped in 0.5, please use
-     *             {@link #load(ClickHouseNode, String, String, ClickHouseCompression, ClickHouseFormat)}
-     *             instead
-     */
-    @Deprecated
-    static CompletableFuture<ClickHouseResponseSummary> load(ClickHouseNode server, String table,
-            ClickHouseFormat format, ClickHouseCompression compression, String file) {
-        return load(server, table, file, compression, format);
-    }
-
-    /**
-     * Loads data from a custom writer into a table using specified format and
-     * compression algorithm.
-     *
-     * @param server      non-null server to connect to
-     * @param table       non-null target table
-     * @param writer      non-null custom writer to generate data
-     * @param compression compression algorithm to use
-     * @param format      input format to use
-     * @return future object to get result
-     * @throws IllegalArgumentException if any of server, table, and writer is null
-     * @throws CompletionException      when error occurred during execution
-     * @deprecated will be dropped in 0.5, please use
-     *             {@link #load(ClickHouseNode, String, ClickHouseWriter, ClickHouseCompression, ClickHouseFormat)}
-     *             instead
-     */
-    @Deprecated
-    static CompletableFuture<ClickHouseResponseSummary> load(ClickHouseNode server, String table,
-            ClickHouseFormat format, ClickHouseCompression compression, ClickHouseWriter writer) {
-        return load(server, table, writer, compression, format);
-    }
-
     /**
      * Loads data from input stream into a table using specified format and
      * compression algorithm.
@@ -625,29 +533,6 @@ static CompletableFuture<ClickHouseResponseSummary> load(ClickHouseNode server,
         });
     }
 
-    /**
-     * Loads data from input stream into a table using specified format and
-     * compression algorithm.
-     *
-     * @param server      non-null server to connect to
-     * @param table       non-null target table
-     * @param format      input format to use
-     * @param compression compression algorithm to use
-     * @param input       input stream, which will be closed automatically at the
-     *                    end of the call
-     * @return future object to get result
-     * @throws IllegalArgumentException if any of server, table, and input is null
-     * @throws CompletionException      when error occurred during execution
-     * @deprecated will be dropped in 0.5, please use
-     *             {@link #load(ClickHouseNode, String, InputStream, ClickHouseCompression, ClickHouseFormat)}
-     *             instead
-     */
-    @Deprecated
-    static CompletableFuture<ClickHouseResponseSummary> load(ClickHouseNode server, String table,
-            ClickHouseFormat format, ClickHouseCompression compression, InputStream input) {
-        return load(server, table, input, compression, format);
-    }
-
     /**
      * Creates a new instance compatible with any of the given protocols.
      *
@@ -906,70 +791,6 @@ default boolean accept(ClickHouseProtocol protocol) {
         return protocol == null || protocol == ClickHouseProtocol.ANY;
     }
 
-    /**
-     * Connects to one or more ClickHouse servers. Same as
-     * {@code connect(ClickHouseNodes.of(uri))}.
-     *
-     * @param endpoints non-empty URIs separated by comma
-     * @return non-null request object holding references to this client and node
-     *         provider
-     * @deprecated will be dropped in 0.5, please use {@link #read(String)} instead
-     */
-    @Deprecated
-    default ClickHouseRequest<?> connect(String endpoints) {
-        return read(endpoints);
-    }
-
-    /**
-     * Connects to a list of managed ClickHouse servers.
-     *
-     * @param nodes non-null list of servers to connect to
-     * @return non-null request object holding references to this client and node
-     *         provider
-     * @deprecated will be dropped in 0.5, please use {@link #read(ClickHouseNodes)}
-     *             instead
-     */
-    @Deprecated
-    default ClickHouseRequest<?> connect(ClickHouseNodes nodes) {
-        return read(nodes);
-    }
-
-    /**
-     * Connects to a ClickHouse server.
-     *
-     * @param node non-null server for read
-     * @return non-null request object holding references to this client and node
-     *         provider
-     * @deprecated will be dropped in 0.5, please use {@link #read(ClickHouseNode)}
-     *             instead
-     */
-    @Deprecated
-    default ClickHouseRequest<?> connect(ClickHouseNode node) {
-        return read(node);
-    }
-
-    /**
-     * Connects to a ClickHouse server defined by the given
-     * {@link java.util.function.Function}. You can pass either
-     * {@link ClickHouseCluster}, {@link ClickHouseNodes} or {@link ClickHouseNode}
-     * here, as all of them implemented the same interface.
-     *
-     * <p>
-     * Please be aware that this is nothing but an intention, so no network
-     * communication happens until {@link #execute(ClickHouseRequest)} is
-     * invoked(usually triggered by {@code request.execute()}).
-     *
-     * @param nodeFunc function to get a {@link ClickHouseNode} to connect to
-     * @return non-null request object holding references to this client and node
-     *         provider
-     * @deprecated will be dropped in 0.5, please use {@link #read(Function, Map)}
-     *             instead
-     */
-    @Deprecated
-    default ClickHouseRequest<?> connect(Function<ClickHouseNodeSelector, ClickHouseNode> nodeFunc) {
-        return read(nodeFunc, null);
-    }
-
     /**
      * Connects to one or more ClickHouse servers to read. Same as
      * {@code read(ClickHouseNodes.of(uri))}.

clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseConfig.java

@@ -235,7 +235,6 @@ public static Map<ClickHouseOption, Serializable> toClientOptions(Map<?, ?> prop
     private final boolean useBlockingQueue;
     private final boolean useCompilation;
     private final boolean useObjectsInArray;
-    private final boolean useNoProxy;
     private final boolean useServerTimeZone;
     private final boolean useServerTimeZoneForDates;
     private final TimeZone timeZoneForDate;
@@ -353,7 +352,6 @@ public ClickHouseConfig(Map<ClickHouseOption, Serializable> options, ClickHouseC
         this.useBlockingQueue = getBoolOption(ClickHouseClientOption.USE_BLOCKING_QUEUE);
         this.useCompilation = getBoolOption(ClickHouseClientOption.USE_COMPILATION);
         this.useObjectsInArray = getBoolOption(ClickHouseClientOption.USE_OBJECTS_IN_ARRAYS);
-        this.useNoProxy = getBoolOption(ClickHouseClientOption.USE_NO_PROXY);
         this.useServerTimeZone = getBoolOption(ClickHouseClientOption.USE_SERVER_TIME_ZONE);
         this.useServerTimeZoneForDates = getBoolOption(ClickHouseClientOption.USE_SERVER_TIME_ZONE_FOR_DATES);
 
@@ -662,10 +660,6 @@ public boolean isUseObjectsInArray() {
      * @deprecated will be dropped in 0.5, please use {@link #getProxyType()}
      *             instead
      */
-    @Deprecated
-    public boolean isUseNoProxy() {
-        return useNoProxy;
-    }
 
     public ClickHouseProxyType getProxyType() {
         return proxyType;

clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseNodes.java

@@ -415,7 +415,7 @@ protected void queryClusterNodes(Collection<ClickHouseNode> seeds, Collection<Cl
 
             try (ClickHouseClient client = ClickHouseClient.builder().agent(false)
                     .nodeSelector(ClickHouseNodeSelector.of(server.getProtocol())).build()) {
-                ClickHouseRequest<?> request = client.connect(server)
+                ClickHouseRequest<?> request = client.read(server)
                         .format(ClickHouseFormat.RowBinaryWithNamesAndTypes);
                 String clusterName = server.getCluster();
                 Set<String> clusters = new LinkedHashSet<>();

clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseTransaction.java

@@ -420,7 +420,7 @@ public void abort() {
         }
 
         id.updateAndGet(x -> {
-            try (ClickHouseResponse response = ClickHouseClient.newInstance(server.getProtocol()).connect(server)
+            try (ClickHouseResponse response = ClickHouseClient.newInstance(server.getProtocol()).read(server)
                     .query("KILL TRANSACTION WHERE tid=" + x.asTupleString()).executeAndWait()) {
                 // ignore
             } catch (ClickHouseException e) {

clickhouse-client/src/main/java/com/clickhouse/client/config/ClickHouseClientOption.java

@@ -377,16 +377,6 @@ public enum ClickHouseClientOption implements ClickHouseOption {
      */
     USE_OBJECTS_IN_ARRAYS("use_objects_in_arrays", ClickHouseDataConfig.DEFAULT_USE_OBJECT_IN_ARRAY,
             "Whether Object[] should be used instead of primitive arrays."),
-    /**
-     * Whether to access ClickHouse server directly without using system wide proxy
-     * including the one defined in JVM system properties.
-     * 
-     * @deprecated will be dropped in 0.5, please use {@link #PROXY_TYPE} instead
-     */
-    @Deprecated
-    USE_NO_PROXY("use_no_proxy", false,
-            "Whether to access ClickHouse server directly without using system wide proxy including the one defined in JVM system properties."),
-
     /**
      * Type of proxy can be used to access ClickHouse server. To use an HTTP/SOCKS
      * proxy, you must specify the {@link #PROXY_HOST} and {@link #PROXY_PORT}.