Fix optimization of queries containing metrics withfill_nulls_with set
#1963
+54
−87
fill_nulls_with set
#1963