[change] Use SeparateDatabaseAndState for JSONField migration #673

Optimized PostgreSQL with jsonb and GIN indexes. Synchronized migration state for both main and sample apps with models. Verified locally in Docker environment.

Closes #673

Author: HMTAhir327

.github/workflows/ci.yml

@@ -92,6 +92,20 @@ jobs:
         if: ${{ !cancelled() && steps.deps.conclusion == 'success' }}
         run: docker compose up -d influxdb
 
+      - name: Wait for InfluxDB
+        if: ${{ !cancelled() && steps.deps.conclusion == 'success' }}
+        run: |
+          for i in {1..20}; do
+            if curl -sI http://localhost:8086/ping | grep "204" > /dev/null; then
+              echo "InfluxDB is ready!"
+              exit 0
+            fi
+            echo "Waiting for InfluxDB to initialize..."
+            sleep 3
+          done
+          echo "Error: InfluxDB timed out"
+          exit 1
+
       - name: QA checks
         run: |
           ./run-qa-checks

openwisp_monitoring/monitoring/migrations/0013_auto_20260224_0730.py

@@ -0,0 +1,82 @@
+import django.contrib.postgres.indexes
+from django.db import migrations, models
+
+
+def migrate_to_jsonb(apps, schema_editor):
+    if schema_editor.connection.vendor != "postgresql":
+        return
+    with schema_editor.connection.cursor() as cursor:
+        cursor.execute(
+            "DROP INDEX IF EXISTS monitoring_metric_main_tags_2d8550ae_like; "
+            "DROP INDEX IF EXISTS monitoring_metric_main_tags_2d8550ae;"
+        )
+        cursor.execute(
+            "ALTER TABLE monitoring_metric ALTER COLUMN main_tags TYPE jsonb USING main_tags::jsonb; "
+            "ALTER TABLE monitoring_metric ALTER COLUMN extra_tags TYPE jsonb USING extra_tags::jsonb;"
+        )
+        cursor.execute(
+            "CREATE INDEX IF NOT EXISTS main_tags_gin_idx ON monitoring_metric USING gin (main_tags); "
+            "CREATE INDEX IF NOT EXISTS extra_tags_gin_idx ON monitoring_metric USING gin (extra_tags);"
+        )
+
+
+def rollback_jsonb(apps, schema_editor):
+    if schema_editor.connection.vendor != "postgresql":
+        return
+    with schema_editor.connection.cursor() as cursor:
+        cursor.execute(
+            "DROP INDEX IF EXISTS main_tags_gin_idx; DROP INDEX IF EXISTS extra_tags_gin_idx;"
+        )
+        cursor.execute(
+            "ALTER TABLE monitoring_metric ALTER COLUMN main_tags TYPE text; "
+            "ALTER TABLE monitoring_metric ALTER COLUMN extra_tags TYPE text;"
+        )
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("monitoring", "0012_migrate_signal_metrics"),
+    ]
+
+    operations = [
+        migrations.SeparateDatabaseAndState(
+            state_operations=[
+                migrations.AlterField(
+                    model_name="metric",
+                    name="extra_tags",
+                    field=models.JSONField(
+                        blank=True,
+                        default=dict,
+                        verbose_name="extra tags",
+                    ),
+                ),
+                migrations.AlterField(
+                    model_name="metric",
+                    name="main_tags",
+                    field=models.JSONField(
+                        blank=True,
+                        db_index=True,
+                        default=dict,
+                        verbose_name="main tags",
+                    ),
+                ),
+                migrations.AddIndex(
+                    model_name="metric",
+                    index=django.contrib.postgres.indexes.GinIndex(
+                        fields=["main_tags"],
+                        name="main_tags_gin_idx",
+                    ),
+                ),
+                migrations.AddIndex(
+                    model_name="metric",
+                    index=django.contrib.postgres.indexes.GinIndex(
+                        fields=["extra_tags"],
+                        name="extra_tags_gin_idx",
+                    ),
+                ),
+            ],
+            database_operations=[
+                migrations.RunPython(migrate_to_jsonb, reverse_code=rollback_jsonb),
+            ],
+        ),
+    ]

openwisp_monitoring/monitoring/migrations/0013_migrate_to_jsonfield.py

@@ -3,3 +3,6 @@ django-redis~=6.0.0
 mock-ssh-server~=0.9.1
 channels_redis~=4.3.0
 freezegun~=1.5.5
+commitizen~=4.13.0
+prompt-toolkit!=3.0.52
+django-filter<25.0

requirements-test.txt

@@ -1,5 +1,6 @@
 # Generated by Django 3.2.15 on 2022-09-08 11:11
 
+import django.contrib.postgres.indexes
 from django.db import migrations, models
 
 
@@ -19,4 +20,23 @@ class Migration(migrations.Migration):
                 max_length=16,
             ),
         ),
+        migrations.SeparateDatabaseAndState(
+            state_operations=[
+                migrations.AddIndex(
+                    model_name="metric",
+                    index=django.contrib.postgres.indexes.GinIndex(
+                        fields=["main_tags"],
+                        name="main_tags_gin_idx",
+                    ),
+                ),
+                migrations.AddIndex(
+                    model_name="metric",
+                    index=django.contrib.postgres.indexes.GinIndex(
+                        fields=["extra_tags"],
+                        name="extra_tags_gin_idx",
+                    ),
+                ),
+            ],
+            database_operations=[],
+        ),
     ]