From e1b593d6c28a562e31f16c300e74768a63029668 Mon Sep 17 00:00:00 2001 From: "Taro L. Saito" Date: Wed, 27 Mar 2013 18:20:05 +0900 Subject: [PATCH 1/5] new snapshot version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 054125b..8b43b3d 100755 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.xerial.snappy snappy-java - 1.1.0-M1 + 1.1.0-M1-SNAPSHOT Snappy for Java snappy-java: A fast compression/decompression library bundle From 64c35c7081376e70ab868babacaed57ba43ecd11 Mon Sep 17 00:00:00 2001 From: "Taro L. Saito" Date: Thu, 28 Mar 2013 12:53:23 +0900 Subject: [PATCH 2/5] Fixes #26. Add throws IOException to rawCompress --- src/main/java/org/xerial/snappy/Snappy.java | 2 +- .../java/org/xerial/snappy/SnappyNative.h | 24 +++++++++++++++++++ .../java/org/xerial/snappy/SnappyNative.java | 2 +- .../org/xerial/snappy/SnappyNativeAPI.java | 2 +- 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/xerial/snappy/Snappy.java b/src/main/java/org/xerial/snappy/Snappy.java index 2247498..96f1670 100755 --- a/src/main/java/org/xerial/snappy/Snappy.java +++ b/src/main/java/org/xerial/snappy/Snappy.java @@ -354,7 +354,7 @@ public class Snappy * the input byte size * @return compressed data */ - public static byte[] rawCompress(Object data, int byteSize) { + public static byte[] rawCompress(Object data, int byteSize) throws IOException { byte[] buf = new byte[Snappy.maxCompressedLength(byteSize)]; int compressedByteSize = ((SnappyNativeAPI) impl).rawCompress(data, 0, byteSize, buf, 0); byte[] result = new byte[compressedByteSize]; diff --git a/src/main/java/org/xerial/snappy/SnappyNative.h b/src/main/java/org/xerial/snappy/SnappyNative.h index 37452d9..477d30a 100755 --- a/src/main/java/org/xerial/snappy/SnappyNative.h +++ b/src/main/java/org/xerial/snappy/SnappyNative.h @@ -15,6 +15,22 @@ extern "C" { JNIEXPORT jstring JNICALL Java_org_xerial_snappy_SnappyNative_nativeLibraryVersion (JNIEnv *, jobject); +/* + * Class: org_xerial_snappy_SnappyNative + * Method: rawCompress + * Signature: (JJJ)J + */ +JNIEXPORT jlong JNICALL Java_org_xerial_snappy_SnappyNative_rawCompress__JJJ + (JNIEnv *, jobject, jlong, jlong, jlong); + +/* + * Class: org_xerial_snappy_SnappyNative + * Method: rawUncompress + * Signature: (JJJ)J + */ +JNIEXPORT jlong JNICALL Java_org_xerial_snappy_SnappyNative_rawUncompress__JJJ + (JNIEnv *, jobject, jlong, jlong, jlong); + /* * Class: org_xerial_snappy_SnappyNative * Method: rawCompress @@ -71,6 +87,14 @@ JNIEXPORT jint JNICALL Java_org_xerial_snappy_SnappyNative_uncompressedLength__L JNIEXPORT jint JNICALL Java_org_xerial_snappy_SnappyNative_uncompressedLength__Ljava_lang_Object_2II (JNIEnv *, jobject, jobject, jint, jint); +/* + * Class: org_xerial_snappy_SnappyNative + * Method: uncompressedLength + * Signature: (JJ)J + */ +JNIEXPORT jlong JNICALL Java_org_xerial_snappy_SnappyNative_uncompressedLength__JJ + (JNIEnv *, jobject, jlong, jlong); + /* * Class: org_xerial_snappy_SnappyNative * Method: isValidCompressedBuffer diff --git a/src/main/java/org/xerial/snappy/SnappyNative.java b/src/main/java/org/xerial/snappy/SnappyNative.java index 3c9acf5..fdcb617 100755 --- a/src/main/java/org/xerial/snappy/SnappyNative.java +++ b/src/main/java/org/xerial/snappy/SnappyNative.java @@ -54,7 +54,7 @@ public class SnappyNative implements SnappyNativeAPI public native int rawCompress(ByteBuffer input, int inputOffset, int inputLength, ByteBuffer compressed, int outputOffset) throws IOException; - public native int rawCompress(Object input, int inputOffset, int inputByteLength, Object output, int outputOffset); + public native int rawCompress(Object input, int inputOffset, int inputByteLength, Object output, int outputOffset) throws IOException; public native int rawUncompress(ByteBuffer compressed, int inputOffset, int inputLength, ByteBuffer uncompressed, int outputOffset) throws IOException; diff --git a/src/main/java/org/xerial/snappy/SnappyNativeAPI.java b/src/main/java/org/xerial/snappy/SnappyNativeAPI.java index 902e22e..b6c92d0 100755 --- a/src/main/java/org/xerial/snappy/SnappyNativeAPI.java +++ b/src/main/java/org/xerial/snappy/SnappyNativeAPI.java @@ -51,7 +51,7 @@ public interface SnappyNativeAPI public int rawCompress(ByteBuffer input, int inputOffset, int inputLength, ByteBuffer compressed, int outputOffset) throws IOException; - public int rawCompress(Object input, int inputOffset, int inputByteLength, Object output, int outputOffset); + public int rawCompress(Object input, int inputOffset, int inputByteLength, Object output, int outputOffset) throws IOException; public int rawUncompress(ByteBuffer compressed, int inputOffset, int inputLength, ByteBuffer uncompressed, int outputOffset) throws IOException; From 1f0d7bd6cd3eeaef145ea989bed8073f497d8624 Mon Sep 17 00:00:00 2001 From: "Taro L. Saito" Date: Thu, 28 Mar 2013 13:02:27 +0900 Subject: [PATCH 3/5] #26. Add throws IOException to compress methods --- src/main/java/org/xerial/snappy/Snappy.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/xerial/snappy/Snappy.java b/src/main/java/org/xerial/snappy/Snappy.java index 96f1670..dbc29c8 100755 --- a/src/main/java/org/xerial/snappy/Snappy.java +++ b/src/main/java/org/xerial/snappy/Snappy.java @@ -151,7 +151,7 @@ public class Snappy * @param input * @return the compressed data */ - public static byte[] compress(char[] input) { + public static byte[] compress(char[] input) throws IOException { return rawCompress(input, input.length * 2); // char uses 2 bytes } @@ -161,7 +161,7 @@ public class Snappy * @param input * @return the compressed data */ - public static byte[] compress(double[] input) { + public static byte[] compress(double[] input) throws IOException { return rawCompress(input, input.length * 8); // double uses 8 bytes } @@ -171,7 +171,7 @@ public class Snappy * @param input * @return the compressed data */ - public static byte[] compress(float[] input) { + public static byte[] compress(float[] input) throws IOException { return rawCompress(input, input.length * 4); // float uses 4 bytes } @@ -181,7 +181,7 @@ public class Snappy * @param input * @return the compressed data */ - public static byte[] compress(int[] input) { + public static byte[] compress(int[] input) throws IOException { return rawCompress(input, input.length * 4); // int uses 4 bytes } @@ -191,7 +191,7 @@ public class Snappy * @param input * @return the compressed data */ - public static byte[] compress(long[] input) { + public static byte[] compress(long[] input) throws IOException { return rawCompress(input, input.length * 8); // long uses 8 bytes } @@ -201,7 +201,7 @@ public class Snappy * @param input * @return the compressed data */ - public static byte[] compress(short[] input) { + public static byte[] compress(short[] input) throws IOException { return rawCompress(input, input.length * 2); // short uses 2 bytes } From 0b48e2db4a319f54583f7e09c7eb16f3212b6904 Mon Sep 17 00:00:00 2001 From: "Taro L. Saito" Date: Thu, 28 Mar 2013 15:02:20 +0900 Subject: [PATCH 4/5] version 1.1.0-M2. Fixes linux amd64 build --- pom.xml | 2 +- .../native/Linux/amd64/libsnappyjava.so | Bin 44680 -> 44616 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8b43b3d..d48d5a8 100755 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.xerial.snappy snappy-java - 1.1.0-M1-SNAPSHOT + 1.1.0-M2 Snappy for Java snappy-java: A fast compression/decompression library bundle diff --git a/src/main/resources/org/xerial/snappy/native/Linux/amd64/libsnappyjava.so b/src/main/resources/org/xerial/snappy/native/Linux/amd64/libsnappyjava.so index 83f5e4f322766499daa4b21c362806e1e8cc3953..62f164c59fd9d130a5f566479b54490597d2929d 100755 GIT binary patch delta 3683 zcmZ9P4Nz3q702&+3%GCPV;7Z&CbDm-xMGMbc4YmCvZA$M)FCa7nD~WO#inZPkkkki ztcij85%9!@Ofzv8FaZU{dFhloHnW-7XqrfwW-`^bNtY%~cbmk3)7nhNWP9#?_u0+f znZ4)z{^#89yZ64=`o41YuS$EaD>9jh6fg~I?I`q@JQXs@vW)3M0Ls(o*DC$3A)Sc0 zqr>acyTvopyLIuPcf93w*^ipyU5fzQz=hjkGi2iLzzvh|AMkyw0(-}DCsrxW)NCqY z!|lqqR92~qhT?SHYy8OwlTL)2MlikCm9RM|!)Y9+bKq zDSJlrLI#ofImPj`5ig_^tH*3+Z2^p>co%#iDN<_2yki=6L)Pt^YYMMQeW&cHj+LqF z7A%w_9FtMEWz^B69(2ndyhpl|jmL-ZMyl6y(klIJvskH&S}XgcqbE&MA{s7Cn+f~) zR5(Uu1<_aVXC%Ie<7t{Ye7DxO(!6k>0)r zYQBOe$r+xQL*jCyIDH#nM~0iK0tWc2j74Ih=$Ty>)tfu;@oBqgQ`p$Yr11nyVN0Z+ z^SkFCB}!qpq*h;e!pD;a+^r1LOFqDbK`UD%P3X)RsPVdh4;p5$oB5%DaNqz9xP zP11c*x66jC1|pK3$@&zt{@kuCT|8L@f_N}f!;vgI%);6%4Sd*dRuX6rdHUV6f-Ejoyj_eva|&)@=r99iA6Zg5a=Bu(7{8XGEN|@P5f^LnJd#)$wa&L$Nkp$gqRw43U zIU3%6QG#wab)1mxn(CA>y#17fm|QH$)~4zSUU8zz2--*F^(A;S63WiU4)O*PysiXq z1-_oGVQzMMhTJH^SA*lER**V9A+`=ZlQi57SE17%2>sr%l0?o^B(TdS-fBaU`5k8Kg0&6!Vo ztV*zhvx9R$u)=vFXP@9N+lkXT>w<4_<_ohi<`lxexRA*MnBc#2&f+}wH3kmQV#jXwkeAMZsVz(qLTGr#pCT2$5MZDL}wLk6JnK; zW0Dt0z9G2~@8tX#p1{3Y5me%f+C6YT4r!a=nvt8k8K4RGPhAAH#;a2=02CWL?s>rm zCr`NNmMQ;<$19Fy*mlsG9-H^+7H$?-*D`jom9O=O{}%42O!vvH!d=JRHPrFwW!&e^ zgVWef`C&Xy`A!_ByaGR?yb#m%JaFKBlz)ONDSrodQ9gjJlpn`e^pjABi#^L=G9L7- zf3Dr=v>Xr3JOOUZ@#f_)UajSAd&3N9FjjhB2I#@@Sv%nYV}0Rw6!-<6y6}XdH8Ez5qOM`e9KhWZOmGD5ooPHTvV>W-;9|{LUtH1uCC}; zpxt=9@`??v8jDwdng)L{W>;^s!B33i>n;IY#0S?m(41Xap9gN^EJ1dKXc9=2i z%H#(gPyE%0CyQ4nF@Lq zuI!mZ^ZjIx8_My8o}IuDPJ7jGNat}(=RIvcCu@F9+F@xwkoKmuUrU=Qze@6?og?iM zY1c@*N!mTq{#4rI(!ONcY3!U7UXylM+MqFd`ieqh?CUL7%jLk!akSU3_DbqSPoLlM zg(MpA*1l4QH4j5B?CL93t(j}V(LTT0DM!(Xo-=-j^@SCgj9br?s@5k+4TjG6?=CMD zB>MkXlIN^n4LmDmkOi>ztlx1bXwsb^cAYI%TSL0wRve|!PD#{aKlNNvFV^<^9o9;O zL)g_{s^0xP!_j`f%X+&C_lVk<50}z^BruTc8tc)8G$uWR!qYO4t6FbVK@1J})v$a= U7{bwkG8jV7xiUJJYR`H92O{o8Z2$lO delta 3780 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 From 733a2f3c102973017e4eaf0a7d606601f0ff4cb9 Mon Sep 17 00:00:00 2001 From: "Taro L. Saito" Date: Thu, 28 Mar 2013 15:06:55 +0900 Subject: [PATCH 5/5] Edit milesgone --- Milestone.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Milestone.md b/Milestone.md index 9a1781a..afc50e1 100644 --- a/Milestone.md +++ b/Milestone.md @@ -2,7 +2,11 @@ * `SnappyIndexer` for parallel compression/decompression * CUI commands (snap/unsnap) -## snappy-java-1.1.0-M1 (27 March, 2013) +## snappy-java-1.1.0-M2 (28 March 2013) + * Fix linux amd64 build + * Fixes #26 + +## snappy-java-1.1.0-M1 (27 March 2013) * Upgrade to snappy-1.1.0 * Add zero-copy compression (rawCompress, rawUncompress) that can be used with LArray * Drop 32-bit Mac support