Skip to content

Commit 947bad6

Browse files
pashandor789pashandor789
authored
[CBO] Column shards tests added (#7972)
1 parent 05367f9 commit 947bad6

18 files changed

+1529
-720
lines changed

‎ydb/core/kqp/query_compiler/kqp_olap_compiler.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,8 @@ ui64 ConvertValueToColumn(const TCoDataCtor& value, TKqpOlapCompileContext& ctx)
325325
ssaValue->MutableConstant()->SetUint64(FromString<ui64>(nodeValue));
326326
} else if (value.Maybe<TCoTimestamp>()) {
327327
ssaValue->MutableConstant()->SetTimestamp(FromString<ui64>(nodeValue));
328+
} else if (value.Maybe<TCoDate>()) {
329+
ssaValue->MutableConstant()->SetTimestamp(FromString<ui16>(nodeValue));
328330
} else {
329331
YQL_ENSURE(false, "Unsupported content: " << value.Ref().Content());
330332
}

‎ydb/core/kqp/ut/join/data/join_order/lookupbug.json

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,34 @@
11
{
2-
"op_name": "LeftJoin (MapJoin)",
3-
"args": [
4-
{
5-
"op_name": "LeftJoin (MapJoin)",
6-
"args": [
7-
{
8-
"op_name": "LeftJoin (MapJoin)",
9-
"args": [
10-
{
11-
"op_name": "TableFullScan",
12-
"table": "quotas_browsers_relation"
13-
},
14-
{
15-
"op_name": "TableLookup",
16-
"table": "browsers"
17-
}
18-
]
19-
},
20-
{
21-
"op_name": "TableLookup",
22-
"table": "browser_groups"
23-
}
24-
]
25-
},
26-
{
27-
"op_name": "TableFullScan",
28-
"table": "quota"
29-
}
2+
"op_name":"LeftJoin (MapJoin)",
3+
"args":
4+
[
5+
{
6+
"op_name":"LeftJoin (MapJoin)",
7+
"args":
8+
[
9+
{
10+
"op_name":"LeftJoin (MapJoin)",
11+
"args":
12+
[
13+
{
14+
"op_name":"TableFullScan",
15+
"table":"quotas_browsers_relation"
16+
},
17+
{
18+
"op_name":"TableLookup",
19+
"table":"browsers"
20+
}
21+
]
22+
},
23+
{
24+
"op_name":"TableLookup",
25+
"table":"browser_groups"
26+
}
27+
]
28+
},
29+
{
30+
"op_name":"TableFullScan",
31+
"table":"quota"
32+
}
3033
]
31-
}
34+
}

‎ydb/core/kqp/ut/join/data/join_order/tpcc.json

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{
2-
"op_name": "InnerJoin (Map)",
3-
"args": [
4-
{
5-
"op_name": "TableLookup",
6-
"table": "stock"
7-
},
8-
{
9-
"op_name": "TableRangeScan",
10-
"table": "order_line"
11-
}
12-
]
13-
}
2+
"op_name":"InnerJoin (MapJoin)",
3+
"args":
4+
[
5+
{
6+
"op_name":"TableLookup",
7+
"table":"test\/tpcc\/stock"
8+
},
9+
{
10+
"op_name":"TableRangeScan",
11+
"table":"test\/tpcc\/order_line"
12+
}
13+
]
14+
}

‎ydb/core/kqp/ut/join/data/join_order/tpcds64_1000s.json

Lines changed: 332 additions & 295 deletions
Large diffs are not rendered by default.

‎ydb/core/kqp/ut/join/data/join_order/tpcds64_1000s_column_store.json

Lines changed: 374 additions & 0 deletions
Large diffs are not rendered by default.

‎ydb/core/kqp/ut/join/data/join_order/tpcds64_small_1000s.json

Lines changed: 54 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,54 @@
1-
{"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"}]}]}
1+
{
2+
"op_name":"InnerJoin (Grace)",
3+
"args":
4+
[
5+
{
6+
"op_name":"CrossJoin",
7+
"args":
8+
[
9+
{
10+
"op_name":"CrossJoin",
11+
"args":
12+
[
13+
{
14+
"op_name":"TableFullScan",
15+
"table":"test\/ds\/catalog_sales"
16+
},
17+
{
18+
"op_name":"TableFullScan",
19+
"table":"test\/ds\/store"
20+
}
21+
]
22+
},
23+
{
24+
"op_name":"TableFullScan",
25+
"table":"test\/ds\/item"
26+
}
27+
]
28+
},
29+
{
30+
"op_name":"CrossJoin",
31+
"args":
32+
[
33+
{
34+
"op_name":"CrossJoin",
35+
"args":
36+
[
37+
{
38+
"op_name":"TableFullScan",
39+
"table":"test\/ds\/catalog_sales"
40+
},
41+
{
42+
"op_name":"TableFullScan",
43+
"table":"test\/ds\/store"
44+
}
45+
]
46+
},
47+
{
48+
"op_name":"TableFullScan",
49+
"table":"test\/ds\/item"
50+
}
51+
]
52+
}
53+
]
54+
}

‎ydb/core/kqp/ut/join/data/join_order/tpcds64_small_1000s_column_store.json

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
{
2+
"op_name":"InnerJoin (Grace)",
3+
"args":
4+
[
5+
{
6+
"op_name":"CrossJoin",
7+
"args":
8+
[
9+
{
10+
"op_name":"CrossJoin",
11+
"args":
12+
[
13+
{
14+
"op_name":"TableFullScan",
15+
"table":"test\/ds\/catalog_sales"
16+
},
17+
{
18+
"op_name":"TableFullScan",
19+
"table":"test\/ds\/store"
20+
}
21+
]
22+
},
23+
{
24+
"op_name":"TableFullScan",
25+
"table":"test\/ds\/item"
26+
}
27+
]
28+
},
29+
{
30+
"op_name":"CrossJoin",
31+
"args":
32+
[
33+
{
34+
"op_name":"CrossJoin",
35+
"args":
36+
[
37+
{
38+
"op_name":"TableFullScan",
39+
"table":"test\/ds\/catalog_sales"
40+
},
41+
{
42+
"op_name":"TableFullScan",
43+
"table":"test\/ds\/store"
44+
}
45+
]
46+
},
47+
{
48+
"op_name":"TableFullScan",
49+
"table":"test\/ds\/item"
50+
}
51+
]
52+
}
53+
]
54+
}

‎ydb/core/kqp/ut/join/data/join_order/tpcds78_1000s.json

Lines changed: 72 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,84 @@
11
{
2-
"op_name": "LeftJoin (Grace)",
3-
"args": [
4-
{
5-
"op_name": "LeftJoin (Grace)",
6-
"args": [
7-
{
8-
"op_name": "LeftJoin (Grace)",
9-
"args": [
2+
"op_name":"LeftJoin (Grace)",
3+
"args":
4+
[
5+
{
6+
"op_name":"LeftJoin (Grace)",
7+
"args":
8+
[
109
{
11-
"op_name": "InnerJoin (MapJoin)",
12-
"args": [
13-
{
14-
"op_name": "TableFullScan",
15-
"table": "test/ds/store_sales"
16-
},
17-
{
18-
"op_name": "TableFullScan",
19-
"table": "test/ds/date_dim"
20-
}
21-
]
10+
"op_name":"LeftJoin (Grace)",
11+
"args":
12+
[
13+
{
14+
"op_name":"InnerJoin (MapJoin)",
15+
"args":
16+
[
17+
{
18+
"op_name":"TableFullScan",
19+
"table":"test\/ds\/store_sales"
20+
},
21+
{
22+
"op_name":"TableFullScan",
23+
"table":"test\/ds\/date_dim"
24+
}
25+
]
26+
},
27+
{
28+
"op_name":"TableFullScan",
29+
"table":"test\/ds\/store_returns"
30+
}
31+
]
2232
},
2333
{
24-
"op_name": "TableFullScan",
25-
"table": "test/ds/store_returns"
34+
"op_name":"InnerJoin (MapJoin)",
35+
"args":
36+
[
37+
{
38+
"op_name":"LeftJoin (Grace)",
39+
"args":
40+
[
41+
{
42+
"op_name":"TableFullScan",
43+
"table":"test\/ds\/web_sales"
44+
},
45+
{
46+
"op_name":"TableFullScan",
47+
"table":"test\/ds\/web_returns"
48+
}
49+
]
50+
},
51+
{
52+
"op_name":"TableFullScan",
53+
"table":"test\/ds\/date_dim"
54+
}
55+
]
2656
}
2757
]
28-
},
29-
{
30-
"op_name": "InnerJoin (MapJoin)",
31-
"args": [
58+
},
59+
{
60+
"op_name":"InnerJoin (MapJoin)",
61+
"args":
62+
[
3263
{
33-
"op_name": "LeftJoin (Grace)",
34-
"args": [
35-
{
36-
"op_name": "TableFullScan",
37-
"table": "test/ds/web_sales"
38-
},
39-
{
40-
"op_name": "TableFullScan",
41-
"table": "test/ds/web_returns"
42-
}
43-
]
64+
"op_name":"LeftJoin (Grace)",
65+
"args":
66+
[
67+
{
68+
"op_name":"TableFullScan",
69+
"table":"test\/ds\/catalog_sales"
70+
},
71+
{
72+
"op_name":"TableFullScan",
73+
"table":"test\/ds\/catalog_returns"
74+
}
75+
]
4476
},
4577
{
46-
"op_name": "TableFullScan",
47-
"table": "test/ds/date_dim"
78+
"op_name":"TableFullScan",
79+
"table":"test\/ds\/date_dim"
4880
}
4981
]
50-
}
51-
]
52-
},
53-
{
54-
"op_name": "InnerJoin (MapJoin)",
55-
"args": [
56-
{
57-
"op_name": "LeftJoin (Grace)",
58-
"args": [
59-
{
60-
"op_name": "TableFullScan",
61-
"table": "test/ds/catalog_sales"
62-
},
63-
{
64-
"op_name": "TableFullScan",
65-
"table": "test/ds/catalog_returns"
66-
}
67-
]
68-
},
69-
{
70-
"op_name": "TableFullScan",
71-
"table": "test/ds/date_dim"
72-
}
73-
]
74-
}
75-
]
82+
}
83+
]
7684
}

0 commit comments

Comments
 (0)