This is an automated email from the ASF dual-hosted git repository.
dzamo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git
The following commit(s) were added to refs/heads/master by this push:
new 0f71146bad DRILL-8467: Update Netty to 4.1.101 (#2857)
0f71146bad is described below
commit 0f71146badea0b911e64504d04c1081d992b385e
Author: Maksym Rymar <[email protected]>
AuthorDate: Tue Jan 2 16:26:17 2024 +0200
DRILL-8467: Update Netty to 4.1.101 (#2857)
* Update Netty to 4.1.101
* Bump up the jdbc-all size limit in the hadoop-2 profile
---
exec/jdbc-all/pom.xml | 2 +-
.../src/main/java/io/netty/buffer/PooledByteBufAllocatorL.java | 9 ++++++++-
pom.xml | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/exec/jdbc-all/pom.xml b/exec/jdbc-all/pom.xml
index c61437c992..c181bd1d9d 100644
--- a/exec/jdbc-all/pom.xml
+++ b/exec/jdbc-all/pom.xml
@@ -882,7 +882,7 @@
<profile>
<id>hadoop-2</id>
<properties>
- <jdbc-all-jar.maxsize>54000000</jdbc-all-jar.maxsize>
+ <jdbc-all-jar.maxsize>54100000</jdbc-all-jar.maxsize>
</properties>
</profile>
</profiles>
diff --git
a/exec/memory/base/src/main/java/io/netty/buffer/PooledByteBufAllocatorL.java
b/exec/memory/base/src/main/java/io/netty/buffer/PooledByteBufAllocatorL.java
index bee3beb9bc..d5f4ee3e35 100644
---
a/exec/memory/base/src/main/java/io/netty/buffer/PooledByteBufAllocatorL.java
+++
b/exec/memory/base/src/main/java/io/netty/buffer/PooledByteBufAllocatorL.java
@@ -90,7 +90,14 @@ public class PooledByteBufAllocatorL {
@SuppressWarnings("unchecked")
public InnerAllocator() {
- super(true);
+ super(true,
+ PooledByteBufAllocator.defaultNumHeapArena(),
+ PooledByteBufAllocator.defaultNumDirectArena(),
+ PooledByteBufAllocator.defaultPageSize(),
+ Integer.getInteger("io.netty.allocator.maxOrder", 11),
+ PooledByteBufAllocator.defaultSmallCacheSize(),
+ PooledByteBufAllocator.defaultNormalCacheSize(),
+
Boolean.parseBoolean(System.getProperty("io.netty.allocator.useCacheForAllThreads",
"true")));
try {
Field f =
PooledByteBufAllocator.class.getDeclaredField("directArenas");
diff --git a/pom.xml b/pom.xml
index b8defc9467..ea258bc727 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,7 @@
<jna.version>5.13.0</jna.version>
<commons.compress.version>1.25.0</commons.compress.version>
<hikari.version>4.0.3</hikari.version>
- <netty.version>4.1.73.Final</netty.version>
+ <netty.version>4.1.101.Final</netty.version>
<httpclient.version>4.5.14</httpclient.version>
<libthrift.version>0.18.1</libthrift.version>
<derby.version>10.14.2.0</derby.version>
