Skip to content

Commit 4c81add

Browse files
Merge remote-tracking branch 'upstream/main' into apachegh-43683-pandas-string-dtype
2 parents 42ecbe8 + 6252e9c commit 4c81add

50 files changed

Lines changed: 836 additions & 152 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/dev_pr/helpers.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const https = require('https');
2020
/**
2121
* Given the title of a PullRequest return the Issue
2222
*
23-
* @param {String} title
23+
* @param {String} title
2424
* @returns {Issue} or null if no issue detected.
2525
*
2626
* @typedef {Object} Issue
@@ -62,6 +62,5 @@ function detectIssue(title) {
6262

6363
module.exports = {
6464
detectIssue,
65-
getJiraInfo,
6665
getGitHubInfo
6766
};

‎.github/workflows/dev_pr/issue_check.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ module.exports = async ({github, context}) => {
7878
const pullRequestNumber = context.payload.number;
7979
const title = context.payload.pull_request.title;
8080
const issue = helpers.detectIssue(title)
81-
if (issue){
81+
if (issue && issue.kind === "github") {
8282
await verifyGitHubIssue(github, context, pullRequestNumber, issue.id);
8383
}
8484
};

‎.github/workflows/dev_pr/link.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ module.exports = async ({github, context}) => {
7777
const pullRequestNumber = context.payload.number;
7878
const title = context.payload.pull_request.title;
7979
const issue = helpers.detectIssue(title);
80-
if (issue){
80+
if (issue && issue.kind === "github") {
8181
await commentGitHubURL(github, context, pullRequestNumber, issue.id);
8282
}
8383
};

‎ci/docker/debian-12-cpp.dockerfile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,11 @@ RUN /arrow/ci/scripts/install_azurite.sh
108108
COPY ci/scripts/install_sccache.sh /arrow/ci/scripts/
109109
RUN /arrow/ci/scripts/install_sccache.sh unknown-linux-musl /usr/local/bin
110110

111+
# Prioritize system packages and local installation.
112+
#
113+
# The following dependencies will be downloaded due to missing/invalid packages
114+
# provided by the distribution:
115+
# - opentelemetry-cpp-dev is not packaged
111116
ENV ARROW_ACERO=ON \
112117
ARROW_AZURE=ON \
113118
ARROW_BUILD_TESTS=ON \
@@ -134,6 +139,7 @@ ENV ARROW_ACERO=ON \
134139
AWSSDK_SOURCE=BUNDLED \
135140
Azure_SOURCE=BUNDLED \
136141
google_cloud_cpp_storage_SOURCE=BUNDLED \
142+
opentelemetry_cpp_SOURCE=BUNDLED \
137143
ORC_SOURCE=BUNDLED \
138144
PATH=/usr/lib/ccache/:$PATH \
139145
PYTHON=python3 \

‎ci/docker/fedora-39-cpp.dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ ENV ARROW_ACERO=ON \
103103
CC=gcc \
104104
CXX=g++ \
105105
google_cloud_cpp_storage_SOURCE=BUNDLED \
106+
opentelemetry_cpp_SOURCE=BUNDLED \
106107
PARQUET_BUILD_EXAMPLES=ON \
107108
PARQUET_BUILD_EXECUTABLES=ON \
108109
PATH=/usr/lib/ccache/:$PATH \

‎ci/docker/ubuntu-20.04-cpp.dockerfile‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,16 +135,19 @@ RUN /arrow/ci/scripts/install_ceph.sh
135135
COPY ci/scripts/install_sccache.sh /arrow/ci/scripts/
136136
RUN /arrow/ci/scripts/install_sccache.sh unknown-linux-musl /usr/local/bin
137137

138-
# Prioritize system packages and local installation
138+
# Prioritize system packages and local installation.
139+
#
139140
# The following dependencies will be downloaded due to missing/invalid packages
140141
# provided by the distribution:
141142
# - Abseil is not packaged
142143
# - libc-ares-dev does not install CMake config files
143144
# - flatbuffer is not packaged
144145
# - libgtest-dev only provide sources
145146
# - libprotobuf-dev only provide sources
147+
# - opentelemetry-cpp-dev is not packaged
148+
#
146149
# ARROW-17051: this build uses static Protobuf, so we must also use
147-
# static Arrow to run Flight/Flight SQL tests
150+
# static Arrow to run Flight/Flight SQL tests.
148151
ENV absl_SOURCE=BUNDLED \
149152
ARROW_ACERO=ON \
150153
ARROW_AZURE=OFF \
@@ -179,6 +182,7 @@ ENV absl_SOURCE=BUNDLED \
179182
google_cloud_cpp_storage_SOURCE=BUNDLED \
180183
gRPC_SOURCE=BUNDLED \
181184
GTest_SOURCE=BUNDLED \
185+
opentelemetry_cpp_SOURCE=BUNDLED \
182186
ORC_SOURCE=BUNDLED \
183187
PARQUET_BUILD_EXAMPLES=ON \
184188
PARQUET_BUILD_EXECUTABLES=ON \

‎ci/docker/ubuntu-22.04-cpp.dockerfile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,11 +184,13 @@ RUN /arrow/ci/scripts/install_azurite.sh
184184
COPY ci/scripts/install_sccache.sh /arrow/ci/scripts/
185185
RUN /arrow/ci/scripts/install_sccache.sh unknown-linux-musl /usr/local/bin
186186

187-
# Prioritize system packages and local installation
187+
# Prioritize system packages and local installation.
188+
#
188189
# The following dependencies will be downloaded due to missing/invalid packages
189190
# provided by the distribution:
190191
# - Abseil is old
191192
# - libc-ares-dev does not install CMake config files
193+
# - opentelemetry-cpp-dev is not packaged
192194
ENV absl_SOURCE=BUNDLED \
193195
ARROW_ACERO=ON \
194196
ARROW_AZURE=ON \
@@ -222,6 +224,7 @@ ENV absl_SOURCE=BUNDLED \
222224
AWSSDK_SOURCE=BUNDLED \
223225
Azure_SOURCE=BUNDLED \
224226
google_cloud_cpp_storage_SOURCE=BUNDLED \
227+
opentelemetry_cpp_SOURCE=BUNDLED \
225228
ORC_SOURCE=BUNDLED \
226229
PARQUET_BUILD_EXAMPLES=ON \
227230
PARQUET_BUILD_EXECUTABLES=ON \

‎ci/docker/ubuntu-24.04-cpp.dockerfile‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,11 @@ RUN /arrow/ci/scripts/install_azurite.sh
172172
COPY ci/scripts/install_sccache.sh /arrow/ci/scripts/
173173
RUN /arrow/ci/scripts/install_sccache.sh unknown-linux-musl /usr/local/bin
174174

175-
# Prioritize system packages and local installation
175+
# Prioritize system packages and local installation.
176+
#
177+
# The following dependencies will be downloaded due to missing/invalid packages
178+
# provided by the distribution:
179+
# - opentelemetry-cpp-dev is not packaged
176180
ENV ARROW_ACERO=ON \
177181
ARROW_AZURE=ON \
178182
ARROW_BUILD_STATIC=ON \
@@ -205,6 +209,7 @@ ENV ARROW_ACERO=ON \
205209
AWSSDK_SOURCE=BUNDLED \
206210
Azure_SOURCE=BUNDLED \
207211
google_cloud_cpp_storage_SOURCE=BUNDLED \
212+
opentelemetry_cpp_SOURCE=BUNDLED \
208213
ORC_SOURCE=BUNDLED \
209214
PARQUET_BUILD_EXAMPLES=ON \
210215
PARQUET_BUILD_EXECUTABLES=ON \

‎ci/scripts/cpp_build.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ else
225225
-DgRPC_SOURCE=${gRPC_SOURCE:-} \
226226
-DGTest_SOURCE=${GTest_SOURCE:-} \
227227
-Dlz4_SOURCE=${lz4_SOURCE:-} \
228+
-Dopentelemetry-cpp_SOURCE=${opentelemetry_cpp_SOURCE:-} \
228229
-DORC_SOURCE=${ORC_SOURCE:-} \
229230
-DPARQUET_BUILD_EXAMPLES=${PARQUET_BUILD_EXAMPLES:-OFF} \
230231
-DPARQUET_BUILD_EXECUTABLES=${PARQUET_BUILD_EXECUTABLES:-OFF} \

‎ci/scripts/integration_spark.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@ if [ "${SPARK_VERSION:1:2}" == "2." ]; then
3232
export ARROW_PRE_0_15_IPC_FORMAT=1
3333
fi
3434

35-
# Get Arrow Java version
36-
pushd ${source_dir}/java
37-
arrow_version=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | sed -n -e '/^\[.*\]/ !{ /^[0-9]/ { p; q } }'`
38-
popd
39-
4035
export MAVEN_OPTS="-Xss256m -Xmx2g -XX:ReservedCodeCacheSize=1g -Dorg.slf4j.simpleLogger.defaultLogLevel=warn"
4136
export MAVEN_OPTS="${MAVEN_OPTS} -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
4237

@@ -47,8 +42,13 @@ pushd ${spark_dir}
4742
build/mvn -B -DskipTests package
4843

4944
# Run pyarrow related Python tests only
45+
# "pyspark.sql.tests.arrow.test_arrow_grouped_map" and
46+
# "pyspark.sql.tests.arrow.test_arrow_cogrouped_map" currently fail.
47+
# See: https://github.com/apache/arrow/issues/44986
5048
spark_python_tests=(
51-
"pyspark.sql.tests.test_arrow")
49+
"pyspark.sql.tests.arrow.test_arrow"
50+
"pyspark.sql.tests.arrow.test_arrow_map"
51+
"pyspark.sql.tests.arrow.test_arrow_python_udf")
5252

5353
case "${SPARK_VERSION}" in
5454
v1.*|v2.*|v3.0.*|v3.1.*|v3.2.*|v3.3.*)

0 commit comments

Comments
 (0)