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
9 changes: 5 additions & 4 deletions ci/scripts/integration_arrow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,12 @@ set -ex
arrow_dir=${1}
source_dir=${1}/cpp
build_dir=${2}/cpp
gold_dir_0_14_1=$arrow_dir/testing/data/arrow-ipc-stream/integration/0.14.1
gold_dir_0_17_1=$arrow_dir/testing/data/arrow-ipc-stream/integration/0.17.1

gold_dir=$arrow_dir/testing/data/arrow-ipc-stream/integration

pip install -e $arrow_dir/dev/archery

archery integration --with-all --run-flight \
--gold-dirs=$gold_dir_0_14_1 \
--gold-dirs=$gold_dir_0_17_1 \
--gold-dirs=$gold_dir/0.14.1 \
--gold-dirs=$gold_dir/0.17.1 \
--gold-dirs=$gold_dir/2.0.0-compression \
5 changes: 5 additions & 0 deletions dev/archery/archery/integration/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,11 @@ def _gold_tests(self, gold_dir):
skip = set()
if name == 'union' and prefix == '0.17.1':
skip.add("Java")
if prefix == '2.0.0-compression':
skip.add("Go")
skip.add("Java")
skip.add("JS")
skip.add("Rust")
yield datagen.File(name, None, None, skip=skip, path=out_path)

def _run_test_cases(self, producer, consumer, case_runner,
Expand Down
9 changes: 8 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1147,9 +1147,16 @@ services:
volumes: *conda-volumes
environment:
<<: *ccache
ARROW_BUILD_STATIC: "OFF"
ARROW_COMPUTE: "OFF"
ARROW_CSV: "OFF"
ARROW_FLIGHT: "ON"
ARROW_GANDIVA: "OFF"
ARROW_PARQUET: "OFF"
ARROW_S3: "OFF"
# tell archery where the arrow binaries are located
ARROW_CPP_EXE_PATH: /build/cpp/debug
# Running integration tests serially until ARROW-8176 resolved
CMAKE_UNITY_BUILD: "ON"
command:
["/arrow/ci/scripts/rust_build.sh /arrow /build &&
/arrow/ci/scripts/cpp_build.sh /arrow /build &&
Expand Down
56 changes: 28 additions & 28 deletions js/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions rust/arrow-flight/src/arrow.flight.protocol.rs
Original file line number Diff line number Diff line change
Expand Up @@ -499,9 +499,8 @@ pub mod flight_service_server {
#[async_trait]
pub trait FlightService: Send + Sync + 'static {
#[doc = "Server streaming response type for the Handshake method."]
type HandshakeStream: Stream<
Item = Result<super::HandshakeResponse, tonic::Status>,
> + Send
type HandshakeStream: Stream<Item = Result<super::HandshakeResponse, tonic::Status>>
+ Send
Copy link
Member Author

Choose a reason for hiding this comment

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

@andygrove This seems to be some automated style that got applied when running archery docker conda-integration. Is it ok?

Copy link
Contributor

Choose a reason for hiding this comment

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

It's a bit of an irritant because there's a slight difference in the behaviour of the formatter in the stable vs nightly versions.
We can leave it as is on this PR. I'll make time to look into a solution.

+ Sync
+ 'static;
#[doc = ""]
Expand Down