🚸 logStat squash same key #46

trydofor · Sep 18, 2024 · a3367e4 · a3367e4
1 parent 532d397
commit a3367e4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/src/main/java/pro/fessional/mirana/stat/LogStat.java b/src/main/java/pro/fessional/mirana/stat/LogStat.java
@@ -346,6 +346,7 @@ public static Stat buildStat(String log, long from, Collection<? extends Word> k
                 int viewLen = 0;
                 int sectLen = 0;
                 int kwc = 1;
+                Word lwd = null;
                 byte[] kwh = SectionHead.getBytes();
                 byte[] kwb = SectionWord.getBytes();
                 byte[] kwt = SectionFoot.getBytes();
@@ -384,7 +385,7 @@ public static Stat buildStat(String log, long from, Collection<? extends Word> k
 
                                 if (viewLen-- <= 0) {
                                     findLen = 0;
-                                    viewLen = 0;
+//                                    viewLen = 0;
                                 }
                             }
                         }
@@ -393,12 +394,15 @@ public static Stat buildStat(String log, long from, Collection<? extends Word> k
                             if (len >= keyMax) {
                                 Word m = find(buff, i, lineEnd, keys);
                                 if (m != null) {
-                                    fos.write(kwh);
-                                    fos.write(String.valueOf(kwc++).getBytes());
-                                    fos.write(kwb);
-                                    fos.write(m.bytes);
-                                    fos.write(kwt);
-                                    fos.write('\n');
+                                    if (lwd == null || viewLen < 0 || !Arrays.equals(lwd.bytes, m.bytes)) {
+                                        fos.write(kwh);
+                                        fos.write(String.valueOf(kwc++).getBytes());
+                                        fos.write(kwb);
+                                        fos.write(m.bytes);
+                                        fos.write(kwt);
+                                        fos.write('\n');
+                                    }
+                                    lwd = m;
                                     findLen = m.bytes.length;
                                     viewLen = preview;
                                     i = i + findLen - 1;

diff --git a/src/test/java/pro/fessional/mirana/stat/LogStatTest.java b/src/test/java/pro/fessional/mirana/stat/LogStatTest.java
@@ -55,6 +55,8 @@ void stat() throws IOException {
                      + "######### #3 KEYWORD: WARN #########\n"
                      + "2021-07-11 00:42:42.244  WARN 24430 --- [pool-1358-thread-3] c.j.b.c.s.f.w.rate.FedexRateService      : PAYOR_ACCOUNT_SHIPMENT:TotalBase=64.0,TotalSur=5.95,TotalNet=69.95\n"
                      + "c11111111111111111\n"
+                     + "2021-07-11 00:42:42.244  WARN 24430 --- [pool-1358-thread-3] should squash to the previous line\n"
+                     + "c11111111111111111\n"
                      + "c22222222222222222\n"
                      + "######### #4 KEYWORD: ERROR #########\n"
                      + "2021-07-11 00:42:42.244  ERROR 24430 --- [pool-1358-thread-3] c.j.b.c.s.f.w.rate.FedexRateService      : PAYOR_ACCOUNT_SHIPMENT:TotalBase=64.0,TotalSur=5.95,TotalNet=69.95\n";

diff --git a/src/test/resources/log-stat.txt b/src/test/resources/log-stat.txt
@@ -29,5 +29,7 @@ b88888888888888888
 b99999999999999999
 2021-07-11 00:42:42.244  WARN 24430 --- [pool-1358-thread-3] c.j.b.c.s.f.w.rate.FedexRateService      : PAYOR_ACCOUNT_SHIPMENT:TotalBase=64.0,TotalSur=5.95,TotalNet=69.95
 c11111111111111111
+2021-07-11 00:42:42.244  WARN 24430 --- [pool-1358-thread-3] should squash to the previous line
+c11111111111111111
 c22222222222222222
 2021-07-11 00:42:42.244  ERROR 24430 --- [pool-1358-thread-3] c.j.b.c.s.f.w.rate.FedexRateService      : PAYOR_ACCOUNT_SHIPMENT:TotalBase=64.0,TotalSur=5.95,TotalNet=69.95