From 635f8d80d5f261ffb6372e0688ee96b5f5b1a169 Mon Sep 17 00:00:00 2001 From: "Christopher M. Wolff" Date: Tue, 27 Sep 2022 07:29:43 -0700 Subject: [PATCH] build(flux): update flux to v0.184.2 (#23758) * build(flux): update flux to v0.184.2 * chore: skip more Flux acceptance tests There are issues for each skip detailed in test-flux.sh. --- etc/test-flux.sh | 23 +++++++++++++++++++++++ go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/etc/test-flux.sh b/etc/test-flux.sh index c9dc3ca3a1..bbd753553a 100755 --- a/etc/test-flux.sh +++ b/etc/test-flux.sh @@ -76,6 +76,10 @@ remove_sort_selector remove_sort_filter_range remove_sort_aggregate_window remove_sort_join +# vectorization-related tests +logical_typed_null_vectorized_const +logical_untyped_null_vectorized_const + vec_conditional_bool vec_conditional_bool_repeat vec_conditional_time @@ -111,12 +115,16 @@ vec_equality_string vec_equality_string_repeat vec_equality_bool vec_equality_casts +vec_nested_logical_conditional_repro +vec_nested_logical_conditional_repro2 vec_with_float vec_with_float_const vec_with_unary_add vec_with_unary_sub vec_with_unary_not vec_with_unary_exists +vectorize_div_by_zero_int_const +vectorize_div_by_zero_int_const_const # Other skipped tests align_time @@ -147,6 +155,21 @@ shapeData shift_negative_duration unique window_null +# Needs feature flag labelPolymorphism +label_to_string + +# Bug https://github.com/influxdata/flux/issues/5232 +# Or, needs feature flag strictNullLogicalOps +logical_typed_null_interp + +# https://github.com/influxdata/influxdb/issues/23757 +# Flux acceptance tests for group |> first (and last) +push_down_group_one_tag_first +push_down_group_all_filter_field_first +push_down_group_one_tag_filter_field_first +push_down_group_one_tag_last +push_down_group_all_filter_field_last +push_down_group_one_tag_filter_field_last ENDSKIPS ) echo "$doc" | sed '/^[[:space:]]*$/d' | sed 's/[[:space:]]*#.*$//' | tr '\n' ',' | sed 's/,$//' diff --git a/go.mod b/go.mod index e0b146ed3e..e98da06bfd 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( github.com/google/go-jsonnet v0.17.0 github.com/hashicorp/vault/api v1.0.2 github.com/influxdata/cron v0.0.0-20201006132531-4bb0a200dcbe - github.com/influxdata/flux v0.181.0 + github.com/influxdata/flux v0.184.2 github.com/influxdata/httprouter v1.3.1-0.20191122104820-ee83e2772f69 github.com/influxdata/influx-cli/v2 v2.2.1-0.20220318222112-88ba3464cd07 github.com/influxdata/influxql v1.1.1-0.20211004132434-7e7d61973256 diff --git a/go.sum b/go.sum index 5bd59136d2..a11023f1a6 100644 --- a/go.sum +++ b/go.sum @@ -503,8 +503,8 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/influxdata/cron v0.0.0-20201006132531-4bb0a200dcbe h1:7j4SdN/BvQwN6WoUq7mv0kg5U9NhnFBxPGMafYRKym0= github.com/influxdata/cron v0.0.0-20201006132531-4bb0a200dcbe/go.mod h1:XabtPPW2qsCg0tl+kjaPU+cFS+CjQXEXbT1VJvHT4og= -github.com/influxdata/flux v0.181.0 h1:9Ffm6htdr9iI28L+xKGLIf8Y0pfm+hX4Vfk84yugv4M= -github.com/influxdata/flux v0.181.0/go.mod h1:FY4XAM6a/04xK/pyKyGKQJ3Ovo98h87I5cbT1758b0M= +github.com/influxdata/flux v0.184.2 h1:WKrnNs2cfufg/27DMhklUwUyIPmlG9HzPn8C0t3Nqes= +github.com/influxdata/flux v0.184.2/go.mod h1:OpNt6KbBOOOfpYdyF+SR/gBnf4s4R5dI1X5HFtJJX2M= github.com/influxdata/gosnowflake v1.6.9 h1:BhE39Mmh8bC+Rvd4QQsP2gHypfeYIH1wqW1AjGWxxrE= github.com/influxdata/gosnowflake v1.6.9/go.mod h1:9W/BvCXOKx2gJtQ+jdi1Vudev9t9/UDOEHnlJZ/y1nU= github.com/influxdata/httprouter v1.3.1-0.20191122104820-ee83e2772f69 h1:WQsmW0fXO4ZE/lFGIE84G6rIV5SJN3P3sjIXAP1a8eU=