You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by al...@apache.org on 2022/04/10 23:22:34 UTC
[arrow-datafusion] branch maint-7.x updated: Prepare for 7.x release: Update version to 7.1.0, add ChangeLog (#2187)
This is an automated email from the ASF dual-hosted git repository.
alamb pushed a commit to branch maint-7.x
in repository https://gitbox.apache.org/repos/asf/arrow-datafusion.git
The following commit(s) were added to refs/heads/maint-7.x by this push:
new f2fcb80f8 Prepare for 7.x release: Update version to 7.1.0, add ChangeLog (#2187)
f2fcb80f8 is described below
commit f2fcb80f8727c6b9620e2a84629d3e45d8c0e8f7
Author: Rich <jy...@users.noreply.github.com>
AuthorDate: Sun Apr 10 19:22:30 2022 -0400
Prepare for 7.x release: Update version to 7.1.0, add ChangeLog (#2187)
* Update version
* modify script to respect release branch
* Create changelog for release
* manually fix changelog
* Apply suggestions from code review
Co-authored-by: Andrew Lamb <an...@nerdnetworks.org>
Co-authored-by: Andrew Lamb <an...@nerdnetworks.org>
---
ballista/rust/client/Cargo.toml | 2 +-
ballista/rust/core/Cargo.toml | 2 +-
ballista/rust/executor/Cargo.toml | 2 +-
ballista/rust/scheduler/Cargo.toml | 2 +-
datafusion-cli/Cargo.toml | 2 +-
datafusion/CHANGELOG.md | 8 ++++++++
datafusion/Cargo.toml | 2 +-
dev/release/README.md | 6 ++----
dev/release/update_change_log-all.sh | 9 ++++++---
dev/release/update_change_log-ballista.sh | 14 ++++++++------
dev/release/update_change_log-datafusion.sh | 15 +++++++++------
11 files changed, 39 insertions(+), 25 deletions(-)
diff --git a/ballista/rust/client/Cargo.toml b/ballista/rust/client/Cargo.toml
index dda763050..0ffc5accf 100644
--- a/ballista/rust/client/Cargo.toml
+++ b/ballista/rust/client/Cargo.toml
@@ -37,7 +37,7 @@ tempfile = "3"
sqlparser = "0.14"
parking_lot = "0.12"
-datafusion = { path = "../../../datafusion", version = "7.0.0" }
+datafusion = { path = "../../../datafusion", version = "7.1.0" }
[features]
default = []
diff --git a/ballista/rust/core/Cargo.toml b/ballista/rust/core/Cargo.toml
index ed433d4ce..4ab064225 100644
--- a/ballista/rust/core/Cargo.toml
+++ b/ballista/rust/core/Cargo.toml
@@ -46,7 +46,7 @@ clap = { version = "3", features = ["derive", "cargo"] }
parse_arg = "0.1.3"
arrow-flight = { version = "9.0.0" }
-datafusion = { path = "../../../datafusion", version = "7.0.0" }
+datafusion = { path = "../../../datafusion", version = "7.1.0" }
parking_lot = "0.12"
diff --git a/ballista/rust/executor/Cargo.toml b/ballista/rust/executor/Cargo.toml
index 8f0d29e20..57ce7ad10 100644
--- a/ballista/rust/executor/Cargo.toml
+++ b/ballista/rust/executor/Cargo.toml
@@ -35,7 +35,7 @@ anyhow = "1"
async-trait = "0.1.36"
ballista-core = { path = "../core", version = "0.6.0" }
configure_me = "0.4.0"
-datafusion = { path = "../../../datafusion", version = "7.0.0" }
+datafusion = { path = "../../../datafusion", version = "7.1.0" }
env_logger = "0.9"
futures = "0.3"
log = "0.4"
diff --git a/ballista/rust/scheduler/Cargo.toml b/ballista/rust/scheduler/Cargo.toml
index e726beb25..dd4d11640 100644
--- a/ballista/rust/scheduler/Cargo.toml
+++ b/ballista/rust/scheduler/Cargo.toml
@@ -35,7 +35,7 @@ anyhow = "1"
ballista-core = { path = "../core", version = "0.6.0" }
clap = { version = "3", features = ["derive", "cargo"] }
configure_me = "0.4.0"
-datafusion = { path = "../../../datafusion", version = "7.0.0" }
+datafusion = { path = "../../../datafusion", version = "7.1.0" }
env_logger = "0.9"
etcd-client = { version = "0.8", optional = true }
futures = "0.3"
diff --git a/datafusion-cli/Cargo.toml b/datafusion-cli/Cargo.toml
index 448c854d9..ff96f0768 100644
--- a/datafusion-cli/Cargo.toml
+++ b/datafusion-cli/Cargo.toml
@@ -31,7 +31,7 @@ rust-version = "1.58"
clap = { version = "3", features = ["derive", "cargo"] }
rustyline = "9.0"
tokio = { version = "1.0", features = ["macros", "rt", "rt-multi-thread", "sync", "parking_lot"] }
-datafusion = { path = "../datafusion", version = "7.0.0" }
+datafusion = { path = "../datafusion", version = "7.1.0" }
arrow = { version = "9.0.0" }
ballista = { path = "../ballista/rust/client", version = "0.6.0" }
env_logger = "0.9"
\ No newline at end of file
diff --git a/datafusion/CHANGELOG.md b/datafusion/CHANGELOG.md
index bba7c28dc..599f64867 100644
--- a/datafusion/CHANGELOG.md
+++ b/datafusion/CHANGELOG.md
@@ -19,6 +19,14 @@
# Changelog
+## [7.1.0](https://github.com/apache/arrow-datafusion/tree/7.1.0) (2022-04-10)
+
+[Full Changelog](https://github.com/apache/arrow-datafusion/compare/7.0.0...7.1.0)
+
+**Fixed bugs:**
+
+- By default, use only 1000 rows to infer the schema [\#2159](https://github.com/apache/arrow-datafusion/pull/2159)
+
## [7.0.0](https://github.com/apache/arrow-datafusion/tree/7.0.0) (2022-02-14)
[Full Changelog](https://github.com/apache/arrow-datafusion/compare/6.0.0...7.0.0)
diff --git a/datafusion/Cargo.toml b/datafusion/Cargo.toml
index d521ead92..26c4398cd 100644
--- a/datafusion/Cargo.toml
+++ b/datafusion/Cargo.toml
@@ -18,7 +18,7 @@
[package]
name = "datafusion"
description = "DataFusion is an in-memory query engine that uses Apache Arrow as the memory model"
-version = "7.0.0"
+version = "7.1.0"
homepage = "https://github.com/apache/arrow-datafusion"
repository = "https://github.com/apache/arrow-datafusion"
readme = "../README.md"
diff --git a/dev/release/README.md b/dev/release/README.md
index 86d36a0c0..02da34304 100644
--- a/dev/release/README.md
+++ b/dev/release/README.md
@@ -105,14 +105,12 @@ git commit -a -m 'Update version'
### Update CHANGELOG.md
-Manully edit the base version tag argument in
-`dev/release/update_change_log-{ballista,datafusion,python}.sh`. Commits
-between the base verstion tag and the latest upstream master will be used to
+Define release branch (e.g. `master`), base version tag (e.g. `7.0.0`) and future version tag (e.g. `8.0.0`). Commits between the base verstion tag and the release branch will be used to
populate the changelog content.
```bash
# create the changelog
-CHANGELOG_GITHUB_TOKEN=<TOKEN> ./dev/release/update_change_log-all.sh
+CHANGELOG_GITHUB_TOKEN=<TOKEN> ./dev/release/update_change_log-all.sh master 8.0.0 7.0.0
# review change log / edit issues and labels if needed, rerun until you are happy with the result
git commit -a -m 'Create changelog for release'
```
diff --git a/dev/release/update_change_log-all.sh b/dev/release/update_change_log-all.sh
index 0d4cf0071..d9bb88f73 100755
--- a/dev/release/update_change_log-all.sh
+++ b/dev/release/update_change_log-all.sh
@@ -21,10 +21,13 @@
set -e
# Usage:
-# CHANGELOG_GITHUB_TOKEN=<TOKEN> ./update_change_log-datafusion.sh
+# CHANGELOG_GITHUB_TOKEN=<TOKEN> ./update_change_log-all.sh <branch> <release_tag> <base_tag>
+# Example:
+# CHANGELOG_GITHUB_TOKEN=<TOKEN> ./update_change_log-all.sh master 8.0.0 7.1.0
+# CHANGELOG_GITHUB_TOKEN=<TOKEN> ./update_change_log-all.sh maint-7.x 7.1.0 7.0.0
SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
SOURCE_TOP_DIR="$(cd "${SOURCE_DIR}/../../" && pwd)"
-${SOURCE_DIR}/update_change_log-datafusion.sh
-${SOURCE_DIR}/update_change_log-ballista.sh
+${SOURCE_DIR}/update_change_log-datafusion.sh $1 $2 $3
+${SOURCE_DIR}/update_change_log-ballista.sh $1 $2 $3
diff --git a/dev/release/update_change_log-ballista.sh b/dev/release/update_change_log-ballista.sh
index b5ce827a8..56a3a7af7 100755
--- a/dev/release/update_change_log-ballista.sh
+++ b/dev/release/update_change_log-ballista.sh
@@ -19,14 +19,16 @@
#
# Usage:
-# CHANGELOG_GITHUB_TOKEN=<TOKEN> ./update_change_log-ballista.sh
+# CHANGELOG_GITHUB_TOKEN=<TOKEN> ./update_change_log-ballista.sh master ballista-0.7.0 ballista-0.6.0
-SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-SOURCE_TOP_DIR="$(cd "${SOURCE_DIR}/../../" && pwd)"
+RELEASE_BRANCH=$1
+RELEASE_TAG=$2
+BASE_TAG=$3
-CURRENT_VER=$(grep version "${SOURCE_TOP_DIR}/ballista/rust/client/Cargo.toml" | head -n 1 | awk '{print $3}' | tr -d '"')
+SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
${SOURCE_DIR}/update_change_log.sh \
ballista \
- ballista-0.5.0 \
+ "${BASE_TAG}" \
--exclude-tags-regex "python-.+" \
- --future-release "ballista-${CURRENT_VER}"
+ --future-release "${RELEASE_TAG}" \
+ --release-branch "${RELEASE_BRANCH}"
diff --git a/dev/release/update_change_log-datafusion.sh b/dev/release/update_change_log-datafusion.sh
index 4259c8646..fb605857e 100755
--- a/dev/release/update_change_log-datafusion.sh
+++ b/dev/release/update_change_log-datafusion.sh
@@ -19,14 +19,17 @@
#
# Usage:
-# CHANGELOG_GITHUB_TOKEN=<TOKEN> ./update_change_log-datafusion.sh
+# CHANGELOG_GITHUB_TOKEN=<TOKEN> ./update_change_log-datafusion.sh master 8.0.0 7.1.0
+# CHANGELOG_GITHUB_TOKEN=<TOKEN> ./update_change_log-datafusion.sh maint-7.x 7.1.0 7.0.0
-SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-SOURCE_TOP_DIR="$(cd "${SOURCE_DIR}/../../" && pwd)"
+RELEASE_BRANCH=$1
+RELEASE_TAG=$2
+BASE_TAG=$3
-CURRENT_VER=$(grep version "${SOURCE_TOP_DIR}/datafusion/Cargo.toml" | head -n 1 | awk '{print $3}' | tr -d '"')
+SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
${SOURCE_DIR}/update_change_log.sh \
datafusion \
- 5.0.0 \
+ "${BASE_TAG}" \
--exclude-tags-regex "(python|ballista)-.+" \
- --future-release "${CURRENT_VER}"
+ --future-release "${RELEASE_TAG}" \
+ --release-branch "${RELEASE_BRANCH}"