You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by rs...@apache.org on 2021/03/09 17:34:59 UTC

[avro] branch branch-1.10 updated (56de625 -> 8111cdc)

This is an automated email from the ASF dual-hosted git repository.

rskraba pushed a change to branch branch-1.10
in repository https://gitbox.apache.org/repos/asf/avro.git.


    from 56de625  AVRO-3069: Ignore modified files after build
     new 806667c  AVRO-3072: Use ZSTD NoFinalizer classes and bump to 1.4.9-1 (#1129)
     new 8111cdc  AVRO-3073: Bump velocity-engine-core from 2.2 to 2.3 in /lang/java

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../avro/src/main/java/org/apache/avro/file/ZstandardLoader.java  | 8 ++++----
 lang/java/pom.xml                                                 | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)


[avro] 02/02: AVRO-3073: Bump velocity-engine-core from 2.2 to 2.3 in /lang/java

Posted by rs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rskraba pushed a commit to branch branch-1.10
in repository https://gitbox.apache.org/repos/asf/avro.git

commit 8111cdc35430ff68dcb644306362859de40999d9
Author: Ryan Skraba <ry...@skraba.com>
AuthorDate: Tue Mar 9 17:34:48 2021 +0100

    AVRO-3073: Bump velocity-engine-core from 2.2 to 2.3 in /lang/java
---
 lang/java/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lang/java/pom.xml b/lang/java/pom.xml
index a03acf7..9b708ea 100644
--- a/lang/java/pom.xml
+++ b/lang/java/pom.xml
@@ -48,7 +48,7 @@
     <thrift.version>0.13.0</thrift.version>
     <slf4j.version>1.7.30</slf4j.version>
     <snappy.version>1.1.8.4</snappy.version>
-    <velocity.version>2.2</velocity.version>
+    <velocity.version>2.3</velocity.version>
     <maven.version>3.3.9</maven.version>
     <ant.version>1.10.9</ant.version>
     <commons-cli.version>1.4</commons-cli.version>


[avro] 01/02: AVRO-3072: Use ZSTD NoFinalizer classes and bump to 1.4.9-1 (#1129)

Posted by rs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rskraba pushed a commit to branch branch-1.10
in repository https://gitbox.apache.org/repos/asf/avro.git

commit 806667cb2b18e45d16fff25514c17a0272db2b2d
Author: Dongjoon Hyun <do...@apache.org>
AuthorDate: Tue Mar 9 07:52:33 2021 -0800

    AVRO-3072: Use ZSTD NoFinalizer classes and bump to 1.4.9-1 (#1129)
---
 .../avro/src/main/java/org/apache/avro/file/ZstandardLoader.java  | 8 ++++----
 lang/java/pom.xml                                                 | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lang/java/avro/src/main/java/org/apache/avro/file/ZstandardLoader.java b/lang/java/avro/src/main/java/org/apache/avro/file/ZstandardLoader.java
index 1819a65..8cfb463 100644
--- a/lang/java/avro/src/main/java/org/apache/avro/file/ZstandardLoader.java
+++ b/lang/java/avro/src/main/java/org/apache/avro/file/ZstandardLoader.java
@@ -25,8 +25,8 @@ import com.github.luben.zstd.BufferPool;
 import com.github.luben.zstd.NoPool;
 import com.github.luben.zstd.RecyclingBufferPool;
 import com.github.luben.zstd.Zstd;
-import com.github.luben.zstd.ZstdInputStream;
-import com.github.luben.zstd.ZstdOutputStream;
+import com.github.luben.zstd.ZstdInputStreamNoFinalizer;
+import com.github.luben.zstd.ZstdOutputStreamNoFinalizer;
 
 /* causes lazier classloader initialization of ZStandard libraries, so that
  * we get NoClassDefFoundError when we try and use the Codec's compress
@@ -35,14 +35,14 @@ final class ZstandardLoader {
 
   static InputStream input(InputStream compressed, boolean useBufferPool) throws IOException {
     BufferPool pool = useBufferPool ? RecyclingBufferPool.INSTANCE : NoPool.INSTANCE;
-    return new ZstdInputStream(compressed, pool);
+    return new ZstdInputStreamNoFinalizer(compressed, pool);
   }
 
   static OutputStream output(OutputStream compressed, int level, boolean checksum, boolean useBufferPool)
       throws IOException {
     int bounded = Math.max(Math.min(level, Zstd.maxCompressionLevel()), Zstd.minCompressionLevel());
     BufferPool pool = useBufferPool ? RecyclingBufferPool.INSTANCE : NoPool.INSTANCE;
-    ZstdOutputStream zstdOutputStream = new ZstdOutputStream(compressed, pool).setLevel(bounded);
+    ZstdOutputStreamNoFinalizer zstdOutputStream = new ZstdOutputStreamNoFinalizer(compressed, pool).setLevel(bounded);
     zstdOutputStream.setCloseFrameOnFlush(false);
     zstdOutputStream.setChecksum(checksum);
     return zstdOutputStream;
diff --git a/lang/java/pom.xml b/lang/java/pom.xml
index 8e576a8..a03acf7 100644
--- a/lang/java/pom.xml
+++ b/lang/java/pom.xml
@@ -58,7 +58,7 @@
     <easymock.version>4.2</easymock.version>
     <hamcrest.version>2.2</hamcrest.version>
     <grpc.version>1.36.0</grpc.version>
-    <zstd-jni.version>1.4.8-7</zstd-jni.version>
+    <zstd-jni.version>1.4.9-1</zstd-jni.version>
     <!-- version properties for plugins -->
     <archetype-plugin.version>3.2.0</archetype-plugin.version>
     <bundle-plugin-version>4.1.0</bundle-plugin-version>