Skip to content

Commit

Permalink
Merge branch 'apache:main' into apacheGH-36433
Browse files Browse the repository at this point in the history
  • Loading branch information
xxlaykxx authored Jul 11, 2023
2 parents 7da736e + b07e3f1 commit 028b175
Show file tree
Hide file tree
Showing 345 changed files with 12,820 additions and 4,060 deletions.
5 changes: 3 additions & 2 deletions .asf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@ github:
description: "Apache Arrow is a multi-language toolbox for accelerated data interchange and in-memory processing"
homepage: https://arrow.apache.org/
collaborators:
- anjakefala
- benibus
- danepitkin
- davisusanibar
- felipecrv
- milesgranger
- toddfarmer
- mapleFU

notifications:
commits: commits@arrow.apache.org
Expand Down
8 changes: 5 additions & 3 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -28,25 +28,27 @@
## Components
/c_glib/ @kou
# /cpp/
/cpp/src/arrow/compute @westonpace
/cpp/src/arrow/acero @westonpace
/cpp/src/arrow/adapters/orc @wgtmac
/cpp/src/arrow/dataset @westonpace
/cpp/src/arrow/engine @westonpace
/cpp/src/arrow/flight/ @lidavidm
/cpp/src/arrow/util/async* @westonpace
/cpp/src/arrow/util/future* @westonpace
/cpp/src/arrow/util/thread* @westonpace
/cpp/src/parquet @wjones127
/cpp/src/parquet @wgtmac
/cpp/src/skyhook @westonpace
/csharp/ @westonpace
/go/ @zeroshade
/java/ @lidavidm
/js/ @domoritz @trxcllnt
/matlab/ @assignUser
/matlab/ @kevingurney @kou
/python/ @AlenkaF
/python/pyarrow/_flight.pyx @lidavidm
/python/pyarrow/**/*gandiva* @wjones127
/r/ @paleolimbot @thisisnic
/ruby/ @kou
/swift/ @kou

# Docs
# /docs/
Expand Down
16 changes: 16 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,19 @@ updates:
interval: "weekly"
commit-message:
prefix: "MINOR: [CI] "
- package-ecosystem: "nuget"
directory: "/csharp/"
schedule:
interval: "weekly"
commit-message:
prefix: "MINOR: [C#] "
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"
2 changes: 1 addition & 1 deletion .github/workflows/cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ jobs:
rm -f /usr/local/bin/pydoc3* || :
rm -f /usr/local/bin/python3* || :
rm -f /usr/local/bin/python3-config || :
brew update --preinstall
brew update --preinstall || :
brew bundle --file=cpp/Brewfile
- name: Install MinIO
run: |
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/dev_pr/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@
"Component: Ruby":
- ruby/**/*

"Component: Swift":
- swift/**/*

"Component: FlightRPC":
- cpp/src/arrow/flight/**/*
- r/R/flight.*
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/dev_pr/link.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,15 @@ async function commentGitHubURL(github, context, pullRequestNumber, issueID) {
const issueInfo = await helpers.getGitHubInfo(github, context, issueID, pullRequestNumber);
const message = "* Closes: #" + issueInfo.number
if (issueInfo) {
if (context.payload.pull_request.body.includes(message)) {
const body = context.payload.pull_request.body || "";
if (body.includes(message)) {
return;
}
await github.rest.pulls.update({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: pullRequestNumber,
body: (context.payload.pull_request.body || "") + "\n" + message
body: body + "\n" + message
});
}
}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:

permissions:
contents: read

env:
ARROW_ENABLE_TIMING_TESTS: OFF
DOCKER_VOLUME_PREFIX: ".docker/"
Expand Down
14 changes: 13 additions & 1 deletion .github/workflows/js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
name: AMD64 macOS 11 NodeJS ${{ matrix.node }}
runs-on: macos-latest
if: github.event_name == 'push'
timeout-minutes: 60
timeout-minutes: 90
strategy:
fail-fast: false
matrix:
Expand All @@ -90,6 +90,12 @@ jobs:
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Jest Cache
uses: actions/cache@v3
with:
path: js/.jest-cache
key: js-jest-cache-${{ runner.os }}-${{ hashFiles('js/src/**/*.ts', 'js/test/**/*.ts', 'js/yarn.lock') }}
restore-keys: js-jest-cache-${{ runner.os }}-
- name: Install NodeJS
uses: actions/setup-node@v3
with:
Expand All @@ -114,6 +120,12 @@ jobs:
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Jest Cache
uses: actions/cache@v3
with:
path: js/.jest-cache
key: js-jest-cache-${{ runner.os }}-${{ hashFiles('js/src/**/*.ts', 'js/test/**/*.ts', 'js/yarn.lock') }}
restore-keys: js-jest-cache-${{ runner.os }}-
- name: Install NodeJS
uses: actions/setup-node@v3
with:
Expand Down
74 changes: 74 additions & 0 deletions .github/workflows/matlab.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,21 @@ jobs:
run: sudo apt-get install ninja-build
- name: Install MATLAB
uses: matlab-actions/setup-matlab@v1
- name: Install ccache
run: sudo apt-get install ccache
- name: Setup ccache
shell: bash
run: ci/scripts/ccache_setup.sh
- name: ccache info
id: ccache-info
shell: bash
run: echo "cache-dir=$(ccache --get-config cache_dir)" >> $GITHUB_OUTPUT
- name: Cache ccache
uses: actions/cache@v3
with:
path: ${{ steps.ccache-info.outputs.cache-dir }}
key: matlab-ccache-ubuntu-${{ hashFiles('cpp/**', 'matlab/**') }}
restore-keys: matlab-ccache-ubuntu-
- name: Build MATLAB Interface
run: ci/scripts/matlab_build.sh $(pwd)
- name: Run MATLAB Tests
Expand Down Expand Up @@ -84,6 +99,21 @@ jobs:
run: brew install ninja
- name: Install MATLAB
uses: matlab-actions/setup-matlab@v1
- name: Install ccache
run: brew install ccache
- name: Setup ccache
shell: bash
run: ci/scripts/ccache_setup.sh
- name: ccache info
id: ccache-info
shell: bash
run: echo "cache-dir=$(ccache --get-config cache_dir)" >> $GITHUB_OUTPUT
- name: Cache ccache
uses: actions/cache@v3
with:
path: ${{ steps.ccache-info.outputs.cache-dir }}
key: matlab-ccache-macos-${{ hashFiles('cpp/**', 'matlab/**') }}
restore-keys: matlab-ccache-macos-
- name: Build MATLAB Interface
run: ci/scripts/matlab_build.sh $(pwd)
- name: Run MATLAB Tests
Expand All @@ -94,3 +124,47 @@ jobs:
uses: matlab-actions/run-tests@v1
with:
select-by-folder: matlab/test
windows:
name: AMD64 Windows 2022 MATLAB
runs-on: windows-2022
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
steps:
- name: Check out repository
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Install MATLAB
uses: matlab-actions/setup-matlab@v1
- name: Download Timezone Database
shell: bash
run: ci/scripts/download_tz_database.sh
- name: Install ccache
shell: bash
run: ci/scripts/install_ccache.sh 4.6.3 /usr
- name: Setup ccache
shell: bash
run: ci/scripts/ccache_setup.sh
- name: ccache info
id: ccache-info
shell: bash
run: echo "cache-dir=$(ccache --get-config cache_dir)" >> $GITHUB_OUTPUT
- name: Cache ccache
uses: actions/cache@v3
with:
path: |
${{ steps.ccache-info.outputs.cache-dir }}
key: matlab-ccache-windows-${{ hashFiles('cpp/**', 'matlab/**') }}
restore-keys: matlab-ccache-windows-
- name: Build MATLAB Interface
shell: cmd
run: |
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
bash -c "ci/scripts/matlab_build.sh $(pwd)"
- name: Run MATLAB Tests
env:
# Add the installation directory to the MATLAB Search Path by
# setting the MATLABPATH environment variable.
MATLABPATH: matlab/install/arrow_matlab
uses: matlab-actions/run-tests@v1
with:
select-by-folder: matlab/test
2 changes: 1 addition & 1 deletion .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ jobs:
rm -f /usr/local/bin/pydoc3* || :
rm -f /usr/local/bin/python3* || :
rm -f /usr/local/bin/python3-config || :
brew update --preinstall
brew update --preinstall || :
brew install --overwrite git
brew bundle --file=cpp/Brewfile
brew install coreutils
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ jobs:
rm -f /usr/local/bin/pydoc3* || :
rm -f /usr/local/bin/python3* || :
rm -f /usr/local/bin/python3-config || :
brew update --preinstall
brew update --preinstall || :
brew install --overwrite git
brew bundle --file=cpp/Brewfile
brew bundle --file=c_glib/Brewfile
Expand Down
32 changes: 32 additions & 0 deletions c_glib/arrow-flight-sql-glib/client.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,38 @@ gaflightsql_client_execute(GAFlightSQLClient *client,
return gaflight_info_new_raw(flight_info.release());
}

/**
* gaflightsql_client_execute_update:
* @client: A #GAFlightSQLClient.
* @query: A query to be executed in the UTF-8 format.
* @options: (nullable): A #GAFlightCallOptions.
* @error: (nullable): Return location for a #GError or %NULL.
*
* Returns: The number of changed records.
*
* Since: 13.0.0
*/
gint64
gaflightsql_client_execute_update(GAFlightSQLClient *client,
const gchar *query,
GAFlightCallOptions *options,
GError **error)
{
auto flight_sql_client = gaflightsql_client_get_raw(client);
arrow::flight::FlightCallOptions flight_default_options;
auto flight_options = &flight_default_options;
if (options) {
flight_options = gaflight_call_options_get_raw(options);
}
auto result = flight_sql_client->ExecuteUpdate(*flight_options, query);
if (!garrow::check(error,
result,
"[flight-sql-client][execute-update]")) {
return 0;
}
return *result;
}

/**
* gaflightsql_client_do_get:
* @client: A #GAFlightClient.
Expand Down
7 changes: 7 additions & 0 deletions c_glib/arrow-flight-sql-glib/client.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,13 @@ gaflightsql_client_execute(GAFlightSQLClient *client,
GAFlightCallOptions *options,
GError **error);

GARROW_AVAILABLE_IN_13_0
gint64
gaflightsql_client_execute_update(GAFlightSQLClient *client,
const gchar *query,
GAFlightCallOptions *options,
GError **error);

GARROW_AVAILABLE_IN_9_0
GAFlightStreamReader *
gaflightsql_client_do_get(GAFlightSQLClient *client,
Expand Down
Loading

0 comments on commit 028b175

Please sign in to comment.