chore: fix (#364)

Author: caojiajun

camellia-redis-proxy/camellia-redis-proxy-core/src/main/java/com/netease/nim/camellia/redis/proxy/upstream/local/storage/compact/CompactExecutor.java

@@ -108,11 +108,6 @@ public void compact(short slot) {
                 for (Pair<KeyInfo, byte[]> pair : surviving) {
                     stringReadWrite.put(slot, pair.getFirst(), pair.getSecond());
                     keyReadWrite.put(slot, pair.getFirst());
-                    if (Utils.bytesToString(pair.getFirst().getKey()).startsWith("k")) {
-                        ValueLocation valueLocation = pair.getFirst().getValueLocation();
-                        logger.info("compact put, key = {}, fileId = {}, blockId = {}, offset = {}",
-                                Utils.bytesToString(pair.getFirst().getKey()), valueLocation.blockLocation().fileId(), valueLocation.blockLocation().blockId(), valueLocation.offset());
-                    }
                 }
             }
             for (BlockLocation block : blocks) {

camellia-redis-proxy/camellia-redis-proxy-core/src/main/java/com/netease/nim/camellia/redis/proxy/upstream/local/storage/value/string/StringReadWrite.java

@@ -53,19 +53,21 @@ public void put(short slot, KeyInfo keyInfo, byte[] data) throws IOException {
 
     public byte[] get(short slot, KeyInfo keyInfo) throws IOException {
         Key key = new Key(keyInfo.getKey());
-        byte[] bytes = readCache.get(key);
-        if (bytes != null) {
-            return bytes;
+        byte[] data = readCache.get(key);
+        if (data != null) {
+            return data;
         }
-        bytes = writeCache.get(key);
-        if (bytes != null) {
-            readCache.put(key, bytes);
+        data = writeCache.get(key);
+        if (data != null) {
+            readCache.put(key, data);
             writeCache.delete(key);
-            return bytes;
+            return data;
+        }
+        data = get(slot).get(keyInfo);
+        if (data != null) {
+            readCache.put(key, data);
         }
-        bytes = get(slot).get(keyInfo);
-        readCache.put(key, bytes);
-        return bytes;
+        return data;
     }
 
     public ValueWrapper<byte[]> getForRunToCompletion(short slot, KeyInfo keyInfo) {

camellia-redis-proxy/camellia-redis-proxy-core/src/main/java/com/netease/nim/camellia/redis/proxy/upstream/local/storage/value/string/block/StringBlockReadWrite.java

@@ -11,6 +11,7 @@
 import com.netease.nim.camellia.redis.proxy.upstream.local.storage.value.block.BlockLocation;
 import com.netease.nim.camellia.redis.proxy.upstream.local.storage.value.block.BlockType;
 import com.netease.nim.camellia.redis.proxy.upstream.local.storage.value.block.IValueManifest;
+import com.netease.nim.camellia.redis.proxy.upstream.local.storage.value.block.ValueLocation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -67,7 +68,11 @@ private void warm() {
 
     @Override
     public byte[] get(KeyInfo keyInfo) throws IOException {
-        BlockLocation blockLocation = keyInfo.getValueLocation().blockLocation();
+        ValueLocation valueLocation = keyInfo.getValueLocation();
+        if (valueLocation == null) {
+            return null;
+        }
+        BlockLocation blockLocation = valueLocation.blockLocation();
         BlockType blockType = valueManifest.blockType(blockLocation.fileId());
         long fileId = blockLocation.fileId();
         long fileOffset = (long) blockType.getBlockSize() * blockLocation.blockId();