[ISSUE #3436] Make configuration for pop be configurable (#3437)

* bugfix: configuration enablePopBufferMerge not work

* make configration for pop be configurable
Co-authored-by: Ndengzhiwen1 <dengzhiwen1@xiaomi.com>

common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java

@@ -238,54 +238,106 @@ public class BrokerConfig {
         return maxPopPollingSize;
     }
 
+    public void setMaxPopPollingSize(long maxPopPollingSize) {
+        this.maxPopPollingSize = maxPopPollingSize;
+    }
+
     public int getReviveQueueNum() {
         return reviveQueueNum;
     }
 
+    public void setReviveQueueNum(int reviveQueueNum) {
+        this.reviveQueueNum = reviveQueueNum;
+    }
+
     public long getReviveInterval() {
         return reviveInterval;
     }
 
+    public void setReviveInterval(long reviveInterval) {
+        this.reviveInterval = reviveInterval;
+    }
+
     public int getPopCkStayBufferTime() {
         return popCkStayBufferTime;
     }
 
+    public void setPopCkStayBufferTime(int popCkStayBufferTime) {
+        this.popCkStayBufferTime = popCkStayBufferTime;
+    }
+
     public int getPopCkStayBufferTimeOut() {
         return popCkStayBufferTimeOut;
     }
 
+    public void setPopCkStayBufferTimeOut(int popCkStayBufferTimeOut) {
+        this.popCkStayBufferTimeOut = popCkStayBufferTimeOut;
+    }
+
     public int getPopPollingMapSize() {
         return popPollingMapSize;
     }
 
+    public void setPopPollingMapSize(int popPollingMapSize) {
+        this.popPollingMapSize = popPollingMapSize;
+    }
+
     public long getReviveScanTime() {
         return reviveScanTime;
     }
 
+    public void setReviveScanTime(long reviveScanTime) {
+        this.reviveScanTime = reviveScanTime;
+    }
+
     public long getReviveMaxSlow() {
         return reviveMaxSlow;
     }
 
+    public void setReviveMaxSlow(long reviveMaxSlow) {
+        this.reviveMaxSlow = reviveMaxSlow;
+    }
+
     public int getPopPollingSize() {
         return popPollingSize;
     }
 
+    public void setPopPollingSize(int popPollingSize) {
+        this.popPollingSize = popPollingSize;
+    }
+
     public boolean isEnablePopBufferMerge() {
         return enablePopBufferMerge;
     }
 
+    public void setEnablePopBufferMerge(boolean enablePopBufferMerge) {
+        this.enablePopBufferMerge = enablePopBufferMerge;
+    }
+
     public int getPopCkMaxBufferSize() {
         return popCkMaxBufferSize;
     }
 
+    public void setPopCkMaxBufferSize(int popCkMaxBufferSize) {
+        this.popCkMaxBufferSize = popCkMaxBufferSize;
+    }
+
     public int getPopCkOffsetMaxQueueSize() {
         return popCkOffsetMaxQueueSize;
     }
 
+    public void setPopCkOffsetMaxQueueSize(int popCkOffsetMaxQueueSize) {
+        this.popCkOffsetMaxQueueSize = popCkOffsetMaxQueueSize;
+    }
+
     public boolean isEnablePopLog() {
         return enablePopLog;
     }
 
+    public void setEnablePopLog(boolean enablePopLog) {
+        this.enablePopLog = enablePopLog;
+    }
+
     public boolean isTraceOn() {
         return traceOn;
     }
@@ -950,12 +1002,10 @@ public class BrokerConfig {
         this.defaultMessageRequestMode = MessageRequestMode.valueOf(defaultMessageRequestMode);
     }
 
-
     public int getDefaultPopShareQueueNum() {
         return defaultPopShareQueueNum;
     }
 
-
     public void setDefaultPopShareQueueNum(int defaultPopShareQueueNum) {
         this.defaultPopShareQueueNum = defaultPopShareQueueNum;
     }