From 07c26008480d3638f9c100df9a4b604e87ef12e5 Mon Sep 17 00:00:00 2001 From: "Heres, Daniel" Date: Sun, 14 Feb 2021 15:36:13 +0100 Subject: [PATCH 1/7] Move benches to its own crate --- rust/Cargo.toml | 1 + rust/arrow-benches/Cargo.toml | 93 +++++++++++++++++++ .../benches/aggregate_kernels.rs | 0 .../benches/arithmetic_kernels.rs | 0 .../benches/array_from_vec.rs | 0 .../benches/array_slice.rs | 0 .../benches/boolean_kernels.rs | 0 .../benches/buffer_bit_ops.rs | 0 .../benches/buffer_create.rs | 0 .../benches/builder.rs | 0 .../benches/cast_kernels.rs | 0 .../benches/comparison_kernels.rs | 0 .../benches/concatenate_kernel.rs | 0 .../benches/csv_writer.rs | 0 .../{arrow => arrow-benches}/benches/equal.rs | 0 .../benches/filter_kernels.rs | 0 .../benches/json_reader.rs | 0 .../benches/length_kernel.rs | 0 .../benches/mutable_array.rs | 0 .../benches/sort_kernel.rs | 0 .../benches/take_kernels.rs | 0 rust/arrow/Cargo.toml | 80 +--------------- 22 files changed, 95 insertions(+), 79 deletions(-) create mode 100644 rust/arrow-benches/Cargo.toml rename rust/{arrow => arrow-benches}/benches/aggregate_kernels.rs (100%) rename rust/{arrow => arrow-benches}/benches/arithmetic_kernels.rs (100%) rename rust/{arrow => arrow-benches}/benches/array_from_vec.rs (100%) rename rust/{arrow => arrow-benches}/benches/array_slice.rs (100%) rename rust/{arrow => arrow-benches}/benches/boolean_kernels.rs (100%) rename rust/{arrow => arrow-benches}/benches/buffer_bit_ops.rs (100%) rename rust/{arrow => arrow-benches}/benches/buffer_create.rs (100%) rename rust/{arrow => arrow-benches}/benches/builder.rs (100%) rename rust/{arrow => arrow-benches}/benches/cast_kernels.rs (100%) rename rust/{arrow => arrow-benches}/benches/comparison_kernels.rs (100%) rename rust/{arrow => arrow-benches}/benches/concatenate_kernel.rs (100%) rename rust/{arrow => arrow-benches}/benches/csv_writer.rs (100%) rename rust/{arrow => arrow-benches}/benches/equal.rs (100%) rename rust/{arrow => arrow-benches}/benches/filter_kernels.rs (100%) rename rust/{arrow => arrow-benches}/benches/json_reader.rs (100%) rename rust/{arrow => arrow-benches}/benches/length_kernel.rs (100%) rename rust/{arrow => arrow-benches}/benches/mutable_array.rs (100%) rename rust/{arrow => arrow-benches}/benches/sort_kernel.rs (100%) rename rust/{arrow => arrow-benches}/benches/take_kernels.rs (100%) diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 16e34de7f14..663afbabd87 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -18,6 +18,7 @@ [workspace] members = [ "arrow", + "arrow-benches", "parquet", "parquet_derive", "parquet_derive_test", diff --git a/rust/arrow-benches/Cargo.toml b/rust/arrow-benches/Cargo.toml new file mode 100644 index 00000000000..4f479668321 --- /dev/null +++ b/rust/arrow-benches/Cargo.toml @@ -0,0 +1,93 @@ +[package] +name = "arrow-benches" +description = "Apache Arrow micro benchmarks" +version = "4.0.0-SNAPSHOT" +edition = "2018" +authors = ["Apache Arrow "] +homepage = "https://github.com/apache/arrow" +repository = "https://github.com/apache/arrow" +license = "Apache-2.0" + +[dependencies] +arrow = { path = "../arrow", version = "4.0.0-SNAPSHOT"} + +[dev-dependencies] +criterion = "0.3" +rand = "0.7" +chrono = "0.4" + +[[bench]] +name = "aggregate_kernels" +harness = false + +[[bench]] +name = "array_from_vec" +harness = false + +[[bench]] +name = "builder" +harness = false + +[[bench]] +name = "buffer_bit_ops" +harness = false + +[[bench]] +name = "boolean_kernels" +harness = false + +[[bench]] +name = "arithmetic_kernels" +harness = false + +[[bench]] +name = "cast_kernels" +harness = false + +[[bench]] +name = "comparison_kernels" +harness = false + +[[bench]] +name = "filter_kernels" +harness = false + +[[bench]] +name = "take_kernels" +harness = false + +[[bench]] +name = "length_kernel" +harness = false + +[[bench]] +name = "sort_kernel" +harness = false + +[[bench]] +name = "csv_writer" +harness = false + +[[bench]] +name = "json_reader" +harness = false + +[[bench]] +name = "equal" +harness = false + +[[bench]] +name = "array_slice" +harness = false + +[[bench]] +name = "concatenate_kernel" +harness = false + +[[bench]] +name = "mutable_array" +harness = false + +[[bench]] +name = "buffer_create" +harness = false \ No newline at end of file diff --git a/rust/arrow/benches/aggregate_kernels.rs b/rust/arrow-benches/benches/aggregate_kernels.rs similarity index 100% rename from rust/arrow/benches/aggregate_kernels.rs rename to rust/arrow-benches/benches/aggregate_kernels.rs diff --git a/rust/arrow/benches/arithmetic_kernels.rs b/rust/arrow-benches/benches/arithmetic_kernels.rs similarity index 100% rename from rust/arrow/benches/arithmetic_kernels.rs rename to rust/arrow-benches/benches/arithmetic_kernels.rs diff --git a/rust/arrow/benches/array_from_vec.rs b/rust/arrow-benches/benches/array_from_vec.rs similarity index 100% rename from rust/arrow/benches/array_from_vec.rs rename to rust/arrow-benches/benches/array_from_vec.rs diff --git a/rust/arrow/benches/array_slice.rs b/rust/arrow-benches/benches/array_slice.rs similarity index 100% rename from rust/arrow/benches/array_slice.rs rename to rust/arrow-benches/benches/array_slice.rs diff --git a/rust/arrow/benches/boolean_kernels.rs b/rust/arrow-benches/benches/boolean_kernels.rs similarity index 100% rename from rust/arrow/benches/boolean_kernels.rs rename to rust/arrow-benches/benches/boolean_kernels.rs diff --git a/rust/arrow/benches/buffer_bit_ops.rs b/rust/arrow-benches/benches/buffer_bit_ops.rs similarity index 100% rename from rust/arrow/benches/buffer_bit_ops.rs rename to rust/arrow-benches/benches/buffer_bit_ops.rs diff --git a/rust/arrow/benches/buffer_create.rs b/rust/arrow-benches/benches/buffer_create.rs similarity index 100% rename from rust/arrow/benches/buffer_create.rs rename to rust/arrow-benches/benches/buffer_create.rs diff --git a/rust/arrow/benches/builder.rs b/rust/arrow-benches/benches/builder.rs similarity index 100% rename from rust/arrow/benches/builder.rs rename to rust/arrow-benches/benches/builder.rs diff --git a/rust/arrow/benches/cast_kernels.rs b/rust/arrow-benches/benches/cast_kernels.rs similarity index 100% rename from rust/arrow/benches/cast_kernels.rs rename to rust/arrow-benches/benches/cast_kernels.rs diff --git a/rust/arrow/benches/comparison_kernels.rs b/rust/arrow-benches/benches/comparison_kernels.rs similarity index 100% rename from rust/arrow/benches/comparison_kernels.rs rename to rust/arrow-benches/benches/comparison_kernels.rs diff --git a/rust/arrow/benches/concatenate_kernel.rs b/rust/arrow-benches/benches/concatenate_kernel.rs similarity index 100% rename from rust/arrow/benches/concatenate_kernel.rs rename to rust/arrow-benches/benches/concatenate_kernel.rs diff --git a/rust/arrow/benches/csv_writer.rs b/rust/arrow-benches/benches/csv_writer.rs similarity index 100% rename from rust/arrow/benches/csv_writer.rs rename to rust/arrow-benches/benches/csv_writer.rs diff --git a/rust/arrow/benches/equal.rs b/rust/arrow-benches/benches/equal.rs similarity index 100% rename from rust/arrow/benches/equal.rs rename to rust/arrow-benches/benches/equal.rs diff --git a/rust/arrow/benches/filter_kernels.rs b/rust/arrow-benches/benches/filter_kernels.rs similarity index 100% rename from rust/arrow/benches/filter_kernels.rs rename to rust/arrow-benches/benches/filter_kernels.rs diff --git a/rust/arrow/benches/json_reader.rs b/rust/arrow-benches/benches/json_reader.rs similarity index 100% rename from rust/arrow/benches/json_reader.rs rename to rust/arrow-benches/benches/json_reader.rs diff --git a/rust/arrow/benches/length_kernel.rs b/rust/arrow-benches/benches/length_kernel.rs similarity index 100% rename from rust/arrow/benches/length_kernel.rs rename to rust/arrow-benches/benches/length_kernel.rs diff --git a/rust/arrow/benches/mutable_array.rs b/rust/arrow-benches/benches/mutable_array.rs similarity index 100% rename from rust/arrow/benches/mutable_array.rs rename to rust/arrow-benches/benches/mutable_array.rs diff --git a/rust/arrow/benches/sort_kernel.rs b/rust/arrow-benches/benches/sort_kernel.rs similarity index 100% rename from rust/arrow/benches/sort_kernel.rs rename to rust/arrow-benches/benches/sort_kernel.rs diff --git a/rust/arrow/benches/take_kernels.rs b/rust/arrow-benches/benches/take_kernels.rs similarity index 100% rename from rust/arrow/benches/take_kernels.rs rename to rust/arrow-benches/benches/take_kernels.rs diff --git a/rust/arrow/Cargo.toml b/rust/arrow/Cargo.toml index 0b14b5bfae8..751429ff430 100644 --- a/rust/arrow/Cargo.toml +++ b/rust/arrow/Cargo.toml @@ -25,7 +25,6 @@ authors = ["Apache Arrow "] license = "Apache-2.0" keywords = [ "arrow" ] include = [ - "benches/*.rs", "src/**/*.rs", "Cargo.toml", ] @@ -63,85 +62,8 @@ prettyprint = ["prettytable-rs"] memory-check = [] [dev-dependencies] -criterion = "0.3" flate2 = "1" tempfile = "3" [build-dependencies] -cfg_aliases = "0.1" - -[[bench]] -name = "aggregate_kernels" -harness = false - -[[bench]] -name = "array_from_vec" -harness = false - -[[bench]] -name = "builder" -harness = false - -[[bench]] -name = "buffer_bit_ops" -harness = false - -[[bench]] -name = "boolean_kernels" -harness = false - -[[bench]] -name = "arithmetic_kernels" -harness = false - -[[bench]] -name = "cast_kernels" -harness = false - -[[bench]] -name = "comparison_kernels" -harness = false - -[[bench]] -name = "filter_kernels" -harness = false - -[[bench]] -name = "take_kernels" -harness = false - -[[bench]] -name = "length_kernel" -harness = false - -[[bench]] -name = "sort_kernel" -harness = false - -[[bench]] -name = "csv_writer" -harness = false - -[[bench]] -name = "json_reader" -harness = false - -[[bench]] -name = "equal" -harness = false - -[[bench]] -name = "array_slice" -harness = false - -[[bench]] -name = "concatenate_kernel" -harness = false - -[[bench]] -name = "mutable_array" -harness = false - -[[bench]] -name = "buffer_create" -harness = false +cfg_aliases = "0.1" \ No newline at end of file From 6b09cc4ece3e6324c1e5705ea17c2bffe7627711 Mon Sep 17 00:00:00 2001 From: "Heres, Daniel" Date: Sun, 14 Feb 2021 15:48:15 +0100 Subject: [PATCH 2/7] Add licence --- rust/arrow-benches/Cargo.toml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/rust/arrow-benches/Cargo.toml b/rust/arrow-benches/Cargo.toml index 4f479668321..6130e0450bd 100644 --- a/rust/arrow-benches/Cargo.toml +++ b/rust/arrow-benches/Cargo.toml @@ -1,3 +1,20 @@ +# 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 = "arrow-benches" description = "Apache Arrow micro benchmarks" From 6db1c5a5d535efaef1bcc4a05dfff7cf3923ae5a Mon Sep 17 00:00:00 2001 From: "Heres, Daniel" Date: Sun, 14 Feb 2021 20:21:40 +0100 Subject: [PATCH 3/7] Add to prepare-test --- dev/release/00-prepare-test.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dev/release/00-prepare-test.rb b/dev/release/00-prepare-test.rb index df27a1aa75a..6bca5cd1e0b 100644 --- a/dev/release/00-prepare-test.rb +++ b/dev/release/00-prepare-test.rb @@ -287,6 +287,13 @@ def test_version_pre_tag "+version = \"#{@release_version}\""], ], }, + { + path: "rust/arrow-benches/Cargo.toml", + hunks: [ + ["-version = \"#{@snapshot_version}\"", + "+version = \"#{@release_version}\""], + ], + }, { path: "rust/benchmarks/Cargo.toml", hunks: [ From 679f294887296cc0edeb0e5dd88deb571f97667c Mon Sep 17 00:00:00 2001 From: "Heres, Daniel" Date: Sun, 14 Feb 2021 20:29:19 +0100 Subject: [PATCH 4/7] Reorder --- dev/release/00-prepare-test.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dev/release/00-prepare-test.rb b/dev/release/00-prepare-test.rb index 6bca5cd1e0b..b2a1f616a96 100644 --- a/dev/release/00-prepare-test.rb +++ b/dev/release/00-prepare-test.rb @@ -263,16 +263,14 @@ def test_version_pre_tag ], }, { - path: "rust/arrow-flight/Cargo.toml", + path: "rust/arrow-benches/Cargo.toml", hunks: [ ["-version = \"#{@snapshot_version}\"", "+version = \"#{@release_version}\""], - ["-arrow = { path = \"../arrow\", version = \"#{@snapshot_version}\" }", - "+arrow = { path = \"../arrow\", version = \"#{@release_version}\" }"], ], }, { - path: "rust/arrow-pyarrow-integration-testing/Cargo.toml", + path: "rust/arrow-flight/Cargo.toml", hunks: [ ["-version = \"#{@snapshot_version}\"", "+version = \"#{@release_version}\""], @@ -281,14 +279,16 @@ def test_version_pre_tag ], }, { - path: "rust/arrow/Cargo.toml", + path: "rust/arrow-pyarrow-integration-testing/Cargo.toml", hunks: [ ["-version = \"#{@snapshot_version}\"", "+version = \"#{@release_version}\""], + ["-arrow = { path = \"../arrow\", version = \"#{@snapshot_version}\" }", + "+arrow = { path = \"../arrow\", version = \"#{@release_version}\" }"], ], }, { - path: "rust/arrow-benches/Cargo.toml", + path: "rust/arrow/Cargo.toml", hunks: [ ["-version = \"#{@snapshot_version}\"", "+version = \"#{@release_version}\""], From cac4427e5a62a0a9061137b2f13e73079a1aeb84 Mon Sep 17 00:00:00 2001 From: "Heres, Daniel" Date: Sun, 14 Feb 2021 20:36:22 +0100 Subject: [PATCH 5/7] Remove? --- dev/release/00-prepare-test.rb | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dev/release/00-prepare-test.rb b/dev/release/00-prepare-test.rb index b2a1f616a96..df27a1aa75a 100644 --- a/dev/release/00-prepare-test.rb +++ b/dev/release/00-prepare-test.rb @@ -262,13 +262,6 @@ def test_version_pre_tag "+ VERSION = \"#{@release_version}\""], ], }, - { - path: "rust/arrow-benches/Cargo.toml", - hunks: [ - ["-version = \"#{@snapshot_version}\"", - "+version = \"#{@release_version}\""], - ], - }, { path: "rust/arrow-flight/Cargo.toml", hunks: [ From d621981a721a187a16f7b80142eeb0aeab310286 Mon Sep 17 00:00:00 2001 From: "Heres, Daniel" Date: Sun, 14 Feb 2021 20:42:10 +0100 Subject: [PATCH 6/7] Add to both --- dev/release/00-prepare-test.rb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dev/release/00-prepare-test.rb b/dev/release/00-prepare-test.rb index df27a1aa75a..a89cd450409 100644 --- a/dev/release/00-prepare-test.rb +++ b/dev/release/00-prepare-test.rb @@ -262,6 +262,13 @@ def test_version_pre_tag "+ VERSION = \"#{@release_version}\""], ], }, + { + path: "rust/arrow-benches/Cargo.toml", + hunks: [ + ["-version = \"#{@snapshot_version}\"", + "+version = \"#{@release_version}\""], + ], + }, { path: "rust/arrow-flight/Cargo.toml", hunks: [ @@ -509,6 +516,13 @@ def test_version_post_tag "+ VERSION = \"#{@next_snapshot_version}\""], ], }, + { + path: "rust/arrow-benches/Cargo.toml", + hunks: [ + ["-version = \"#{@snapshot_version}\"", + "+version = \"#{@release_version}\""], + ], + }, { path: "rust/arrow-flight/Cargo.toml", hunks: [ From 466f4b0b1bcd8489f5beb52f33fbe2ed48634287 Mon Sep 17 00:00:00 2001 From: "Heres, Daniel" Date: Sun, 14 Feb 2021 20:58:41 +0100 Subject: [PATCH 7/7] Fix --- dev/release/00-prepare-test.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/release/00-prepare-test.rb b/dev/release/00-prepare-test.rb index a89cd450409..96b36153686 100644 --- a/dev/release/00-prepare-test.rb +++ b/dev/release/00-prepare-test.rb @@ -519,9 +519,9 @@ def test_version_post_tag { path: "rust/arrow-benches/Cargo.toml", hunks: [ - ["-version = \"#{@snapshot_version}\"", - "+version = \"#{@release_version}\""], - ], + ["-version = \"#{@release_version}\"", + "+version = \"#{@next_snapshot_version}\""], + ], }, { path: "rust/arrow-flight/Cargo.toml",