Tweaks.

Author: CodeBlanch

rust/experimental/query_engine/engine-columnar/src/primitives/dictionary/dictionary_transform.rs

@@ -65,20 +65,16 @@ impl<'a> Dictionary<'a> {
                 length,
                 value_index,
             } => {
-                let (key_buffer, null_buffer) = match value_index {
+                let (key_buffer, null_buffer) = match value_index
+                    .and_then(|value_index| transform(&values.get_value_at(value_index)))
+                {
                     None => (
                         BooleanBuffer::new_unset(length),
                         Some(NullBuffer::new_null(length)),
                     ),
-                    Some(value_index) => match transform(&values.get_value_at(value_index)) {
-                        None => (
-                            BooleanBuffer::new_unset(length),
-                            Some(NullBuffer::new_null(length)),
-                        ),
-                        Some(v) => {
-                            return BooleanArrayOrValue::Value(v);
-                        }
-                    },
+                    Some(v) => {
+                        return BooleanArrayOrValue::Value(v);
+                    }
                 };
 
                 BooleanArrayOrValue::Array(BooleanArray::new(key_buffer, null_buffer))

rust/experimental/query_engine/engine-columnar/src/primitives/resolved_value.rs

@@ -237,9 +237,10 @@ pub enum ResolvedSingleOrDictionaryValue<'a> {
 impl<'a> ResolvedSingleOrDictionaryValue<'a> {
     pub fn into_dictionary(self, key_data_type: DataType, key_count: usize) -> Dictionary<'a> {
         match self {
-            ResolvedSingleOrDictionaryValue::Single(v) => {
-                Dictionary::new_scalar_with_data_type(key_data_type, key_count, v)
-            }
+            ResolvedSingleOrDictionaryValue::Single(v) => match v {
+                ValueOrRef::Null => Dictionary::new_null_with_data_type(key_count, key_data_type),
+                v => Dictionary::new_scalar_with_data_type(key_data_type, key_count, v),
+            },
             ResolvedSingleOrDictionaryValue::Dictionary(d) => d,
         }
     }