[#noissue] Reduce memory usage in EncodingStrategy

pinpoint-apm · Apr 15, 2022 · d82cc1a · d82cc1a
1 parent 886e8d3
commit d82cc1a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/.../src/main/java/com/navercorp/pinpoint/common/server/bo/codec/stat/strategy/MathUtils.java b/.../src/main/java/com/navercorp/pinpoint/common/server/bo/codec/stat/strategy/MathUtils.java
@@ -0,0 +1,12 @@
+package com.navercorp.pinpoint.common.server.bo.codec.stat.strategy;
+
+final class MathUtils {
+    private MathUtils() {
+    }
+
+    static int min(int a, int b, int c, int d) {
+        int min1 = Math.min(a, b);
+        int min2 = Math.min(c, d);
+        return Math.min(min1, min2);
+    }
+}
diff --git a/...a/com/navercorp/pinpoint/common/server/bo/codec/stat/strategy/StringEncodingStrategy.java b/...a/com/navercorp/pinpoint/common/server/bo/codec/stat/strategy/StringEncodingStrategy.java
@@ -23,7 +23,6 @@
 import com.navercorp.pinpoint.common.server.bo.codec.strategy.impl.StringRepeatCountEncodingStrategy;
 import com.navercorp.pinpoint.common.server.bo.codec.strategy.impl.StringValueEncodingStrategy;
 import com.navercorp.pinpoint.common.util.BytesUtils;
-import org.apache.commons.lang3.math.NumberUtils;
 
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -127,7 +126,7 @@ public StrategyAnalyzer<String> build() {
                 if (repeatedValueCount != 0 && repeatedValueCount == values.size()) {
                     bestStrategy = ALWAYS_SAME_VALUE;
                 } else {
-                    int minimumNumBytesUsed = NumberUtils.min(
+                    int minimumNumBytesUsed = Math.min(
                             this.byteSizeValue,
                             this.byteSizeRepeatCount);
                     if (this.byteSizeValue == minimumNumBytesUsed) {

diff --git a/...ercorp/pinpoint/common/server/bo/codec/stat/strategy/UnsignedIntegerEncodingStrategy.java b/...ercorp/pinpoint/common/server/bo/codec/stat/strategy/UnsignedIntegerEncodingStrategy.java
@@ -25,7 +25,6 @@
 import com.navercorp.pinpoint.common.server.bo.codec.strategy.impl.RepeatCountEncodingStrategy;
 import com.navercorp.pinpoint.common.server.bo.codec.strategy.impl.ValueEncodingStrategy;
 import com.navercorp.pinpoint.common.util.BytesUtils;
-import org.apache.commons.lang3.math.NumberUtils;
 
 import java.util.ArrayList;
 import java.util.EnumSet;
@@ -127,7 +126,7 @@ public StrategyAnalyzer<Integer> build() {
                     this.byteSizeRepeatCount += BytesUtils.computeVar32Size(this.repeatedValueCount);
                 }
                 EncodingStrategy<Integer> bestStrategy;
-                int minimumNumBytesUsed = NumberUtils.min(
+                int minimumNumBytesUsed = MathUtils.min(
                         this.byteSizeValue,
                         this.byteSizeDelta,
                         this.byteSizeDeltaOfDelta,

diff --git a/...navercorp/pinpoint/common/server/bo/codec/stat/strategy/UnsignedLongEncodingStrategy.java b/...navercorp/pinpoint/common/server/bo/codec/stat/strategy/UnsignedLongEncodingStrategy.java
@@ -25,7 +25,6 @@
 import com.navercorp.pinpoint.common.server.bo.codec.strategy.impl.RepeatCountEncodingStrategy;
 import com.navercorp.pinpoint.common.server.bo.codec.strategy.impl.ValueEncodingStrategy;
 import com.navercorp.pinpoint.common.util.BytesUtils;
-import org.apache.commons.lang3.math.NumberUtils;
 
 import java.util.ArrayList;
 import java.util.EnumSet;
@@ -128,7 +127,7 @@ public StrategyAnalyzer<Long> build() {
                     this.byteSizeRepeatCount += BytesUtils.computeVar32Size(this.repeatedValueCount);
                 }
                 EncodingStrategy<Long> bestStrategy;
-                int minimumNumBytesUsed = NumberUtils.min(
+                int minimumNumBytesUsed = MathUtils.min(
                         this.byteSizeValue,
                         this.byteSizeDelta,
                         this.byteSizeDeltaOfDelta,

diff --git a/...avercorp/pinpoint/common/server/bo/codec/stat/strategy/UnsignedShortEncodingStrategy.java b/...avercorp/pinpoint/common/server/bo/codec/stat/strategy/UnsignedShortEncodingStrategy.java
@@ -22,7 +22,6 @@
 import com.navercorp.pinpoint.common.server.bo.codec.strategy.impl.RepeatCountEncodingStrategy;
 import com.navercorp.pinpoint.common.server.bo.codec.strategy.impl.ValueEncodingStrategy;
 import com.navercorp.pinpoint.common.util.BytesUtils;
-import org.apache.commons.lang3.math.NumberUtils;
 
 import java.util.ArrayList;
 import java.util.EnumSet;
@@ -119,7 +118,7 @@ public StrategyAnalyzer<Short> build() {
                     this.byteSizeRepeatCount += BytesUtils.computeVar32Size(this.repeatedValueCount);
                 }
                 EncodingStrategy<Short> bestStrategy;
-                int minimumNumBytesUsed = NumberUtils.min(
+                int minimumNumBytesUsed = Math.min(
                         this.byteSizeValue,
                         this.byteSizeRepeatCount);
                 if (this.byteSizeValue == minimumNumBytesUsed) {