Use separate result sets when exporting hosts/services

Icinga · Mar 22, 2024 · e311d8b · e311d8b
1 parent 0148984
commit e311d8b
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 6 deletions.
diff --git a/library/Icingadb/Data/CsvResultSet.php b/library/Icingadb/Data/CsvResultSet.php
@@ -4,9 +4,9 @@
 
 namespace Icinga\Module\Icingadb\Data;
 
-use Icinga\Module\Icingadb\Redis\VolatileStateResults;
+use ipl\Orm\ResultSet;
 
-class CsvResultSet extends VolatileStateResults
+class CsvResultSet extends ResultSet
 {
     use CsvResultSetUtils;
 }
diff --git a/library/Icingadb/Data/CsvResultSetUtils.php b/library/Icingadb/Data/CsvResultSetUtils.php
@@ -6,6 +6,8 @@
 
 use DateTime;
 use DateTimeZone;
+use Icinga\Module\Icingadb\Model\Host;
+use Icinga\Module\Icingadb\Model\Service;
 use ipl\Orm\Model;
 use ipl\Orm\Query;
 
@@ -65,7 +67,11 @@ protected function extractKeysAndValues(Model $model, string $path = ''): array
 
     public static function stream(Query $query): void
     {
-        $query->setResultSetClass(__CLASS__);
+        if ($query->getModel() instanceof Host || $query->getModel() instanceof Service) {
+            $query->setResultSetClass(VolatileCsvResults::class);
+        } else {
+            $query->setResultSetClass(__CLASS__);
+        }
 
         foreach ($query->execute()->disableCache() as $i => $keysAndValues) {
             if ($i === 0) {

diff --git a/library/Icingadb/Data/JsonResultSet.php b/library/Icingadb/Data/JsonResultSet.php
@@ -4,9 +4,9 @@
 
 namespace Icinga\Module\Icingadb\Data;
 
-use Icinga\Module\Icingadb\Redis\VolatileStateResults;
+use ipl\Orm\ResultSet;
 
-class JsonResultSet extends VolatileStateResults
+class JsonResultSet extends ResultSet
 {
     use JsonResultSetUtils;
 }
diff --git a/library/Icingadb/Data/JsonResultSetUtils.php b/library/Icingadb/Data/JsonResultSetUtils.php
@@ -6,6 +6,8 @@
 
 use DateTime;
 use DateTimeZone;
+use Icinga\Module\Icingadb\Model\Host;
+use Icinga\Module\Icingadb\Model\Service;
 use Icinga\Util\Json;
 use ipl\Orm\Model;
 use ipl\Orm\Query;
@@ -59,7 +61,11 @@ protected function createObject(Model $model): array
 
     public static function stream(Query $query): void
     {
-        $query->setResultSetClass(__CLASS__);
+        if ($query->getModel() instanceof Host || $query->getModel() instanceof Service) {
+            $query->setResultSetClass(VolatileJsonResults::class);
+        } else {
+            $query->setResultSetClass(__CLASS__);
+        }
 
         echo '[';
         foreach ($query->execute()->disableCache() as $i => $object) {

diff --git a/library/Icingadb/Data/VolatileCsvResults.php b/library/Icingadb/Data/VolatileCsvResults.php
@@ -0,0 +1,15 @@
+<?php
+
+/* Icinga DB Web | (c) 2024 Icinga GmbH | GPLv2 */
+
+namespace Icinga\Module\Icingadb\Data;
+
+use Icinga\Module\Icingadb\Redis\VolatileStateResults;
+
+/**
+ * @internal This class is supposed to be used by {@see CsvResultSet::stream()} only.
+ */
+final class VolatileCsvResults extends VolatileStateResults
+{
+    use CsvResultSetUtils;
+}
diff --git a/library/Icingadb/Data/VolatileJsonResults.php b/library/Icingadb/Data/VolatileJsonResults.php
@@ -0,0 +1,15 @@
+<?php
+
+/* Icinga DB Web | (c) 2024 Icinga GmbH | GPLv2 */
+
+namespace Icinga\Module\Icingadb\Data;
+
+use Icinga\Module\Icingadb\Redis\VolatileStateResults;
+
+/**
+ * @internal This class is supposed to be used by {@see JsonResultSet::stream()} only.
+ */
+final class VolatileJsonResults extends VolatileStateResults
+{
+    use JsonResultSetUtils;
+}