Merge pull request ClickHouse#63583 from ClickHouse/ij

alexey-milovidov · web-flow · commit c34ae6d18983 · 2024-05-10T05:09:34.000Z
Fix logical error in ColumnTuple::tryInsert()
diff --git a/src/Columns/ColumnTuple.cpp b/src/Columns/ColumnTuple.cpp
@@ -164,7 +164,7 @@ bool ColumnTuple::tryInsert(const Field & x)
         if (!columns[i]->tryInsert(tuple[i]))
         {
             for (size_t j = 0; j != i; ++j)
-                columns[i]->popBack(1);
+                columns[j]->popBack(1);
 
             return false;
         }
diff --git a/tests/queries/0_stateless/03149_variant_pop_back_typo.reference b/tests/queries/0_stateless/03149_variant_pop_back_typo.reference
@@ -0,0 +1 @@
+[{1:[],'':1},{'':1,1:'',1:1}]
diff --git a/tests/queries/0_stateless/03149_variant_pop_back_typo.sql b/tests/queries/0_stateless/03149_variant_pop_back_typo.sql
@@ -0,0 +1 @@
+select [map(1, [], '', 1), map('', 1, 1, '', toUInt128(1), 1)] settings allow_experimental_variant_type=1, use_variant_as_common_type=1

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ bool ColumnTuple::tryInsert(const Field & x)`
`164`	`164`	`if (!columns[i]->tryInsert(tuple[i]))`
`165`	`165`	`{`
`166`	`166`	`for (size_t j = 0; j != i; ++j)`
`167`		`- columns[i]->popBack(1);`
	`167`	`+ columns[j]->popBack(1);`
`168`	`168`
`169`	`169`	`return false;`
`170`	`170`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+select [map(1, [], '', 1), map('', 1, 1, '', toUInt128(1), 1)] settings allow_experimental_variant_type=1, use_variant_as_common_type=1`