Skip to content

Commit 96c394f

Browse files
BryanCutlerrshkv
authored andcommitted
[SPARK-29376][SQL][PYTHON] Upgrade Apache Arrow to version 0.15.1
Upgrade Apache Arrow to version 0.15.1. This includes Java artifacts and increases the minimum required version of PyArrow also. Version 0.12.0 to 0.15.1 includes the following selected fixes/improvements relevant to Spark users: * ARROW-6898 - [Java] Fix potential memory leak in ArrowWriter and several test classes * ARROW-6874 - [Python] Memory leak in Table.to_pandas() when conversion to object dtype * ARROW-5579 - [Java] shade flatbuffer dependency * ARROW-5843 - [Java] Improve the readability and performance of BitVectorHelper#getNullCount * ARROW-5881 - [Java] Provide functionalities to efficiently determine if a validity buffer has completely 1 bits/0 bits * ARROW-5893 - [C++] Remove arrow::Column class from C++ library * ARROW-5970 - [Java] Provide pointer to Arrow buffer * ARROW-6070 - [Java] Avoid creating new schema before IPC sending * ARROW-6279 - [Python] Add Table.slice method or allow slices in \_\_getitem\_\_ * ARROW-6313 - [Format] Tracking for ensuring flatbuffer serialized values are aligned in stream/files. * ARROW-6557 - [Python] Always return pandas.Series from Array/ChunkedArray.to_pandas, propagate field names to Series from RecordBatch, Table * ARROW-2015 - [Java] Use Java Time and Date APIs instead of JodaTime * ARROW-1261 - [Java] Add container type for Map logical type * ARROW-1207 - [C++] Implement Map logical type Changelog can be seen at https://arrow.apache.org/release/0.15.0.html Upgrade to get bug fixes, improvements, and maintain compatibility with future versions of PyArrow. No Existing tests, manually tested with Python 3.7, 3.8 Closes apache#26133 from BryanCutler/arrow-upgrade-015-SPARK-29376. Authored-by: Bryan Cutler <[email protected]> Signed-off-by: HyukjinKwon <[email protected]>
1 parent c2daee4 commit 96c394f

File tree

5 files changed

+15
-12
lines changed

5 files changed

+15
-12
lines changed

dev/deps/spark-deps-hadoop-palantir

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ apacheds-kerberos-codec-2.0.0-M15.jar
1010
api-asn1-api-1.0.0-M20.jar
1111
api-util-1.0.0-M20.jar
1212
arpack_combined_all-0.1.jar
13-
arrow-format-0.12.0.jar
14-
arrow-memory-0.12.0.jar
15-
arrow-vector-0.12.0.jar
13+
arrow-format-0.15.1.jar
14+
arrow-memory-0.15.1.jar
15+
arrow-vector-0.15.1.jar
1616
audience-annotations-0.7.0.jar
1717
automaton-1.11-8.jar
1818
avro-1.8.2.jar
@@ -87,7 +87,6 @@ hibernate-validator-5.2.4.Final.jar
8787
hk2-api-2.5.0-b32.jar
8888
hk2-locator-2.5.0-b32.jar
8989
hk2-utils-2.5.0-b32.jar
90-
hppc-0.7.2.jar
9190
htrace-core4-4.1.0-incubating.jar
9291
httpclient-4.5.6.jar
9392
httpcore-4.4.10.jar

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,9 @@
219219
<commons-crypto.version>1.0.0</commons-crypto.version>
220220
<!--
221221
If you are changing Arrow version specification, please check ./python/pyspark/sql/utils.py,
222-
./python/run-tests.py and ./python/setup.py too.
222+
and ./python/setup.py too.
223223
-->
224-
<arrow.version>0.12.0</arrow.version>
224+
<arrow.version>0.15.1</arrow.version>
225225

226226
<!-- Async shuffle upload plugin dependency versions -->
227227
<safe-logging.version>1.13.0</safe-logging.version>

python/pyspark/sql/utils.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,10 @@ def require_minimum_pyarrow_version():
136136
""" Raise ImportError if minimum version of pyarrow is not installed
137137
"""
138138
# TODO(HyukjinKwon): Relocate and deduplicate the version specification.
139-
minimum_pyarrow_version = "0.12.1"
139+
minimum_pyarrow_version = "0.15.1"
140140

141141
from distutils.version import LooseVersion
142+
import os
142143
try:
143144
import pyarrow
144145
have_arrow = True
@@ -150,6 +151,9 @@ def require_minimum_pyarrow_version():
150151
if LooseVersion(pyarrow.__version__) < LooseVersion(minimum_pyarrow_version):
151152
raise ImportError("PyArrow >= %s must be installed; however, "
152153
"your version was %s." % (minimum_pyarrow_version, pyarrow.__version__))
154+
if os.environ.get("ARROW_PRE_0_15_IPC_FORMAT", "0") == "1":
155+
raise RuntimeError("Arrow legacy IPC format is not supported in PySpark, "
156+
"please unset ARROW_PRE_0_15_IPC_FORMAT")
153157

154158

155159
def require_test_compiled():

python/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ def _supports_symlinks():
104104
# For Arrow, you should also check ./pom.xml and ensure there are no breaking changes in the
105105
# binary format protocol with the Java version, see ARROW_HOME/format/* for specifications.
106106
_minimum_pandas_version = "0.19.2"
107-
_minimum_pyarrow_version = "0.12.1"
107+
_minimum_pyarrow_version = "0.15.1"
108108

109109
try:
110110
# We copy the shell script to be under pyspark/python/pyspark so that the launcher scripts

sql/core/src/main/scala/org/apache/spark/sql/execution/arrow/ArrowConverters.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import org.apache.arrow.flatbuf.MessageHeader
2626
import org.apache.arrow.memory.BufferAllocator
2727
import org.apache.arrow.vector._
2828
import org.apache.arrow.vector.ipc.{ArrowStreamWriter, ReadChannel, WriteChannel}
29-
import org.apache.arrow.vector.ipc.message.{ArrowRecordBatch, MessageSerializer}
29+
import org.apache.arrow.vector.ipc.message.{ArrowRecordBatch, IpcOption, MessageSerializer}
3030

3131
import org.apache.spark.TaskContext
3232
import org.apache.spark.api.java.JavaRDD
@@ -63,7 +63,7 @@ private[sql] class ArrowBatchStreamWriter(
6363
* End the Arrow stream, does not close output stream.
6464
*/
6565
def end(): Unit = {
66-
ArrowStreamWriter.writeEndOfStream(writeChannel)
66+
ArrowStreamWriter.writeEndOfStream(writeChannel, new IpcOption)
6767
}
6868
}
6969

@@ -250,8 +250,8 @@ private[sql] object ArrowConverters {
250250
// Only care about RecordBatch messages, skip Schema and unsupported Dictionary messages
251251
if (msgMetadata.getMessage.headerType() == MessageHeader.RecordBatch) {
252252

253-
// Buffer backed output large enough to hold the complete serialized message
254-
val bbout = new ByteBufferOutputStream(4 + msgMetadata.getMessageLength + bodyLength)
253+
// Buffer backed output large enough to hold 8-byte length + complete serialized message
254+
val bbout = new ByteBufferOutputStream(8 + msgMetadata.getMessageLength + bodyLength)
255255

256256
// Write message metadata to ByteBuffer output stream
257257
MessageSerializer.writeMessageBuffer(

0 commit comments

Comments
 (0)