Skip to content
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.

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

Fix clicbench cannon requests and results #6700

Merged
merged 1 commit into from
Jul 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions ydb/library/workload/clickbench/click_bench_canonical/q28.result
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
"key","l","c","min(Referer)"
"svpressa.ru",307.04749241683174,243302,"http://svpressa.ru"
"msuzie-showforumdisplay",263.3184917,183672,"http://msuzie-showforumdisplay"
"saint-peters-total=меньше 80",242.521155,200520,"http://saint-peters-total=меньше 80/cash/station=search&input_age1=&int[2274/trashbox.ru/details&cad=rjt&fu=0&input_who1=2&input_who1=2&input_city-4400047.html?1=1&price_ot=&price_ot=&price=мень&clid=143431512&s_yers=0&model&desc=&name=1&markett.ru%2Frenazheltyj-95692465&text=поздравстраницу&clid=4405404/menu_29.html&ei=UIX1UZTFNJTI0ci8guSn3tW.pl?cmd=showthreadreplies=978-4121-469171&history47/11/?from=&district"
"domics",212.9240679,326094,"http://domics/825179.11931861234499792"
"e96.ru",210.08111950270487,1019274,"http://e96.ru"
"gadgets.irr.ru",131.95758485602357,349710,"https://gadgets.irr.ru/2jmj7l5rSw0yVb"
"google.ru",109.16344473978774,2160198,"http://google.ru"
"go.mail",108.40130323464007,8248553,"http://go.mail"
"msouz.ru",106.10463459410022,301774,"http://msouz.ru/?ffshop"
"bonprix.ru",104.2440292701707,1127291,"http://bonprix.ru"
"state=19945206",105.6452146,512414,"http://state=19945206/foto-4/login%20NoTs3M&where=all&filmId=u8aGGqtWs3M&where=all&server=sc.cheloveplanet.ru/forum.little&categoriya/muzhskaya_istory.com/demii-malchik_148_4055074241537][to]=&input_activalry: A Love&where=all&text=купить florer&aktion/loansert перевозобности&site_id=197&text=добавь лазерногорский тайская полупая автомобильника&v=1414-resp_desyachnyeprague"
"bonprix.ru",104.21207091462847,1127835,"http://bonprix.ru"
"http",104.2082564,5647203,"http:%2F%239910044f097e2f-99e68385218&text=Andreg&category_id]=3&select[649][to]=1051/frl-2/online.am"
"loveplanet.ru",103.88034237651095,465102,"http://loveplanet.ru"
"novjob.ru",96.75331644732393,133049,"http://novjob.ru/"
"cn.ru",95.63003809905754,124675,"http://cn.ru/GameMain.aspx#catalog/100523&tails.xml?market_pc.html?pid=9403&lr=47&msgid=36305f39386"
"",95.04595534133051,23206334,"http:%2F%239910044f097e2f-99e68385218&text=Andreg&category_id]=3&select[649][to]=1051/frl-2/online.am"
"geomethiettai.ru",94.78713161708883,115912,"https://geomethiettai.ru/GameMain.aspx?group=houses/list=266559j7077&num=7&prune_day=lastdiscussd59394303&price_ot=&priceup&page3/sankt-petushhiblock"
"kino",90.27436553,120139,"http://kino/6/21/2/women.asp?whichpage4/#oversion=unreadm&uid"
"yaroslavens.ru",90.17111441069063,124595,"http://yaroslavens.ru/main.aspx#catalog%2F1004-1100000147-otvet/actions/dislocal"
"mysw.info",89.54998884833739,986400,"http://mysw.info"
"direct.yandsearch",89.07906497290224,162006,"http://direct.yandsearch"
"direct.yandsearch",89.06789815,162081,"http://direct.yandsearch"
"m.myloveplanet.ru",85.15769556868906,160404,"http://m.myloveplanet.ru"
"povarenok.ru",83.38767032350344,146119,"http://povarenok.ru"
"gorod",80.3081958,110764,"http://gorod"
"myloveplanet.ru",78.90796725204231,112862,"http://myloveplanet.ru"
"kirov.ru",75.14674151712799,462255,"http://kirov.ru/?newwindow=1&text=фина"
"tambov.irr.ru",75.07411543825123,331294,"http://tambov.irr.ru"
"kurortmag.ru",74.58814399818299,158502,"http://kurortmag.ru"
"go.mail.ru",74.29600103911285,123182,"http://go.mail.ru"
"love.ru",73.97896625305462,200107,"http://love.ru"
"mkap.ru",73.1919522955935,165687,"http://mkap.ru/199/0/&AdRiver"
"yandex.ru",71.64128562279629,4854581,"http://www.yandex.ru/a-folder/novosib"
16 changes: 8 additions & 8 deletions ydb/library/workload/clickbench/click_bench_canonical/q39.result
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
"TraficSourceID","SearchEngineID","AdvEngineID","Src","Dst","PageViews"
-1,0,0,"http://state=19945206/foto-4/login-2006/makumirostova.ru/GameMain.aspx?transk.irr.ru/search","http://irr.ru/index.php?showalbum/login-leniya7777294,938303130",15
-1,0,0,"http://state=19945206/foto-4/login-2006/makumirostova.rambler.spb.jobrapido.com/gosthelp.ru","http://irr.ru/index.php?showalbum/login-leniya7777294,938303130",15
-1,0,0,"http://state=19945206/foto-4/login=instructions[0][1520][]=","http://irr.ru/index.php?showalbum/login-yakutsk.irr.ru/catalog=on&input_age10",15
-1,0,0,"http://state=19945206/foto-4/login-2006/makumiroshoowbiz/photo=on&input_onlineradio/chasti.ria.ua/search;weUsyw&bvm=bv.48705608","http://irr.ru/index.php?showalbum/login.html%26custom%3D%26CompPath.2; WOW64; rv:22.0&he=100&currency=1&target=search?text=форс-уфа-батай (размеры - Обувь - bonprix colleux/frl-29/1096157291&from=&engineVolumeFrom=trudovodstview.php?r=10985.html?1=1&cid=732-receptik",15
-1,0,0,"http://state=19945206/foto-4/login-2006/makumiroshoowbiz/photo=450&with_photo=700758&brand had art&pagead2","http://irr.ru/index.php?showalbum/login-lential/secondary/details9.html_params%3Drhost%3D43%26bt%3D41%26url%3Dhttp://trashbox.ru/a-albumshowbiz/photo.kiev.ua/auto.ria.ua/auto.ria.ua/sfynkcioner.ru/filmId=model=0&saledParam=0&under_credit=0&che_sistana/tm.pulscend/telefon-A48A-F40EFF22-pro-rassiysk.irr.ru/search",15
-1,0,0,"http://state=19945206/foto-4/login-2006/makumiroshoowbiz/down%2Fholodilnik.ru/769000&price=меньше 170005585-page","http://irr.ru/index.php?showalbum/litlip/saint-peter557932E-8C62-4917%26ad%3D648076.html?1=1&currency=1&gearbox=0&top=0&check_PP",15
-1,0,0,"http://state=19945206/foto-4/login-2006/makum","http://irr.ru/index.php?showalbum/login/?do=ready-mansion%3D0%26url%3D%26bn%3D0%26ref%3D%26custom=0",15
-1,0,0,"http://state=19945206/foto-4/login-olga664.1721/deti74.ru/animals-planet.ru","http://irr.ru/index.php?showalbum/login=K-SR-B-13-9635095,9661/9#f",15
-1,0,0,"http://state=19945206/foto-4/login-11925.17661-sh-93861361091_27_iyunya_5_iyunya_5_iyunya_5_iyulyanovskii_interval=&only_owners","http://irr.ru/index.php?showalbum/login=int[2364][from=29&modelove.ru/ru/index.php?vacancies/toolin_MP50807/details",15
-1,0,0,"http://state=19945206/foto-4/login-2006/makumiroshoowbiz/down%2Fholodilnik.ru/7656&lr","http://irr.ru/index.php?showalbum/login=vladimir/page_type=0&expand_search?text=метр&f[140][from]=7112-6417817495,932446/next_all=от 33 AA Little&category_id=&auth=0&driver.ru/novostova.ru/photo/69363/27824721&referer_detej-otlicheskiipirog",15
-1,0,0,"http://state=19945206/foto-4/login-2006/makumiroshoowbiz/down%2Fholodilnik.ru/765155","http://irr.ru/index.php?showalbum/login-leniya7777294,938303130",15
-1,0,0,"http://state=19945206/foto-4/login-2006/makumiroshoowbiz/down%2Fholodilnik.ru/765/price","http://irr.ru/index.php?showalbum/login-leniya7777294,938303130",15
-1,0,0,"http://state=19945206/foto-4/login-2006/makumiroshoowbiz/down%2Fholodilnik.ru/765/page","http://irr.ru/index.php?showalbum/login-leniya7777294,938303130",15
-1,0,0,"http://state=19945206/foto-4/login-2006/makumiroshoowbiz/down%2Fholodilnik.ru/76/~54","http://irr.ru/index.php?showalbum/login-leniya7777294,938303130",15
-1,0,0,"http://state=19945206/foto-4/login-verb=1&prepairs=0&city[1","http://irr.ru/index.php?showalbum/lounona-muzhchin-kupaljinik-chernyj-odnoe/sankt",15
-1,0,0,"http://kinopoisk.ru/rative","http://irr.ru/index.ru/show/414526863_112",15
-1,0,0,"http://state=19&numphoto/login=A-CL-MS-smi.org%2F40 (KHTML, like Gecko) Version_2013-06-30-doma.ru/replies.ru/GameMain","http://irr.ru/index.ru/widgetchrome%2F&ti=no&dom_sell/pansiyskaya-obl.irr.html%3Fhtml?1=1",15
5,0,0,"http://state=19945HPS?analog/r10418/sort=price_do=200&site_off=1","http://irr.ru/index.ru/Новгородольник лилова",15
12 changes: 6 additions & 6 deletions ydb/tests/functional/clickbench/data/queries-deterministic.sql
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
/*33*/ SELECT URL, COUNT(*) AS c FROM $data GROUP BY URL ORDER BY c DESC LIMIT 10;
/*34*/ SELECT UserID, URL, COUNT(*) AS c FROM $data GROUP BY UserID, URL ORDER BY c DESC, UserID, URL LIMIT 10;
/*35*/ SELECT ClientIP, ClientIP - 1, ClientIP - 2, ClientIP - 3, COUNT(*) AS c FROM $data GROUP BY ClientIP, ClientIP - 1, ClientIP - 2, ClientIP - 3 ORDER BY c DESC, ClientIP LIMIT 10;
/*36*/ SELECT URL, COUNT(*) AS PageViews FROM $data WHERE CounterID = 62 AND EventDate >= Date('2013-07-01') AND EventDate <= Date('2013-07-31') AND DontCountHits = 0 AND IsRefresh = 0 AND URL <> '' GROUP BY URL ORDER BY PageViews DESC LIMIT 10;
/*37*/ SELECT Title, COUNT(*) AS PageViews FROM $data WHERE CounterID = 62 AND EventDate >= Date('2013-07-01') AND EventDate <= Date('2013-07-31') AND DontCountHits = 0 AND IsRefresh = 0 AND Title <> '' GROUP BY Title ORDER BY PageViews DESC LIMIT 10;
/*38*/ SELECT URL, COUNT(*) AS PageViews FROM $data WHERE CounterID = 62 AND EventDate >= Date('2013-07-01') AND EventDate <= Date('2013-07-31') AND IsRefresh = 0 AND IsLink <> 0 AND IsDownload = 0 GROUP BY URL ORDER BY PageViews DESC LIMIT 10 OFFSET 1000;
/*39*/ SELECT TraficSourceID, SearchEngineID, AdvEngineID, Src, Dst, COUNT(*) AS PageViews FROM $data WHERE CounterID = 62 AND EventDate >= Date('2013-07-01') AND EventDate <= Date('2013-07-31') AND IsRefresh = 0 GROUP BY TraficSourceID, SearchEngineID, AdvEngineID, CASE WHEN (SearchEngineID = 0 AND AdvEngineID = 0) THEN Referer ELSE '' END AS Src, URL AS Dst ORDER BY PageViews DESC LIMIT 10 OFFSET 1000;
/*40*/ SELECT URLHash, EventDate, COUNT(*) AS PageViews FROM $data WHERE CounterID = 62 AND EventDate >= Date('2013-07-01') AND EventDate <= Date('2013-07-31') AND IsRefresh = 0 AND TraficSourceID IN (-1, 6) AND RefererHash = 3594120000172545465 GROUP BY URLHash, EventDate ORDER BY PageViews DESC LIMIT 10 OFFSET 100;
/*41*/ SELECT WindowClientWidth, WindowClientHeight, COUNT(*) AS PageViews FROM $data WHERE CounterID = 62 AND EventDate >= Date('2013-07-01') AND EventDate <= Date('2013-07-31') AND IsRefresh = 0 AND DontCountHits = 0 AND URLHash = 2868770270353813622 GROUP BY WindowClientWidth, WindowClientHeight ORDER BY PageViews DESC LIMIT 10 OFFSET 10000;
/*36*/ SELECT URL, COUNT(*) AS PageViews FROM $data WHERE CounterID = 62 AND EventDate >= Date('2013-07-01') AND EventDate <= Date('2013-07-31') AND DontCountHits = 0 AND IsRefresh = 0 AND URL <> '' GROUP BY URL ORDER BY PageViews DESC, URL LIMIT 10;
/*37*/ SELECT Title, COUNT(*) AS PageViews FROM $data WHERE CounterID = 62 AND EventDate >= Date('2013-07-01') AND EventDate <= Date('2013-07-31') AND DontCountHits = 0 AND IsRefresh = 0 AND Title <> '' GROUP BY Title ORDER BY PageViews DESC, Title LIMIT 10;
/*38*/ SELECT URL, COUNT(*) AS PageViews FROM $data WHERE CounterID = 62 AND EventDate >= Date('2013-07-01') AND EventDate <= Date('2013-07-31') AND IsRefresh = 0 AND IsLink <> 0 AND IsDownload = 0 GROUP BY URL ORDER BY PageViews DESC, URL DESC LIMIT 10 OFFSET 1000;
/*39*/ SELECT TraficSourceID, SearchEngineID, AdvEngineID, Src, Dst, COUNT(*) AS PageViews FROM $data WHERE CounterID = 62 AND EventDate >= Date('2013-07-01') AND EventDate <= Date('2013-07-31') AND IsRefresh = 0 GROUP BY TraficSourceID, SearchEngineID, AdvEngineID, CASE WHEN (SearchEngineID = 0 AND AdvEngineID = 0) THEN Referer ELSE '' END AS Src, URL AS Dst ORDER BY PageViews DESC, Dst, Src DESC LIMIT 10 OFFSET 1000;
/*40*/ SELECT URLHash, EventDate, COUNT(*) AS PageViews FROM $data WHERE CounterID = 62 AND EventDate >= Date('2013-07-01') AND EventDate <= Date('2013-07-31') AND IsRefresh = 0 AND TraficSourceID IN (-1, 6) AND RefererHash = 3594120000172545465 GROUP BY URLHash, EventDate ORDER BY PageViews DESC, URLHash DESC LIMIT 10 OFFSET 100;
/*41*/ SELECT WindowClientWidth, WindowClientHeight, COUNT(*) AS PageViews FROM $data WHERE CounterID = 62 AND EventDate >= Date('2013-07-01') AND EventDate <= Date('2013-07-31') AND IsRefresh = 0 AND DontCountHits = 0 AND URLHash = 2868770270353813622 GROUP BY WindowClientWidth, WindowClientHeight ORDER BY PageViews DESC, WindowClientWidth DESC, WindowClientHeight DESC LIMIT 10 OFFSET 10000;
/*42*/ SELECT Minute, COUNT(*) AS PageViews FROM $data WHERE CounterID = 62 AND EventDate >= Date('2013-07-14') AND EventDate <= Date('2013-07-15') AND IsRefresh = 0 AND DontCountHits = 0 GROUP BY DateTime::ToSeconds(EventTime)/60 As Minute ORDER BY Minute LIMIT 10 OFFSET 1000;
Loading