Merge pull request #1064 from zhicwu/develop

Fix some LGTM alerts

Author: zhicwu

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

@@ -290,7 +290,7 @@ static Process startProcess(ClickHouseRequest<?> request) {
                         throw new UncheckedIOException(e);
                     } catch (UnsupportedOperationException e) {
                         try {
-                            f = ClickHouseInputStream.save(newPath.toFile(), new FileInputStream(f),
+                            f = ClickHouseInputStream.save(newPath.toFile(), new FileInputStream(f), // lgtm[java/input-resource-leak]
                                     config.getWriteBufferSize(), timeout, true);
                         } catch (FileNotFoundException exp) {
                             throw new UncheckedIOException(exp);
@@ -312,7 +312,7 @@ static Process startProcess(ClickHouseRequest<?> request) {
                     CompletableFuture<File> data = ClickHouseClient.submit(() -> {
                         File tmp = File.createTempFile("tmp", "data");
                         tmp.deleteOnExit();
-                        try (ClickHouseOutputStream out = ClickHouseOutputStream.of(new FileOutputStream(tmp))) {
+                        try (ClickHouseOutputStream out = ClickHouseOutputStream.of(new FileOutputStream(tmp))) { // lgtm[java/output-resource-leak]
                             request.getInputStream().get().pipe(out);
                         }
                         return tmp;

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

@@ -776,6 +776,7 @@ public boolean equals(Object obj) {
     }
 
     @Override
+    @SuppressWarnings("lgtm[java/print-array]")
     public String toString() {
         return new StringBuilder().append(getClass().getSimpleName()).append("array=").append(array)
                 .append(", position=").append(position).append(", length=").append(length).append(')').toString();

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

@@ -965,7 +965,7 @@ protected ClickHouseNode(String host, ClickHouseProtocol protocol, int port, Cli
         this.config = new ClickHouseConfig(ClickHouseConfig.toClientOptions(options), credentials, null, null);
         this.manager = new AtomicReference<>(null);
 
-        StringBuilder builder = new StringBuilder().append(protocol.name().toLowerCase(Locale.ROOT));
+        StringBuilder builder = new StringBuilder().append(this.protocol.name().toLowerCase(Locale.ROOT));
         if (config.isSsl()) {
             builder.append('s');
         }

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

@@ -467,8 +467,7 @@ protected void queryClusterNodes(Collection<ClickHouseNode> seeds, Collection<Cl
                 }
                 try (ClickHouseResponse response = request.query(query)
                         .params(isAddress ? "host_address" : "host_name",
-                                ClickHouseValues.convertToSqlExpression(
-                                        clusters != null ? clusters : Collections.singleton(clusterName)))
+                                ClickHouseValues.convertToSqlExpression(clusters))
                         .executeAndWait()) {
                     for (ClickHouseRecord r : response.records()) {
                         int idx = 0;

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

@@ -84,8 +84,7 @@ default boolean isInfinity() {
      * @return true if the value is NaN; false otherwise
      */
     default boolean isNaN() {
-        double v = asDouble();
-        return v != v;
+        return Double.isNaN(asDouble());
     }
 
     /**

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

@@ -1140,8 +1140,13 @@ private static ClickHouseValue newValue(ClickHouseConfig config, ClickHouseDataT
                 value = ClickHouseGeoMultiPolygonValue.ofEmpty();
                 break;
             case SimpleAggregateFunction:
-                column = column.getNestedColumns().get(0);
-                return newValue(config, column.getDataType(), column);
+                if (column != null) {
+                    column = column.getNestedColumns().get(0);
+                    return newValue(config, column.getDataType(), column);
+                } else { // should never happen
+                    value = ClickHouseEmptyValue.INSTANCE;
+                }
+                break;
             case AggregateFunction:
                 value = ClickHouseEmptyValue.INSTANCE;
                 if (column != null) {

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

@@ -202,7 +202,7 @@ public enum ClickHouseClientOption implements ClickHouseOption {
      * Maximum rows allowed in the result.
      */
     MAX_RESULT_ROWS("max_result_rows", 0L,
-            "Limit on the number of rows in the result."
+            "Limit on the number of rows in the result. "
                     + "Also checked for subqueries, and on remote servers when running parts of a distributed query."),
     /**
      * Maximum size of thread pool for each client.

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

@@ -107,6 +107,7 @@ protected KeyStore getKeyStore(String cert, String key)
         return ks;
     }
 
+    @SuppressWarnings("lgtm[java/insecure-trustmanager]")
     protected SSLContext getJavaSslContext(ClickHouseConfig config) throws SSLException {
         ClickHouseSslMode sslMode = config.getSslMode();
         String clientCert = config.getSslCert();

clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseFloatValue.java

@@ -100,7 +100,7 @@ public boolean isInfinity() {
 
     @Override
     public boolean isNaN() {
-        return value != value;
+        return Float.isNaN(value);
     }
 
     @Override

clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseGeoMultiPolygonValue.java

@@ -413,7 +413,7 @@ public ClickHouseGeoMultiPolygonValue update(ClickHouseValue value) {
     @Override
     public ClickHouseGeoMultiPolygonValue update(Object[] value) {
         if (value == null || value.length != 2) {
-            throw new IllegalArgumentException(ClickHouseValues.ERROR_INVALID_POINT + value);
+            throw new IllegalArgumentException(ClickHouseValues.ERROR_INVALID_POINT + Arrays.toString(value));
         }
         Object v1 = value[0];
         Object v2 = value[1];