fix: remove FINAL from MergeTree queries, fix PHPStan errors, fix Database adapter

Author: lohanidamodar

src/Usage/Adapter/ClickHouse.php

@@ -61,7 +61,7 @@ class ClickHouse extends SQL
     private Client $client;
 
     /** @var bool Whether to use FINAL in SELECT queries to force merge-on-read (tests) */
-    private bool $useFinal = true;
+    private bool $useFinal = false;
 
     protected ?string $tenant = null;
 
@@ -523,9 +523,8 @@ private function getTableName(): string
      */
     private function buildTableReference(string $tableName, ?bool $useFinal = null): string
     {
-        $useFinal = $useFinal ?? $this->useFinal;
         $escapedTable = $this->escapeIdentifier($this->database) . '.' . $this->escapeIdentifier($tableName);
-        return $escapedTable . ($useFinal ? ' FINAL' : '');
+        return $escapedTable;
     }
 
     /**
@@ -1307,7 +1306,7 @@ public function addBatch(array $metrics, int $batchSize = self::INSERT_BATCH_SIZ
                 $rows[] = $encoded;
             }
 
-            if (!empty($rows)) {
+            if (count($rows) > 0) {
                 $this->insert($tableName, $rows);
             }
         }
@@ -1332,7 +1331,7 @@ private function resolveTenantFromMetric(array $metricData): ?string
             return $tenant;
         }
 
-        return (string) $tenant;
+        return is_numeric($tenant) ? (string) $tenant : (string) ($tenant ?? '');
     }
 
     /**

src/Usage/Adapter/Database.php

@@ -108,7 +108,7 @@ public function addBatch(array $metrics, int $batchSize = 1000): bool
         $this->db->getAuthorization()->skip(function () use ($metrics, $batchSize) {
             $documents = [];
             foreach ($metrics as $metric) {
-                $type = $metric['type'] ?? 'event';
+                $type = $metric['type'];
 
                 if ($type !== 'event' && $type !== 'gauge') {
                     throw new \InvalidArgumentException("Invalid type '{$type}'. Allowed: event, gauge");
@@ -164,30 +164,65 @@ public function getTimeSeries(array $metrics, string $interval, string $startDat
     /**
      * Get total value for a single metric.
      *
-     * Stub implementation for Database adapter.
+     * Returns SUM for event metrics, latest value for gauge metrics.
      *
      * @param string $metric
      * @param array<Query> $queries
      * @return int
      */
     public function getTotal(string $metric, array $queries = []): int
     {
-        // Stub: not yet implemented
-        return 0;
+        $allQueries = array_merge($queries, [
+            Query::equal('metric', [$metric]),
+        ]);
+
+        /** @var array<Metric> $results */
+        $results = $this->find($allQueries);
+
+        if (empty($results)) {
+            return 0;
+        }
+
+        // Determine type from first result
+        $type = $results[0]->getType();
+
+        if ($type === 'gauge') {
+            // For gauge, return the last (most recently inserted) value
+            $lastResult = end($results);
+            return $lastResult !== false ? ($lastResult->getValue(0) ?? 0) : 0;
+        }
+
+        // For events, SUM all values
+        $sum = 0;
+        foreach ($results as $result) {
+            $sum += (int) ($result->getValue(0) ?? 0);
+        }
+
+        return $sum;
     }
 
     /**
      * Get totals for multiple metrics.
      *
-     * Stub implementation for Database adapter.
+     * Returns SUM for event metrics, latest value for gauge metrics.
      *
      * @param array<string> $metrics
      * @param array<Query> $queries
      * @return array<string, int>
      */
     public function getTotalBatch(array $metrics, array $queries = []): array
     {
-        return \array_fill_keys($metrics, 0);
+        if (empty($metrics)) {
+            return [];
+        }
+
+        $totals = \array_fill_keys($metrics, 0);
+
+        foreach ($metrics as $metric) {
+            $totals[$metric] = $this->getTotal($metric, $queries);
+        }
+
+        return $totals;
     }
 
     /**
@@ -377,7 +412,7 @@ public function setNamespace(string $namespace): self
      */
     public function setTenant(?string $tenant): self
     {
-        $this->db->setTenant($tenant);
+        $this->db->setTenant($tenant !== null ? (int) $tenant : null);
         return $this;
     }
 

src/Usage/Metric.php

@@ -163,7 +163,7 @@ public function getTenant(): ?string
             return null;
         }
 
-        return (string) $tenant;
+        return is_string($tenant) ? $tenant : (is_numeric($tenant) ? (string) $tenant : null);
     }
 
     /**