Merge pull request ClickHouse#90619 from ClickHouse/backport/25.8/90375

Backport ClickHouse#90375 to 25.8: Fix prewhere on non-existing JSON path with index_granularity_bytes=0

Author: clickhouse-gh[bot]

src/DataTypes/Serializations/SerializationObjectSharedDataPath.cpp

@@ -250,7 +250,7 @@ void SerializationObjectSharedDataPath::deserializeBinaryBulkWithMultipleStreams
         /// Check if we don't have any paths in shared data in current range.
         const auto & offsets = assert_cast<const ColumnArray &>(*map_column).getOffsets();
         if (offsets.back() == offsets[ssize_t(map_column_offset) - 1])
-            dynamic_column->insertManyDefaults(limit);
+            dynamic_column->insertManyDefaults(num_read_rows);
         else
             ColumnObject::fillPathColumnFromSharedData(*dynamic_column, path, map_column, map_column_offset, map_column->size());
 

src/DataTypes/Serializations/SerializationVariantElementNullMap.cpp

@@ -163,12 +163,12 @@ void SerializationVariantElementNullMap::deserializeBinaryBulkWithMultipleStream
     /// Check if there are no such variant in read range.
     if (variant_limit && *variant_limit == 0)
     {
-        data.resize_fill(data.size() + limit, 1);
+        data.resize_fill(data.size() + num_read_discriminators, 1);
     }
     /// Check if there is only our variant in read range.
-    else if (variant_limit && *variant_limit == limit)
+    else if (variant_limit && *variant_limit == num_read_discriminators)
     {
-        data.resize_fill(data.size() + limit, 0);
+        data.resize_fill(data.size() + num_read_discriminators, 0);
     }
     /// Iterate through new discriminators to calculate the null map of our variant.
     else

tests/queries/0_stateless/03725_json_dynamic_subcolumn_prewhere_zero_index_granularity_bytes.reference

@@ -0,0 +1 @@
+1

tests/queries/0_stateless/03725_json_dynamic_subcolumn_prewhere_zero_index_granularity_bytes.sql

@@ -0,0 +1,16 @@
+DROP TABLE IF EXISTS test;
+
+CREATE TABLE test (
+    s String,
+    json JSON
+)
+ENGINE = MergeTree
+ORDER BY (s)
+SETTINGS index_granularity = 2, index_granularity_bytes = 0, min_rows_for_wide_part=0, min_bytes_for_wide_part=0;
+
+INSERT INTO test SELECT 'a', '{}' FROM numbers(1);
+
+SELECT count() FROM test WHERE s = 'a' AND json.a IS NULL;
+
+DROP TABLE test;
+

tests/queries/0_stateless/03725_variant_element_null_map_subcolumn_prewhere_zero_index_granularity_bytes.reference

@@ -0,0 +1 @@
+42

tests/queries/0_stateless/03725_variant_element_null_map_subcolumn_prewhere_zero_index_granularity_bytes.sql

@@ -0,0 +1,6 @@
+drop table if exists test;
+create table test (s Int128, v Variant(UUID, Int128)) engine=MergeTree order by s settings index_granularity = 2, index_granularity_bytes = 0, min_rows_for_wide_part=0, min_bytes_for_wide_part=0;
+insert into test select 42::Int128, 42::Int128;
+select v from test prewhere 1;
+drop table test;
+