Handle ranking query others row properly in contents & events archiver. (#14622)

* Add more types of actions to ManyVisitsWithMockLocationProvider fixture.

* fix test change

* update expected test files

* Handle ranking query others row properly in contents & events archiver.

* Use custom ranking query specific others label and handle by default in DataArray::asDatatable().

* Updating expected test files.

* Use strict compare since label can be 0 apparently.

* Update expecred test files.

1 files changed, 0 insertions, 16 deletions

diff --git a/plugins/UserId/Archiver.php b/plugins/UserId/Archiver.php
index ae7fdcee8a..07e6be51d5 100644
--- a/plugins/UserId/Archiver.php
+++ b/plugins/UserId/Archiver.php
@@ -83,7 +83,6 @@ class Archiver extends \Piwik\Plugin\Archiver
         $rankingQuery = false;
         if ($rankingQueryLimit > 0) {
             $rankingQuery = new RankingQuery($rankingQueryLimit);
-            $rankingQuery->setOthersLabel(DataTable::LABEL_SUMMARY_ROW);
             $rankingQuery->addLabelColumn($userIdFieldName);
             $rankingQuery->addLabelColumn($visitorIdFieldName);
         }
@@ -119,21 +118,6 @@ class Archiver extends \Piwik\Plugin\Archiver
     {
         /** @var DataTable $dataTable */
         $dataTable = $this->arrays->asDataTable();
-
-        // deal w/ ranking query summary row
-        $rankingQuerySummaryRow = $dataTable->getRowFromLabel(DataTable::LABEL_SUMMARY_ROW);
-        if ($rankingQuerySummaryRow) {
-            $rankingQuerySummaryRowId = $dataTable->getRowIdFromLabel(DataTable::LABEL_SUMMARY_ROW);
-            $dataTable->deleteRow($rankingQuerySummaryRowId);
-
-            $actualSummaryRow = $dataTable->getRowFromId(DataTable::ID_SUMMARY_ROW);
-            if ($actualSummaryRow) {
-                $actualSummaryRow->sumRow($rankingQuerySummaryRow);
-            } else {
-                $dataTable->addSummaryRow($rankingQuerySummaryRow);
-            }
-        }
-
         $this->setVisitorIds($dataTable);
         $report = $dataTable->getSerialized($this->maximumRowsInDataTableLevelZero, null, PiwikMetrics::INDEX_NB_VISITS);
         $this->getProcessor()->insertBlobRecord(self::USERID_ARCHIVE_RECORD, $report);