Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore: upgrade arrow and Rust 

See https://github.com/apache/arrow/pull/10082 for upstream PR.
pull/24376/head
Marco Neumann 2021-04-19 13:46:14 +02:00
parent ae36c1da88
commit fd0da7e74a
11 changed files with 54 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.circleci/config.yml
View File

@ -29,11 +29,11 @@ commands:
description: Install nightly Rust toolchain
steps:
- run:
name: Install rust nightly-2020-11-19
command: rustup toolchain install nightly-2020-11-19
name: Install rust nightly-2021-03-24
command: rustup toolchain install nightly-2021-03-24
- run:
name: Install rustfmt and clippy for nightly-2020-11-19
command: rustup component add rustfmt clippy --toolchain nightly-2020-11-19
name: Install rustfmt and clippy for nightly-2021-03-24
command: rustup component add rustfmt clippy --toolchain nightly-2021-03-24
cache_restore:
description: Restore Cargo Cache
steps:

10
Cargo.lock generated
View File

@ -1,5 +1,7 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
[[package]]
name = "Inflector"
version = "0.11.4"
@ -111,7 +113,7 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
[[package]]
name = "arrow"
version = "4.0.0-SNAPSHOT"
source = "git+https://github.com/apache/arrow.git?rev=00a443629c00079ea03c0b9f415d74669d2759a7#00a443629c00079ea03c0b9f415d74669d2759a7"
source = "git+https://github.com/apache/arrow.git?rev=d4c5c3c02e52e76579d95a84ae33491b9c1284c9#d4c5c3c02e52e76579d95a84ae33491b9c1284c9"
dependencies = [
"cfg_aliases",
"chrono",
@ -134,7 +136,7 @@ dependencies = [
[[package]]
name = "arrow-flight"
version = "4.0.0-SNAPSHOT"
source = "git+https://github.com/apache/arrow.git?rev=00a443629c00079ea03c0b9f415d74669d2759a7#00a443629c00079ea03c0b9f415d74669d2759a7"
source = "git+https://github.com/apache/arrow.git?rev=d4c5c3c02e52e76579d95a84ae33491b9c1284c9#d4c5c3c02e52e76579d95a84ae33491b9c1284c9"
dependencies = [
"arrow",
"bytes",
@ -789,7 +791,7 @@ dependencies = [
[[package]]
name = "datafusion"
version = "4.0.0-SNAPSHOT"
source = "git+https://github.com/apache/arrow.git?rev=00a443629c00079ea03c0b9f415d74669d2759a7#00a443629c00079ea03c0b9f415d74669d2759a7"
source = "git+https://github.com/apache/arrow.git?rev=d4c5c3c02e52e76579d95a84ae33491b9c1284c9#d4c5c3c02e52e76579d95a84ae33491b9c1284c9"
dependencies = [
"ahash 0.7.2",
"arrow",
@ -2301,7 +2303,7 @@ dependencies = [
[[package]]
name = "parquet"
version = "4.0.0-SNAPSHOT"
source = "git+https://github.com/apache/arrow.git?rev=00a443629c00079ea03c0b9f415d74669d2759a7#00a443629c00079ea03c0b9f415d74669d2759a7"
source = "git+https://github.com/apache/arrow.git?rev=d4c5c3c02e52e76579d95a84ae33491b9c1284c9#d4c5c3c02e52e76579d95a84ae33491b9c1284c9"
dependencies = [
"arrow",
"base64 0.12.3",

10
arrow_deps/Cargo.toml
View File

@ -8,14 +8,14 @@ description = "Apache Arrow / Parquet / DataFusion dependencies for InfluxDB IOx
[dependencies] # In alphabetical order
# We are using development version of arrow/parquet/datafusion and the dependencies are at the same rev
# The version can be found here: https://github.com/apache/arrow/commit/00a443629c00079ea03c0b9f415d74669d2759a7
# The version can be found here: https://github.com/apache/arrow/commit/d4c5c3c02e52e76579d95a84ae33491b9c1284c9
#
arrow = { git = "https://github.com/apache/arrow.git", rev = "00a443629c00079ea03c0b9f415d74669d2759a7" , features = ["simd"] }
arrow-flight = { git = "https://github.com/apache/arrow.git", rev = "00a443629c00079ea03c0b9f415d74669d2759a7" }
arrow = { git = "https://github.com/apache/arrow.git", rev = "d4c5c3c02e52e76579d95a84ae33491b9c1284c9" , features = ["simd"] }
arrow-flight = { git = "https://github.com/apache/arrow.git", rev = "d4c5c3c02e52e76579d95a84ae33491b9c1284c9" }
# Turn off optional datafusion features (function packages)
datafusion = { git = "https://github.com/apache/arrow.git", rev = "00a443629c00079ea03c0b9f415d74669d2759a7", default-features = false }
datafusion = { git = "https://github.com/apache/arrow.git", rev = "d4c5c3c02e52e76579d95a84ae33491b9c1284c9", default-features = false }
# Turn off the "arrow" feature; it currently has a bug that causes the crate to rebuild every time
# and we're not currently using it anyway
parquet = { git = "https://github.com/apache/arrow.git", rev = "00a443629c00079ea03c0b9f415d74669d2759a7", default-features = false, features = ["snap", "brotli", "flate2", "lz4", "zstd"] }
parquet = { git = "https://github.com/apache/arrow.git", rev = "d4c5c3c02e52e76579d95a84ae33491b9c1284c9", default-features = false, features = ["snap", "brotli", "flate2", "lz4", "zstd"] }

4
docker/Dockerfile.ci
View File

@ -47,8 +47,8 @@ RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
RUN locale-gen C.UTF-8 || true
ENV LANG=C.UTF-8
RUN rustup toolchain install nightly-2020-11-19
RUN rustup component add rustfmt clippy --toolchain nightly-2020-11-19
RUN rustup toolchain install nightly-2021-03-24
RUN rustup component add rustfmt clippy --toolchain nightly-2021-03-24
RUN groupadd -g 1500 rust \
&& useradd -u 1500 -g rust -s /bin/bash -m rust \

38
object_store/src/aws.rs
View File

@ -400,26 +400,24 @@ impl Error {
use rusoto_core::RusotoError;
use Error::*;
matches! (self,
UnableToPutData {
source: RusotoError::Credentials(_),
bucket: _,
location: _,
} |
UnableToGetData {
source: RusotoError::Credentials(_),
bucket: _,
location: _,
} |
UnableToDeleteData {
source: RusotoError::Credentials(_),
bucket: _,
location: _,
} |
UnableToListData {
source: RusotoError::Credentials(_),
bucket: _,
}
matches!(
self,
UnableToPutData {
source: RusotoError::Credentials(_),
bucket: _,
location: _,
} | UnableToGetData {
source: RusotoError::Credentials(_),
bucket: _,
location: _,
} | UnableToDeleteData {
source: RusotoError::Credentials(_),
bucket: _,
location: _,
} | UnableToListData {
source: RusotoError::Credentials(_),
bucket: _,
}
)
}
}

4
read_buffer/src/row_group.rs
View File

@ -2200,7 +2200,7 @@ impl PartialEq for ReadAggregateResult<'_> {
/// The Debug implementation emits both the schema and the column data for the
/// results.
impl std::fmt::Debug for &ReadAggregateResult<'_> {
impl std::fmt::Debug for ReadAggregateResult<'_> {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
// Display the schema
Display::fmt(&self.schema(), f)?;
@ -2212,7 +2212,7 @@ impl std::fmt::Debug for &ReadAggregateResult<'_> {
/// The Display implementation emits all of the column data for the results, but
/// omits the schema.
impl Display for &ReadAggregateResult<'_> {
impl Display for ReadAggregateResult<'_> {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
if self.is_empty() {
return Ok(());

2
rust-toolchain
View File

@ -1 +1 @@
nightly-2020-11-19
nightly-2021-03-24

2
server/src/config.rs
View File

@ -299,7 +299,7 @@ mod test {
{
let _db_reservation = config.create_db(rules.clone()).unwrap();
let err = config.create_db(rules.clone()).unwrap_err();
assert!(matches!(err, Error::DatabaseAlreadyExists{ .. }));
assert!(matches!(err, Error::DatabaseAlreadyExists { .. }));
}
let db_reservation = config.create_db(rules).unwrap();

2
server/src/lib.rs
View File

@ -901,7 +901,7 @@ mod tests {
.await
.unwrap_err();
if !matches!(got, Error::DatabaseAlreadyExists {..}) {
if !matches!(got, Error::DatabaseAlreadyExists { .. }) {
panic!("expected already exists error");
}
}

2
src/influxdb_ioxd/rpc/storage/expr.rs
View File

@ -440,7 +440,7 @@ fn make_tag_name(tag_name: Vec<u8>) -> Result<String> {
// Builds an Expr given the Value and the converted children
fn build_node(value: RPCValue, inputs: Vec<Expr>) -> Result<Expr> {
// Only logical / comparison ops can have inputs.
let can_have_children = matches!(&value, RPCValue::Logical(_) | RPCValue::Comparison(_));
let can_have_children = matches!(&value, RPCValue::Logical(_) | RPCValue::Comparison(_));
if !can_have_children && !inputs.is_empty() {
return UnexpectedChildren { value }.fail();

18
tracker/src/task.rs
View File

@ -187,7 +187,7 @@ impl<T> TaskTracker<T> {
/// Returns true if all futures associated with this tracker have
/// been dropped and no more can be created
pub fn is_complete(&self) -> bool {
matches!(self.get_status(), TaskStatus::Complete{..})
matches!(self.get_status(), TaskStatus::Complete { .. })
}
/// Gets the status of the tracker
@ -488,9 +488,14 @@ mod tests {
let result3 = task3.await.unwrap();
assert!(result3.is_ok());
assert!(
matches!(tracked[0].get_status(), TaskStatus::Running { pending_count: 1, total_count: 2, ..})
);
assert!(matches!(
tracked[0].get_status(),
TaskStatus::Running {
pending_count: 1,
total_count: 2,
..
}
));
// Trigger termination of task5
running[1].cancel();
@ -511,7 +516,10 @@ mod tests {
let result4 = task4.await.unwrap();
assert!(result4.is_err());
assert!(matches!(running[0].get_status(), TaskStatus::Complete { total_count: 2, ..}));
assert!(matches!(
running[0].get_status(),
TaskStatus::Complete { total_count: 2, .. }
));
let reclaimed = sorted(registry.reclaim().collect());