Refactor IOV comparison functions and update PayloadIOV model to use 'extra' field; add new SQL query for payload IOVs with extra information.

Author: ruslan33

cdb_rest/iov_comparisons.py

@@ -57,31 +57,31 @@ def is_conflicting_iov_end_discrete(piov, major_iov, minor_iov):
     return (
         (piov.major_iov_end >= major_iov) or
         ((piov.major_iov_end == major_iov) and 
-         ((piov.minor_iov_end >= minor_iov) or (minor_iov_end is None))
+         ((piov.minor_iov_end >= minor_iov) or (minor_iov_end is None)))
     )
 
 
 def is_conflicting_iov_end_continuous(piov, major_iov, minor_iov):
     return (
         (piov.major_iov_end > major_iov) or
         ((piov.major_iov_end == major_iov) and 
-         ((piov.minor_iov_end > minor_iov) or (minor_iov_end is None))
+         ((piov.minor_iov_end > minor_iov) or (minor_iov_end is None)))
     )
 
 
 def is_iov_end_inside_discrete(piov, major_iov_end, minor_iov_end):
     return (
         (piov.major_iov_end < major_iov_end) or
         ((piov.major_iov_end == major_iov_end) and
-         ((piov.minor_iov_end <= minor_iov_end) or (minor_iov_end is None))
+         ((piov.minor_iov_end <= minor_iov_end) or (minor_iov_end is None)))
     )
 
 
 def is_iov_end_inside_continuous(piov, major_iov_end, minor_iov_end):
     return (
         (piov.major_iov_end < major_iov_end) or
         ((piov.major_iov_end == major_iov_end) and
-         ((piov.minor_iov_end < minor_iov_end) or (minor_iov_end is None))
+         ((piov.minor_iov_end < minor_iov_end) or (minor_iov_end is None)))
     )
 
 

cdb_rest/models.py

@@ -101,7 +101,7 @@ class PayloadIOV(models.Model):
     major_iov_end = models.BigIntegerField(db_column='major_iov_end')
     minor_iov_end = models.BigIntegerField(db_column='minor_iov_end')
     payload_list = models.ForeignKey(PayloadList, related_name='payload_iov', on_delete=models.CASCADE, null=True)
-    description = models.CharField(max_length=255, db_column='description', null=True)
+    extra = models.CharField(max_length=255, db_column='extra', null=True)
     inserted = models.DateTimeField(auto_now_add=True, db_column='created')
     updated = models.DateTimeField(auto_now=True, db_column='updated')
     comb_iov = models.DecimalField(db_column='comb_iov', max_digits=38, decimal_places=19, null=True)

cdb_rest/queries.py

@@ -12,3 +12,17 @@
 ) pi ON true
 JOIN "PayloadType" pt ON pl.payload_type_id = pt.id;
 '''
+get_payload_iovs_with_extra = '''
+SELECT pt.name AS payload_type_name, pi.payload_url, pi.checksum, pi.size, pi.major_iov, pi.minor_iov, pi.major_iov_end, pi.minor_iov_end, pi.extra as revision
+FROM "PayloadList" pl
+JOIN "GlobalTag" gt ON pl.global_tag_id = gt.id AND gt.name = %(my_gt)s
+JOIN LATERAL (
+   SELECT payload_url, checksum, size, major_iov, minor_iov, major_iov_end, minor_iov_end, extra
+   FROM   "PayloadIOV" pi
+   WHERE  pi.payload_list_id = pl.id
+     AND pi.comb_iov <= CAST(%(my_major_iov)s + CAST(%(my_minor_iov)s AS DECIMAL(19,0)) / 1E19 AS DECIMAL(38,19))
+   ORDER BY pi.comb_iov DESC NULLS LAST
+   LIMIT 1
+) pi ON true
+JOIN "PayloadType" pt ON pl.payload_type_id = pt.id;
+'''

cdb_rest/views.py

@@ -600,6 +600,11 @@ def list(self, request):
         return Response(serializer.data)
 
 
+def _resolve_query(setting_name, default):
+    query_name = getattr(settings, setting_name, None)
+    if query_name:
+        return getattr(cdb_rest.queries, query_name)
+    return default
 class PayloadIOVsSQLListAPIView(ListAPIView):
 
     def list(self, request):
@@ -609,8 +614,11 @@ def list(self, request):
         # If at least one read database is available, use it; otherwise, use "default"
         read_db = random.choice(read_dbs) if read_dbs else "default"
 
+        query = _resolve_query('CDB_PAYLOAD_IOVS_QUERY', cdb_rest.queries.get_payload_iovs)
+
+
         with connections[read_db].cursor() as cursor:
-            cursor.execute(cdb_rest.queries.get_payload_iovs,
+            cursor.execute(query,
                            {'my_major_iov': self.request.GET.get('majorIOV'),
                             'my_minor_iov': self.request.GET.get('minorIOV'),
                             'my_gt': self.request.GET.get('gtName')})

nopayloaddb/settings.py

@@ -262,6 +262,7 @@
 }
 
 CDB_IOV_MODE = os.environ.get('CDB_IOV_MODE', 'continuous')
+CDB_PAYLOAD_IOVS_QUERY = "get_payload_iovs_with_extra"  # omit to use default
 
 if CDB_IOV_MODE not in ('discrete', 'continuous'):
     raise ValueError(f"Invalid CDB_IOV_MODE '{CDB_IOV_MODE}'. Must be 'discrete' or 'continuous'.")