From 8977e499c2315d4302bc38115bcc357a2a486a8a Mon Sep 17 00:00:00 2001 From: Sema Checherinda Date: Fri, 16 Sep 2022 15:45:21 +0200 Subject: [PATCH] address 01825_type_json_18 test --- src/DataTypes/ObjectUtils.cpp | 14 ++++++++++++++ src/DataTypes/ObjectUtils.h | 2 ++ src/Storages/MergeTree/MergeTreeData.cpp | 2 +- .../0_stateless/01825_type_json_1.reference | 6 +++++- .../0_stateless/01825_type_json_18.reference | 2 ++ tests/queries/0_stateless/01825_type_json_18.sql | 16 ++++++++++++++++ 6 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 tests/queries/0_stateless/01825_type_json_18.reference create mode 100644 tests/queries/0_stateless/01825_type_json_18.sql diff --git a/src/DataTypes/ObjectUtils.cpp b/src/DataTypes/ObjectUtils.cpp index e711b34ffa9..4c1e048e65f 100644 --- a/src/DataTypes/ObjectUtils.cpp +++ b/src/DataTypes/ObjectUtils.cpp @@ -981,4 +981,18 @@ Field FieldVisitorFoldDimension::operator()(const Array & x) const return res; } +DataTypePtr makeDummyTupleTypeForObject() +{ + return std::make_shared( + DataTypes{std::make_shared()}, + Names{ColumnObject::COLUMN_NAME_DUMMY}); +} + +void setAllObjectsToDummyTupleType(NamesAndTypesList & columns) +{ + for (auto & column : columns) + if (column.type->hasDynamicSubcolumns()) + column.type = createConcreteEmptyDynamicColumn(column.type); +} + } diff --git a/src/DataTypes/ObjectUtils.h b/src/DataTypes/ObjectUtils.h index bd15edfe851..2bfcaae09ca 100644 --- a/src/DataTypes/ObjectUtils.h +++ b/src/DataTypes/ObjectUtils.h @@ -162,6 +162,8 @@ private: size_t num_dimensions_to_fold; }; +void setAllObjectsToDummyTupleType(NamesAndTypesList & columns); + /// Receives range of objects, which contains collections /// of columns-like objects (e.g. ColumnsDescription or NamesAndTypesList) /// and deduces the common types of object columns for all entries. diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp index 0703b6b537f..94ff1d658c0 100644 --- a/src/Storages/MergeTree/MergeTreeData.cpp +++ b/src/Storages/MergeTree/MergeTreeData.cpp @@ -7253,7 +7253,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeData::createEmptyPart(MergeTreePartIn auto block = metadata_snapshot->getSampleBlock(); NamesAndTypesList columns = metadata_snapshot->getColumns().getAllPhysical().filter(block.getNames()); - extendObjectColumns(columns, object_columns, /*with_subcolumns*/ false); + setAllObjectsToDummyTupleType(columns); DB::IMergeTreeDataPart::TTLInfos move_ttl_infos; ReservationPtr reservation = reserveSpacePreferringTTLRules(metadata_snapshot, 0, move_ttl_infos, time(nullptr), 0, true); diff --git a/tests/queries/0_stateless/01825_type_json_1.reference b/tests/queries/0_stateless/01825_type_json_1.reference index 857c624fb9b..2ae6eac5c5c 100644 --- a/tests/queries/0_stateless/01825_type_json_1.reference +++ b/tests/queries/0_stateless/01825_type_json_1.reference @@ -6,22 +6,26 @@ all_2_2_0 data Tuple(k5 String) all_1_2_1 data Tuple(k1 String, k2 Tuple(k3 String, k4 String), k5 String) ============ 1 ['aaa','ddd'] [['bbb','ccc'],['eee','fff']] +all_1_2_2 data Tuple(_dummy UInt8) all_3_3_0 data Tuple(k1 Nested(k2 String, k3 Nested(k4 String))) ============ 1 a 42 2 b 4200 4242 +all_1_3_3 data Tuple(_dummy UInt8) all_4_4_0 data Tuple(name String, value Int16) 1 a 42 2 b 4200 3 a 42.123 +all_1_3_3 data Tuple(_dummy UInt8) all_4_4_0 data Tuple(name String, value Int16) all_5_5_0 data Tuple(name String, value Float64) 1 a 42 2 b 4200 3 a 42.123 4 a some +all_1_3_3 data Tuple(_dummy UInt8) all_4_4_0 data Tuple(name String, value Int16) all_5_5_0 data Tuple(name String, value Float64) all_6_6_0 data Tuple(name String, value String) -all_4_6_1 data Tuple(name String, value String) +all_1_6_4 data Tuple(name String, value String) diff --git a/tests/queries/0_stateless/01825_type_json_18.reference b/tests/queries/0_stateless/01825_type_json_18.reference new file mode 100644 index 00000000000..d93f9bda63c --- /dev/null +++ b/tests/queries/0_stateless/01825_type_json_18.reference @@ -0,0 +1,2 @@ +1 (1) Tuple(k1 Int8) +1 ([1,2]) Tuple(k1 Array(Int8)) diff --git a/tests/queries/0_stateless/01825_type_json_18.sql b/tests/queries/0_stateless/01825_type_json_18.sql new file mode 100644 index 00000000000..b493982a12c --- /dev/null +++ b/tests/queries/0_stateless/01825_type_json_18.sql @@ -0,0 +1,16 @@ +-- Tags: no-fasttest + +SET allow_experimental_object_type = 1; + +DROP TABLE IF EXISTS t_json_2; + +CREATE TABLE t_json_2(id UInt64, data Object('JSON')) +ENGINE = MergeTree ORDER BY tuple(); + +INSERT INTO t_json_2 FORMAT JSONEachRow {"id": 1, "data" : {"k1": 1}}; +SELECT id, data, toTypeName(data) FROM t_json_2 ORDER BY id; + +TRUNCATE TABLE t_json_2; + +INSERT INTO t_json_2 FORMAT JSONEachRow {"id": 1, "data" : {"k1": [1, 2]}}; +SELECT id, data, toTypeName(data) FROM t_json_2 ORDER BY id;