Browse Source

Remove dependency of log4j-slf4j-impl (#1074)

Signed-off-by: yhmo <yihua.mo@zilliz.com>
groot 7 months ago
parent
commit
ca9c5b5867

+ 0 - 6
pom.xml

@@ -75,7 +75,6 @@
         <javax.annotation.version>1.2</javax.annotation.version>
         <commons.text.version>1.10.0</commons.text.version>
         <slf4j.api.version>1.7.36</slf4j.api.version>
-        <log4j.slf4j.version>2.17.1</log4j.slf4j.version>
         <junit.version>4.13.2</junit.version>
         <junit.jupiter.version>5.10.1</junit.jupiter.version>
         <lombok.version>1.18.22</lombok.version>
@@ -242,11 +241,6 @@
             <artifactId>commons-collections4</artifactId>
             <version>${commons-collections4.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>${log4j.slf4j.version}</version>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

+ 2 - 2
src/main/java/io/milvus/common/utils/VectorUtils.java

@@ -22,7 +22,6 @@ package io.milvus.common.utils;
 import io.milvus.exception.ParamException;
 import io.milvus.param.collection.FieldType;
 import io.milvus.response.DescCollResponseWrapper;
-import org.apache.logging.log4j.util.Strings;
 
 import java.util.List;
 import java.util.Optional;
@@ -53,6 +52,7 @@ public class VectorUtils {
     }
 
     public static String convertPksExpr(List<?> primaryIds, String primaryFieldName) {
-        return primaryFieldName + " in [" + Strings.join(primaryIds, ',') + "]";
+        String strIDs = primaryIds.stream().map(Object::toString).collect(Collectors.joining(","));
+        return primaryFieldName + " in [" + strIDs + "]";
     }
 }

+ 1 - 2
src/main/java/io/milvus/param/highlevel/collection/CreateSimpleCollectionParam.java

@@ -36,7 +36,6 @@ import lombok.Getter;
 import lombok.NonNull;
 import lombok.ToString;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.util.Strings;
 
 import java.util.HashMap;
 import java.util.List;
@@ -69,7 +68,7 @@ public class CreateSimpleCollectionParam {
         private String collectionName;
         private int dimension;
         private MetricType metricType = MetricType.L2;
-        private String description = Strings.EMPTY;
+        private String description = "";
         private String primaryField;
         private String vectorField;
         private boolean autoId = Boolean.FALSE;

+ 0 - 1
src/main/java/io/milvus/param/highlevel/dml/DeleteIdsParam.java

@@ -25,7 +25,6 @@ import lombok.Getter;
 import lombok.NonNull;
 import lombok.ToString;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.logging.log4j.util.Strings;
 
 import java.util.ArrayList;
 import java.util.List;

+ 17 - 20
src/test/java/io/milvus/client/MilvusMultiClientDockerTest.java

@@ -32,8 +32,6 @@ import io.milvus.param.partition.GetPartitionStatisticsParam;
 import io.milvus.param.partition.ShowPartitionsParam;
 import io.milvus.response.*;
 import org.apache.commons.text.RandomStringGenerator;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.codehaus.plexus.util.FileUtils;
 
 import org.junit.jupiter.api.BeforeAll;
@@ -49,7 +47,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 class MilvusMultiClientDockerTest {
-    private static final Logger logger = LogManager.getLogger("MilvusMultiClientDockerTest");
     private static MilvusClient client;
     private static RandomStringGenerator generator;
     private static final int dimension = 128;
@@ -65,16 +62,16 @@ class MilvusMultiClientDockerTest {
         String bashCommand = "docker compose up -d";
 
         try {
-            logger.debug(bashCommand);
+            System.out.print(bashCommand);
             Process pro = runtime.exec(bashCommand);
             int status = pro.waitFor();
             if (status != 0) {
-                logger.error("Failed to start docker compose, status " + status);
+                System.out.print("Failed to start docker compose, status " + status);
             }
 
-            logger.debug("Milvus service started");
+            System.out.print("Milvus service started");
         } catch (Throwable t) {
-            logger.error("Failed to execute docker compose up", t);
+            System.out.print("Failed to execute docker compose up: " + t.getMessage());
         }
 
         ConnectParam connectParam = connectParamBuilder().withAuthorization("root", "Milvus").build();
@@ -88,24 +85,24 @@ class MilvusMultiClientDockerTest {
             try {
                 TimeUnit.SECONDS.sleep(checkInterval);
             } catch (InterruptedException t) {
-                logger.error("Interrupted", t);
+                System.out.print("Interrupted: " + t.getMessage());
                 break;
             }
 
             try{
                 R<CheckHealthResponse> resp = tempClient.checkHealth();
                 if (resp.getData().getIsHealthy()) {
-                    logger.info(String.format("Milvus service is ready after %d seconds", waitTime));
+                    System.out.print(String.format("Milvus service is ready after %d seconds", waitTime));
                     break;
                 }
-                logger.info("Milvus service is not ready, waiting...");
+                System.out.print("Milvus service is not ready, waiting...");
             } catch (Throwable t) {
-                logger.error("Milvus service is in initialize, not able to connect", t);
+                System.out.print("Milvus service is in initialize, not able to connect: " + t.getMessage());
             }
 
             waitTime += checkInterval;
             if (waitTime > 120) {
-                logger.error(String.format("Milvus service failed to start within %d seconds", waitTime));
+                System.out.print(String.format("Milvus service failed to start within %d seconds", waitTime));
                 break;
             }
         }
@@ -121,16 +118,16 @@ class MilvusMultiClientDockerTest {
         String bashCommand = "docker compose down";
 
         try {
-            logger.debug("Milvus service stopping...");
+            System.out.print("Milvus service stopping...");
             TimeUnit.SECONDS.sleep(5);
-            logger.debug(bashCommand);
+            System.out.print(bashCommand);
             Process pro = runtime.exec(bashCommand);
             int status = pro.waitFor();
             if (status != 0) {
-                logger.error("Failed to stop test docker containers" + pro.getOutputStream().toString());
+                System.out.print("Failed to stop test docker containers" + pro.getOutputStream().toString());
             }
         } catch (Throwable t) {
-            logger.error("Failed to execute docker compose down", t);
+            System.out.print("Failed to execute docker compose down:" + t.getMessage());
         }
 
         // clean up log dir
@@ -138,17 +135,17 @@ class MilvusMultiClientDockerTest {
         bashCommand = "docker compose rm";
 
         try {
-            logger.debug(bashCommand);
+            System.out.print(bashCommand);
             Process pro = runtime.exec(bashCommand);
             int status = pro.waitFor();
             if (status != 0) {
-                logger.error("Failed to clean up test docker containers" + pro.getOutputStream().toString());
+                System.out.print("Failed to clean up test docker containers" + pro.getOutputStream().toString());
             }
 
-            logger.error("Clean up volume directory of Docker");
+            System.out.print("Clean up volume directory of Docker");
             FileUtils.deleteDirectory("volumes");
         } catch (Throwable t) {
-            logger.error("Failed to remove docker compose volume", t);
+            System.out.print("Failed to remove docker compose volume: " + t.getMessage());
         }
     }