From bb716ee360cbf1a2a98110a99deeac4f5a94ee72 Mon Sep 17 00:00:00 2001 From: Ruihang Xia Date: Sat, 11 Jul 2026 10:31:27 +0800 Subject: [PATCH] fix(promql): compare dictionary tags by logical nulls Signed-off-by: Ruihang Xia --- src/promql/src/extension_plan/series_divide.rs | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/promql/src/extension_plan/series_divide.rs b/src/promql/src/extension_plan/series_divide.rs index 3cffdadeec4..59d31b1faef 100644 --- a/src/promql/src/extension_plan/series_divide.rs +++ b/src/promql/src/extension_plan/series_divide.rs @@ -193,7 +193,7 @@ impl<'a> RawTagColumn<'a> { Self::Utf8(array) => array.is_null(row), Self::LargeUtf8(array) => array.is_null(row), Self::Utf8View(array) => array.is_null(row), - Self::Dictionary(array, _) => array.is_null(row), + Self::Dictionary(array, values) => array.key(row).is_none_or(|key| values.is_null(key)), } } @@ -695,6 +695,7 @@ impl SeriesDivideStream { #[cfg(test)] mod test { + use datafusion::arrow::array::UInt32Array; use datafusion::arrow::datatypes::{DataType, Field, Schema}; use datafusion::common::ToDFSchema; use datafusion::datasource::memory::MemorySourceConfig; @@ -704,6 +705,19 @@ mod test { use super::*; + #[test] + fn test_dictionary_tag_child_null_comparison() { + let dictionary = DictionaryArray::::new( + UInt32Array::from(vec![Some(0), None, Some(1)]), + Arc::new(StringArray::from(vec![None, Some("")])), + ); + let tags = RawTagColumn::try_new(&dictionary).unwrap(); + + assert!(tags.equal_at(0, &tags, 1).unwrap()); + assert!(!tags.equal_at(0, &tags, 2).unwrap()); + assert!(!tags.equal_at(1, &tags, 2).unwrap()); + } + fn prepare_test_data() -> DataSourceExec { let schema = Arc::new(Schema::new(vec![ Field::new("host", DataType::Utf8, true),