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/05/04 00:41:42 UTC
[arrow-datafusion] branch master updated: minor: update versions and paths in changelog scripts (#2429)
This is an automated email from the ASF dual-hosted git repository.
alamb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow-datafusion.git
The following commit(s) were added to refs/heads/master by this push:
new 21a2973f0 minor: update versions and paths in changelog scripts (#2429)
21a2973f0 is described below
commit 21a2973f03f0cef43a3e018553f77e97b7ddd13c
Author: Andy Grove <ag...@apache.org>
AuthorDate: Tue May 3 18:41:37 2022 -0600
minor: update versions and paths in changelog scripts (#2429)
* update versions and paths in changelog scripts
* Update release process README
* fix crate publish order
* add ASL header for dot file
---
dev/release/README.md | 56 ++++--
dev/release/crate-deps.dot | 62 +++++++
dev/release/crate-deps.svg | 253 ++++++++++++++++++++++++++++
dev/release/update_change_log-ballista.sh | 2 +-
dev/release/update_change_log-datafusion.sh | 4 +-
5 files changed, 357 insertions(+), 20 deletions(-)
diff --git a/dev/release/README.md b/dev/release/README.md
index aeb7f44d2..3244d32d2 100644
--- a/dev/release/README.md
+++ b/dev/release/README.md
@@ -103,9 +103,6 @@ If there is a ballista release, update versions in ballista Cargo.tomls, run
./dev/update_ballista_versions.py 0.5.0
```
-If there is a datafusion python binding release, update versions in
-`./python/Cargo.toml`.
-
Lastly commit the version change:
```
@@ -114,11 +111,15 @@ 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
+Manually edit the base version tag argument in
+`dev/release/update_change_log-{ballista,datafusion}.sh`. Commits
between the base verstion tag and the latest upstream master will be used to
populate the changelog content.
+You will need a GitHub Personal Access Token for the following steps. Follow
+[these instructions](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token)
+to generate one if you do not already have one.
+
```bash
# create the changelog
CHANGELOG_GITHUB_TOKEN=<TOKEN> ./dev/release/update_change_log-all.sh
@@ -137,12 +138,12 @@ the changelog and update the PR accordingly.
## Prepare release candidate artifacts
-After the PR gets merged, you are ready to create releaes artifacts based off the
+After the PR gets merged, you are ready to create release artifacts based off the
merged commit.
(Note you need to be a committer to run these scripts as they upload to the apache svn distribution servers)
-### Pick an Release Candidate (RC) number
+### Pick a Release Candidate (RC) number
Pick numbers in sequential order, with `0` for `rc0`, `1` for `rc1`, etc.
@@ -151,7 +152,7 @@ Pick numbers in sequential order, with `0` for `rc0`, `1` for `rc1`, etc.
While the official release artifacts are signed tarballs and zip files, we also
tag the commit it was created for convenience and code archaeology.
-Using a string such as `5.1.0` as the `<version>`, create and push the tag thusly:
+Using a string such as `5.1.0` as the `<version>`, create and push the tag by running these commands:
```shell
git fetch apache
@@ -160,9 +161,6 @@ git tag <version>-<rc> apache/master
git push apache <version>
```
-This should trigger the `Python Release Build` Github Action workflow for the
-pushed tag. You can monitor the pipline run status at https://github.com/apache/arrow-datafusion/actions/workflows/python_build.yml.
-
### Create, sign, and upload artifacts
Run `create-tarball.sh` with the `<version>` tag and `<rc>` and you found in previous steps:
@@ -240,7 +238,7 @@ the `release-tarball.sh` script:
./dev/release/release-tarball.sh 5.1.0 0
```
-Congratulations! The release is now offical!
+Congratulations! The release is now official!
### Create release git tags
@@ -274,6 +272,14 @@ create an account and login to crates.io before asking to be added as an owner
of the following crates:
- [datafusion](https://crates.io/crates/datafusion)
+- [datafusion-cli](https://crates.io/crates/datafusion-cli)
+- [datafusion-common](https://crates.io/crates/datafusion-common)
+- [datafusion-data-access](https://crates.io/crates/datafusion-data-access)
+- [datafusion-expr](https://crates.io/crates/datafusion-expr)
+- [datafusion-jit](https://crates.io/crates/datafusion-jit)
+- [datafusion-physical-expr](https://crates.io/crates/datafusion-physical-expr)
+- [datafusion-proto](https://crates.io/crates/datafusion-proto)
+- [datafusion-row](https://crates.io/crates/datafusion-row)
- [ballista](https://crates.io/crates/ballista)
- [ballista-core](https://crates.io/crates/ballista-core)
- [ballista-executor](https://crates.io/crates/ballista-executor)
@@ -282,15 +288,32 @@ of the following crates:
Download and unpack the official release tarball
Verify that the Cargo.toml in the tarball contains the correct version
-(e.g. `version = "5.1.0"`) and then publish the crate with the
-following commands
+(e.g. `version = "5.1.0"`) and then publish the crates with the
+following commands. Crates need to be published in the correct order as shown in this diagram.
+
+
+
+_To update this diagram, manually edit the dependencies in [crate-deps.dot](crate-deps.dot) and then run:_
+
+``` bash
+dot -Tsvg dev/release/crate-deps.dot > dev/release/crate-deps.svg
+```
```shell
-(cd datafusion-common && cargo publish)
-(cd datafusion-expr && cargo publish)
+(cd data-access && cargo publish)
+(cd datafusion/common && cargo publish)
+(cd datafusion/expr && cargo publish)
+(cd datafusion/physical-expr && cargo publish)
+(cd datafusion/jit && cargo publish)
+(cd datafusion/row && cargo publish)
(cd datafusion && cargo publish)
+(cd datafusion/proto && cargo publish)
+(cd datafusion-cli && cargo publish)
```
+Note that `datafusion-cli` will depend on the previously published version of Ballista (which depends on the
+previously published version of DataFusion) until https://github.com/apache/arrow-datafusion/issues/2433 is resolved.
+
If there is a ballista release, run
```shell
@@ -300,7 +323,6 @@ If there is a ballista release, run
(cd ballista/rust/client && cargo publish)
```
-
### Publish datafusion-cli on Homebrew and crates.io
For Homebrew, Send a simple PR to update tag and commit hash for the datafusion
diff --git a/dev/release/crate-deps.dot b/dev/release/crate-deps.dot
new file mode 100644
index 000000000..67e0af924
--- /dev/null
+++ b/dev/release/crate-deps.dot
@@ -0,0 +1,62 @@
+// 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.
+
+digraph G {
+
+ datafusion_common
+
+ datafusion_data_access
+
+ datafusion_expr -> datafusion_common
+
+ datafusion_physical_expr -> datafusion_common
+ datafusion_physical_expr -> datafusion_expr
+
+ datafusion_jit -> datafusion_common
+ datafusion_jit -> datafusion_expr
+
+ datafusion_row -> datafusion_common
+ datafusion_row -> datafusion_expr
+ datafusion_row -> datafusion_jit
+
+ datafusion -> datafusion_common
+ datafusion -> datafusion_data_access
+ datafusion -> datafusion_expr
+ datafusion -> datafusion_jit
+ datafusion -> datafusion_physical_expr
+ datafusion -> datafusion_row
+
+ datafusion_proto -> datafusion
+
+ ballista_core -> datafusion
+ ballista_core -> datafusion_proto
+
+ ballista_scheduler -> ballista_core
+ ballista_scheduler -> datafusion
+
+ ballista_executor -> ballista_core
+ ballista_executor -> datafusion
+
+ ballista -> datafusion
+ ballista -> ballista_core
+ ballista -> ballista_scheduler
+ ballista -> ballista_executor
+
+ datafusion_cli -> datafusion
+ datafusion_cli -> ballista
+
+}
diff --git a/dev/release/crate-deps.svg b/dev/release/crate-deps.svg
new file mode 100644
index 000000000..5b57131d8
--- /dev/null
+++ b/dev/release/crate-deps.svg
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Generated by graphviz version 2.43.0 (0)
+ -->
+<!-- Title: G Pages: 1 -->
+<svg width="614pt" height="692pt"
+ viewBox="0.00 0.00 613.97 692.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 688)">
+<title>G</title>
+<polygon fill="white" stroke="transparent" points="-4,4 -4,-688 609.97,-688 609.97,4 -4,4"/>
+<!-- datafusion_common -->
+<g id="node1" class="node">
+<title>datafusion_common</title>
+<ellipse fill="none" stroke="black" cx="318.52" cy="-18" rx="102.88" ry="18"/>
+<text text-anchor="middle" x="318.52" y="-14.3" font-family="Times,serif" font-size="14.00">datafusion_common</text>
+</g>
+<!-- datafusion_data_access -->
+<g id="node2" class="node">
+<title>datafusion_data_access</title>
+<ellipse fill="none" stroke="black" cx="146.52" cy="-234" rx="118.88" ry="18"/>
+<text text-anchor="middle" x="146.52" y="-230.3" font-family="Times,serif" font-size="14.00">datafusion_data_access</text>
+</g>
+<!-- datafusion_expr -->
+<g id="node3" class="node">
+<title>datafusion_expr</title>
+<ellipse fill="none" stroke="black" cx="318.52" cy="-90" rx="85.29" ry="18"/>
+<text text-anchor="middle" x="318.52" y="-86.3" font-family="Times,serif" font-size="14.00">datafusion_expr</text>
+</g>
+<!-- datafusion_expr->datafusion_common -->
+<g id="edge1" class="edge">
+<title>datafusion_expr->datafusion_common</title>
+<path fill="none" stroke="black" d="M318.52,-71.7C318.52,-63.98 318.52,-54.71 318.52,-46.11"/>
+<polygon fill="black" stroke="black" points="322.02,-46.1 318.52,-36.1 315.02,-46.1 322.02,-46.1"/>
+</g>
+<!-- datafusion_physical_expr -->
+<g id="node4" class="node">
+<title>datafusion_physical_expr</title>
+<ellipse fill="none" stroke="black" cx="176.52" cy="-162" rx="127.28" ry="18"/>
+<text text-anchor="middle" x="176.52" y="-158.3" font-family="Times,serif" font-size="14.00">datafusion_physical_expr</text>
+</g>
+<!-- datafusion_physical_expr->datafusion_common -->
+<g id="edge2" class="edge">
+<title>datafusion_physical_expr->datafusion_common</title>
+<path fill="none" stroke="black" d="M182.45,-143.8C189.82,-124.42 203.99,-92.92 224.52,-72 237.47,-58.81 254.39,-47.92 270.31,-39.51"/>
+<polygon fill="black" stroke="black" points="272.18,-42.48 279.52,-34.84 269.02,-36.24 272.18,-42.48"/>
+</g>
+<!-- datafusion_physical_expr->datafusion_expr -->
+<g id="edge3" class="edge">
+<title>datafusion_physical_expr->datafusion_expr</title>
+<path fill="none" stroke="black" d="M209.81,-144.59C229.95,-134.66 255.79,-121.92 277.22,-111.36"/>
+<polygon fill="black" stroke="black" points="278.99,-114.39 286.42,-106.83 275.9,-108.11 278.99,-114.39"/>
+</g>
+<!-- datafusion_jit -->
+<g id="node5" class="node">
+<title>datafusion_jit</title>
+<ellipse fill="none" stroke="black" cx="532.52" cy="-162" rx="73.39" ry="18"/>
+<text text-anchor="middle" x="532.52" y="-158.3" font-family="Times,serif" font-size="14.00">datafusion_jit</text>
+</g>
+<!-- datafusion_jit->datafusion_common -->
+<g id="edge4" class="edge">
+<title>datafusion_jit->datafusion_common</title>
+<path fill="none" stroke="black" d="M519.68,-144.25C503.98,-124.72 475.74,-92.5 445.52,-72 424.42,-57.68 398.83,-46.09 376.17,-37.44"/>
+<polygon fill="black" stroke="black" points="377.25,-34.11 366.66,-33.91 374.82,-40.67 377.25,-34.11"/>
+</g>
+<!-- datafusion_jit->datafusion_expr -->
+<g id="edge5" class="edge">
+<title>datafusion_jit->datafusion_expr</title>
+<path fill="none" stroke="black" d="M490.24,-147.17C456.62,-136.17 409.33,-120.7 372.89,-108.79"/>
+<polygon fill="black" stroke="black" points="373.52,-105.31 362.92,-105.52 371.34,-111.96 373.52,-105.31"/>
+</g>
+<!-- datafusion_row -->
+<g id="node6" class="node">
+<title>datafusion_row</title>
+<ellipse fill="none" stroke="black" cx="440.52" cy="-234" rx="81.49" ry="18"/>
+<text text-anchor="middle" x="440.52" y="-230.3" font-family="Times,serif" font-size="14.00">datafusion_row</text>
+</g>
+<!-- datafusion_row->datafusion_common -->
+<g id="edge6" class="edge">
+<title>datafusion_row->datafusion_common</title>
+<path fill="none" stroke="black" d="M442.07,-215.69C443.98,-184.1 443.78,-116.27 412.52,-72 402.59,-57.93 387.67,-47.13 372.63,-39.07"/>
+<polygon fill="black" stroke="black" points="373.8,-35.74 363.29,-34.4 370.66,-42 373.8,-35.74"/>
+</g>
+<!-- datafusion_row->datafusion_expr -->
+<g id="edge7" class="edge">
+<title>datafusion_row->datafusion_expr</title>
+<path fill="none" stroke="black" d="M426.05,-216.15C404.59,-191.17 364.21,-144.17 339.5,-115.42"/>
+<polygon fill="black" stroke="black" points="342.15,-113.13 332.98,-107.82 336.84,-117.69 342.15,-113.13"/>
+</g>
+<!-- datafusion_row->datafusion_jit -->
+<g id="edge8" class="edge">
+<title>datafusion_row->datafusion_jit</title>
+<path fill="none" stroke="black" d="M462.32,-216.41C474.44,-207.19 489.69,-195.59 502.88,-185.55"/>
+<polygon fill="black" stroke="black" points="505.35,-188.07 511.19,-179.23 501.12,-182.5 505.35,-188.07"/>
+</g>
+<!-- datafusion -->
+<g id="node7" class="node">
+<title>datafusion</title>
+<ellipse fill="none" stroke="black" cx="312.52" cy="-306" rx="59.59" ry="18"/>
+<text text-anchor="middle" x="312.52" y="-302.3" font-family="Times,serif" font-size="14.00">datafusion</text>
+</g>
+<!-- datafusion->datafusion_common -->
+<g id="edge9" class="edge">
+<title>datafusion->datafusion_common</title>
+<path fill="none" stroke="black" d="M253.24,-302.98C176.14,-298.97 47.83,-287.07 18.52,-252 -63.07,-154.38 148.7,-71.57 258,-36.68"/>
+<polygon fill="black" stroke="black" points="259.12,-40 267.61,-33.66 257.02,-33.32 259.12,-40"/>
+</g>
+<!-- datafusion->datafusion_data_access -->
+<g id="edge10" class="edge">
+<title>datafusion->datafusion_data_access</title>
+<path fill="none" stroke="black" d="M279.33,-291C254.87,-280.69 221.25,-266.51 193.96,-255"/>
+<polygon fill="black" stroke="black" points="195.17,-251.72 184.6,-251.05 192.45,-258.17 195.17,-251.72"/>
+</g>
+<!-- datafusion->datafusion_expr -->
+<g id="edge11" class="edge">
+<title>datafusion->datafusion_expr</title>
+<path fill="none" stroke="black" d="M313,-287.85C314.04,-250.83 316.5,-163.18 317.75,-118.39"/>
+<polygon fill="black" stroke="black" points="321.26,-118.33 318.04,-108.23 314.26,-118.13 321.26,-118.33"/>
+</g>
+<!-- datafusion->datafusion_physical_expr -->
+<g id="edge13" class="edge">
+<title>datafusion->datafusion_physical_expr</title>
+<path fill="none" stroke="black" d="M308.79,-287.73C303.84,-268.29 293.43,-236.73 274.52,-216 262.21,-202.5 245.64,-191.74 229.63,-183.55"/>
+<polygon fill="black" stroke="black" points="230.83,-180.24 220.31,-179.02 227.78,-186.54 230.83,-180.24"/>
+</g>
+<!-- datafusion->datafusion_jit -->
+<g id="edge12" class="edge">
+<title>datafusion->datafusion_jit</title>
+<path fill="none" stroke="black" d="M367.94,-299.16C425.64,-291.82 510.38,-277.04 530.52,-252 544.25,-234.93 543.39,-209.48 539.89,-190.16"/>
+<polygon fill="black" stroke="black" points="543.26,-189.19 537.74,-180.15 536.42,-190.66 543.26,-189.19"/>
+</g>
+<!-- datafusion->datafusion_row -->
+<g id="edge14" class="edge">
+<title>datafusion->datafusion_row</title>
+<path fill="none" stroke="black" d="M339.98,-289.98C358.2,-280.02 382.36,-266.81 402.43,-255.83"/>
+<polygon fill="black" stroke="black" points="404.23,-258.83 411.33,-250.97 400.87,-252.69 404.23,-258.83"/>
+</g>
+<!-- datafusion_proto -->
+<g id="node8" class="node">
+<title>datafusion_proto</title>
+<ellipse fill="none" stroke="black" cx="371.52" cy="-378" rx="89.08" ry="18"/>
+<text text-anchor="middle" x="371.52" y="-374.3" font-family="Times,serif" font-size="14.00">datafusion_proto</text>
+</g>
+<!-- datafusion_proto->datafusion -->
+<g id="edge15" class="edge">
+<title>datafusion_proto->datafusion</title>
+<path fill="none" stroke="black" d="M357.24,-360.05C350.07,-351.54 341.24,-341.07 333.33,-331.68"/>
+<polygon fill="black" stroke="black" points="335.79,-329.18 326.67,-323.79 330.44,-333.69 335.79,-329.18"/>
+</g>
+<!-- ballista_core -->
+<g id="node9" class="node">
+<title>ballista_core</title>
+<ellipse fill="none" stroke="black" cx="350.52" cy="-450" rx="69.59" ry="18"/>
+<text text-anchor="middle" x="350.52" y="-446.3" font-family="Times,serif" font-size="14.00">ballista_core</text>
+</g>
+<!-- ballista_core->datafusion -->
+<g id="edge16" class="edge">
+<title>ballista_core->datafusion</title>
+<path fill="none" stroke="black" d="M315.69,-434.4C299.78,-425.75 282.51,-413.09 273.52,-396 262.29,-374.63 275.8,-349.35 289.9,-331.2"/>
+<polygon fill="black" stroke="black" points="292.67,-333.34 296.33,-323.4 287.27,-328.89 292.67,-333.34"/>
+</g>
+<!-- ballista_core->datafusion_proto -->
+<g id="edge17" class="edge">
+<title>ballista_core->datafusion_proto</title>
+<path fill="none" stroke="black" d="M355.71,-431.7C358.05,-423.9 360.87,-414.51 363.47,-405.83"/>
+<polygon fill="black" stroke="black" points="366.87,-406.69 366.39,-396.1 360.16,-404.68 366.87,-406.69"/>
+</g>
+<!-- ballista_scheduler -->
+<g id="node10" class="node">
+<title>ballista_scheduler</title>
+<ellipse fill="none" stroke="black" cx="473.52" cy="-522" rx="94.78" ry="18"/>
+<text text-anchor="middle" x="473.52" y="-518.3" font-family="Times,serif" font-size="14.00">ballista_scheduler</text>
+</g>
+<!-- ballista_scheduler->datafusion -->
+<g id="edge19" class="edge">
+<title>ballista_scheduler->datafusion</title>
+<path fill="none" stroke="black" d="M478.87,-503.95C487.69,-472.17 501.37,-403.22 469.52,-360 448.95,-332.09 412.95,-318.71 380.61,-312.37"/>
+<polygon fill="black" stroke="black" points="381.16,-308.91 370.71,-310.62 379.94,-315.8 381.16,-308.91"/>
+</g>
+<!-- ballista_scheduler->ballista_core -->
+<g id="edge18" class="edge">
+<title>ballista_scheduler->ballista_core</title>
+<path fill="none" stroke="black" d="M444.99,-504.76C427.67,-494.91 405.4,-482.23 386.83,-471.66"/>
+<polygon fill="black" stroke="black" points="388.47,-468.57 378.05,-466.67 385.01,-474.65 388.47,-468.57"/>
+</g>
+<!-- ballista_executor -->
+<g id="node11" class="node">
+<title>ballista_executor</title>
+<ellipse fill="none" stroke="black" cx="232.52" cy="-522" rx="89.88" ry="18"/>
+<text text-anchor="middle" x="232.52" y="-518.3" font-family="Times,serif" font-size="14.00">ballista_executor</text>
+</g>
+<!-- ballista_executor->datafusion -->
+<g id="edge21" class="edge">
+<title>ballista_executor->datafusion</title>
+<path fill="none" stroke="black" d="M232.98,-503.58C234.41,-472.94 240.32,-408.12 264.52,-360 269.9,-349.3 278.05,-339.14 286.1,-330.63"/>
+<polygon fill="black" stroke="black" points="288.82,-332.86 293.4,-323.31 283.86,-327.92 288.82,-332.86"/>
+</g>
+<!-- ballista_executor->ballista_core -->
+<g id="edge20" class="edge">
+<title>ballista_executor->ballista_core</title>
+<path fill="none" stroke="black" d="M259.89,-504.76C276.36,-495 297.49,-482.46 315.2,-471.95"/>
+<polygon fill="black" stroke="black" points="317.3,-474.78 324.11,-466.67 313.73,-468.76 317.3,-474.78"/>
+</g>
+<!-- ballista -->
+<g id="node12" class="node">
+<title>ballista</title>
+<ellipse fill="none" stroke="black" cx="350.52" cy="-594" rx="44.69" ry="18"/>
+<text text-anchor="middle" x="350.52" y="-590.3" font-family="Times,serif" font-size="14.00">ballista</text>
+</g>
+<!-- ballista->datafusion -->
+<g id="edge22" class="edge">
+<title>ballista->datafusion</title>
+<path fill="none" stroke="black" d="M394.17,-589.15C453.57,-582.9 555.07,-568.29 577.52,-540 587.47,-527.47 581.78,-519.42 577.52,-504 557.7,-432.14 550.41,-405.71 491.52,-360 459,-334.75 414.66,-321.51 378.26,-314.57"/>
+<polygon fill="black" stroke="black" points="378.67,-311.09 368.21,-312.78 377.44,-317.98 378.67,-311.09"/>
+</g>
+<!-- ballista->ballista_core -->
+<g id="edge23" class="edge">
+<title>ballista->ballista_core</title>
+<path fill="none" stroke="black" d="M350.52,-575.87C350.52,-551.67 350.52,-507.21 350.52,-478.39"/>
+<polygon fill="black" stroke="black" points="354.02,-478.19 350.52,-468.19 347.02,-478.19 354.02,-478.19"/>
+</g>
+<!-- ballista->ballista_scheduler -->
+<g id="edge24" class="edge">
+<title>ballista->ballista_scheduler</title>
+<path fill="none" stroke="black" d="M375.41,-578.83C392.82,-568.93 416.39,-555.52 436.06,-544.32"/>
+<polygon fill="black" stroke="black" points="437.83,-547.34 444.79,-539.35 434.36,-541.26 437.83,-547.34"/>
+</g>
+<!-- ballista->ballista_executor -->
+<g id="edge25" class="edge">
+<title>ballista->ballista_executor</title>
+<path fill="none" stroke="black" d="M326.36,-578.67C309.79,-568.83 287.5,-555.61 268.81,-544.52"/>
+<polygon fill="black" stroke="black" points="270.34,-541.37 259.96,-539.28 266.77,-547.39 270.34,-541.37"/>
+</g>
+<!-- datafusion_cli -->
+<g id="node13" class="node">
+<title>datafusion_cli</title>
+<ellipse fill="none" stroke="black" cx="232.52" cy="-666" rx="74.99" ry="18"/>
+<text text-anchor="middle" x="232.52" y="-662.3" font-family="Times,serif" font-size="14.00">datafusion_cli</text>
+</g>
+<!-- datafusion_cli->datafusion -->
+<g id="edge26" class="edge">
+<title>datafusion_cli->datafusion</title>
+<path fill="none" stroke="black" d="M205.75,-648.99C170.93,-625.9 114.52,-579.74 114.52,-523 114.52,-523 114.52,-523 114.52,-449 114.52,-378.42 198.63,-339.52 257.21,-320.99"/>
+<polygon fill="black" stroke="black" points="258.55,-324.24 267.1,-317.98 256.51,-317.54 258.55,-324.24"/>
+</g>
+<!-- datafusion_cli->ballista -->
+<g id="edge27" class="edge">
+<title>datafusion_cli->ballista</title>
+<path fill="none" stroke="black" d="M259.3,-649.12C276.6,-638.85 299.22,-625.43 317.61,-614.52"/>
+<polygon fill="black" stroke="black" points="319.45,-617.5 326.26,-609.39 315.87,-611.48 319.45,-617.5"/>
+</g>
+</g>
+</svg>
diff --git a/dev/release/update_change_log-ballista.sh b/dev/release/update_change_log-ballista.sh
index b5ce827a8..330603d01 100755
--- a/dev/release/update_change_log-ballista.sh
+++ b/dev/release/update_change_log-ballista.sh
@@ -27,6 +27,6 @@ SOURCE_TOP_DIR="$(cd "${SOURCE_DIR}/../../" && pwd)"
CURRENT_VER=$(grep version "${SOURCE_TOP_DIR}/ballista/rust/client/Cargo.toml" | head -n 1 | awk '{print $3}' | tr -d '"')
${SOURCE_DIR}/update_change_log.sh \
ballista \
- ballista-0.5.0 \
+ ballista-0.6.0 \
--exclude-tags-regex "python-.+" \
--future-release "ballista-${CURRENT_VER}"
diff --git a/dev/release/update_change_log-datafusion.sh b/dev/release/update_change_log-datafusion.sh
index 4259c8646..e00a06430 100755
--- a/dev/release/update_change_log-datafusion.sh
+++ b/dev/release/update_change_log-datafusion.sh
@@ -24,9 +24,9 @@
SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
SOURCE_TOP_DIR="$(cd "${SOURCE_DIR}/../../" && pwd)"
-CURRENT_VER=$(grep version "${SOURCE_TOP_DIR}/datafusion/Cargo.toml" | head -n 1 | awk '{print $3}' | tr -d '"')
+CURRENT_VER=$(grep version "${SOURCE_TOP_DIR}/datafusion/core/Cargo.toml" | head -n 1 | awk '{print $3}' | tr -d '"')
${SOURCE_DIR}/update_change_log.sh \
datafusion \
- 5.0.0 \
+ 7.0.0 \
--exclude-tags-regex "(python|ballista)-.+" \
--future-release "${CURRENT_VER}"