Done.

core/ArchiveProcessor/Period.php

@@ -164,7 +164,7 @@ class Period extends ArchiveProcessor
     {
         $table = new DataTable();
         if (!empty($columnAggregationOperations)) {
-            $table->setColumnAggregationOperations($columnAggregationOperations);
+            $table->metadata[DataTable::COLUMN_AGGREGATION_OPS_METADATA_NAME] = $columnAggregationOperations;
         }
 
         $data = $this->archiver->getDataTableExpanded($name, $idSubTable = null, $depth = null, $addMetadataSubtableId = false);

core/DataTable/Filter/AddSummaryRow.php

@@ -78,10 +78,10 @@ class AddSummaryRow extends Filter
 
                 //FIXME: I'm not sure why it could return false, but it was reported in: http://forum.piwik.org/read.php?2,89324,page=1#msg-89442
                 if ($summaryRow) {
-                    $newRow->sumRow($summaryRow, $enableCopyMetadata = false, $table->getColumnAggregationOperations());
+                    $newRow->sumRow($summaryRow, $enableCopyMetadata = false, $table->metadata[DataTable::COLUMN_AGGREGATION_OPS_METADATA_NAME]);
                 }
             } else {
-                $newRow->sumRow($rows[$i], $enableCopyMetadata = false, $table->getColumnAggregationOperations());
+                $newRow->sumRow($rows[$i], $enableCopyMetadata = false, $table->metadata[DataTable::COLUMN_AGGREGATION_OPS_METADATA_NAME]);
             }
         }
 

core/DataTable/Filter/GroupBy.php

@@ -87,7 +87,7 @@ class GroupBy extends Filter
             } else {
                 // if we have already encountered this group by value, we add this row to the
                 // row that will be kept, and mark this one for deletion
-                $groupByRows[$groupByValue]->sumRow($row, $copyMeta = true, $table->getColumnAggregationOperations());
+                $groupByRows[$groupByValue]->sumRow($row, $copyMeta = true, $table->metadata[DataTable::COLUMN_AGGREGATION_OPS_METADATA_NAME]);
                 $nonGroupByRowIds[] = $rowId;
             }
         }

core/DataTable/Filter/Limit.php

@@ -45,7 +45,7 @@ class Limit extends Filter
      */
     public function filter($table)
     {
-        $table->setRowsCountBeforeLimitFilter();
+        $table->metadata[DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME] = $table->getRowsCount();
 
         if ($this->keepSummaryRow) {
             $summaryRow = $table->getRowFromId(DataTable::ID_SUMMARY_ROW);

core/DataTable/Row.php

@@ -287,7 +287,8 @@ class Row
             $thisSubTable = new DataTable();
             $this->addSubtable($thisSubTable);
         }
-        $thisSubTable->setColumnAggregationOperations($subTable->getColumnAggregationOperations());
+        $thisSubTable->metadata[DataTable::COLUMN_AGGREGATION_OPS_METADATA_NAME]
+            = $subTable->metadata[DataTable::COLUMN_AGGREGATION_OPS_METADATA_NAME];
         $thisSubTable->addDataTable($subTable);
     }
 

core/DataTable/Row/DataTableSummaryRow.php

@@ -59,7 +59,7 @@ class DataTableSummaryRow extends Row
     private function sumTable($table)
     {
         foreach ($table->getRows() as $row) {
-            $this->sumRow($row, $enableCopyMetadata = false, $table->getColumnAggregationOperations());
+            $this->sumRow($row, $enableCopyMetadata = false, $table->metadata[DataTable::COLUMN_AGGREGATION_OPS_METADATA_NAME]);
         }
     }
 }

core/Plugin/Visualization.php

@@ -175,7 +175,7 @@ class Visualization extends ViewDataTable
 
         // deal w/ table metadata
         if ($this->dataTable instanceof DataTable) {
-            $this->config->metadata = $this->dataTable->getAllTableMetadata();
+            $this->config->metadata = $this->dataTable->metadata;
 
             if (isset($this->config->metadata[DataTable::ARCHIVED_DATE_METADATA_NAME])) {
                 $this->config->report_last_updated_message = $this->makePrettyArchivedOnText();
@@ -372,7 +372,8 @@ class Visualization extends ViewDataTable
             !($this->dataTable instanceof DataTable\Map)
             && empty($javascriptVariablesToSet['totalRows'])
         ) {
-            $javascriptVariablesToSet['totalRows'] = $this->dataTable->getRowsCountBeforeLimitFilter();
+            $javascriptVariablesToSet['totalRows'] =
+                $this->dataTable->getMetadata(DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME) ?: $this->dataTable->getRowsCount();
         }
 
         $deleteFromJavascriptVariables = array(

plugins/Actions/Archiver.php

@@ -166,7 +166,7 @@ class Archiver extends \Piwik\Plugin\Archiver
                 || $type == Action::TYPE_ACTION_NAME
             ) {
                 // for page urls and page titles, performance metrics exist and have to be aggregated correctly
-                $dataTable->setColumnAggregationOperations(self::$actionColumnAggregationOperations);
+                $dataTable->metadata[DataTable::COLUMN_AGGREGATION_OPS_METADATA_NAME] = self::$actionColumnAggregationOperations;
             }
 
             $this->actionsTablesByType[$type] = $dataTable;

plugins/UserSettings/API.php

@@ -219,7 +219,7 @@ class API extends \Piwik\Plugin\API
 
             // When Truncate filter is applied, it will call AddSummaryRow which tries to sum all rows.
             // We tell the object to skip the column nb_visits_percentage when aggregating (since it's not correct to sum % values)
-            $table->setColumnAggregationOperation('nb_visits_percentage', 'skip');
+            $table->metadata[DataTable::COLUMN_AGGREGATION_OPS_METADATA_NAME]['nb_visits_percentage'] = 'skip';
 
             // The filter must be applied now so that the new column can
             // be sorted by the generic filters (applied right after this loop exits)

tests/PHPUnit/BaseFixture.php

@@ -383,6 +383,7 @@ abstract class Test_Piwik_BaseFixture extends PHPUnit_Framework_Assert
 
         // run the command
         exec($cmd, $output, $result);
+        echo "OUTPUT: ".implode("\n", $output);
         if ($result !== 0) {
             throw new Exception("log importer failed: " . implode("\n", $output) . "\n\ncommand used: $cmd");
         }

tests/PHPUnit/Core/DataTable/Filter/LimitTest.php

@@ -49,7 +49,7 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(3, $table->getRowsCount());
         $this->assertEquals(2, $table->getFirstRow()->getColumn('idRow'));
         $this->assertEquals(4, $table->getLastRow()->getColumn('idRow'));
-        $this->assertEquals(10, $table->getRowsCountBeforeLimitFilter());
+        $this->assertEquals(10, $table->metadata[DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME]);
     }
 
     /**
@@ -65,7 +65,7 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(7, $table->getRowsCount());
         $this->assertEquals(2, $table->getFirstRow()->getColumn('idRow'));
         $this->assertEquals(8, $table->getLastRow()->getColumn('idRow'));
-        $this->assertEquals(10, $table->getRowsCountBeforeLimitFilter());
+        $this->assertEquals(10, $table->metadata[DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME]);
     }
 
     /**
@@ -76,13 +76,13 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase
         $offset = 0;
         $limit = 10;
         $table = $this->getDataTableCount10();
-        $this->assertEquals(10, $table->getRowsCountBeforeLimitFilter());
+        $this->assertEquals(10, $table->metadata[DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME]);
         $filter = new Limit($table, $offset, $limit);
         $filter->filter($table);
         $this->assertEquals(10, $table->getRowsCount());
         $this->assertEquals(0, $table->getFirstRow()->getColumn('idRow'));
         $this->assertEquals(9, $table->getLastRow()->getColumn('idRow'));
-        $this->assertEquals(10, $table->getRowsCountBeforeLimitFilter());
+        $this->assertEquals(10, $table->metadata[DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME]);
     }
 
     /**
@@ -93,13 +93,13 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase
         $offset = 5;
         $limit = 20;
         $table = $this->getDataTableCount10();
-        $this->assertEquals(10, $table->getRowsCountBeforeLimitFilter());
+        $this->assertEquals(10, $table->metadata[DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME]);
         $filter = new Limit($table, $offset, $limit);
         $filter->filter($table);
         $this->assertEquals(5, $table->getRowsCount());
         $this->assertEquals(5, $table->getFirstRow()->getColumn('idRow'));
         $this->assertEquals(9, $table->getLastRow()->getColumn('idRow'));
-        $this->assertEquals(10, $table->getRowsCountBeforeLimitFilter());
+        $this->assertEquals(10, $table->metadata[DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME]);
     }
 
     /**
@@ -114,7 +114,7 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(9, $table->getRowsCount());
         $this->assertEquals(1, $table->getFirstRow()->getColumn('idRow'));
         $this->assertEquals(9, $table->getLastRow()->getColumn('idRow'));
-        $this->assertEquals(10, $table->getRowsCountBeforeLimitFilter());
+        $this->assertEquals(10, $table->metadata[DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME]);
     }
 
     /**
@@ -130,7 +130,7 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(1, $table->getRowsCount());
         $this->assertEquals(9, $table->getFirstRow()->getColumn('idRow'));
         $this->assertEquals(9, $table->getLastRow()->getColumn('idRow'));
-        $this->assertEquals(10, $table->getRowsCountBeforeLimitFilter());
+        $this->assertEquals(10, $table->metadata[DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME]);
     }
 
     /**
@@ -146,7 +146,7 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(1, $table->getRowsCount());
         $this->assertEquals(9, $table->getFirstRow()->getColumn('idRow'));
         $this->assertEquals(9, $table->getLastRow()->getColumn('idRow'));
-        $this->assertEquals(10, $table->getRowsCountBeforeLimitFilter());
+        $this->assertEquals(10, $table->metadata[DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME]);
     }
 
     /**
@@ -162,7 +162,7 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(2, $table->getRowsCount());
         $this->assertEquals(8, $table->getFirstRow()->getColumn('idRow'));
         $this->assertEquals(9, $table->getLastRow()->getColumn('idRow'));
-        $this->assertEquals(10, $table->getRowsCountBeforeLimitFilter());
+        $this->assertEquals(10, $table->metadata[DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME]);
     }
 
     /**
@@ -176,7 +176,7 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase
         $filter = new Limit($table, $offset, $limit);
         $filter->filter($table);
         $this->assertEquals(0, $table->getRowsCount());
-        $this->assertEquals(10, $table->getRowsCountBeforeLimitFilter());
+        $this->assertEquals(10, $table->metadata[DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME]);
     }
 
     /**
@@ -190,7 +190,7 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase
         $filter = new Limit($table, $offset, $limit);
         $filter->filter($table);
         $this->assertEquals(0, $table->getRowsCount());
-        $this->assertEquals(10, $table->getRowsCountBeforeLimitFilter());
+        $this->assertEquals(10, $table->metadata[DataTable::TOTAL_ROWS_BEFORE_LIMIT_METADATA_NAME]);
     }
 
     /**