diff --git a/cpp/submodules/parquet-testing b/cpp/submodules/parquet-testing
index 600d437de0e8b..7175a47133970 160000
--- a/cpp/submodules/parquet-testing
+++ b/cpp/submodules/parquet-testing
@@ -1 +1 @@
-Subproject commit 600d437de0e8b0e9927c87e76f844a1b385b02e8
+Subproject commit 7175a471339704c7645af0fe66c68305e2e6759c
diff --git a/java/adapter/avro/pom.xml b/java/adapter/avro/pom.xml
index a942960949365..73d5efc688882 100644
--- a/java/adapter/avro/pom.xml
+++ b/java/adapter/avro/pom.xml
@@ -16,7 +16,7 @@
org.apache.arrow
arrow-java-root
- 6.0.0
+ 6.0.100
../../pom.xml
diff --git a/java/adapter/jdbc/pom.xml b/java/adapter/jdbc/pom.xml
index cc799f145c667..f195559adbacd 100644
--- a/java/adapter/jdbc/pom.xml
+++ b/java/adapter/jdbc/pom.xml
@@ -16,7 +16,7 @@
org.apache.arrow
arrow-java-root
- 6.0.0
+ 6.0.100
../../pom.xml
diff --git a/java/adapter/orc/pom.xml b/java/adapter/orc/pom.xml
index cf2695e48c895..f0f4469f5e5bf 100644
--- a/java/adapter/orc/pom.xml
+++ b/java/adapter/orc/pom.xml
@@ -87,7 +87,7 @@
org.apache.arrow
arrow-java-root
- 6.0.0
+ 6.0.100
../../pom.xml
diff --git a/java/algorithm/pom.xml b/java/algorithm/pom.xml
index 8dcb5ed9c102f..79dad7a8b792f 100644
--- a/java/algorithm/pom.xml
+++ b/java/algorithm/pom.xml
@@ -14,7 +14,7 @@
org.apache.arrow
arrow-java-root
- 6.0.0
+ 6.0.100
arrow-algorithm
Arrow Algorithms
diff --git a/java/c/pom.xml b/java/c/pom.xml
index b2933b581dba7..5ea3c04e8e742 100644
--- a/java/c/pom.xml
+++ b/java/c/pom.xml
@@ -13,7 +13,7 @@
arrow-java-root
org.apache.arrow
- 6.0.0
+ 6.0.100
4.0.0
diff --git a/java/compression/pom.xml b/java/compression/pom.xml
index e5787cdc6f7f0..0462f15080f96 100644
--- a/java/compression/pom.xml
+++ b/java/compression/pom.xml
@@ -14,7 +14,7 @@
org.apache.arrow
arrow-java-root
- 6.0.0
+ 6.0.100
arrow-compression
Arrow Compression
diff --git a/java/dataset/pom.xml b/java/dataset/pom.xml
index 9e1871c1b535b..086ef6ff47797 100644
--- a/java/dataset/pom.xml
+++ b/java/dataset/pom.xml
@@ -15,7 +15,7 @@
arrow-java-root
org.apache.arrow
- 6.0.0
+ 6.0.100
4.0.0
diff --git a/java/flight/flight-core/pom.xml b/java/flight/flight-core/pom.xml
index e01a59ec8ab21..4b38719a8ddf7 100644
--- a/java/flight/flight-core/pom.xml
+++ b/java/flight/flight-core/pom.xml
@@ -14,7 +14,7 @@
org.apache.arrow
arrow-java-root
- 6.0.0
+ 6.0.100
../../pom.xml
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/ArrowMessage.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/ArrowMessage.java
index b4ee835dee4a0..af660c6afced3 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/ArrowMessage.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/ArrowMessage.java
@@ -17,6 +17,7 @@
package org.apache.arrow.flight;
+import io.netty.buffer.PooledByteBufAllocator;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -130,15 +131,23 @@ public static HeaderType getHeader(byte b) {
// Pre-allocated buffers for padding serialized ArrowMessages.
private static final List PADDING_BUFFERS = Arrays.asList(
null,
- Unpooled.copiedBuffer(new byte[] { 0 }),
- Unpooled.copiedBuffer(new byte[] { 0, 0 }),
- Unpooled.copiedBuffer(new byte[] { 0, 0, 0 }),
- Unpooled.copiedBuffer(new byte[] { 0, 0, 0, 0 }),
- Unpooled.copiedBuffer(new byte[] { 0, 0, 0, 0, 0 }),
- Unpooled.copiedBuffer(new byte[] { 0, 0, 0, 0, 0, 0 }),
- Unpooled.copiedBuffer(new byte[] { 0, 0, 0, 0, 0, 0, 0 })
+ paddingBuf(1),
+ paddingBuf(2),
+ paddingBuf(3),
+ paddingBuf(4),
+ paddingBuf(5),
+ paddingBuf(6),
+ paddingBuf(7)
);
+ private static ByteBuf paddingBuf(int size) {
+ ByteBuf byteBuf = Unpooled.directBuffer(size, size);
+ byte[] padding = new byte[size];
+ Arrays.fill(padding, (byte) 0);
+ byteBuf.writeBytes(padding);
+ return byteBuf;
+ }
+
private final IpcOption writeOption;
private final FlightDescriptor descriptor;
private final MessageMetadataResult message;
@@ -435,10 +444,10 @@ private InputStream asInputStream(BufferAllocator allocator) {
cos.writeUInt32NoTag(size);
cos.flush();
- ByteBuf initialBuf = Unpooled.buffer(baos.size());
+ ByteBuf initialBuf = Unpooled.directBuffer(baos.size());
initialBuf.writeBytes(baos.toByteArray());
final CompositeByteBuf bb;
- final int maxNumComponents = Math.max(2, bufs.size() + 1);
+ final int maxNumComponents = Math.max(2, allBufs.size() * 3);
final ImmutableList byteBufs = ImmutableList.builder()
.add(initialBuf)
.addAll(allBufs)
diff --git a/java/flight/flight-grpc/pom.xml b/java/flight/flight-grpc/pom.xml
index 539b4b537d251..5915796139758 100644
--- a/java/flight/flight-grpc/pom.xml
+++ b/java/flight/flight-grpc/pom.xml
@@ -13,7 +13,7 @@
arrow-java-root
org.apache.arrow
- 6.0.0
+ 6.0.100
../../pom.xml
4.0.0
diff --git a/java/format/pom.xml b/java/format/pom.xml
index fcb2709c8eaef..35448dd54fad2 100644
--- a/java/format/pom.xml
+++ b/java/format/pom.xml
@@ -15,7 +15,7 @@
arrow-java-root
org.apache.arrow
- 6.0.0
+ 6.0.100
arrow-format
diff --git a/java/gandiva/pom.xml b/java/gandiva/pom.xml
index fbf5cd82b0548..b0056a769c146 100644
--- a/java/gandiva/pom.xml
+++ b/java/gandiva/pom.xml
@@ -14,7 +14,7 @@
org.apache.arrow
arrow-java-root
- 6.0.0
+ 6.0.100
org.apache.arrow.gandiva
diff --git a/java/memory/memory-core/pom.xml b/java/memory/memory-core/pom.xml
index 0e4db824c221b..253abe731e471 100644
--- a/java/memory/memory-core/pom.xml
+++ b/java/memory/memory-core/pom.xml
@@ -13,7 +13,7 @@
arrow-memory
org.apache.arrow
- 6.0.0
+ 6.0.100
4.0.0
diff --git a/java/memory/memory-netty/pom.xml b/java/memory/memory-netty/pom.xml
index 88daf58d59e14..1063de8d3ccb9 100644
--- a/java/memory/memory-netty/pom.xml
+++ b/java/memory/memory-netty/pom.xml
@@ -13,7 +13,7 @@
arrow-memory
org.apache.arrow
- 6.0.0
+ 6.0.100
4.0.0
diff --git a/java/memory/memory-unsafe/pom.xml b/java/memory/memory-unsafe/pom.xml
index 9c4520d2f57c6..fc740951c1e70 100644
--- a/java/memory/memory-unsafe/pom.xml
+++ b/java/memory/memory-unsafe/pom.xml
@@ -13,7 +13,7 @@
arrow-memory
org.apache.arrow
- 6.0.0
+ 6.0.100
4.0.0
diff --git a/java/memory/pom.xml b/java/memory/pom.xml
index c060bff3cbf41..e34dcea6a6560 100644
--- a/java/memory/pom.xml
+++ b/java/memory/pom.xml
@@ -14,7 +14,7 @@
org.apache.arrow
arrow-java-root
- 6.0.0
+ 6.0.100
arrow-memory
Arrow Memory
diff --git a/java/performance/pom.xml b/java/performance/pom.xml
index b6c8be7c44f52..1f29cbe4330eb 100644
--- a/java/performance/pom.xml
+++ b/java/performance/pom.xml
@@ -14,7 +14,7 @@
arrow-java-root
org.apache.arrow
- 6.0.0
+ 6.0.100
arrow-performance
jar
@@ -86,7 +86,7 @@
org.apache.arrow
arrow-algorithm
- 6.0.0
+ 6.0.100
test
diff --git a/java/plasma/pom.xml b/java/plasma/pom.xml
index c6208520e0502..ee67a46b3ec0b 100644
--- a/java/plasma/pom.xml
+++ b/java/plasma/pom.xml
@@ -14,7 +14,7 @@
org.apache.arrow
arrow-java-root
- 6.0.0
+ 6.0.100
arrow-plasma
Arrow Plasma Client
diff --git a/java/pom.xml b/java/pom.xml
index b249282cd7ee0..2e95259a10c79 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -20,7 +20,7 @@
org.apache.arrow
arrow-java-root
- 6.0.0
+ 6.0.100
pom
Apache Arrow Java Root POM
diff --git a/java/tools/pom.xml b/java/tools/pom.xml
index da47c0852bc63..fb6446583e603 100644
--- a/java/tools/pom.xml
+++ b/java/tools/pom.xml
@@ -14,7 +14,7 @@
org.apache.arrow
arrow-java-root
- 6.0.0
+ 6.0.100
arrow-tools
Arrow Tools
diff --git a/java/vector/pom.xml b/java/vector/pom.xml
index 5c92014307d2e..b881c23543f06 100644
--- a/java/vector/pom.xml
+++ b/java/vector/pom.xml
@@ -14,7 +14,7 @@
org.apache.arrow
arrow-java-root
- 6.0.0
+ 6.0.100
arrow-vector
Arrow Vectors
diff --git a/testing b/testing
index a60b715263d9b..d315f7985207d 160000
--- a/testing
+++ b/testing
@@ -1 +1 @@
-Subproject commit a60b715263d9bbf7e744527fb0c084b693f58043
+Subproject commit d315f7985207d2d67fc2c8e41053e9d97d573f4b