From 99d9a8e4127eba6954c5d9e71fdedcd66297b5f3 Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@71dcc7fd-b1f2-4e5d-bb8e-274146e81173> Date: Wed, 31 May 2023 19:22:38 +0000 Subject: [PATCH] checkDataIntegrity git-svn-id: svn://home0/checkDataIntegrity@3075 71dcc7fd-b1f2-4e5d-bb8e-274146e81173 --- bin/checkDataIntegrity/Main.class | Bin 6549 -> 6509 bytes checkDataIntegrity.jar | Bin 12892 -> 12897 bytes src/checkDataIntegrity/Main.java | 56 ++++++++++++++++-------------- 3 files changed, 29 insertions(+), 27 deletions(-) diff --git a/bin/checkDataIntegrity/Main.class b/bin/checkDataIntegrity/Main.class index 1ff3015fd6479c46e09970e0f1404444f3925be8..67aa0a3991c31dc4745055e4ff35a6f8890a796a 100644 GIT binary patch delta 349 zcmXYr&nv@m7{^~vv`@AiY{|YP^J|)-MUp8OcAZ*{`8D|+)1=V+Xrs{%yR5!BC?^g$ zOtKnLJ8@A??k>*CUw}`e=lwkI=XH6W_i^`U*Uh`5aa$_b5gWVG!=Ch$lu7m_!+~6q zk_Qg+KaQM8ET5}RONY8(z^86$d!&8rj&s9O;MyTZ0k5G7qzh#9YR{I~oT=$dA_-k} z{CWMqHRx#&Z;P4Vr51uS(AjFbxE-yM{LSHTT&!$x}4RXxHR*O!XqJRp-2UO>62Dz(s2Uf r6*phl2#ec{ID3`iO~*@`r_O1Y2ESssq^LqmV-Wq;9MbJG2aVt_JG)89 delta 346 zcmXYr&nv@m7{^~vcCDBqd#JNe|l+BQ1yQ$OXG{ z&t9(Rx)M3bUAYg$p<@vm$%_Y_??ds84uaY(1oncAq@$kpGf7X|n zK~aVsn5S0v02K^U%@7t*0*nwMMwn5CiF3pRr%ZCr6qii%#0)Pacx9Fk=J;V=%2^PD zMX@t34w8~~vLqQ+WS>>ZvnB=BRfFjc2^cD$X7=#S^OIa|`(Pspd$BO&{06|Lz diff --git a/checkDataIntegrity.jar b/checkDataIntegrity.jar index 350efa9d3e85755100259f27764984920622b657..7a1a7f55b80ac476fe46c72e9194d39d8b367dc1 100644 GIT binary patch delta 3479 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 A#sB~S diff --git a/src/checkDataIntegrity/Main.java b/src/checkDataIntegrity/Main.java index d76f5f3..1822296 100644 --- a/src/checkDataIntegrity/Main.java +++ b/src/checkDataIntegrity/Main.java @@ -81,38 +81,40 @@ public class Main { .stream() .parallel() .forEach(p0 -> { - final long cnt = count.incrementAndGet(); - if (cnt % 1000 == 0) { - System.out.println(cnt); - } - - final String rel = p0.toString().substring(path0.length()); - final Path p1 = Path.of(path1 + rel); - - final byte[] buf0 = bufs0.get(); - final byte[] buf1 = bufs1.get(); - try (InputStream inputStream0 = new BufferedInputStream(new FileInputStream(p0.toFile()), 65536); InputStream inputStream1 = new BufferedInputStream(new FileInputStream(p1.toFile()), 65536)) { - int len0, len1; - do { - len0 = inputStream0.read(buf0); - len1 = inputStream1.read(buf1); - if (len0 != len1) { - System.out.println(rel + ": Length mismatch"); - countErr.incrementAndGet(); - break; - } - if (len0 > -1 && !Arrays.equals(buf0, 0, len0, buf1, 0, len1)) { - System.out.println(rel + ": Data mismatch"); - countErr.incrementAndGet(); - break; - } - } while (len0 > -1); + try { + final long cnt = count.incrementAndGet(); + if (cnt % 1000 == 0) { + System.out.println(cnt); + } + + final String rel = p0.toString().substring(path0.length()); + final Path p1 = Path.of(path1 + rel); + + final byte[] buf0 = bufs0.get(); + final byte[] buf1 = bufs1.get(); + try (InputStream inputStream0 = new BufferedInputStream(new FileInputStream(p0.toFile()), 65536); InputStream inputStream1 = new BufferedInputStream(new FileInputStream(p1.toFile()), 65536)) { + int len0, len1; + do { + len0 = inputStream0.read(buf0); + len1 = inputStream1.read(buf1); + if (len0 != len1) { + System.out.println(rel + ": Length mismatch"); + countErr.incrementAndGet(); + break; + } + if (len0 > -1 && !Arrays.equals(buf0, 0, len0, buf1, 0, len1)) { + System.out.println(rel + ": Data mismatch"); + countErr.incrementAndGet(); + break; + } + } while (len0 > -1); + } } catch (NoSuchFileException | FileNotFoundException | InvalidPathException ex) { // System.out.println(rel + ": NoSuchFileException"); } catch (final Exception ex) { - System.out.println(rel + ": Exception: " + ex.getClass().getName() + " " + ex.getMessage()); + System.out.println(p0 + ": Exception: " + ex.getClass().getName() + " " + ex.getMessage()); countErr.incrementAndGet(); } });