Skip to content

Commit ad20183

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into 8-kv-app-err
2 parents abed122 + 132a816 commit ad20183

File tree

3 files changed

+40
-42
lines changed

3 files changed

+40
-42
lines changed

‎.github/workflows/dev-linux.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -169,15 +169,13 @@ jobs:
169169
- uses: actions/checkout@v3
170170
- uses: ./.github/actions/test_stateful_standalone_linux
171171

172-
# Wait for issue https://github.com/datafuselabs/databend/issues/7684
173-
#
174-
# test_stateful_cluster_linux:
175-
# timeout-minutes: 20
176-
# runs-on: [ self-hosted, X64, Linux, development ]
177-
# needs: build_gnu
178-
# steps:
179-
# - uses: actions/checkout@v3
180-
# - uses: ./.github/actions/test_stateful_cluster_linux
172+
test_stateful_cluster_linux:
173+
timeout-minutes: 20
174+
runs-on: [ self-hosted, X64, Linux, development ]
175+
needs: build_gnu
176+
steps:
177+
- uses: actions/checkout@v3
178+
- uses: ./.github/actions/test_stateful_cluster_linux
181179

182180
test_fuzz_standalone_linux:
183181
timeout-minutes: 10

‎tests/suites/1_stateful/04_mini_dataset/04_0001_mini_hits.result

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -196,38 +196,38 @@ usb на юбился ворожение русскую
196196
====== SQL30 ======
197197
161012265 161112264 161212263 161312262 161412261 161512260 161612259 161712258 161812257 161912256 162012255 162112254 162212253 162312252 162412251 162512250 162612249 162712248 162812247 162912246 163012245 163112244 163212243 163312242 163412241 163512240 163612239 163712238 163812237 163912236 164012235 164112234 164212233 164312232 164412231 164512230 164612229 164712228 164812227 164912226 165012225 165112224 165212223 165312222 165412221 165512220 165612219 165712218 165812217 165912216 166012215 166112214 166212213 166312212 166412211 166512210 166612209 166712208 166812207 166912206 167012205 167112204 167212203 167312202 167412201 167512200 167612199 167712198 167812197 167912196 168012195 168112194 168212193 168312192 168412191 168512190 168612189 168712188 168812187 168912186 169012185 169112184 169212183 169312182 169412181 169512180 169612179 169712178 169812177 169912176
198198
====== SQL31 ======
199-
2 1124827693 154 77 1750.0
200-
2 1388696273 50 25 1917.0
201-
3 1707103414 31 23 1638.0
202-
2 1320087367 28 14 1368.0
203-
2 1760151079 28 14 1638.0
204-
2 -1691584608 28 10 1638.0
205-
2 -928401671 24 10 1750.0
206-
2 -1265832712 23 12 1087.0
207-
2 -1104629711 21 10 1996.0
208-
2 -430621593 21 12 1368.0
199+
2 2099022581 1 0 1917.0
200+
9 2095061913 1 1 1917.0
201+
2 2011901432 1 0 1368.0
202+
2 1974516222 1 0 1638.0
203+
13 1948103693 1 0 601.0
204+
13 1900352143 1 0 561.0
205+
13 1892274624 1 0 561.0
206+
2 1889433379 1 1 1828.0
207+
4 1855730505 1 0 1828.0
208+
2 1839382221 1 0 1917.0
209209
====== SQL32 ======
210-
6103609278412364237 -436078919 1 0 1368.0
211-
4951947865110738245 1873681563 1 1 1368.0
212-
7060168263352146849 861419998 1 0 1996.0
213-
7019660611280962560 1119218655 1 1 1750.0
214-
6637093127069035223 694937018 1 0 1750.0
215-
5152264301509686058 1752766681 1 1 1638.0
216-
7806095028878167273 2107471378 1 0 1368.0
217-
8003672837648309970 2110881137 1 0 1996.0
218-
5599202363973519738 1530977616 1 1 1368.0
219-
7054755713861488389 1421038618 1 1 1638.0
210+
9222062763096293687 1573660126 1 0 1996.0
211+
9221544107040413752 -752740973 1 1 1917.0
212+
9221410686773811574 974061890 1 1 1917.0
213+
9221368504820084611 1640798824 1 1 1638.0
214+
9220084873232186349 1683005462 1 1 1750.0
215+
9219669275090417693 -539253977 1 1 1368.0
216+
9219482629560492274 1445544778 1 0 1996.0
217+
9218696198217409492 -673500741 1 1 1638.0
218+
9218208948461077009 817434605 1 0 1087.0
219+
9218137639919336157 -377347780 1 0 1087.0
220220
====== SQL33 ======
221-
6526264117404580809 -83604998 1 1 582.0
222-
5152264301509686058 1752766681 1 1 1638.0
223-
7806095028878167273 2107471378 1 0 1368.0
224-
7947646975100161633 577544894 1 1 1917.0
225-
7819272473842414756 1355129322 1 1 1638.0
226-
8291896465054243802 -928854628 1 0 1996.0
227-
8505348986965736427 682244364 1 0 1996.0
228-
5915405884132436842 577544894 1 0 1917.0
229-
7984901677412501734 1744948143 1 1 1638.0
230-
5439260956883700997 -525132013 1 0 1087.0
221+
9223347246352681765 1262094149 1 1 1087.0
222+
9223293557789499343 1743521871 1 1 1760.0
223+
9223247512111991176 1745080255 1 0 1917.0
224+
9223229607482000671 1097571787 1 0 1638.0
225+
9223164623569128382 1906338976 1 1 1917.0
226+
9223146529267307848 -645126345 1 0 1917.0
227+
9223131219442295001 1136579596 1 0 1917.0
228+
9223117509516371378 -2134099372 1 0 1638.0
229+
9223045258383580740 -786180122 1 1 1396.0
230+
9222998256733150832 1846550127 1 1 1638.0
231231
====== SQL34 ======
232232
https://produkty%2Fproduct 2245
233233
https://produkty/kurortmag 1154

‎tests/suites/1_stateful/04_mini_dataset/04_0001_mini_hits.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ hits_statements=(
7272
"SELECT '====== SQL30 ======';"
7373
"SELECT SUM(ResolutionWidth), SUM(ResolutionWidth + 1), SUM(ResolutionWidth + 2), SUM(ResolutionWidth + 3), SUM(ResolutionWidth + 4), SUM(ResolutionWidth + 5), SUM(ResolutionWidth + 6), SUM(ResolutionWidth + 7), SUM(ResolutionWidth + 8), SUM(ResolutionWidth + 9), SUM(ResolutionWidth + 10), SUM(ResolutionWidth + 11), SUM(ResolutionWidth + 12), SUM(ResolutionWidth + 13), SUM(ResolutionWidth + 14), SUM(ResolutionWidth + 15), SUM(ResolutionWidth + 16), SUM(ResolutionWidth + 17), SUM(ResolutionWidth + 18), SUM(ResolutionWidth + 19), SUM(ResolutionWidth + 20), SUM(ResolutionWidth + 21), SUM(ResolutionWidth + 22), SUM(ResolutionWidth + 23), SUM(ResolutionWidth + 24), SUM(ResolutionWidth + 25), SUM(ResolutionWidth + 26), SUM(ResolutionWidth + 27), SUM(ResolutionWidth + 28), SUM(ResolutionWidth + 29), SUM(ResolutionWidth + 30), SUM(ResolutionWidth + 31), SUM(ResolutionWidth + 32), SUM(ResolutionWidth + 33), SUM(ResolutionWidth + 34), SUM(ResolutionWidth + 35), SUM(ResolutionWidth + 36), SUM(ResolutionWidth + 37), SUM(ResolutionWidth + 38), SUM(ResolutionWidth + 39), SUM(ResolutionWidth + 40), SUM(ResolutionWidth + 41), SUM(ResolutionWidth + 42), SUM(ResolutionWidth + 43), SUM(ResolutionWidth + 44), SUM(ResolutionWidth + 45), SUM(ResolutionWidth + 46), SUM(ResolutionWidth + 47), SUM(ResolutionWidth + 48), SUM(ResolutionWidth + 49), SUM(ResolutionWidth + 50), SUM(ResolutionWidth + 51), SUM(ResolutionWidth + 52), SUM(ResolutionWidth + 53), SUM(ResolutionWidth + 54), SUM(ResolutionWidth + 55), SUM(ResolutionWidth + 56), SUM(ResolutionWidth + 57), SUM(ResolutionWidth + 58), SUM(ResolutionWidth + 59), SUM(ResolutionWidth + 60), SUM(ResolutionWidth + 61), SUM(ResolutionWidth + 62), SUM(ResolutionWidth + 63), SUM(ResolutionWidth + 64), SUM(ResolutionWidth + 65), SUM(ResolutionWidth + 66), SUM(ResolutionWidth + 67), SUM(ResolutionWidth + 68), SUM(ResolutionWidth + 69), SUM(ResolutionWidth + 70), SUM(ResolutionWidth + 71), SUM(ResolutionWidth + 72), SUM(ResolutionWidth + 73), SUM(ResolutionWidth + 74), SUM(ResolutionWidth + 75), SUM(ResolutionWidth + 76), SUM(ResolutionWidth + 77), SUM(ResolutionWidth + 78), SUM(ResolutionWidth + 79), SUM(ResolutionWidth + 80), SUM(ResolutionWidth + 81), SUM(ResolutionWidth + 82), SUM(ResolutionWidth + 83), SUM(ResolutionWidth + 84), SUM(ResolutionWidth + 85), SUM(ResolutionWidth + 86), SUM(ResolutionWidth + 87), SUM(ResolutionWidth + 88), SUM(ResolutionWidth + 89) FROM hits;"
7474
"SELECT '====== SQL31 ======';"
75-
"SELECT SearchEngineID, ClientIP, COUNT(*) AS c, SUM(IsRefresh), AVG(ResolutionWidth) FROM hits WHERE SearchPhrase <> '' GROUP BY SearchEngineID, ClientIP ORDER BY c DESC LIMIT 10;"
75+
"SELECT SearchEngineID, ClientIP, COUNT(*) AS c, SUM(IsRefresh), AVG(ResolutionWidth) FROM hits WHERE SearchPhrase <> '' GROUP BY SearchEngineID, ClientIP ORDER BY c, ClientIP DESC LIMIT 10;"
7676
"SELECT '====== SQL32 ======';"
77-
"SELECT WatchID, ClientIP, COUNT(*) AS c, SUM(IsRefresh), AVG(ResolutionWidth) FROM hits WHERE SearchPhrase <> '' GROUP BY WatchID, ClientIP ORDER BY c DESC LIMIT 10;"
77+
"SELECT WatchID, ClientIP, COUNT(*) AS c, SUM(IsRefresh), AVG(ResolutionWidth) FROM hits WHERE SearchPhrase <> '' GROUP BY WatchID, ClientIP ORDER BY c, WatchID DESC LIMIT 10;"
7878
"SELECT '====== SQL33 ======';"
79-
"SELECT WatchID, ClientIP, COUNT(*) AS c, SUM(IsRefresh), AVG(ResolutionWidth) FROM hits GROUP BY WatchID, ClientIP ORDER BY c DESC LIMIT 10;"
79+
"SELECT WatchID, ClientIP, COUNT(*) AS c, SUM(IsRefresh), AVG(ResolutionWidth) FROM hits GROUP BY WatchID, ClientIP ORDER BY c, WatchID DESC LIMIT 10;"
8080
"SELECT '====== SQL34 ======';"
8181
"SELECT URL, COUNT(*) AS c FROM hits GROUP BY URL ORDER BY c DESC LIMIT 10;"
8282
"SELECT '====== SQL35 ======';"

0 commit comments

Comments
 (0)