Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: More version upgrades #557

Merged
merged 1 commit into from
Jul 26, 2023
Merged
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
335 changes: 174 additions & 161 deletions Cargo.lock

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ arrow-ord = { version = "43.0.0" }
arrow-schema = { version = "43.0.0", features = ["serde"] }
arrow-select = { version = "43.0.0" }
arrow-string = { version = "43.0.0" }
async-once-cell = "0.3.1"
async-once-cell = "0.5.3"
async-stream = "0.3.4"
async-trait = "0.1.68"
avro-rs = "0.13.0"
avro-schema = "0.3.0"
bigdecimal = { version = "0.3.1", features = ["serde"] }
bigdecimal = { version = "0.4.1", features = ["serde"] }
bincode = "1.3.3"
bit-set = "0.5.3"
bitvec = { version = "1.0.1", features = ["serde"] }
Expand All @@ -40,7 +40,7 @@ codespan-reporting = "0.11.1"
const_format = "0.2.30"
core_affinity = "0.8.0"
cpu-time = "1.0.0"
criterion = { version = "0.4.0", default-features = false, features = [
criterion = { version = "0.5.1", default-features = false, features = [
"async_tokio",
] }
dashmap = "5.4.0"
Expand All @@ -53,28 +53,28 @@ enum-as-inner = "0.6.0"
enum-map = "2.5.0"
erased-serde = "0.3.25"
error-stack = { version = "0.3.1", features = ["anyhow", "spantrace"] }
fallible-iterator = "0.2.0"
fallible-iterator = "0.3.0"
futures = "0.3.27"
futures-lite = "1.12.0"
half = { version = "2.2.1", features = ["serde"] }
hashbrown = { version = "0.13.2", features = ["serde"] }
hashbrown = { version = "0.14.0", features = ["serde"] }
hex = "0.4.3"
index_vec = { version = "0.1.3", features = ["serde"] }
indoc = "1.0.9"
insta = { version = "1.29.0", features = ["ron", "yaml", "json"] }
inventory = "0.3.8"
itertools = "0.10.5"
lalrpop = "0.19.9"
lalrpop-util = "0.19.9"
itertools = "0.11.0"
lalrpop = "0.20.0"
lalrpop-util = "0.20.0"
logos = "0.12.1"
lz4 = "1.24.0"
lz4-sys = "1.9.4"
num = "0.4.0"
num-traits = "0.2.15"
object_store = { version = "0.6.1", features = ["aws", "gcp"] }
once_cell = "1.17.1"
opentelemetry = { version = "0.18.0", features = ["rt-tokio"] }
opentelemetry-otlp = "0.11.0"
opentelemetry = { version = "0.19.0", features = ["rt-tokio"] }
opentelemetry-otlp = "0.12.0"
owning_ref = "0.4.1"
parking_lot = { version = "0.12.1" }
parquet = { version = "43.0.0", features = ["async"] }
Expand Down Expand Up @@ -122,14 +122,14 @@ tokio = { version = "1.27.0", features = [
] }
tokio-stream = { version = "0.1.12", features = ["fs"] }
tokio-util = { version = "0.7.7", features = ["io"] }
toml = "0.5.11"
toml = "0.7.6"
tonic = "0.9.2"
tonic-build = { version = "0.9.2", features = ["prost"] }
tonic-health = "0.9.2"
tonic-reflection = "0.9.2"
tracing = "0.1.37"
tracing-error = "0.2.0"
tracing-opentelemetry = "0.18.0"
tracing-opentelemetry = "0.19.0"
tracing-serde = "0.1.3"
tracing-subscriber = { version = "0.3.17", features = [
"env-filter",
Expand All @@ -143,7 +143,7 @@ uuid = { version = "1.3.0", features = ["v4"] }
# This disables compression algorithms that cause issues during linking due to
# https://github.com/rust-rocksdb/rust-rocksdb/issues/514
default-features = false
version = "0.19.0"
version = "0.21.0"
features = ["lz4"]

[profile.release]
Expand Down
30 changes: 15 additions & 15 deletions crates/sparrow-catalog/catalog/add.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name = 'add'
signature = 'add(a: number, b: number) -> number'
operator = 'a + b'
short_doc = 'Returns the sum of two numbers.'
long_doc = '''
name = "add"
signature = "add(a: number, b: number) -> number"
operator = "a + b"
short_doc = "Returns the sum of two numbers."
long_doc = """
This is the function used for the binary operation `a + b`.

### Parameters
Expand All @@ -16,28 +16,28 @@ following the [numeric type coercion rules](docs:data-model#numeric-type-coercio
Returns a numeric column of the promoted numeric type compatible with both `a` and `b`.
The result contains `null` if `a` or `b` was null at that row.
Otherwise the row contains the sum of `a` and `b`.
'''
tags = ['math']
"""
tags = ["math"]

[[examples]]
name = 'Addition'
description = '''
name = "Addition"
description = """
In this example, `a` is an integer column (defaulting to `i64`) and `b`
is a floating point column (defaulting to `f64`). The result is a floating
point column, achieved by implicitly converting `a` to `f64`.
'''
expression = 'Input.a + Input.b'
input_csv = '''
"""
expression = "Input.a + Input.b"
input_csv = """
time,key,a,b
2021-01-01T00:00:00.000000000Z,A,5,1.2
2021-01-02T00:00:00.000000000Z,A,6.3,0.4
2021-03-01T00:00:00.000000000Z,B,,3.7
2021-04-10T00:00:00.000000000Z,A,13,
'''
output_csv = '''
"""
output_csv = """
time,key,a,b,result
2021-01-01T00:00:00.000000000,A,5.0,1.2,6.2
2021-01-02T00:00:00.000000000,A,6.3,0.4,6.7
2021-03-01T00:00:00.000000000,B,,3.7,
2021-04-10T00:00:00.000000000,A,13.0,,
'''
"""
28 changes: 14 additions & 14 deletions crates/sparrow-catalog/catalog/add_time.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = 'add_time'
signature = 'add_time(delta: timedelta, time: timestamp_ns) -> timestamp_ns'
short_doc = 'Adds a `timedelta` (duration or interval) to a time.'
long_doc = '''
name = "add_time"
signature = "add_time(delta: timedelta, time: timestamp_ns) -> timestamp_ns"
short_doc = "Adds a `timedelta` (duration or interval) to a time."
long_doc = """
### Parameters
* delta: The time delta to add to the timestamp. See other
[time functions](#time-functions) for how to create `timedelta`s.
Expand All @@ -11,31 +11,31 @@ long_doc = '''
Returns a time column with each row containing the value of `time` for
that row plus the given `delta`. If either the `delta` or `time` are `null`
then the result is `null` in that row.
'''
tags = ['time']
"""
tags = ["time"]

[[examples]]
name = 'Adding a fixed number of days'
description = '''
name = "Adding a fixed number of days"
description = """
This example uses [`days`](#days) to create a fixed `interval_days`
to add to a given date.
'''
expression = 'Input.time | add_time(days(3))'
input_csv = '''
"""
expression = "Input.time | add_time(days(3))"
input_csv = """
time,key
1996-03-21T00:00:00-00:00,Ben
1996-04-21T00:00:00-00:00,Ryan
1996-05-21T00:00:00-00:00,Ryan
1996-06-21T00:00:00-00:00,Ryan
1996-07-21T00:00:00-00:00,Ben
1996-08-21T00:00:00-00:00,Ben
'''
output_csv = '''
"""
output_csv = """
time,key,result
1996-03-21T00:00:00.000000000,Ben,1996-03-24T00:00:00.000000000
1996-04-21T00:00:00.000000000,Ryan,1996-04-24T00:00:00.000000000
1996-05-21T00:00:00.000000000,Ryan,1996-05-24T00:00:00.000000000
1996-06-21T00:00:00.000000000,Ryan,1996-06-24T00:00:00.000000000
1996-07-21T00:00:00.000000000,Ben,1996-07-24T00:00:00.000000000
1996-08-21T00:00:00.000000000,Ben,1996-08-24T00:00:00.000000000
'''
"""
24 changes: 12 additions & 12 deletions crates/sparrow-catalog/catalog/ceil.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = 'ceil'
signature = 'ceil(n: number) -> number'
short_doc = 'Rounds the number up to the next largest integer.'
long_doc = '''
name = "ceil"
signature = "ceil(n: number) -> number"
short_doc = "Rounds the number up to the next largest integer."
long_doc = """
See also [`round`](#round) and [`floor`](#floor).

### Parameters
Expand All @@ -14,23 +14,23 @@ Note: This method may be applied to any numeric type. For anything other than
Returns a numeric column of the same type as `n`.
The result contains `null` if `n` was null at that position.
Otherwise, it contains the result of rounding `n` up to the next largest integer.
'''
tags = ['math']
"""
tags = ["math"]

[[examples]]
name = 'Ceil'
expression = 'Input.a | ceil()'
input_csv = '''
name = "Ceil"
expression = "Input.a | ceil()"
input_csv = """
time,key,a
2021-01-01T00:00:00.000000000Z,A,5.7
2021-01-01T00:00:00.000000000Z,A,6.3
2021-01-02T00:00:00.000000000Z,B,
2021-01-02T00:00:00.000000000Z,B,-2.3
'''
output_csv = '''
"""
output_csv = """
time,key,a,result
2021-01-01T00:00:00.000000000,A,5.7,6.0
2021-01-01T00:00:00.000000000,A,6.3,7.0
2021-01-02T00:00:00.000000000,B,,
2021-01-02T00:00:00.000000000,B,-2.3,-2.0
'''
"""
44 changes: 22 additions & 22 deletions crates/sparrow-catalog/catalog/clamp.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = 'clamp'
signature = 'clamp(value: number, min: number = null, max: number = null) -> number'
short_doc = 'Returns `value` clamped between the bounds `min` and `max`.'
long_doc = '''
name = "clamp"
signature = "clamp(value: number, min: number = null, max: number = null) -> number"
short_doc = "Returns `value` clamped between the bounds `min` and `max`."
long_doc = """
### Parameters
* `value`: The value to be clamped.
* `min`: The minimum bound. If `null`, no minimum bound will be applied.
Expand All @@ -20,48 +20,48 @@ it contains `value` if `value` is between `min` and `max`, `min` if
`value` is less than `min`, `max` if `value` is greater than `max`, and
`null` if `value` is `null` or `min > max`. If `min` or `max`
are null than no clamping on that side will be performed.
'''
tags = ['math']
"""
tags = ["math"]

[[examples]]
name = 'Clamp With Min and Max'
description = '''
name = "Clamp With Min and Max"
description = """
This example shows the use of `clamp` with both a `min` and
`max` value provided.
'''
expression = 'Input.a | clamp(min = 0.5, max = 9.5)'
input_csv = '''
"""
expression = "Input.a | clamp(min = 0.5, max = 9.5)"
input_csv = """
time,key,a
2021-01-01T00:00:00.000000000Z,A,5.7
2021-01-01T00:00:00.000000000Z,A,6.3
2021-01-01T00:00:00.000000000Z,B,
2021-01-01T00:00:00.000000000Z,A,
'''
output_csv = '''
"""
output_csv = """
time,key,a,result
2021-01-01T00:00:00.000000000,A,5.7,5.7
2021-01-01T00:00:00.000000000,A,6.3,6.3
2021-01-01T00:00:00.000000000,B,,
2021-01-01T00:00:00.000000000,A,,
'''
"""

[[examples]]
name = 'Clamp with Min'
description = '''
name = "Clamp with Min"
description = """
This example shows the use of clamp with just a minimum bound.
'''
expression = 'Input.a | clamp(min = 0.5)'
input_csv = '''
"""
expression = "Input.a | clamp(min = 0.5)"
input_csv = """
time,key,a
2021-01-01T00:00:00.000000000Z,A,5.7
2021-01-01T00:00:00.000000000Z,A,6.3
2021-01-01T00:00:00.000000000Z,B,
2021-01-01T00:00:00.000000000Z,A,
'''
output_csv = '''
"""
output_csv = """
time,key,a,result
2021-01-01T00:00:00.000000000,A,5.7,5.7
2021-01-01T00:00:00.000000000,A,6.3,6.3
2021-01-01T00:00:00.000000000,B,,
2021-01-01T00:00:00.000000000,A,,
'''
"""
28 changes: 14 additions & 14 deletions crates/sparrow-catalog/catalog/coalesce.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = 'coalesce'
signature = 'coalesce(values+: any) -> any'
short_doc = 'Return first non-`null` value or `null` if all values are `null`.'
long_doc = '''
name = "coalesce"
signature = "coalesce(values+: any) -> any"
short_doc = "Return first non-`null` value or `null` if all values are `null`."
long_doc = """
### Parameters
* values: One or more values to be coalesced.
Note that all of the values must be promotable to the same type.
Expand All @@ -12,20 +12,20 @@ If all values are `null`, then returns `null`.

The type of the result is the minimum type that all of the `values`
were [promotable](docs:data-model#type-promotion-rules) to.
'''
tags = ['logical']
"""
tags = ["logical"]

[[examples]]
description = '''
description = """
In this example we use `coalesce` to apply multiple conditions, almost
like a `switch` statement. Each case uses [`if`](#if) to only pass through
the cases where the condition is met.

One thing to be aware of when using `coalesce` like this is that the first
non-`null` is taken. Which means that even if a condition is met, if the
corresponding value was `null`, it would move on to other conditions.
'''
expression = '''
"""
expression = """
coalesce(
# Tax exempt items
Input.value | if(Input.tax_category == 'exempt'),
Expand All @@ -34,18 +34,18 @@ coalesce(
# Normal tax (10%) items
Input.value * 1.1
)
'''
input_csv = '''
"""
input_csv = """
time,key,value,tax_category
2020-01-01T00:00:00.000000000Z,Ben,10.00,exempt
2020-01-02T00:00:00.000000000Z,Ben,12.00,
2020-01-02T01:00:00.000000000Z,Ryan,13.00,flat
2020-01-02T01:00:00.000000000Z,Ryan,,exempt
'''
output_csv = '''
"""
output_csv = """
time,key,value,tax_category,result
2020-01-01T00:00:00.000000000,Ben,10.0,exempt,10.0
2020-01-02T00:00:00.000000000,Ben,12.0,,13.200000000000001
2020-01-02T01:00:00.000000000,Ryan,13.0,flat,14.0
2020-01-02T01:00:00.000000000,Ryan,,exempt,
'''
"""
Loading
Loading