Skip to content

[CBO] Column shards tests added #7972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pavelvelikhov merged 4 commits into from
Aug 19, 2024
Merged

[CBO] Column shards tests added #7972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c85f04
[CBO] Column shards tests added
pashandor789 Aug 18, 2024
3422a15
[CBO] Column shards tests added
pashandor789 Aug 19, 2024
6fc554a
[CBO] Column shards tests added
pashandor789 Aug 19, 2024
fa25231
[CBO] Column shards tests added
pashandor789 Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ydb/core/kqp/query_compiler/kqp_olap_compiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,8 @@ ui64 ConvertValueToColumn(const TCoDataCtor& value, TKqpOlapCompileContext& ctx)
ssaValue->MutableConstant()->SetUint64(FromString<ui64>(nodeValue));
} else if (value.Maybe<TCoTimestamp>()) {
ssaValue->MutableConstant()->SetTimestamp(FromString<ui64>(nodeValue));
} else if (value.Maybe<TCoDate>()) {
ssaValue->MutableConstant()->SetTimestamp(FromString<ui16>(nodeValue));
} else {
YQL_ENSURE(false, "Unsupported content: " << value.Ref().Content());
}
Expand Down
61 changes: 32 additions & 29 deletions ydb/core/kqp/ut/join/data/join_order/lookupbug.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,34 @@
{
"op_name": "LeftJoin (MapJoin)",
"args": [
{
"op_name": "LeftJoin (MapJoin)",
"args": [
{
"op_name": "LeftJoin (MapJoin)",
"args": [
{
"op_name": "TableFullScan",
"table": "quotas_browsers_relation"
},
{
"op_name": "TableLookup",
"table": "browsers"
}
]
},
{
"op_name": "TableLookup",
"table": "browser_groups"
}
]
},
{
"op_name": "TableFullScan",
"table": "quota"
}
"op_name":"LeftJoin (MapJoin)",
"args":
[
{
"op_name":"LeftJoin (MapJoin)",
"args":
[
{
"op_name":"LeftJoin (MapJoin)",
"args":
[
{
"op_name":"TableFullScan",
"table":"quotas_browsers_relation"
},
{
"op_name":"TableLookup",
"table":"browsers"
}
]
},
{
"op_name":"TableLookup",
"table":"browser_groups"
}
]
},
{
"op_name":"TableFullScan",
"table":"quota"
}
]
}
}
25 changes: 13 additions & 12 deletions ydb/core/kqp/ut/join/data/join_order/tpcc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{
"op_name": "InnerJoin (Map)",
"args": [
{
"op_name": "TableLookup",
"table": "stock"
},
{
"op_name": "TableRangeScan",
"table": "order_line"
}
]
}
"op_name":"InnerJoin (MapJoin)",
"args":
[
{
"op_name":"TableLookup",
"table":"test\/tpcc\/stock"
},
{
"op_name":"TableRangeScan",
"table":"test\/tpcc\/order_line"
}
]
}
627 changes: 332 additions & 295 deletions ydb/core/kqp/ut/join/data/join_order/tpcds64_1000s.json
View file
Open in desktop

Large diffs are not rendered by default.

374 changes: 374 additions & 0 deletions ydb/core/kqp/ut/join/data/join_order/tpcds64_1000s_column_store.json
View file
Open in desktop

Large diffs are not rendered by default.

55 changes: 54 additions & 1 deletion ydb/core/kqp/ut/join/data/join_order/tpcds64_small_1000s.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,54 @@
{"op_name":"InnerJoin (Grace)","args":[{"op_name":"CrossJoin","args":[{"op_name":"CrossJoin","args":[{"op_name":"TableFullScan","table":"test\/ds\/catalog_sales"},{"op_name":"TableFullScan","table":"test\/ds\/store"}]},{"op_name":"TableFullScan","table":"test\/ds\/item"}]},{"op_name":"CrossJoin","args":[{"op_name":"CrossJoin","args":[{"op_name":"TableFullScan","table":"test\/ds\/catalog_sales"},{"op_name":"TableFullScan","table":"test\/ds\/store"}]},{"op_name":"TableFullScan","table":"test\/ds\/item"}]}]}
{
"op_name":"InnerJoin (Grace)",
"args":
[
{
"op_name":"CrossJoin",
"args":
[
{
"op_name":"CrossJoin",
"args":
[
{
"op_name":"TableFullScan",
"table":"test\/ds\/catalog_sales"
},
{
"op_name":"TableFullScan",
"table":"test\/ds\/store"
}
]
},
{
"op_name":"TableFullScan",
"table":"test\/ds\/item"
}
]
},
{
"op_name":"CrossJoin",
"args":
[
{
"op_name":"CrossJoin",
"args":
[
{
"op_name":"TableFullScan",
"table":"test\/ds\/catalog_sales"
},
{
"op_name":"TableFullScan",
"table":"test\/ds\/store"
}
]
},
{
"op_name":"TableFullScan",
"table":"test\/ds\/item"
}
]
}
]
}
54 changes: 54 additions & 0 deletions ydb/core/kqp/ut/join/data/join_order/tpcds64_small_1000s_column_store.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"op_name":"InnerJoin (Grace)",
"args":
[
{
"op_name":"CrossJoin",
"args":
[
{
"op_name":"CrossJoin",
"args":
[
{
"op_name":"TableFullScan",
"table":"test\/ds\/catalog_sales"
},
{
"op_name":"TableFullScan",
"table":"test\/ds\/store"
}
]
},
{
"op_name":"TableFullScan",
"table":"test\/ds\/item"
}
]
},
{
"op_name":"CrossJoin",
"args":
[
{
"op_name":"CrossJoin",
"args":
[
{
"op_name":"TableFullScan",
"table":"test\/ds\/catalog_sales"
},
{
"op_name":"TableFullScan",
"table":"test\/ds\/store"
}
]
},
{
"op_name":"TableFullScan",
"table":"test\/ds\/item"
}
]
}
]
}
136 changes: 72 additions & 64 deletions ydb/core/kqp/ut/join/data/join_order/tpcds78_1000s.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,76 +1,84 @@
{
"op_name": "LeftJoin (Grace)",
"args": [
{
"op_name": "LeftJoin (Grace)",
"args": [
{
"op_name": "LeftJoin (Grace)",
"args": [
"op_name":"LeftJoin (Grace)",
"args":
[
{
"op_name":"LeftJoin (Grace)",
"args":
[
{
"op_name": "InnerJoin (MapJoin)",
"args": [
{
"op_name": "TableFullScan",
"table": "test/ds/store_sales"
},
{
"op_name": "TableFullScan",
"table": "test/ds/date_dim"
}
]
"op_name":"LeftJoin (Grace)",
"args":
[
{
"op_name":"InnerJoin (MapJoin)",
"args":
[
{
"op_name":"TableFullScan",
"table":"test\/ds\/store_sales"
},
{
"op_name":"TableFullScan",
"table":"test\/ds\/date_dim"
}
]
},
{
"op_name":"TableFullScan",
"table":"test\/ds\/store_returns"
}
]
},
{
"op_name": "TableFullScan",
"table": "test/ds/store_returns"
"op_name":"InnerJoin (MapJoin)",
"args":
[
{
"op_name":"LeftJoin (Grace)",
"args":
[
{
"op_name":"TableFullScan",
"table":"test\/ds\/web_sales"
},
{
"op_name":"TableFullScan",
"table":"test\/ds\/web_returns"
}
]
},
{
"op_name":"TableFullScan",
"table":"test\/ds\/date_dim"
}
]
}
]
},
{
"op_name": "InnerJoin (MapJoin)",
"args": [
},
{
"op_name":"InnerJoin (MapJoin)",
"args":
[
{
"op_name": "LeftJoin (Grace)",
"args": [
{
"op_name": "TableFullScan",
"table": "test/ds/web_sales"
},
{
"op_name": "TableFullScan",
"table": "test/ds/web_returns"
}
]
"op_name":"LeftJoin (Grace)",
"args":
[
{
"op_name":"TableFullScan",
"table":"test\/ds\/catalog_sales"
},
{
"op_name":"TableFullScan",
"table":"test\/ds\/catalog_returns"
}
]
},
{
"op_name": "TableFullScan",
"table": "test/ds/date_dim"
"op_name":"TableFullScan",
"table":"test\/ds\/date_dim"
}
]
}
]
},
{
"op_name": "InnerJoin (MapJoin)",
"args": [
{
"op_name": "LeftJoin (Grace)",
"args": [
{
"op_name": "TableFullScan",
"table": "test/ds/catalog_sales"
},
{
"op_name": "TableFullScan",
"table": "test/ds/catalog_returns"
}
]
},
{
"op_name": "TableFullScan",
"table": "test/ds/date_dim"
}
]
}
]
}
]
}
Loading