Skip to content

Commit

Permalink
chore(deps): Update arrow and datafusion to 49.0.0 (#24605)
Browse files Browse the repository at this point in the history
* chore(deps): Update arrow and datafusion to 49.0.0

This commit copies in our dependency code from influxdb_iox in order for
us to be able to upgrade from a forked version of 46.0.0 to 49.0.0 of
both arrow and datafusion. Most of the important changes were around how
we consumed the crates in influxdb3(_server/_write). Those diffs are
particularly worth looking at as the rest was a straight copy and we
don't touch those crates in our development currently for influxdb3
edge.

* fix: regenerate workspace hack crate

* fix: Protobuf issues with incompatibility labels

* fix: Broken CI yaml

* fix: buf version

* fix: Only check IOx repo

* fix: Remove protobuf lint

* fix: Comment out call to protobuf-lint
  • Loading branch information
mgattozzi committed Feb 1, 2024
1 parent 001a2a6 commit ff567cd
Show file tree
Hide file tree
Showing 477 changed files with 52,700 additions and 11,613 deletions.
56 changes: 29 additions & 27 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -323,32 +323,34 @@ jobs:
name: Check iox_data_generator compiles
command: cargo check --package="iox_data_generator" --no-default-features

# Lint protobufs.
protobuf-lint:
docker:
- image: bufbuild/buf:0.40.0
environment:
# Value to look for to skip breaking changes check
SKIP_LABEL: "https://api.github.com/repos/influxdata/influxdb/labels/incompatible%20protobuf"
steps:
- checkout
- run:
name: buf lint
command: buf lint
- run:
name: buf breaking changes
command: |
echo "If you want to make changes forbidden by this lint, please"
echo "coordinate with the conductor team, add the 'incompatible protobuf' label"
echo "to the PR, and rerun this test"
# Check if label is present using github API:
# Inspired by https://discuss.circleci.com/t/tag-label-filter/11158
if wget -O - https://api.github.com/repos/influxdata/influxdb/issues/$(echo $CIRCLE_PULL_REQUEST | grep -oE "[^/pull]+$") | grep "$SKIP_LABEL" ; then echo "SKIPPING (FOUND LABEL)" && exit ; else echo "CHECKING (NO LABEL FOUND)"; fi
git fetch origin main
# compare against only changes in this branch (not against
# other stuff that may have been added to main since last merge)
MERGE_BASE=$(git merge-base origin/main $CIRCLE_BRANCH) sh -c 'buf breaking --against ".git#ref=$MERGE_BASE,depth=100"'
# TODO: Figure out how to get this to work with changes in IOx Repo
# and here
# # Lint protobufs.
# protobuf-lint:
# docker:
# - image: bufbuild/buf:0.40.0
# environment:
# # Value to look for to skip breaking changes check
# SKIP_LABEL: "https://api.github.com/repos/influxdata/influxdb/labels/incompatible%20protobuf"
# steps:
# - checkout
# - run:
# name: buf lint
# command: buf lint
# - run:
# name: buf breaking changes
# command: |
# echo "If you want to make changes forbidden by this lint, please"
# echo "coordinate with the conductor team, add the 'incompatible protobuf' label"
# echo "to the PR, and rerun this test"
# # Check if label is present using github API:
# # Inspired by https://discuss.circleci.com/t/tag-label-filter/11158
# if wget -O - https://api.github.com/repos/influxdata/influxdb/issues/$(echo $CIRCLE_PULL_REQUEST | grep -oE "[^/pull]+$") | grep "$SKIP_LABEL" ; then echo "SKIPPING (FOUND LABEL)" && exit ; else echo "CHECKING (NO LABEL FOUND)"; fi
# git fetch origin main
# # compare against only changes in this branch (not against
# # other stuff that may have been added to main since last merge)
# MERGE_BASE=$(git merge-base origin/main $CIRCLE_BRANCH) sh -c 'buf breaking --against ".git#ref=$MERGE_BASE,depth=100"'
#
# Lint docs
docs-lint:
docker:
Expand Down Expand Up @@ -455,7 +457,7 @@ workflows:
- fmt
- lint
- cargo_audit
- protobuf-lint
# - protobuf-lint
- docs-lint
- test
- test_heappy
Expand Down

0 comments on commit ff567cd

Please sign in to comment.