Skip to content

Commit

Permalink
Merge branch 'main' into reloaded_remove_python
Browse files Browse the repository at this point in the history
  • Loading branch information
andygrove authored Oct 12, 2024
2 parents 738d4ce + 37b4b0e commit 808f22f
Show file tree
Hide file tree
Showing 193 changed files with 13 additions and 20,972 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,5 @@ jobs:
'{ballista,docs}/**/*.md' \
'!ballista/CHANGELOG.md' \
README.md \
CONTRIBUTING.md \
'ballista/**/*.{ts,tsx}'
CONTRIBUTING.md
git diff --exit-code
46 changes: 1 addition & 45 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,44 +72,6 @@ jobs:
/github/home/target/release/ballista-scheduler
/github/home/target/release/ballista-executor
react-build:
name: React build
runs-on: ubuntu-latest # proprietary github image, not ubuntu:latest
container:
image: ubuntu:latest # actual ubuntu:latest that ubuntu publishes
env:
DEBIAN_FRONTEND: "noninteractive"
steps:
- uses: actions/checkout@v3
- name: Install dependencies
run: |
cat /etc/*-release
apt-get -qq update
apt-get -qq upgrade
apt-get -qq install -y curl
curl -fsSL https://deb.nodesource.com/setup_18.x | bash
apt-get -qq update
apt-get -qq install -y nodejs
npm install -g yarn
which node
which npm
which yarn
node --version
npm --version
yarn --version
- name: Run yarn build
run: |
cd ballista/scheduler/ui
pwd
yarn install
yarn build
- name: Save artifacts
uses: actions/upload-artifact@v4
with:
name: react-artifacts
path: |
ballista/scheduler/ui/build
# test the crate
linux-test:
name: Test Workspace on AMD64 Rust ${{ matrix.rust }}
Expand Down Expand Up @@ -338,7 +300,7 @@ jobs:

docker:
name: Docker
needs: [linux-build-lib, react-build]
needs: [linux-build-lib]
runs-on: ubuntu-latest
permissions:
contents: read
Expand All @@ -350,11 +312,6 @@ jobs:
with:
name: rust-artifacts
path: target/release
- name: Restore react artifacts
uses: actions/download-artifact@v4
with:
name: react-artifacts
path: ballista/scheduler/ui/build
- name: Build and push Docker image
run: |
echo "github user is $DOCKER_USER"
Expand Down Expand Up @@ -468,7 +425,6 @@ jobs:
env:
CARGO_HOME: "/github/home/.cargo"
CARGO_TARGET_DIR: "/github/home/target"

# Coverage job was failing. https://github.com/apache/arrow-datafusion/issues/590 tracks re-instating it

# coverage:
Expand Down
19 changes: 0 additions & 19 deletions .readthedocs.yml

This file was deleted.

5 changes: 0 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ This section describes how you can get started with Ballista development.
Ballista contains components implemented in the following programming languages:

- Rust (Scheduler and Executor processes, Client library)
- Javascript (Scheduler Web UI)

### Rust Environment

Expand Down Expand Up @@ -90,10 +89,6 @@ Environment variables are prefixed by `BALLISTA_EXECUTOR` or `BALLISTA_SCHEDULER
respectively. Hyphens in command line arguments become underscores. For example, the `--scheduler-host` argument
for the executor becomes `BALLISTA_EXECUTOR_SCHEDULER_HOST`

### Javascript Environment

Refer to the instructions in the Scheduler Web UI [README](./ballista/scheduler/ui/README.md)

## Integration Tests

The integration tests can be executed by running the following command from the root of the repository.
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ See the [architecture guide](docs/source/contributors-guide/architecture.md) for
- DataFrame and SQL APIs available from Python and Rust.
- Clients can connect to a Ballista cluster using [Flight SQL][flight-sql].
- JDBC support via Arrow Flight SQL JDBC Driver
- Scheduler web interface and REST UI for monitoring query progress and viewing query plans and metrics.
- Scheduler REST UI for monitoring query progress and viewing query plans and metrics.
- Support for Docker, Docker Compose, and Kubernetes deployment, as well as manual deployment on bare metal.

## Performance
Expand Down Expand Up @@ -105,5 +105,4 @@ Please see the [Contribution Guide](CONTRIBUTING.md) for information about contr
[datafusion]: https://github.com/apache/arrow-datafusion
[flight]: https://arrow.apache.org/blog/2019/10/13/introducing-arrow-flight/
[flight-sql]: https://arrow.apache.org/blog/2022/02/16/introducing-arrow-flight-sql/
[ballista-talk]: https://www.youtube.com/watch?v=ZZHQaOap9pQ
[user-guide]: https://datafusion.apache.org/ballista/
165 changes: 0 additions & 165 deletions ballista/client/src/columnar_batch.rs

This file was deleted.

1 change: 0 additions & 1 deletion ballista/client/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,5 @@

#![doc = include_str!("../README.md")]

pub mod columnar_batch;
pub mod context;
pub mod prelude;
1 change: 0 additions & 1 deletion ballista/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ futures = "0.3"
hashbrown = "0.14"

itertools = "0.12"
libloading = "0.8.0"
log = "0.4"
md-5 = { version = "^0.10.0" }
object_store = { workspace = true }
Expand Down
2 changes: 0 additions & 2 deletions ballista/core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ pub mod error;
pub mod event_loop;
pub mod execution_plans;
pub mod object_store_registry;
/// some plugins
pub mod plugin;
pub mod utils;

#[macro_use]
Expand Down
Loading

0 comments on commit 808f22f

Please sign in to comment.