From 800568ee114f0a8e2fb9344e1f58e4aab16e0945 Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Mon, 25 Nov 2024 15:20:31 -0500 Subject: [PATCH 1/4] Update references from `master` to `main` --- .asf.yaml | 2 +- .github/dependabot.yml | 4 ++-- .github/workflows/README.md | 4 ++-- .github/workflows/arrow.yml | 2 +- .github/workflows/arrow_flight.yml | 4 ++-- .github/workflows/audit.yml | 4 ++-- .github/workflows/dev.yml | 4 ++-- .github/workflows/docs.yml | 10 +++++----- .github/workflows/integration.yml | 4 ++-- .github/workflows/miri.yaml | 4 ++-- .github/workflows/object_store.yml | 4 ++-- .github/workflows/parquet.yml | 4 ++-- .github/workflows/parquet_derive.yml | 4 ++-- .github/workflows/rust.yml | 4 ++-- CONTRIBUTING.md | 2 +- README.md | 4 +--- arrow-flight/README.md | 2 +- arrow-integration-testing/README.md | 2 +- arrow/README.md | 4 ++-- arrow/src/lib.rs | 2 +- dev/release/README.md | 8 ++++---- dev/release/create-tarball.sh | 2 +- object_store/dev/release/README.md | 10 +++++----- object_store/dev/release/create-tarball.sh | 2 +- parquet/README.md | 2 +- parquet/examples/async_read_parquet.rs | 2 +- 26 files changed, 49 insertions(+), 51 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index bd063d4bbf4a..366c719597aa 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -38,7 +38,7 @@ github: features: issues: true protected_branches: - master: + main: required_status_checks: # require branches to be up-to-date before merging strict: true diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ffde5378da93..b22c01f8a1b9 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,14 +5,14 @@ updates: schedule: interval: daily open-pull-requests-limit: 10 - target-branch: master + target-branch: main labels: [ auto-dependencies, arrow ] - package-ecosystem: cargo directory: "/object_store" schedule: interval: daily open-pull-requests-limit: 10 - target-branch: master + target-branch: main labels: [ auto-dependencies, object_store ] - package-ecosystem: "github-actions" directory: "/" diff --git a/.github/workflows/README.md b/.github/workflows/README.md index 679ccc956a20..08bdf123f4d6 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -20,6 +20,6 @@ The CI is structured so most tests are run in specific workflows: `arrow.yml` for `arrow`, `parquet.yml` for `parquet` and so on. -The basic idea is to run all tests on pushes to master (to ensure we -keep master green) but run only the individual workflows on PRs that +The basic idea is to run all tests on pushes to main (to ensure we +keep main green) but run only the individual workflows on PRs that change files that could affect them. diff --git a/.github/workflows/arrow.yml b/.github/workflows/arrow.yml index d3b2526740fa..d065c554bbf4 100644 --- a/.github/workflows/arrow.yml +++ b/.github/workflows/arrow.yml @@ -26,7 +26,7 @@ on: # always trigger push: branches: - - master + - main pull_request: paths: - .github/** diff --git a/.github/workflows/arrow_flight.yml b/.github/workflows/arrow_flight.yml index 242e0f2a3b0d..79627448ca40 100644 --- a/.github/workflows/arrow_flight.yml +++ b/.github/workflows/arrow_flight.yml @@ -23,11 +23,11 @@ concurrency: group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }} cancel-in-progress: true -# trigger for all PRs that touch certain files and changes to master +# trigger for all PRs that touch certain files and changes to main on: push: branches: - - master + - main pull_request: paths: - arrow-array/** diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml index 2c1dcdfd2100..e6254ea24a58 100644 --- a/.github/workflows/audit.yml +++ b/.github/workflows/audit.yml @@ -21,11 +21,11 @@ concurrency: group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }} cancel-in-progress: true -# trigger for all PRs that touch certain files and changes to master +# trigger for all PRs that touch certain files and changes to main on: push: branches: - - master + - main pull_request: paths: - '**/Cargo.toml' diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 2026e257ab29..b28e8c20cfe7 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -21,11 +21,11 @@ concurrency: group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }} cancel-in-progress: true -# trigger for all PRs and changes to master +# trigger for all PRs and changes to main on: push: branches: - - master + - main pull_request: env: diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 08d287bcceb2..d6ec0622f6ed 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -21,11 +21,11 @@ concurrency: group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }} cancel-in-progress: true -# trigger for all PRs and changes to master +# trigger for all PRs and changes to main on: push: branches: - - master + - main pull_request: jobs: @@ -70,8 +70,8 @@ jobs: path: target/doc deploy: - # Only deploy if a push to master - if: github.ref_name == 'master' && github.event_name == 'push' + # Only deploy if a push to main + if: github.ref_name == 'main' && github.event_name == 'push' needs: docs permissions: contents: write @@ -90,7 +90,7 @@ jobs: cp .asf.yaml ./website/build/.asf.yaml - name: Deploy to gh-pages uses: peaceiris/actions-gh-pages@v4.0.0 - if: github.event_name == 'push' && github.ref_name == 'master' + if: github.event_name == 'push' && github.ref_name == 'main' with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: website/build diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 868729a168e8..9b23b1b5ad2e 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -21,11 +21,11 @@ concurrency: group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }} cancel-in-progress: true -# trigger for all PRs that touch certain files and changes to master +# trigger for all PRs that touch certain files and changes to main on: push: branches: - - master + - main pull_request: paths: - .github/** diff --git a/.github/workflows/miri.yaml b/.github/workflows/miri.yaml index 19b432121b6f..ce67546a104b 100644 --- a/.github/workflows/miri.yaml +++ b/.github/workflows/miri.yaml @@ -21,11 +21,11 @@ concurrency: group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }} cancel-in-progress: true -# trigger for all PRs that touch certain files and changes to master +# trigger for all PRs that touch certain files and changes to main on: push: branches: - - master + - main pull_request: paths: - .github/** diff --git a/.github/workflows/object_store.yml b/.github/workflows/object_store.yml index 1857b330326a..86250fc17579 100644 --- a/.github/workflows/object_store.yml +++ b/.github/workflows/object_store.yml @@ -23,11 +23,11 @@ concurrency: group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }} cancel-in-progress: true -# trigger for all PRs that touch certain files and changes to master +# trigger for all PRs that touch certain files and changes to main on: push: branches: - - master + - main pull_request: paths: - object_store/** diff --git a/.github/workflows/parquet.yml b/.github/workflows/parquet.yml index a4e654892662..2269950fd235 100644 --- a/.github/workflows/parquet.yml +++ b/.github/workflows/parquet.yml @@ -23,11 +23,11 @@ concurrency: group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }} cancel-in-progress: true -# trigger for all PRs that touch certain files and changes to master +# trigger for all PRs that touch certain files and changes to main on: push: branches: - - master + - main pull_request: paths: - arrow/** diff --git a/.github/workflows/parquet_derive.yml b/.github/workflows/parquet_derive.yml index d8b02f73a8aa..17aec724a820 100644 --- a/.github/workflows/parquet_derive.yml +++ b/.github/workflows/parquet_derive.yml @@ -23,11 +23,11 @@ concurrency: group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }} cancel-in-progress: true -# trigger for all PRs that touch certain files and changes to master +# trigger for all PRs that touch certain files and changes to main on: push: branches: - - master + - main pull_request: paths: - parquet/** diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 1b65c5057de1..ff5040fd2947 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -22,11 +22,11 @@ concurrency: group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }} cancel-in-progress: true -# trigger for all PRs and changes to master +# trigger for all PRs and changes to main on: push: branches: - - master + - main pull_request: jobs: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2dea0b2cca64..a3dcbaa19e6b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -138,7 +138,7 @@ cargo test cargo test -p arrow ``` -For some changes, you may want to run additional tests. You can find up-to-date information on the current CI tests in [.github/workflows](https://github.com/apache/arrow-rs/tree/master/.github/workflows). Here are some examples of additional tests you may want to run: +For some changes, you may want to run additional tests. You can find up-to-date information on the current CI tests in [.github/workflows](https://github.com/apache/arrow-rs/tree/main/.github/workflows). Here are some examples of additional tests you may want to run: ```bash # run tests for the parquet crate diff --git a/README.md b/README.md index 3b16629d66c0..57794b1d6a46 100644 --- a/README.md +++ b/README.md @@ -19,8 +19,6 @@ # Native Rust implementation of Apache Arrow and Apache Parquet -[![Coverage Status](https://codecov.io/gh/apache/arrow-rs/rust/branch/master/graph/badge.svg)](https://codecov.io/gh/apache/arrow-rs?branch=master) - Welcome to the [Rust][rust] implementation of [Apache Arrow], the popular in-memory columnar format. This repo contains the following main components: @@ -58,7 +56,7 @@ breaking API changes) at most once a quarter, and release incremental minor versions in the intervening months. See [this ticket] for more details. To keep our maintenance burden down, we do regularly scheduled releases (major -and minor) from the `master` branch. How we handle PRs with breaking API changes +and minor) from the `main` branch. How we handle PRs with breaking API changes is described in the [contributing] guide. [contributing]: CONTRIBUTING.md#breaking-changes diff --git a/arrow-flight/README.md b/arrow-flight/README.md index bc5f9d26e1a3..661abfc58691 100644 --- a/arrow-flight/README.md +++ b/arrow-flight/README.md @@ -38,7 +38,7 @@ Apache Arrow Flight is a gRPC based protocol for exchanging Arrow data between p This crate provides a Rust implementation of the [Flight.proto](../format/Flight.proto) gRPC protocol and -[examples](https://github.com/apache/arrow-rs/tree/master/arrow-flight/examples) +[examples](https://github.com/apache/arrow-rs/tree/main/arrow-flight/examples) that demonstrate how to build a Flight server implemented with [tonic](https://docs.rs/crate/tonic/latest). ## Feature Flags diff --git a/arrow-integration-testing/README.md b/arrow-integration-testing/README.md index dcf39c27fbc5..86c79f5030ce 100644 --- a/arrow-integration-testing/README.md +++ b/arrow-integration-testing/README.md @@ -53,7 +53,7 @@ pip install -e dev/archery[integration] ### Build the C++ binaries: -Follow the [C++ Direction](https://github.com/apache/arrow/tree/master/docs/source/developers/cpp) and build the integration test binaries with a command like this: +Follow the [C++ Direction](https://github.com/apache/arrow/tree/main/docs/source/developers/cpp) and build the integration test binaries with a command like this: ``` # build cpp binaries diff --git a/arrow/README.md b/arrow/README.md index 557a0b474e4b..a1444005ec00 100644 --- a/arrow/README.md +++ b/arrow/README.md @@ -25,7 +25,7 @@ This crate contains the official Native Rust implementation of [Apache Arrow][arrow] in memory format, governed by the Apache Software Foundation. The [API documentation](https://docs.rs/arrow/latest) contains examples and full API. -There are several [examples](https://github.com/apache/arrow-rs/tree/master/arrow/examples) to start from as well. +There are several [examples](https://github.com/apache/arrow-rs/tree/main/arrow/examples) to start from as well. The API documentation for most recent, unreleased code is available [here](https://arrow.apache.org/rust/arrow/index.html). @@ -57,7 +57,7 @@ The `arrow` crate provides the following features which may be enabled in your ` - `ipc` (default) - support for reading [Arrow IPC Format](https://arrow.apache.org/docs/format/Columnar.html#serialization-and-interprocess-communication-ipc), also used as the wire protocol in [arrow-flight](https://crates.io/crates/arrow-flight) - `ipc_compression` - Enables reading and writing compressed IPC streams (also enables `ipc`) - `prettyprint` - support for formatting record batches as textual columns - implementations of some [compute](https://github.com/apache/arrow-rs/tree/master/arrow/src/compute/kernels) + implementations of some [compute](https://github.com/apache/arrow-rs/tree/main/arrow/src/compute/kernels) - `chrono-tz` - support of parsing timezone using [chrono-tz](https://docs.rs/chrono-tz/0.6.0/chrono_tz/) - `ffi` - bindings for the Arrow C [C Data Interface](https://arrow.apache.org/docs/format/CDataInterface.html) - `pyarrow` - bindings for pyo3 to call arrow-rs from python diff --git a/arrow/src/lib.rs b/arrow/src/lib.rs index 5002e5bf181a..7fc5acdc1b19 100644 --- a/arrow/src/lib.rs +++ b/arrow/src/lib.rs @@ -336,7 +336,7 @@ //! //! If you think you have found an instance where this is possible, please file //! a ticket in our [issue tracker] and it will be triaged and fixed. For more information on -//! arrow's use of unsafe, see [here](https://github.com/apache/arrow-rs/tree/master/arrow#safety). +//! arrow's use of unsafe, see [here](https://github.com/apache/arrow-rs/tree/main/arrow#safety). //! //! # Higher-level Processing //! diff --git a/dev/release/README.md b/dev/release/README.md index 50aa5e8bc93e..56beefaa2d7b 100644 --- a/dev/release/README.md +++ b/dev/release/README.md @@ -27,7 +27,7 @@ This file documents the release process for the "Rust Arrow Crates": `arrow`, `a The Rust Arrow Crates are interconnected (e.g. `parquet` has an optional dependency on `arrow`) so we increment and release all of them together. -If any code has been merged to master that has a breaking API change, as defined +If any code has been merged to main that has a breaking API change, as defined in [Rust RFC 1105] he major version number is incremented (e.g. `9.0.2` to `10.0.2`). Otherwise the new minor version incremented (e.g. `9.0.2` to `9.1.0`). @@ -46,14 +46,14 @@ crates.io, the Rust ecosystem's package manager. We create a `CHANGELOG.md` so our users know what has been changed between releases. The CHANGELOG is created automatically using -[update_change_log.sh](https://github.com/apache/arrow-rs/blob/master/dev/release/update_change_log.sh) +[update_change_log.sh](https://github.com/apache/arrow-rs/blob/main/dev/release/update_change_log.sh) This script creates a changelog using github issues and the labels associated with them. ## Prepare CHANGELOG and version: -Now prepare a PR to update `CHANGELOG.md` and versions on `master` to reflect the planned release. +Now prepare a PR to update `CHANGELOG.md` and versions on `main` to reflect the planned release. Do this in the root of this repository. For example [#2323](https://github.com/apache/arrow-rs/pull/2323) @@ -96,7 +96,7 @@ Note that when reviewing the change log, rather than editing the `CHANGELOG.md`, it is preferred to update the issues and their labels (e.g. add `invalid` label to exclude them from release notes) -Merge this PR to `master` prior to the next step. +Merge this PR to `main` prior to the next step. ## Prepare release candidate tarball diff --git a/dev/release/create-tarball.sh b/dev/release/create-tarball.sh index a77ddbe75701..8b92509104c8 100755 --- a/dev/release/create-tarball.sh +++ b/dev/release/create-tarball.sh @@ -109,7 +109,7 @@ The vote will be open for at least 72 hours. [1]: https://github.com/apache/arrow-rs/tree/${release_hash} [2]: ${url} [3]: https://github.com/apache/arrow-rs/blob/${release_hash}/CHANGELOG.md -[4]: https://github.com/apache/arrow-rs/blob/master/dev/release/verify-release-candidate.sh +[4]: https://github.com/apache/arrow-rs/blob/main/dev/release/verify-release-candidate.sh MAIL echo "---------------------------------------------------------" diff --git a/object_store/dev/release/README.md b/object_store/dev/release/README.md index 4077dcad9653..b47773b41492 100644 --- a/object_store/dev/release/README.md +++ b/object_store/dev/release/README.md @@ -27,11 +27,11 @@ This file documents the release process for the `object_store` crate. At the time of writing, we release a new version of `object_store` on demand rather than on a regular schedule. As we are still in an early phase, we use the 0.x version scheme. If any code has -been merged to master that has a breaking API change, as defined in [Rust RFC 1105] +been merged to main that has a breaking API change, as defined in [Rust RFC 1105] the minor version number is incremented changed (e.g. `0.3.0` to `0.4.0`). Otherwise the patch version is incremented (e.g. `0.3.0` to `0.3.1`). -[Rust RFC 1105]: https://github.com/rust-lang/rfcs/blob/master/text/1105-api-evolution.md +[Rust RFC 1105]: https://github.com/rust-lang/rfcs/blob/main/text/1105-api-evolution.md # Release Mechanics ## Process Overview @@ -45,14 +45,14 @@ crates.io, the Rust ecosystem's package manager. We create a `CHANGELOG.md` so our users know what has been changed between releases. The CHANGELOG is created automatically using -[update_change_log.sh](https://github.com/apache/arrow-rs/blob/master/object_store/dev/release/update_change_log.sh) +[update_change_log.sh](https://github.com/apache/arrow-rs/blob/main/object_store/dev/release/update_change_log.sh) This script creates a changelog using github issues and the labels associated with them. ## Prepare CHANGELOG and version: -Now prepare a PR to update `CHANGELOG.md` and versions on `master` to reflect the planned release. +Now prepare a PR to update `CHANGELOG.md` and versions on `main` to reflect the planned release. Note this process is done in the `object_store` directory. See [#6227] for an example @@ -90,7 +90,7 @@ Note that when reviewing the change log, rather than editing the `CHANGELOG.md`, it is preferred to update the issues and their labels (e.g. add `invalid` label to exclude them from release notes) -Merge this PR to `master` prior to the next step. +Merge this PR to `main` prior to the next step. ## Prepare release candidate tarball diff --git a/object_store/dev/release/create-tarball.sh b/object_store/dev/release/create-tarball.sh index bbffde89b043..efc26fd0ef0f 100755 --- a/object_store/dev/release/create-tarball.sh +++ b/object_store/dev/release/create-tarball.sh @@ -101,7 +101,7 @@ The vote will be open for at least 72 hours. [1]: https://github.com/apache/arrow-rs/tree/${release_hash} [2]: ${url} [3]: https://github.com/apache/arrow-rs/blob/${release_hash}/object_store/CHANGELOG.md -[4]: https://github.com/apache/arrow-rs/blob/master/object_store/dev/release/verify-release-candidate.sh +[4]: https://github.com/apache/arrow-rs/blob/main/object_store/dev/release/verify-release-candidate.sh MAIL echo "---------------------------------------------------------" diff --git a/parquet/README.md b/parquet/README.md index a0441ee6026d..e9f52ff279d5 100644 --- a/parquet/README.md +++ b/parquet/README.md @@ -59,7 +59,7 @@ The `parquet` crate provides the following features which may be enabled in your - `lz4` (default) - support for parquet using `lz4` compression - `zstd` (default) - support for parquet using `zstd` compression - `snap` (default) - support for parquet using `snappy` compression -- `cli` - parquet [CLI tools](https://github.com/apache/arrow-rs/tree/master/parquet/src/bin) +- `cli` - parquet [CLI tools](https://github.com/apache/arrow-rs/tree/main/parquet/src/bin) - `crc` - enables functionality to automatically verify checksums of each page (if present) when decoding - `experimental` - Experimental APIs which may change, even between minor releases diff --git a/parquet/examples/async_read_parquet.rs b/parquet/examples/async_read_parquet.rs index e59cad8055cb..414fcdf25e7f 100644 --- a/parquet/examples/async_read_parquet.rs +++ b/parquet/examples/async_read_parquet.rs @@ -45,7 +45,7 @@ async fn main() -> Result<()> { builder = builder.with_projection(mask); // Highlight: set `RowFilter`, it'll push down filter predicates to skip IO and decode. - // For more specific usage: please refer to https://github.com/apache/arrow-datafusion/blob/master/datafusion/core/src/physical_plan/file_format/parquet/row_filter.rs. + // For more specific usage: please refer to https://github.com/apache/arrow-datafusion/blob/main/datafusion/core/src/physical_plan/file_format/parquet/row_filter.rs. let scalar = Int32Array::from(vec![1]); let filter = ArrowPredicateFn::new( ProjectionMask::roots(file_metadata.schema_descr(), [0]), From 48108f30574c916b216af79ddb9d24ed4b97e6e9 Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Mon, 25 Nov 2024 15:21:39 -0500 Subject: [PATCH 2/4] more --- CONTRIBUTING.md | 6 +++--- dev/release/README.md | 4 ++-- object_store/Cargo.toml | 2 +- object_store/dev/release/README.md | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a3dcbaa19e6b..38236ee39125 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -217,13 +217,13 @@ cargo bench -p arrow-cast --bench parse_time To set the baseline for your benchmarks, use the --save-baseline flag: ```bash -git checkout master +git checkout main -cargo bench --bench parse_time -- --save-baseline master +cargo bench --bench parse_time -- --save-baseline main git checkout feature -cargo bench --bench parse_time -- --baseline master +cargo bench --bench parse_time -- --baseline main ``` ## Git Pre-Commit Hook diff --git a/dev/release/README.md b/dev/release/README.md index 56beefaa2d7b..6e6817bffb12 100644 --- a/dev/release/README.md +++ b/dev/release/README.md @@ -58,7 +58,7 @@ Now prepare a PR to update `CHANGELOG.md` and versions on `main` to reflect the Do this in the root of this repository. For example [#2323](https://github.com/apache/arrow-rs/pull/2323) ```bash -git checkout master +git checkout main git pull git checkout -b @@ -115,7 +115,7 @@ Create and push the tag thusly: ```shell git fetch apache -git tag apache/master +git tag apache/main # push tag to apache git push apache ``` diff --git a/object_store/Cargo.toml b/object_store/Cargo.toml index 536874fc9eef..a04733625135 100644 --- a/object_store/Cargo.toml +++ b/object_store/Cargo.toml @@ -23,7 +23,7 @@ license = "MIT/Apache-2.0" readme = "README.md" description = "A generic object store interface for uniformly interacting with AWS S3, Google Cloud Storage, Azure Blob Storage and local files." keywords = ["object", "storage", "cloud"] -repository = "https://github.com/apache/arrow-rs/tree/master/object_store" +repository = "https://github.com/apache/arrow-rs/tree/main/object_store" rust-version = "1.64.0" [package.metadata.docs.rs] diff --git a/object_store/dev/release/README.md b/object_store/dev/release/README.md index b47773b41492..f758cd973636 100644 --- a/object_store/dev/release/README.md +++ b/object_store/dev/release/README.md @@ -62,7 +62,7 @@ Note this process is done in the `object_store` directory. See [#6227] for an e # NOTE: Run commands in object_store sub directory (not main repo checkout) # cd object_store -git checkout master +git checkout main git pull git checkout -b @@ -82,7 +82,7 @@ export CHANGELOG_GITHUB_TOKEN= # Commit changes git commit -a -m 'Create changelog' -# push changes to fork and create a PR to master +# push changes to fork and create a PR to main git push ``` @@ -109,7 +109,7 @@ Create and push the tag thusly: ```shell git fetch apache -git tag apache/master +git tag apache/main # push tag to apache git push apache ``` @@ -170,7 +170,7 @@ The vote will be open for at least 72 hours. [1]: https://github.com/apache/arrow-rs/tree/b945b15de9085f5961a478d4f35b0c5c3427e248 [2]: https://dist.apache.org/repos/dist/dev/arrow/apache-arrow-object-store-rs-0.11.1-rc1 [3]: https://github.com/apache/arrow-rs/blob/b945b15de9085f5961a478d4f35b0c5c3427e248/object_store/CHANGELOG.md -[4]: https://github.com/apache/arrow-rs/blob/master/object_store/dev/release/verify-release-candidate.sh +[4]: https://github.com/apache/arrow-rs/blob/main/object_store/dev/release/verify-release-candidate.sh ``` For the release to become "official" it needs at least three Apache Arrow PMC members to vote +1 on it. From a876a23bb84235e2cbba95204d468c1891919d4b Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Mon, 25 Nov 2024 15:26:37 -0500 Subject: [PATCH 3/4] Update parquet/examples/async_read_parquet.rs --- parquet/examples/async_read_parquet.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parquet/examples/async_read_parquet.rs b/parquet/examples/async_read_parquet.rs index 414fcdf25e7f..0a2e9ba994dd 100644 --- a/parquet/examples/async_read_parquet.rs +++ b/parquet/examples/async_read_parquet.rs @@ -45,7 +45,7 @@ async fn main() -> Result<()> { builder = builder.with_projection(mask); // Highlight: set `RowFilter`, it'll push down filter predicates to skip IO and decode. - // For more specific usage: please refer to https://github.com/apache/arrow-datafusion/blob/main/datafusion/core/src/physical_plan/file_format/parquet/row_filter.rs. + // For more specific usage: please refer to https://github.com/apache/datafusion/blob/main/datafusion/core/src/datasource/physical_plan/parquet/row_filter.rs. let scalar = Int32Array::from(vec![1]); let filter = ArrowPredicateFn::new( ProjectionMask::roots(file_metadata.schema_descr(), [0]), From ded038514ccd01eb11eb8e1ffc3f81ec0ee65741 Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Mon, 25 Nov 2024 15:35:56 -0500 Subject: [PATCH 4/4] Update object_store/dev/release/README.md Co-authored-by: Matthijs Brobbel --- object_store/dev/release/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/object_store/dev/release/README.md b/object_store/dev/release/README.md index f758cd973636..912ff4cd8bac 100644 --- a/object_store/dev/release/README.md +++ b/object_store/dev/release/README.md @@ -31,7 +31,7 @@ been merged to main that has a breaking API change, as defined in [Rust RFC 1105 the minor version number is incremented changed (e.g. `0.3.0` to `0.4.0`). Otherwise the patch version is incremented (e.g. `0.3.0` to `0.3.1`). -[Rust RFC 1105]: https://github.com/rust-lang/rfcs/blob/main/text/1105-api-evolution.md +[Rust RFC 1105]: https://github.com/rust-lang/rfcs/blob/master/text/1105-api-evolution.md # Release Mechanics ## Process Overview