1919use Piwik \DataAccess \LogAggregator ;
2020use Piwik \DataTable ;
2121use Piwik \Db ;
22- use Piwik \Plugins \Actions \ArchivingHelper ;
2322use Piwik \Plugins \BotTracking \Archiver ;
2423use Piwik \Plugins \BotTracking \BotDetector ;
2524use Piwik \Plugins \BotTracking \Dao \BotRequestsDao ;
@@ -66,8 +65,6 @@ public function getRecordMetadata(ArchiveProcessor $archiveProcessor): array
6665 {
6766 return [
6867 Record::make (Record::TYPE_BLOB , Archiver::AI_ASSISTANTS_PAGES_RECORD ),
69- Record::make (Record::TYPE_BLOB , Archiver::AI_ASSISTANTS_REQUESTED_DOCUMENTS_RECORD ),
70- Record::make (Record::TYPE_BLOB , Archiver::AI_ASSISTANTS_REQUESTED_PAGES_RECORD ),
7168 Record::make (Record::TYPE_BLOB , Archiver::AI_ASSISTANTS_DOCUMENTS_RECORD ),
7269 Record::make (Record::TYPE_NUMERIC , Metrics::METRIC_AI_ASSISTANTS_UNIQUE_ASSISTANTS )
7370 ->setIsCountOfBlobRecordRows (Archiver::AI_ASSISTANTS_PAGES_RECORD ),
@@ -91,8 +88,6 @@ protected function aggregate(ArchiveProcessor $archiveProcessor): array
9188 $ tables = [
9289 Archiver::AI_ASSISTANTS_PAGES_RECORD => new DataTable (),
9390 Archiver::AI_ASSISTANTS_DOCUMENTS_RECORD => new DataTable (),
94- Archiver::AI_ASSISTANTS_REQUESTED_PAGES_RECORD => new DataTable (),
95- Archiver::AI_ASSISTANTS_REQUESTED_DOCUMENTS_RECORD => new DataTable (),
9691 ];
9792
9893 $ this ->populateTables ($ archiveProcessor , $ tables );
@@ -111,9 +106,6 @@ private function populateTables(ArchiveProcessor $archiveProcessor, array &$tabl
111106
112107 $ this ->populateAssistantTableForActionType ($ tables , Action::TYPE_PAGE_URL , $ logAggregator , $ visits );
113108 $ this ->populateAssistantTableForActionType ($ tables , Action::TYPE_DOWNLOAD , $ logAggregator , $ visits );
114-
115- $ this ->populateRequestTableForActionType ($ tables [Archiver::AI_ASSISTANTS_REQUESTED_PAGES_RECORD ], Action::TYPE_PAGE_URL , $ logAggregator );
116- $ this ->populateRequestTableForActionType ($ tables [Archiver::AI_ASSISTANTS_REQUESTED_DOCUMENTS_RECORD ], Action::TYPE_DOWNLOAD , $ logAggregator );
117109 }
118110
119111 /**
@@ -267,51 +259,6 @@ private function getRankingQueryLimit(): int
267259 return max ($ configLimit , $ maxRowsInTable , $ maxRowsInSubtable );
268260 }
269261
270- public function populateRequestTableForActionType (DataTable $ table , int $ actionType , LogAggregator $ logAggregator ): void
271- {
272- $ where = $ logAggregator ->getWhereStatement ('bot ' , 'server_time ' );
273- $ bindBase = $ logAggregator ->getGeneralQueryBindParams ();
274-
275- $ sql = sprintf (
276- "SELECT log_action.name AS url, log_action.url_prefix, COUNT(*) AS requests
277- FROM `%s` AS bot
278- INNER JOIN `%s` AS log_action ON log_action.idaction = bot.idaction_url
279- WHERE log_action.name IS NOT NULL
280- AND log_action.name <> ''
281- AND log_action.type = %d
282- AND bot.bot_type = ?
283- AND %s
284- GROUP BY log_action.name
285- ORDER BY requests DESC, url " ,
286- BotRequestsDao::getPrefixedTableName (),
287- Common::prefixTable ('log_action ' ),
288- $ actionType ,
289- $ where
290- );
291-
292- if ($ this ->rankingQueryLimit > 0 ) {
293- $ rankingQuery = new RankingQuery ($ this ->rankingQueryLimit );
294- $ rankingQuery ->addLabelColumn (['url ' ]);
295- $ rankingQuery ->addColumn ('requests ' );
296- $ rankingQuery ->addColumn ('url_prefix ' , 'sum ' );
297- $ sql = $ rankingQuery ->generateRankingQuery ($ sql , true );
298- }
299-
300- $ resultSet = Db::query ($ sql , array_merge ([BotDetector::BOT_TYPE_AI_ASSISTANT ], $ bindBase ));
301-
302- while ($ record = $ resultSet ->fetch ()) {
303- /**
304- * @var array{requests: int, url: string, url_prefix: ?int} $record
305- */
306- $ path = ArchivingHelper::getActionExplodedNames ($ record ['url ' ], $ actionType , $ record ['url_prefix ' ]);
307- [$ row , $ level ] = $ table ->walkPath ($ path , [Metrics::COLUMN_REQUESTS => 0 ], $ this ->maxRowsInSubtable );
308-
309- if ($ row ) {
310- $ row ->setColumn (Metrics::COLUMN_REQUESTS , $ record ['requests ' ]);
311- }
312- }
313- }
314-
315262 /**
316263 * @param array<string, DataTable> $tables
317264 */
0 commit comments