thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 08:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix logical error in tupleElement()

Browse Source
This commit is contained in:
Robert Schulze 2023-06-28 12:26:34 +00:00
parent bf54fb4caa
commit 5b78b3903b
No known key found for this signature in database
GPG Key ID: 26703B55FB13728A
4 changed files with 34 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/Functions/tupleElement.cpp
View File

@ -17,11 +17,8 @@ namespace DB
namespace ErrorCodes
{
extern const int ILLEGAL_TYPE_OF_ARGUMENT;
extern const int ILLEGAL_INDEX;
extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
extern const int NOT_FOUND_COLUMN_IN_BLOCK;
extern const int NUMBER_OF_DIMENSIONS_MISMATCHED;
extern const int SIZES_OF_ARRAYS_DONT_MATCH;
}
namespace
@ -79,21 +76,7 @@ public:
return return_type;
}
else
{
const IDataType * default_type = arguments[2].type.get();
size_t default_count_arrays = 0;
if (const DataTypeArray * default_type_as_array = checkAndGetDataType<DataTypeArray>(default_type))
default_count_arrays = default_type_as_array->getNumberOfDimensions();
if (count_arrays != default_count_arrays)
throw Exception(ErrorCodes::NUMBER_OF_DIMENSIONS_MISMATCHED,
"Dimension of types mismatched between first argument and third argument. "
"Dimension of 1st argument: {}. "
"Dimension of 3rd argument: {}", count_arrays, default_count_arrays);
return arguments[2].type;
}
}
ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
@ -128,11 +111,7 @@ public:
std::optional<size_t> index = getElementIndex(arguments[1].column, *input_type_as_tuple, arguments.size());
if (!index.has_value())
{
if (!array_offsets.empty())
recursiveCheckArrayOffsets(arguments[0].column, arguments[2].column, array_offsets.size());
return arguments[2].column;
}
ColumnPtr res = input_col_as_tuple->getColumns()[index.value()];
@ -146,54 +125,6 @@ public:
}
private:
void recursiveCheckArrayOffsets(ColumnPtr col_x, ColumnPtr col_y, size_t depth) const
{
for (size_t i = 1; i < depth; ++i)
{
checkArrayOffsets(col_x, col_y);
col_x = assert_cast<const ColumnArray *>(col_x.get())->getDataPtr();
col_y = assert_cast<const ColumnArray *>(col_y.get())->getDataPtr();
}
checkArrayOffsets(col_x, col_y);
}
void checkArrayOffsets(ColumnPtr col_x, ColumnPtr col_y) const
{
if (isColumnConst(*col_x))
checkArrayOffsetsWithFirstArgConst(col_x, col_y);
else if (isColumnConst(*col_y))
checkArrayOffsetsWithFirstArgConst(col_y, col_x);
else
{
const auto & array_x = *assert_cast<const ColumnArray *>(col_x.get());
const auto & array_y = *assert_cast<const ColumnArray *>(col_y.get());
if (!array_x.hasEqualOffsets(array_y))
throw Exception(ErrorCodes::SIZES_OF_ARRAYS_DONT_MATCH,
"The argument 1 and argument 3 of function {} have different array sizes", getName());
}
}
void checkArrayOffsetsWithFirstArgConst(ColumnPtr col_x, ColumnPtr col_y) const
{
col_x = assert_cast<const ColumnConst *>(col_x.get())->getDataColumnPtr();
col_y = col_y->convertToFullColumnIfConst();
const auto & array_x = *assert_cast<const ColumnArray *>(col_x.get());
const auto & array_y = *assert_cast<const ColumnArray *>(col_y.get());
const auto & offsets_x = array_x.getOffsets();
const auto & offsets_y = array_y.getOffsets();
ColumnArray::Offset prev_offset = 0;
size_t row_size = offsets_y.size();
for (size_t row = 0; row < row_size; ++row)
{
if (offsets_x[0] != offsets_y[row] - prev_offset)
throw Exception(ErrorCodes::SIZES_OF_ARRAYS_DONT_MATCH,
"The argument 1 and argument 3 of function {} have different array sizes", getName());
prev_offset = offsets_y[row];
}
}
std::optional<size_t> getElementIndex(const ColumnPtr & index_column, const DataTypeTuple & tuple, size_t argument_size) const
{
if (checkAndGetColumnConst<ColumnUInt8>(index_column.get())

4
tests/queries/0_stateless/02286_tuple_numeric_identifier.sql
View File

@ -12,8 +12,8 @@ SELECT * FROM t_tuple_numeric FORMAT JSONEachRow;
SELECT `t`.`1`.`2`, `t`.`1`.`3`, `t`.`4` FROM t_tuple_numeric;
SELECT t.1.1, t.1.2, t.2 FROM t_tuple_numeric;
SELECT t.1.3 FROM t_tuple_numeric; -- {serverError ILLEGAL_INDEX}
SELECT t.4 FROM t_tuple_numeric; -- {serverError ILLEGAL_INDEX}
SELECT t.1.3 FROM t_tuple_numeric; -- {serverError NOT_FOUND_COLUMN_IN_BLOCK}
SELECT t.4 FROM t_tuple_numeric; -- {serverError NOT_FOUND_COLUMN_IN_BLOCK}
SELECT `t`.`1`.`1`, `t`.`1`.`2`, `t`.`2` FROM t_tuple_numeric; -- {serverError UNKNOWN_IDENTIFIER}
DROP TABLE t_tuple_numeric;

43
tests/queries/0_stateless/02354_tuple_element_with_default.reference
View File

@ -1,28 +1,15 @@
z
SELECT tupleElement(t1, \'z\', \'z\')
FROM t_tuple_element_default
0
SELECT tupleElement(t1, \'z\', 0)
FROM t_tuple_element_default
z
SELECT tupleElement(t2, \'z\', \'z\')
FROM t_tuple_element_default
z
z
--------------------
[(3,4)]
SELECT tupleElement([(1, 2)], \'a\', [(3, 4)])
--------------------
SELECT tupleElement(t1, \'a\', [tuple(1)])
FROM t_tuple_element_default
--------------------
[(0)]
SELECT tupleElement(t1, \'a\', [tuple(0)])
FROM t_tuple_element_default
[0]
SELECT tupleElement(t1, \'a\', [0])
FROM t_tuple_element_default
[0]
[0]
SELECT tupleElement(t1, \'a\', [0])
FROM t_tuple_element_default
hello
world
default
default
[(['a'],1)]
[1,3]
[2,4]
default
--------
hello
world
default
default
[(['a'],1)]
[[1,2,3]]

61
tests/queries/0_stateless/02354_tuple_element_with_default.sql
View File

@ -1,50 +1,23 @@
DROP TABLE IF EXISTS t_tuple_element_default;
-- const tuple argument
CREATE TABLE t_tuple_element_default(t1 Tuple(a UInt32, s String), t2 Tuple(UInt32, String)) ENGINE = Memory;
INSERT INTO t_tuple_element_default VALUES ((1, 'a'), (2, 'b'));
SELECT tupleElement(('hello', 'world'), 1, 'default');
SELECT tupleElement(('hello', 'world'), 2, 'default');
SELECT tupleElement(('hello', 'world'), 3, 'default');
SELECT tupleElement(('hello', 'world'), 'xyz', 'default');
SELECT tupleElement(('hello', 'world'), 3, [([('a')], 1)]); -- arbitrary default value
SELECT tupleElement(t1, 'z', 'z') FROM t_tuple_element_default;
EXPLAIN SYNTAX SELECT tupleElement(t1, 'z', 'z') FROM t_tuple_element_default;
SELECT tupleElement(t1, 'z', 0) FROM t_tuple_element_default;
EXPLAIN SYNTAX SELECT tupleElement(t1, 'z', 0) FROM t_tuple_element_default;
SELECT tupleElement(t2, 'z', 'z') FROM t_tuple_element_default;
EXPLAIN SYNTAX SELECT tupleElement(t2, 'z', 'z') FROM t_tuple_element_default;
SELECT tupleElement([(1, 2), (3, 4)], 1, 'default');
SELECT tupleElement([(1, 2), (3, 4)], 2, 'default');
SELECT tupleElement([(1, 2), (3, 4)], 3, 'default');
SELECT tupleElement(t1, 3, 'z') FROM t_tuple_element_default;
SELECT tupleElement(t1, 0, 'z') FROM t_tuple_element_default;
SELECT '--------';
DROP TABLE t_tuple_element_default;
-- non-const tuple argument
SELECT '--------------------';
SELECT tupleElement(array(tuple(1, 2)), 'a', 0); -- { serverError NUMBER_OF_DIMENSIONS_MISMATCHED }
SELECT tupleElement(array(tuple(1, 2)), 'a', array(tuple(1, 2), tuple(3, 4))); -- { serverError SIZES_OF_ARRAYS_DONT_MATCH }
SELECT tupleElement(array(array(tuple(1))), 'a', array(array(1, 2, 3))); -- { serverError SIZES_OF_ARRAYS_DONT_MATCH }
SELECT tupleElement(array(tuple(1, 2)), 'a', array(tuple(3, 4)));
EXPLAIN SYNTAX SELECT tupleElement(array(tuple(1, 2)), 'a', array(tuple(3, 4)));
SELECT '--------------------';
CREATE TABLE t_tuple_element_default(t1 Array(Tuple(UInt32)), t2 UInt32) ENGINE = Memory;
SELECT tupleElement(t1, 'a', array(tuple(1))) FROM t_tuple_element_default;
EXPLAIN SYNTAX SELECT tupleElement(t1, 'a', array(tuple(1))) FROM t_tuple_element_default;
SELECT '--------------------';
INSERT INTO t_tuple_element_default VALUES ([(1)], 100);
SELECT tupleElement(t1, 'a', array(tuple(0))) FROM t_tuple_element_default;
EXPLAIN SYNTAX SELECT tupleElement(t1, 'a', array(tuple(0))) FROM t_tuple_element_default;
SELECT tupleElement(t1, 'a', array(0)) FROM t_tuple_element_default;
EXPLAIN SYNTAX SELECT tupleElement(t1, 'a', array(0)) FROM t_tuple_element_default;
INSERT INTO t_tuple_element_default VALUES ([(2)], 200);
SELECT tupleElement(t1, 'a', array(0)) FROM t_tuple_element_default;
EXPLAIN SYNTAX SELECT tupleElement(t1, 'a', array(0)) FROM t_tuple_element_default;
DROP TABLE t_tuple_element_default;
SELECT tupleElement(materialize(('hello', 'world')), 1, 'default');
SELECT tupleElement(materialize(('hello', 'world')), 2, 'default');
SELECT tupleElement(materialize(('hello', 'world')), 3, 'default');
SELECT tupleElement(materialize(('hello', 'world')), 'xzy', 'default');
SELECT tupleElement(materialize(('hello', 'world')), 'xzy', [([('a')], 1)]); -- arbitrary default value
SELECT tupleElement([[(count('2147483646'), 1)]], 'aaaa', [[1, 2, 3]]) -- bug #51525