Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ jobs:
# run tests on all workspace members with default feature list
cargo test
# test datafusion examples
cd datafusion
cargo test --no-default-features --features cli
cd datafusion-examples
cargo test --no-default-features
cargo run --example csv_sql
cargo run --example parquet_sql
cd ..
Expand Down
18 changes: 14 additions & 4 deletions dev/release/00-prepare-test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,13 @@ def test_version_pre_tag
"+version = \"#{@release_version}\""],
],
},
{
path: "rust/datafusion-examples/Cargo.toml",
hunks: [
["-version = \"#{@snapshot_version}\"",
"+version = \"#{@release_version}\""],
],
},
{
path: "rust/datafusion/Cargo.toml",
hunks: [
Expand All @@ -297,8 +304,6 @@ def test_version_pre_tag
"-parquet = { path = \"../parquet\", version = \"#{@snapshot_version}\", features = [\"arrow\"] }",
"+arrow = { path = \"../arrow\", version = \"#{@release_version}\", features = [\"prettyprint\"] }",
"+parquet = { path = \"../parquet\", version = \"#{@release_version}\", features = [\"arrow\"] }"],
["-arrow-flight = { path = \"../arrow-flight\", version = \"#{@snapshot_version}\" }",
"+arrow-flight = { path = \"../arrow-flight\", version = \"#{@release_version}\" }"]
],
},
{
Expand Down Expand Up @@ -535,6 +540,13 @@ def test_version_post_tag
"+version = \"#{@next_snapshot_version}\""],
],
},
{
path: "rust/datafusion-examples/Cargo.toml",
hunks: [
["-version = \"#{@release_version}\"",
"+version = \"#{@next_snapshot_version}\""],
],
},
{
path: "rust/datafusion/Cargo.toml",
hunks: [
Expand All @@ -544,8 +556,6 @@ def test_version_post_tag
"-parquet = { path = \"../parquet\", version = \"#{@release_version}\", features = [\"arrow\"] }",
"+arrow = { path = \"../arrow\", version = \"#{@next_snapshot_version}\", features = [\"prettyprint\"] }",
"+parquet = { path = \"../parquet\", version = \"#{@next_snapshot_version}\", features = [\"arrow\"] }"],
["-arrow-flight = { path = \"../arrow-flight\", version = \"#{@release_version}\" }",
"+arrow-flight = { path = \"../arrow-flight\", version = \"#{@next_snapshot_version}\" }"]
],
},
{
Expand Down
1 change: 1 addition & 0 deletions rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ members = [
"parquet_derive",
"parquet_derive_test",
"datafusion",
"datafusion-examples",
"arrow-flight",
"integration-testing",
"benchmarks",
Expand Down
39 changes: 39 additions & 0 deletions rust/datafusion-examples/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# 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.

[package]
name = "datafusion-examples"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI @andygrove -- I am not sure what you think about possibly releasing the examples as a crate of their own. I personally think it would be necessary. However perhaps it would be the right way to to eventually to somehow link to the example code from the docs.rs page https://docs.rs/datafusion/3.0.0/datafusion/

I filed this JIRA https://issues.apache.org/jira/browse/ARROW-11863 to track that

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd lean on not publishing by default, so I'd prefer a publish = false on the Cargo file. I support clarifying this as part of ARROW-11863 @alamb.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added publish = false.
The examples are currently also not on https://docs.rs/datafusion/3.0.0/datafusion/ I think - agree that it would be very useful.

Copy link
Contributor Author

@Dandandan Dandandan Mar 22, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ok, outcome would be to point the docs from docs.rs always at master

another (better) option would be to link at a versioned url (based on published version)
https://github.com/apache/arrow/tree/apache-arrow-3.0.0

description = "DataFusion usage examples"
version = "4.0.0-SNAPSHOT"
homepage = "https://github.com/apache/arrow"
repository = "https://github.com/apache/arrow"
authors = ["Apache Arrow <dev@arrow.apache.org>"]
license = "Apache-2.0"
keywords = [ "arrow", "query", "sql" ]
edition = "2018"
publish = false


[dev-dependencies]
datafusion = { path = "../datafusion" }
arrow = { path = "../arrow" }
prost = "0.7"
arrow-flight = { path = "../arrow-flight" }
tonic = "0.4"
tokio = { version = "1.0", features = ["macros", "rt", "rt-multi-thread", "sync"] }
futures = "0.3"
num_cpus = "1.13.0"
3 changes: 0 additions & 3 deletions rust/datafusion/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,6 @@ lazy_static = { version = "^1.4.0", optional = true }
rand = "0.8"
criterion = "0.3"
tempfile = "3"
prost = "0.7"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉

arrow-flight = { path = "../arrow-flight", version = "4.0.0-SNAPSHOT" }
tonic = "0.4"
doc-comment = "0.3"

[[bench]]
Expand Down