From 2aea192c1a5b467e6973fdbc43ff32eae323474b Mon Sep 17 00:00:00 2001 From: Brett Laptop Date: Fri, 17 Nov 2023 15:52:24 -0500 Subject: [PATCH] broken --- .../ChunkedCompressedChecksumFileReader.java | 3 +++ src/main/java/shared/FileUtil.java | 2 +- .../ChunkedCompressedChecksumFileWriter.class | Bin 3070 -> 3702 bytes .../ChunkedCompressedChecksumFileReader.class | Bin 4921 -> 5700 bytes .../FileUtil$InvalidUsageException.class | Bin 472 -> 472 bytes target/classes/shared/FileUtil.class | Bin 5683 -> 5682 bytes 6 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/server/ChunkedCompressedChecksumFileReader.java b/src/main/java/server/ChunkedCompressedChecksumFileReader.java index 707536f..b27c77b 100644 --- a/src/main/java/server/ChunkedCompressedChecksumFileReader.java +++ b/src/main/java/server/ChunkedCompressedChecksumFileReader.java @@ -30,6 +30,9 @@ public class ChunkedCompressedChecksumFileReader { public FileHeader readChunk(Tracer trace, Span sp) throws IOException { Span gf = trace.spanBuilder("Chunk Read").startSpan(); FileHeader header = readHeader(); + gf.setAttribute("Read Uncompressed", header.getUncompressed()); + gf.setAttribute("Read Compressed", header.getCompressed()); + gf.setAttribute("Read Hash", header.getHash()); try (Scope scope = gf.makeCurrent()) { if (header.getUncompressed() == 0) return header; diff --git a/src/main/java/shared/FileUtil.java b/src/main/java/shared/FileUtil.java index 9f8aaeb..b2a1c2d 100644 --- a/src/main/java/shared/FileUtil.java +++ b/src/main/java/shared/FileUtil.java @@ -19,7 +19,7 @@ import java.util.concurrent.TimeUnit; public class FileUtil { // do not change it breaks stuff - protected static final int READER_SIZE = 8192; + protected static final int READER_SIZE = 131072; public static final long SEED = 691; private static final LZ4Factory LZ_FACTORY = LZ4Factory.fastestInstance(); diff --git a/target/classes/client/ChunkedCompressedChecksumFileWriter.class b/target/classes/client/ChunkedCompressedChecksumFileWriter.class index 2cb0de65f93079a4d9d6166ebc093e06f773f565..18420d62888db09bf4602edc8bc550f48162b3c9 100644 GIT binary patch delta 2002 zcmaJ?`&SfI9RJ*%S!Q<`R5ZZlp?F#iSa8vl&BzxIa}h;^G^K|FjIgrIY&!!;ueGO{ zMUUyBX4%6>W>%oB287wmveW5L==2x#Tc;n&)A!EoS@7s-&zZe*@BQBI=kfi{%=Lo5 zihb9vk52(ujbBE6S6xXj)?vMbIvMq7V3@O48B{_sMe7N*4I8G~&mianCPQAcy%W_# zTN6>uY%>$8(qHSt2HY!Qql^fe80Os~hCzz+6ETfJEQ^$H_n`*OGB%@yBO~##gogv#k$PbrC=2Cs%kntwoVkqcW z`qX+|>r%`eQL~rs3{%legLcXy6zr7MDY!{>>alBjm>2X2RlV%yeW!x&$Z(_J7>VP+ zeC<6Pm+-!f5AfmnGwwTB?pX$3@I6D$=K4}r zI$)^XG%yA^qIGI&qCUpk$B=N9Vew5uZ^d82&kPIxKa@)0h_wz#D|4w&sS7-y_Qgl^ zf5Q4z3bT`z+jINuQ?#>!)`2BBjgPIcr)u6AWWj|KwDueA@V!=R$P-vKhP8e%g_S8Z z(rs{x#)=D&_}V5Ry|aa{q|iP}rv#j&|E0*bu6Rn4AygoYAT?7ZwxS9gxdI~3&XH+! zqZyyzEHTWbH&F;>#9}^H;ZvNWxX&npH2i~X37_K&nu!!SO4s=e-*&=ew6lP-5K`E| zN4oqeBzL8-dj>g|O>VADpqdgdLq3+Hgq|QyOm@RH10tLCP|YT!UD)aT|#uy)65rwDd?-mU>rp|ZRUny?!fhEPp9coS{2%R~ALiIG1j@Wy#` z3{UVoT3MXJQ|Bnmamr^)ZbUYHO}Ih%_Pj7-P$5z_2NxA;MH=7;B)bsdF+9(czqq=1 z(zAt62%$=#lDt|YCaGnM^TgoPI4n?-wCE*N{aGHsi{2H;{$f16|NbCeUSALcGoSovC_wO+Y;L)G?pSQ%0fj&L|c4q+l5w_wzgZq z=i&nu6&1!8^-)CyHJV5vgOR5GWK2x_cZ?>Ao;y3Kb&@+b_uTJ2-|zXJJM(+$N{#dD zl^>UZUcNc+{1R$($g)Lo8*K*mfkJ5@U&=f5Ghnk#aXWVy)Sf(1>z2*yHuaNJ?4ZgZ zyuUa%JFanqiaXh55IH57A>#YdEeHST$BhCipO}|U9eKdL3hcjt1n_|In#>kUrWys3DLw=a~cnvD2q183Wj(ZY0TVrp{M=2Q1u`>eYd?T(9P=}QDD zg_H6=<^B=fXt-{tbJNxD$WE8UVLk8io;%`Xu6>^>LY$J=McL7No82=`i;OrK@uXR(YK45B z4+Zy;AVlb2#B4t16Ioe;T#)hEil{xpWysDt&2D<^)U%9)$6X%x=~X!p74k)`@ddO? z;ttl*NgW$}VXBfQ5cVHgNThEL95^Us+JS^ldqY5$3g!l()3vXr=@OdmGS^7YYT3BT zfJDF}xx|1*pF1ICH_CAx(^i@1DjYr?rV;LTZa4fv;o{;_H6_0(#|+ diff --git a/target/classes/server/ChunkedCompressedChecksumFileReader.class b/target/classes/server/ChunkedCompressedChecksumFileReader.class index 0336e4e3dae7dd23ab2c99a1b9005698c5464cac..6acedb52adf3184ac3e7f5c2694c27c800fe5970 100644 GIT binary patch delta 2841 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 diff --git a/target/classes/shared/FileUtil$InvalidUsageException.class b/target/classes/shared/FileUtil$InvalidUsageException.class index 8c157cd17bc3c480c7d898c0620d50a5eb2f4e5c..f5f0dc4c22afaf026f6d89766425788d2c54b458 100644 GIT binary patch delta 17 Ycmcb?e1mzzR7Tb)23CgX$+H;k05t*yC;$Ke delta 17 Ycmcb?e1mzzR7Tbq23CgH$+H;k05u*3EC2ui diff --git a/target/classes/shared/FileUtil.class b/target/classes/shared/FileUtil.class index bcaf31f66b3bb6b663c9f2b51e711bbf0d242857..4a1e8e0b5f5617eb668062e09c2baf4123bfd73e 100644 GIT binary patch delta 1567 zcmZ8hX>=1+7`?BV&SZI|Fl}v9g`!ZbX-baD*0Sj-A{^4Pw-gjflaWpvQblTQ!&YJ(bsrRbuGM%i?Z8IT$H!f>Ns zi$u!n7Ka*)L={K1kx2Ik8zY(>eNm-gHbYiDb@2p!q4}OGn*G|ssNNW|<0@ROU@pfs zn8$EVq|O)C0%!B0Nh*m?MIySe||X*X_6t%?g%qTraky4^(etkjCpl&4D16al~+w zIGR2ucLhU+0r#J#`8B;s3n;jm!6mvgT$y&XV5Q;Ftqh(bukf*4(IMwqTW~wa9k^2* zkn0_*uv)?09QR=G$$8z12gpK`syeJkqgqJ8gM^q~>5U#E zV@E663_@;<9_Dxi>lkFMS&u{`=7!8xuwLv}T0!+u zZ4585;wdr4dRgYv49sIk9-iUYjAz9v>o9pM`G{@epmlV1E8-l_nKTO;0(v;2AR+Q? z1uQAbYz0}{4T2PQDR`b^H}){(i*>eqvC=kNeu3jf>=XNJgRLpN%&{K_#3@^;e30W+ zye3B2FDCpAjyLg^SY*Fkew*VRyepFS(q4!0zJd>ojvq4g7wa8P5pyV_z)>uJ#PKmc z5mOwc*2DOW<8yo=);K)!R~%pC8?oQvjpuT&h1JIcnVVVpQG5%A@91!(VFH}^9>@Nj zPei_9O?}FTsuQv?u?v&Rq>=R(Hhhj+3N1CR64R7h$|R>$>`vge1nz3E4Mg0I8{@lS68WLz{sS9@iRAzQ delta 1535 zcmZ8hdsGx<6#sqf?9A@$hr$2}ltLM5%OX9@6O@{VB1_oJAVe}NZ(c7<+uw^%1xq@{Pq zW=J;OxpQ^DZZzrv1*;g`VmR5Ys%XWvW{Xyfwel24E3W6b0XK@Ba-HjDtWj_a$E}zn zW-5~w-$q)kzEC1xzqNU5`7pWl0HK&^3I(v=!v5>Vm^t z(2x0>i7tiK)WAG3UK`)y#i^*oR4l-0w8uq+oIzMI>To*k=``#olIf5!nednE ze15?JNE9RCR~#fC3Bhmpoviuv2mZ8J7UD1RCE;)Kj)!yzUIm#7#wsWsH4GPQ3OJpo zlNU@OLA$l=mPP#tcs&IJSORQ8T@tE#&_Kr+kiasJc16J!TxmmQc>pi+^XTCtBBu!`E0 zMAkEiwrY1D?kdYqprZrHgXpZ*?(f5cL*#gDWy1HhfS2*(40`!AV0(fuGI+ z919)!G_d^;YtkpQw51Rq-9ICIgESn8-kI&z9!=o!GIxIdHYsqjmXW}ia#Mqr+>gDcv))IZ_AF{&SR#^A{BaYYm@m3srd$2cw599b$3}#GWo#MxgQ$}~f!Sdi_6WAo? GM%F(