Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
7c19398
Bring protegrity/arrow main branch up to date (#210)
sofia-tekdatum Nov 19, 2025
bff0be5
Merging all changes to python code
sofia-tekdatum Dec 7, 2025
d23a165
Adding rest of modified files in Parquet PME Encryption Extension pro…
sofia-tekdatum Dec 15, 2025
da3bbe5
Bringing base_app up to date
sofia-tekdatum Dec 15, 2025
310d2ab
Addressing review comments
sofia-tekdatum Dec 17, 2025
7d9138b
Updated Thrift version
sofia-tekdatum Dec 17, 2025
134ccdf
Returning test to cmake file
sofia-tekdatum Dec 17, 2025
48d2e6d
Adding necessary boost packages to Ubuntu images (CI/Github Actions)
argmarco-tkd Dec 17, 2025
c6727f2
Updating to the latest version (SHA/tag) of DBPS
argmarco-tkd Dec 18, 2025
7f23e43
Updating dbpa_executor_test.cc and dbpa_library_wrapper_test.cc to la…
argmarco-tkd Dec 18, 2025
56463c1
Updated the type of 'key_size' in Get*AesEncryptor() to make the comp…
argmarco-tkd Dec 18, 2025
13b21c9
Adding size checks to make the compiler happy (external_dbpa_encrypti…
argmarco-tkd Dec 18, 2025
37968f7
Updating dbpa_library_wrapper_test.cc to avoid type-shortening errors…
argmarco-tkd Dec 18, 2025
dc342ce
Preventing type-shortening errors from the compiler
argmarco-tkd Dec 18, 2025
7375bb5
Removing external_dbpa_encryption_integ_test.cc
argmarco-tkd Dec 18, 2025
537de52
Ensuring that memcpy() is never called with an array of size 0. Added…
argmarco-tkd Dec 18, 2025
b63ada7
In types_test.cc removing a (somewhat redundant) test which caused th…
argmarco-tkd Dec 19, 2025
e3b758d
Disabling EXTERNAL_DBPA_V1 as an option for file level encryption (#227)
sofia-tekdatum Jan 7, 2026
36c80e9
Using magic enum in types_test to improve ParquetCipher testing (#228)
sofia-tekdatum Jan 7, 2026
26d1086
Ensuring that a bool column has encryption (for testing purposes)
argmarco-tkd Jan 7, 2026
28341e2
Renaming 'connection_config' to 'configuration_properties' (C++, Pyth…
argmarco-tkd Jan 7, 2026
7046c92
Adding per_column_encryption_test
argmarco-tkd Jan 8, 2026
c23dcd6
Refactoring constructors and make methods to remove unused encoding (…
sofia-tekdatum Jan 10, 2026
953bcb7
Fixing all lint errors (#233)
sofia-tekdatum Jan 26, 2026
132d621
Fix failing test (#234)
sofia-tekdatum Jan 26, 2026
94c6a82
Updating to the latest version of DBPA library - where 'UNDEFINED' wa…
argmarco-tkd Jan 26, 2026
9f0d248
Making the C++ happy
argmarco-tkd Jan 27, 2026
f599527
Adding missing doc for parameters (#235)
sofia-tekdatum Jan 28, 2026
dcebae7
Fixing macos problems with Boost (#241)
sofia-tekdatum Feb 4, 2026
7d3aae4
Fixing Windows failing github actions (#242)
sofia-tekdatum Feb 5, 2026
0161cf3
Fix debian docs (#244)
sofia-tekdatum Feb 6, 2026
3c7a1e9
Testing JNI macos compilation (#239)
sofia-tekdatum Feb 6, 2026
f4b4747
Fix python actions (#243)
sofia-tekdatum Feb 6, 2026
76a6518
Ensuring that AadMetadata and EncryptionAlgorithm are initialized det…
argmarco-tkd Feb 17, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ ColumnLimit: 90
DerivePointerAlignment: false
IncludeBlocks: Preserve
IndentPPDirectives: AfterHash
QualifierAlignment: Left
1 change: 0 additions & 1 deletion .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ Checks: |
# produce HeaderFilterRegex from cpp/build-support/lint_exclusions.txt with:
# echo -n '^('; sed -e 's/*/\.*/g' cpp/build-support/lint_exclusions.txt | tr '\n' '|'; echo ')$'
HeaderFilterRegex: '^(.*codegen.*|.*_generated.*|.*windows_compatibility.h|.*pyarrow_api.h|.*pyarrow_lib.h|.*python/config.h|.*python/platform.h|.*thirdparty/ae/.*|.*vendored/.*|.*RcppExports.cpp.*|)$'
AnalyzeTemporaryDtors: true
CheckOptions:
- key: google-readability-braces-around-statements.ShortStatementLines
value: '1'
Expand Down
9 changes: 0 additions & 9 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,6 @@ indent_style = space
indent_size = 2
indent_style = space

[*.go]
indent_size = 8
indent_style = tab
tab_width = 8

[*.{js,ts}]
indent_size = 4
indent_style = space

[*.{py,pyx,pxd,pxi}]
indent_size = 4
indent_style = space
Expand Down
28 changes: 17 additions & 11 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ DOCKER_BUILDKIT=1
ARCH=amd64
ARCH_ALIAS=x86_64
ARCH_SHORT=amd64
# For aarch64
# ARCH=arm64v8
# ARCH_ALIAS=aarch64
# ARCH_SHORT=arm64

# Default repository to pull and push images from
REPO=apache/arrow-dev
Expand All @@ -47,14 +51,14 @@ ULIMIT_CORE=-1

# Default versions for platforms
ALMALINUX=8
ALPINE_LINUX=3.18
ALPINE_LINUX=3.22
DEBIAN=12
FEDORA=39
FEDORA=42
UBUNTU=22.04

# Default versions for various dependencies
CLANG_TOOLS=14
CMAKE=3.25.0
CMAKE=3.26.0
CUDA=11.7.1
DASK=latest
DOTNET=8.0
Expand All @@ -65,14 +69,15 @@ KARTOTHEK=latest
# LLVM 12 and GCC 11 reports -Wmismatched-new-delete.
LLVM=18
MAVEN=3.8.7
NODE=18
NODE=20
NUMBA=latest
NUMBA_CUDA=latest
NUMPY=latest
PANDAS=latest
PYTHON=3.9
PYTHON_IMAGE_TAG=3.9
PYTHON_ABI_TAG=cp39
R=4.4
PYTHON=3.10
PYTHON_IMAGE_TAG=3.10
PYTHON_ABI_TAG=cp310
R=4.5
SPARK=master
TURBODBC=latest

Expand All @@ -82,6 +87,7 @@ R_ORG=rhub
R_TAG=latest

# Env vars for R builds
R_UPDATE_CLANG=false
R_CUSTOM_CCACHE=false
ARROW_R_DEV=TRUE
R_PRUNE_DEPS=FALSE
Expand All @@ -90,14 +96,14 @@ TZ=UTC
# Used through docker-compose.yml and serves as the default version for the
# ci/scripts/install_vcpkg.sh script. Prefer to use short SHAs to keep the
# docker tags more readable.
VCPKG="f7423ee180c4b7f40d43402c2feb3859161ef625" # 2024.06.15 Release
VCPKG="4334d8b4c8916018600212ab4dd4bbdc343065d1" # 2025.09.17 Release

# This must be updated when we update
# ci/docker/python-*-windows-*.dockerfile or the vcpkg config.
# This is a workaround for our CI problem that "archery docker build" doesn't
# use pulled built images in dev/tasks/python-wheels/github.windows.yml.
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2025-02-25
PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION=2025-02-25
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2025-10-13
PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION=2025-10-13

# Use conanio/${CONAN_BASE}:{CONAN_VERSION} for "docker compose run --rm conan".
# See https://github.com/conan-io/conan-docker-tools#readme and
Expand Down
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
cpp/src/arrow/util/bpacking_*_generated.h linguist-generated=true
cpp/src/parquet/chunker_*_generated.h linguist-generated=true
cpp/src/generated/*.cpp linguist-generated=true
cpp/src/generated/*.h linguist-generated=true
go/**/*.s linguist-generated=true
Expand Down
6 changes: 1 addition & 5 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,12 @@
/cpp/src/arrow/engine @westonpace
/cpp/src/arrow/flight/ @lidavidm
/cpp/src/parquet @wgtmac
/csharp/ @curthagenlocher
/go/ @zeroshade
/java/ @lidavidm
/js/ @domoritz @trxcllnt
/matlab/ @kevingurney @kou @sgilmore10
/python/ @AlenkaF @raulcd @rok
/python/pyarrow/_flight.pyx @lidavidm
/python/pyarrow/**/*gandiva* @wjones127
/r/ @jonkeane @thisisnic
/ruby/ @kou
/swift/ @kou

# Docs
# /docs/
Expand Down
38 changes: 0 additions & 38 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,41 +24,3 @@ updates:
commit-message:
prefix: "MINOR: [CI] "
open-pull-requests-limit: 10
- package-ecosystem: "gomod"
directory: "/swift/CDataWGo/"
schedule:
interval: "weekly"
commit-message:
prefix: "MINOR: [Swift] "
open-pull-requests-limit: 10
- package-ecosystem: "gomod"
directory: "/swift/data-generator/swift-datagen/"
schedule:
interval: "weekly"
commit-message:
prefix: "MINOR: [Swift] "
open-pull-requests-limit: 10
- package-ecosystem: "npm"
directory: "/js/"
schedule:
interval: "monthly"
commit-message:
prefix: "MINOR: [JS] "
open-pull-requests-limit: 10
- package-ecosystem: "nuget"
directory: "/csharp/"
schedule:
interval: "weekly"
commit-message:
prefix: "MINOR: [C#] "
open-pull-requests-limit: 10
ignore:
- dependency-name: "Microsoft.Extensions.*"
update-types:
- "version-update:semver-major"
- dependency-name: "Microsoft.Bcl.*"
update-types:
- "version-update:semver-major"
- dependency-name: "System.*"
update-types:
- "version-update:semver-major"
6 changes: 3 additions & 3 deletions .github/workflows/archery.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,16 @@ jobs:
timeout-minutes: 15
steps:
- name: Checkout Arrow
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
fetch-depth: 0
- name: Git Fixup
shell: bash
run: git branch $ARCHERY_DEFAULT_BRANCH origin/$ARCHERY_DEFAULT_BRANCH || true
- name: Setup Python
uses: actions/setup-python@v5.5.0
uses: actions/setup-python@v6.0.0
with:
python-version: '3.9'
python-version: '3.12'
- name: Install pygit2 binary wheel
run: pip install pygit2 --only-binary pygit2
- name: Install Archery, Crossbow- and Test Dependencies
Expand Down
75 changes: 75 additions & 0 deletions .github/workflows/check_labels.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

name: Check Labels Reusable

on:
workflow_call:
inputs:
parent-workflow:
description: "The parent workflow filename (without .yml)"
required: true
type: string
outputs:
ci-extra-labels:
description: "The extra CI labels"
value: ${{ jobs.check-labels.outputs.ci-extra-labels }}
force:
description: "Whether to force running the jobs"
value: ${{ jobs.check-labels.outputs.force }}

jobs:
check-labels:
name: Check labels
runs-on: ubuntu-latest
timeout-minutes: 5
outputs:
ci-extra-labels: ${{ steps.check.outputs.ci-extra-labels }}
force: ${{ steps.check.outputs.force }}
steps:
- name: Checkout Arrow
if: github.event_name == 'pull_request'
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
- name: Check
id: check
env:
GH_TOKEN: ${{ github.token }}
run: |
set -ex
case "${GITHUB_EVENT_NAME}" in
push|schedule|workflow_dispatch)
echo "force=true" >> "${GITHUB_OUTPUT}"
;;
pull_request)
{
echo "ci-extra-labels<<LABELS"
gh pr view ${{ github.event.number }} \
--jq '[.labels[].name | select(startswith("CI: Extra"))]' \
--json labels \
--repo ${GITHUB_REPOSITORY}
echo "LABELS"
} >> "${GITHUB_OUTPUT}"
git fetch origin ${GITHUB_BASE_REF}
git diff --stat origin/${GITHUB_BASE_REF}..
if git diff --stat origin/${GITHUB_BASE_REF}.. | \
grep \
--fixed-strings ".github/workflows/${{ inputs.parent-workflow }}.yml" \
--quiet; then
echo "force=true" >> "${GITHUB_OUTPUT}"
fi
;;
esac
8 changes: 4 additions & 4 deletions .github/workflows/comment_bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,20 @@ jobs:
pull-requests: write
steps:
- name: Checkout Arrow
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
with:
path: arrow
# fetch the tags for version number generation
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
with:
python-version: 3.12
- name: Install Archery and Crossbow dependencies
run: pip install -e arrow/dev/archery[bot]
- name: Handle GitHub comment event
env:
ARROW_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
CROSSBOW_GITHUB_TOKEN: ${{ secrets.CROSSBOW_GITHUB_TOKEN }}
run: |
archery --debug trigger-bot \
Expand All @@ -63,7 +63,7 @@ jobs:
if: github.event.comment.body == 'take'
runs-on: ubuntu-latest
steps:
- uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
- uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
Expand Down
Loading