This is an automated email from the ASF dual-hosted git repository.
agrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow-datafusion.git
The following commit(s) were added to refs/heads/master by this push:
new 93d985ca7 Correct schema nullabiilty declaration in tests (#2802)
93d985ca7 is described below
commit 93d985ca7cb039f7ba813437901cc2b48eba19d0
Author: Andrew Lamb <[email protected]>
AuthorDate: Tue Jun 28 02:51:41 2022 -0400
Correct schema nullabiilty declaration in tests (#2802)
---
datafusion/core/src/datasource/listing/helpers.rs | 2 +-
.../core/src/physical_optimizer/aggregate_statistics.rs | 4 ++--
datafusion/core/src/physical_plan/hash_join.rs | 4 ++--
datafusion/core/src/physical_plan/memory.rs | 4 ++--
datafusion/physical-expr/src/aggregate/correlation.rs | 16 ++++++++--------
datafusion/physical-expr/src/aggregate/covariance.rs | 16 ++++++++--------
datafusion/physical-expr/src/aggregate/stddev.rs | 4 ++--
datafusion/physical-expr/src/aggregate/sum_distinct.rs | 2 +-
datafusion/physical-expr/src/aggregate/variance.rs | 4 ++--
datafusion/physical-expr/src/expressions/binary.rs | 6 +++---
datafusion/physical-expr/src/expressions/cast.rs | 4 ++--
datafusion/physical-expr/src/expressions/literal.rs | 2 +-
datafusion/physical-expr/src/expressions/mod.rs | 6 +++---
datafusion/physical-expr/src/expressions/try_cast.rs | 4 ++--
datafusion/physical-expr/src/window/row_number.rs | 2 +-
15 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/datafusion/core/src/datasource/listing/helpers.rs
b/datafusion/core/src/datasource/listing/helpers.rs
index a26eafabb..4b482d968 100644
--- a/datafusion/core/src/datasource/listing/helpers.rs
+++ b/datafusion/core/src/datasource/listing/helpers.rs
@@ -272,7 +272,7 @@ fn paths_to_batch(
let mut fields = vec![
Field::new(FILE_PATH_COLUMN_NAME, DataType::Utf8, false),
Field::new(FILE_SIZE_COLUMN_NAME, DataType::UInt64, false),
- Field::new(FILE_MODIFIED_COLUMN_NAME, DataType::Date64, false),
+ Field::new(FILE_MODIFIED_COLUMN_NAME, DataType::Date64, true),
];
for pn in table_partition_cols {
fields.push(Field::new(pn, DataType::Utf8, false));
diff --git a/datafusion/core/src/physical_optimizer/aggregate_statistics.rs
b/datafusion/core/src/physical_optimizer/aggregate_statistics.rs
index cafd61d9e..c75bf7e1b 100644
--- a/datafusion/core/src/physical_optimizer/aggregate_statistics.rs
+++ b/datafusion/core/src/physical_optimizer/aggregate_statistics.rs
@@ -276,8 +276,8 @@ mod tests {
/// Mock data using a MemoryExec which has an exact count statistic
fn mock_data() -> Result<Arc<MemoryExec>> {
let schema = Arc::new(Schema::new(vec![
- Field::new("a", DataType::Int32, false),
- Field::new("b", DataType::Int32, false),
+ Field::new("a", DataType::Int32, true),
+ Field::new("b", DataType::Int32, true),
]));
let batch = RecordBatch::try_new(
diff --git a/datafusion/core/src/physical_plan/hash_join.rs
b/datafusion/core/src/physical_plan/hash_join.rs
index 825120dd9..6d90120da 100644
--- a/datafusion/core/src/physical_plan/hash_join.rs
+++ b/datafusion/core/src/physical_plan/hash_join.rs
@@ -2388,8 +2388,8 @@ mod tests {
},
];
let intermediate_schema = Schema::new(vec![
- Field::new("c", DataType::Int32, false),
- Field::new("c", DataType::Int32, false),
+ Field::new("c", DataType::Int32, true),
+ Field::new("c", DataType::Int32, true),
]);
let filter_expression = Arc::new(BinaryExpr::new(
Arc::new(Column::new("c", 0)),
diff --git a/datafusion/core/src/physical_plan/memory.rs
b/datafusion/core/src/physical_plan/memory.rs
index 6a0af7650..d2dbe0d73 100644
--- a/datafusion/core/src/physical_plan/memory.rs
+++ b/datafusion/core/src/physical_plan/memory.rs
@@ -231,8 +231,8 @@ mod tests {
let schema = Arc::new(Schema::new(vec![
Field::new("a", DataType::Int32, false),
Field::new("b", DataType::Int32, false),
- Field::new("c", DataType::Int32, false),
- Field::new("d", DataType::Int32, true),
+ Field::new("c", DataType::Int32, true),
+ Field::new("d", DataType::Int32, false),
]));
let batch = RecordBatch::try_new(
diff --git a/datafusion/physical-expr/src/aggregate/correlation.rs
b/datafusion/physical-expr/src/aggregate/correlation.rs
index 2bdcce291..94a820849 100644
--- a/datafusion/physical-expr/src/aggregate/correlation.rs
+++ b/datafusion/physical-expr/src/aggregate/correlation.rs
@@ -336,8 +336,8 @@ mod tests {
let b: ArrayRef = Arc::new(Int32Array::from(vec![Some(4), Some(5),
Some(6)]));
let schema = Schema::new(vec![
- Field::new("a", DataType::Int32, false),
- Field::new("b", DataType::Int32, false),
+ Field::new("a", DataType::Int32, true),
+ Field::new("b", DataType::Int32, true),
]);
let batch = RecordBatch::try_new(Arc::new(schema.clone()), vec![a,
b])?;
@@ -359,8 +359,8 @@ mod tests {
let b: ArrayRef = Arc::new(Int32Array::from(vec![None, None]));
let schema = Schema::new(vec![
- Field::new("a", DataType::Int32, false),
- Field::new("b", DataType::Int32, false),
+ Field::new("a", DataType::Int32, true),
+ Field::new("b", DataType::Int32, true),
]);
let batch = RecordBatch::try_new(Arc::new(schema.clone()), vec![a,
b])?;
@@ -384,8 +384,8 @@ mod tests {
let d = Arc::new(Float64Array::from(vec![4.4_f64, 5.5_f64, 9.9_f64]));
let schema = Schema::new(vec![
- Field::new("a", DataType::Float64, false),
- Field::new("b", DataType::Float64, false),
+ Field::new("a", DataType::Float64, true),
+ Field::new("b", DataType::Float64, true),
]);
let batch1 = RecordBatch::try_new(Arc::new(schema.clone()), vec![a,
b])?;
@@ -419,8 +419,8 @@ mod tests {
let d = Arc::new(Float64Array::from(vec![None]));
let schema = Schema::new(vec![
- Field::new("a", DataType::Float64, false),
- Field::new("b", DataType::Float64, false),
+ Field::new("a", DataType::Float64, true),
+ Field::new("b", DataType::Float64, true),
]);
let batch1 = RecordBatch::try_new(Arc::new(schema.clone()), vec![a,
b])?;
diff --git a/datafusion/physical-expr/src/aggregate/covariance.rs
b/datafusion/physical-expr/src/aggregate/covariance.rs
index 028b7d311..1df002b48 100644
--- a/datafusion/physical-expr/src/aggregate/covariance.rs
+++ b/datafusion/physical-expr/src/aggregate/covariance.rs
@@ -511,8 +511,8 @@ mod tests {
let b: ArrayRef = Arc::new(Int32Array::from(vec![Some(4), Some(5),
Some(6)]));
let schema = Schema::new(vec![
- Field::new("a", DataType::Int32, false),
- Field::new("b", DataType::Int32, false),
+ Field::new("a", DataType::Int32, true),
+ Field::new("b", DataType::Int32, true),
]);
let batch = RecordBatch::try_new(Arc::new(schema.clone()), vec![a,
b])?;
@@ -534,8 +534,8 @@ mod tests {
let b: ArrayRef = Arc::new(Int32Array::from(vec![None, None]));
let schema = Schema::new(vec![
- Field::new("a", DataType::Int32, false),
- Field::new("b", DataType::Int32, false),
+ Field::new("a", DataType::Int32, true),
+ Field::new("b", DataType::Int32, true),
]);
let batch = RecordBatch::try_new(Arc::new(schema.clone()), vec![a,
b])?;
@@ -559,8 +559,8 @@ mod tests {
let d = Arc::new(Float64Array::from(vec![4.4_f64, 5.5_f64, 6.6_f64]));
let schema = Schema::new(vec![
- Field::new("a", DataType::Float64, false),
- Field::new("b", DataType::Float64, false),
+ Field::new("a", DataType::Float64, true),
+ Field::new("b", DataType::Float64, true),
]);
let batch1 = RecordBatch::try_new(Arc::new(schema.clone()), vec![a,
b])?;
@@ -594,8 +594,8 @@ mod tests {
let d = Arc::new(Float64Array::from(vec![None]));
let schema = Schema::new(vec![
- Field::new("a", DataType::Float64, false),
- Field::new("b", DataType::Float64, false),
+ Field::new("a", DataType::Float64, true),
+ Field::new("b", DataType::Float64, true),
]);
let batch1 = RecordBatch::try_new(Arc::new(schema.clone()), vec![a,
b])?;
diff --git a/datafusion/physical-expr/src/aggregate/stddev.rs
b/datafusion/physical-expr/src/aggregate/stddev.rs
index df02b8ac8..13085fee2 100644
--- a/datafusion/physical-expr/src/aggregate/stddev.rs
+++ b/datafusion/physical-expr/src/aggregate/stddev.rs
@@ -348,7 +348,7 @@ mod tests {
#[test]
fn stddev_i32_all_nulls() -> Result<()> {
let a: ArrayRef = Arc::new(Int32Array::from(vec![None, None]));
- let schema = Schema::new(vec![Field::new("a", DataType::Int32,
false)]);
+ let schema = Schema::new(vec![Field::new("a", DataType::Int32, true)]);
let batch = RecordBatch::try_new(Arc::new(schema.clone()), vec![a])?;
let agg = Arc::new(Stddev::new(
@@ -395,7 +395,7 @@ mod tests {
let a = Arc::new(Float64Array::from(vec![1_f64, 2_f64, 3_f64, 4_f64,
5_f64]));
let b = Arc::new(Float64Array::from(vec![None]));
- let schema = Schema::new(vec![Field::new("a", DataType::Float64,
false)]);
+ let schema = Schema::new(vec![Field::new("a", DataType::Float64,
true)]);
let batch1 = RecordBatch::try_new(Arc::new(schema.clone()), vec![a])?;
let batch2 = RecordBatch::try_new(Arc::new(schema.clone()), vec![b])?;
diff --git a/datafusion/physical-expr/src/aggregate/sum_distinct.rs
b/datafusion/physical-expr/src/aggregate/sum_distinct.rs
index 2b887c1fe..29baffa44 100644
--- a/datafusion/physical-expr/src/aggregate/sum_distinct.rs
+++ b/datafusion/physical-expr/src/aggregate/sum_distinct.rs
@@ -199,7 +199,7 @@ mod tests {
macro_rules! generic_test_sum_distinct {
($ARRAY:expr, $DATATYPE:expr, $EXPECTED:expr, $EXPECTED_DATATYPE:expr)
=> {{
- let schema = Schema::new(vec![Field::new("a", $DATATYPE, false)]);
+ let schema = Schema::new(vec![Field::new("a", $DATATYPE, true)]);
let batch = RecordBatch::try_new(Arc::new(schema.clone()),
vec![$ARRAY])?;
diff --git a/datafusion/physical-expr/src/aggregate/variance.rs
b/datafusion/physical-expr/src/aggregate/variance.rs
index 775078733..364936213 100644
--- a/datafusion/physical-expr/src/aggregate/variance.rs
+++ b/datafusion/physical-expr/src/aggregate/variance.rs
@@ -429,7 +429,7 @@ mod tests {
#[test]
fn variance_i32_all_nulls() -> Result<()> {
let a: ArrayRef = Arc::new(Int32Array::from(vec![None, None]));
- let schema = Schema::new(vec![Field::new("a", DataType::Int32,
false)]);
+ let schema = Schema::new(vec![Field::new("a", DataType::Int32, true)]);
let batch = RecordBatch::try_new(Arc::new(schema.clone()), vec![a])?;
let agg = Arc::new(Variance::new(
@@ -476,7 +476,7 @@ mod tests {
let a = Arc::new(Float64Array::from(vec![1_f64, 2_f64, 3_f64, 4_f64,
5_f64]));
let b = Arc::new(Float64Array::from(vec![None]));
- let schema = Schema::new(vec![Field::new("a", DataType::Float64,
false)]);
+ let schema = Schema::new(vec![Field::new("a", DataType::Float64,
true)]);
let batch1 = RecordBatch::try_new(Arc::new(schema.clone()), vec![a])?;
let batch2 = RecordBatch::try_new(Arc::new(schema.clone()), vec![b])?;
diff --git a/datafusion/physical-expr/src/expressions/binary.rs
b/datafusion/physical-expr/src/expressions/binary.rs
index 87de0acbb..c0876a722 100644
--- a/datafusion/physical-expr/src/expressions/binary.rs
+++ b/datafusion/physical-expr/src/expressions/binary.rs
@@ -2113,8 +2113,8 @@ mod tests {
/// b: [true, NULL, false, true, NULL, false, true, NULL, false]
fn bool_test_arrays() -> (SchemaRef, ArrayRef, ArrayRef) {
let schema = Schema::new(vec![
- Field::new("a", DataType::Boolean, false),
- Field::new("b", DataType::Boolean, false),
+ Field::new("a", DataType::Boolean, true),
+ Field::new("b", DataType::Boolean, true),
]);
let a: BooleanArray = [
Some(true),
@@ -2147,7 +2147,7 @@ mod tests {
/// Returns (schema, BooleanArray) with [true, NULL, false]
fn scalar_bool_test_array() -> (SchemaRef, ArrayRef) {
- let schema = Schema::new(vec![Field::new("a", DataType::Boolean,
false)]);
+ let schema = Schema::new(vec![Field::new("a", DataType::Boolean,
true)]);
let a: BooleanArray = vec![Some(true), None,
Some(false)].iter().collect();
(Arc::new(schema), Arc::new(a))
}
diff --git a/datafusion/physical-expr/src/expressions/cast.rs
b/datafusion/physical-expr/src/expressions/cast.rs
index 9144acc40..a373685c7 100644
--- a/datafusion/physical-expr/src/expressions/cast.rs
+++ b/datafusion/physical-expr/src/expressions/cast.rs
@@ -177,7 +177,7 @@ mod tests {
// 5. verify that the resulting values are downcastable and correct
macro_rules! generic_decimal_to_other_test_cast {
($DECIMAL_ARRAY:ident, $A_TYPE:expr, $TYPEARRAY:ident, $TYPE:expr,
$VEC:expr,$CAST_OPTIONS:expr) => {{
- let schema = Schema::new(vec![Field::new("a", $A_TYPE, false)]);
+ let schema = Schema::new(vec![Field::new("a", $A_TYPE, true)]);
let batch = RecordBatch::try_new(
Arc::new(schema.clone()),
vec![Arc::new($DECIMAL_ARRAY)],
@@ -225,7 +225,7 @@ mod tests {
// 5. verify that the resulting values are downcastable and correct
macro_rules! generic_test_cast {
($A_ARRAY:ident, $A_TYPE:expr, $A_VEC:expr, $TYPEARRAY:ident,
$TYPE:expr, $VEC:expr, $CAST_OPTIONS:expr) => {{
- let schema = Schema::new(vec![Field::new("a", $A_TYPE, false)]);
+ let schema = Schema::new(vec![Field::new("a", $A_TYPE, true)]);
let a = $A_ARRAY::from($A_VEC);
let batch =
RecordBatch::try_new(Arc::new(schema.clone()),
vec![Arc::new(a)])?;
diff --git a/datafusion/physical-expr/src/expressions/literal.rs
b/datafusion/physical-expr/src/expressions/literal.rs
index 6fff67e0e..b91e498a1 100644
--- a/datafusion/physical-expr/src/expressions/literal.rs
+++ b/datafusion/physical-expr/src/expressions/literal.rs
@@ -88,7 +88,7 @@ mod tests {
#[test]
fn literal_i32() -> Result<()> {
// create an arbitrary record bacth
- let schema = Schema::new(vec![Field::new("a", DataType::Int32,
false)]);
+ let schema = Schema::new(vec![Field::new("a", DataType::Int32, true)]);
let a = Int32Array::from(vec![Some(1), None, Some(3), Some(4),
Some(5)]);
let batch = RecordBatch::try_new(Arc::new(schema), vec![Arc::new(a)])?;
diff --git a/datafusion/physical-expr/src/expressions/mod.rs
b/datafusion/physical-expr/src/expressions/mod.rs
index 22e80e20e..8eb95f2bf 100644
--- a/datafusion/physical-expr/src/expressions/mod.rs
+++ b/datafusion/physical-expr/src/expressions/mod.rs
@@ -100,7 +100,7 @@ pub(crate) mod tests {
#[macro_export]
macro_rules! generic_test_op {
($ARRAY:expr, $DATATYPE:expr, $OP:ident, $EXPECTED:expr,
$EXPECTED_DATATYPE:expr) => {{
- let schema = Schema::new(vec![Field::new("a", $DATATYPE, false)]);
+ let schema = Schema::new(vec![Field::new("a", $DATATYPE, true)]);
let batch = RecordBatch::try_new(Arc::new(schema.clone()),
vec![$ARRAY])?;
@@ -123,8 +123,8 @@ pub(crate) mod tests {
macro_rules! generic_test_op2 {
($ARRAY1:expr, $ARRAY2:expr, $DATATYPE1:expr, $DATATYPE2:expr,
$OP:ident, $EXPECTED:expr, $EXPECTED_DATATYPE:expr) => {{
let schema = Schema::new(vec![
- Field::new("a", $DATATYPE1, false),
- Field::new("b", $DATATYPE2, false),
+ Field::new("a", $DATATYPE1, true),
+ Field::new("b", $DATATYPE2, true),
]);
let batch =
RecordBatch::try_new(Arc::new(schema.clone()), vec![$ARRAY1,
$ARRAY2])?;
diff --git a/datafusion/physical-expr/src/expressions/try_cast.rs
b/datafusion/physical-expr/src/expressions/try_cast.rs
index 6b0d3e1b1..53e1d3e89 100644
--- a/datafusion/physical-expr/src/expressions/try_cast.rs
+++ b/datafusion/physical-expr/src/expressions/try_cast.rs
@@ -138,7 +138,7 @@ mod tests {
// 5. verify that the resulting values are downcastable and correct
macro_rules! generic_decimal_to_other_test_cast {
($DECIMAL_ARRAY:ident, $A_TYPE:expr, $TYPEARRAY:ident, $TYPE:expr,
$VEC:expr) => {{
- let schema = Schema::new(vec![Field::new("a", $A_TYPE, false)]);
+ let schema = Schema::new(vec![Field::new("a", $A_TYPE, true)]);
let batch = RecordBatch::try_new(
Arc::new(schema.clone()),
vec![Arc::new($DECIMAL_ARRAY)],
@@ -185,7 +185,7 @@ mod tests {
// 5. verify that the resulting values are downcastable and correct
macro_rules! generic_test_cast {
($A_ARRAY:ident, $A_TYPE:expr, $A_VEC:expr, $TYPEARRAY:ident,
$TYPE:expr, $VEC:expr) => {{
- let schema = Schema::new(vec![Field::new("a", $A_TYPE, false)]);
+ let schema = Schema::new(vec![Field::new("a", $A_TYPE, true)]);
let a = $A_ARRAY::from($A_VEC);
let batch =
RecordBatch::try_new(Arc::new(schema.clone()),
vec![Arc::new(a)])?;
diff --git a/datafusion/physical-expr/src/window/row_number.rs
b/datafusion/physical-expr/src/window/row_number.rs
index 8a720d28d..d8ff215d4 100644
--- a/datafusion/physical-expr/src/window/row_number.rs
+++ b/datafusion/physical-expr/src/window/row_number.rs
@@ -93,7 +93,7 @@ mod tests {
let arr: ArrayRef = Arc::new(BooleanArray::from(vec![
None, None, None, None, None, None, None, None,
]));
- let schema = Schema::new(vec![Field::new("arr", DataType::Boolean,
false)]);
+ let schema = Schema::new(vec![Field::new("arr", DataType::Boolean,
true)]);
let batch = RecordBatch::try_new(Arc::new(schema), vec![arr])?;
let row_number = RowNumber::new("row_number".to_owned());
let result =
row_number.create_evaluator(&batch)?.evaluate(vec![0..8])?;
