Sfoglia il codice sorgente

feat:添加zstd依赖

zhaohaipeng 4 settimane fa
parent
commit
38c8c48280

+ 13 - 6
recommend-feature-common/pom.xml

@@ -43,12 +43,6 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-pool2</artifactId>
         </dependency>
-        <!-- Snappy compression library -->
-        <dependency>
-            <groupId>org.xerial.snappy</groupId>
-            <artifactId>snappy-java</artifactId>
-            <version>1.1.8.4</version>
-        </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
@@ -58,6 +52,19 @@
             <artifactId>guava</artifactId>
         </dependency>
 
+        <!-- Snappy compression library -->
+        <dependency>
+            <groupId>org.xerial.snappy</groupId>
+            <artifactId>snappy-java</artifactId>
+            <version>1.1.8.4</version>
+        </dependency>
+        <!-- zstd compression library -->
+        <dependency>
+            <groupId>com.github.luben</groupId>
+            <artifactId>zstd-jni</artifactId>
+            <version>1.5.5-5</version>
+        </dependency>
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>

+ 0 - 1
recommend-feature-common/src/main/java/com/tzld/piaoquan/recommend/feature/common/enums/Env.java

@@ -7,7 +7,6 @@ public enum Env {
 
     DEV("dev", "开发环境"),
     PROD("prod", "正式环境"),
-    PROD_DISK("prod_disk", "磁盘存储-正式环境"),
     ;
     private final String env;
     private final String desc;

+ 10 - 0
recommend-feature-common/src/main/java/com/tzld/piaoquan/recommend/feature/common/util/CompressionUtil.java

@@ -1,5 +1,6 @@
 package com.tzld.piaoquan.recommend.feature.common.util;
 
+import com.github.luben.zstd.Zstd;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.xerial.snappy.Snappy;
@@ -27,6 +28,11 @@ public class CompressionUtil {
         return Snappy.compress(inputBytes);
     }
 
+    public static byte[] zstdCompress(String input) {
+        byte[] inputBytes = input.getBytes(StandardCharsets.UTF_8);
+        return Zstd.compress(inputBytes, 5);
+    }
+
     // 将Snappy压缩后的String解压缩回String
     public static String snappyDecompress(String compressedInput) {
         if (StringUtils.isBlank(compressedInput)) {
@@ -54,4 +60,8 @@ public class CompressionUtil {
             return "";
         }
     }
+
+    public static String zstdDecompress(byte[] compressedInput) {
+        return "";
+    }
 }

+ 0 - 6
recommend-feature-produce/src/main/java/com/tzld/piaoquan/recommend/feature/produce/ODPSToRedis.java

@@ -4,13 +4,10 @@ import com.tzld.piaoquan.recommend.feature.common.model.DTSConfig;
 import com.tzld.piaoquan.recommend.feature.produce.service.DTSConfigService;
 import com.tzld.piaoquan.recommend.feature.produce.service.RedisService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.spark.api.java.JavaRDD;
 
 import java.util.Map;
 
-import static com.tzld.piaoquan.recommend.feature.common.enums.Env.PROD_DISK;
-
 /**
  * @author dyp
  */
@@ -23,9 +20,6 @@ public class ODPSToRedis extends AbstractODPSSyncJob {
 
     @Override
     protected String appName(Map<String, String> argMap) {
-        if (StringUtils.equals(PROD_DISK.getEnv(), argMap.get("env"))) {
-            return "ODPSSyncToDiskStore : " + argMap.get("table");
-        }
         return "odps sync to redis : " + argMap.get("table");
     }
 

+ 0 - 4
recommend-feature-produce/src/main/java/com/tzld/piaoquan/recommend/feature/produce/service/RedisService.java

@@ -19,7 +19,6 @@ import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import static com.tzld.piaoquan.recommend.feature.common.enums.Env.PROD;
-import static com.tzld.piaoquan.recommend.feature.common.enums.Env.PROD_DISK;
 
 /**
  * https://help.aliyun.com/zh/maxcompute/user-guide/java-sdk-1/?spm=a2c4g.11174283.0.0.6d0111c1E15lI3
@@ -36,9 +35,6 @@ public class RedisService implements Serializable {
         if (StringUtils.equals(env, PROD.getEnv())) {
             password = "Wqsd@2019";
             hostName = "r-bp1pi8wyv6lzvgjy5z.redis.rds.aliyuncs.com";
-        } else if (StringUtils.equals(env, PROD_DISK.getEnv())) {
-            password = "Wqsd@2019";
-            hostName = "r-bp1t8fqdubofxntci5.redis.rds.aliyuncs.com";
         } else {
             password = "Wqsd@2019";
             hostName = "r-bp1wwqqkjqwwkxgbup.redis.rds.aliyuncs.com";

+ 0 - 19
recommend-feature-service/src/test/java/com/tzld/piaoquan/recommend/feature/service/FeatureV2ServiceTest.java

@@ -1,15 +1,11 @@
 package com.tzld.piaoquan.recommend.feature.service;
 
-import com.tzld.piaoquan.recommend.feature.common.util.CompressionUtil;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.redis.core.RedisTemplate;
 
-import java.util.Arrays;
-import java.util.List;
-
 @SpringBootTest
 public class FeatureV2ServiceTest {
 
@@ -24,21 +20,6 @@ public class FeatureV2ServiceTest {
     @Test
     public void featureV2Test() {
 
-        List<String> byteArraykeys = Arrays.asList(
-                "snappy:alg_user_network_seq_feature:ohlZ7xLtnpqmeqJaBHejIeX2BZiY:v2"
-        );
-
-        for (byte[] bytes : byteRedisTemplate.opsForValue().multiGet(byteArraykeys)) {
-            System.out.println(CompressionUtil.snappyDecompressV2(bytes));
-        }
-
-        List<String> keys = Arrays.asList(
-                "snappy:alg_user_network_seq_feature:ohlZ7xLtnpqmeqJaBHejIeX2BZiY"
-        );
-
-        for (String value : redisTemplate.opsForValue().multiGet(keys)) {
-            System.out.println(CompressionUtil.snappyDecompress(value));
-        }
 
     }
 }