Dropping PhEDEx DAOs

Dropping phedex MySQL_Create Dropping phedex MySQL_NewSubscription Dropping phedex Oracle_Create Dropping phedex Oracle_NewSubscription
dmwm · Jun 17, 2022 · 86a0925 · 86a0925
1 parent f0d7547
commit 86a0925
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 19 deletions.
diff --git a/src/python/WMComponent/DBS3Buffer/MySQL/Create.py b/src/python/WMComponent/DBS3Buffer/MySQL/Create.py
@@ -44,14 +44,12 @@ def __init__(self, logger=None, dbi=None, params=None):
                  site                   VARCHAR(100) NOT NULL,
                  custodial              INTEGER      DEFAULT 0,
                  auto_approve           INTEGER      DEFAULT 0,
-                 move                   INTEGER      DEFAULT 0,
                  priority               VARCHAR(10)  DEFAULT 'Low',
                  subscribed             INTEGER      DEFAULT 0,
-                 phedex_group           VARCHAR(100),
                  delete_blocks          INTEGER,
                  dataset_lifetime       INTEGER      DEFAULT 0 NOT NULL,
                  PRIMARY KEY (id),
-                 CONSTRAINT uq_dbs_dat_sub UNIQUE (dataset_id, site, custodial, auto_approve, move, priority))"""
+                 CONSTRAINT uq_dbs_dat_sub UNIQUE (dataset_id, site, custodial, auto_approve, priority))"""
 
         self.create[len(self.create)] = \
             """CREATE TABLE dbsbuffer_algo (

diff --git a/src/python/WMComponent/DBS3Buffer/MySQL/NewSubscription.py b/src/python/WMComponent/DBS3Buffer/MySQL/NewSubscription.py
@@ -19,8 +19,8 @@ class NewSubscription(DBFormatter):
     """
 
     sql = """INSERT IGNORE INTO dbsbuffer_dataset_subscription
-            (dataset_id, site, custodial, auto_approve, move, priority, subscribed, phedex_group, delete_blocks, dataset_lifetime)
-            VALUES (:id, :site, :custodial, :auto_approve, :move, :priority, 0, :phedex_group, :delete_blocks, :dataset_lifetime)
+            (dataset_id, site, custodial, auto_approve, priority, subscribed, delete_blocks, dataset_lifetime)
+            VALUES (:id, :site, :custodial, :auto_approve, :priority, 0, :delete_blocks, :dataset_lifetime)
           """
 
     def _createPhEDExSubBinds(self, datasetID, subscriptionInfo, custodialFlag):
@@ -43,24 +43,17 @@ def _createPhEDExSubBinds(self, datasetID, subscriptionInfo, custodialFlag):
         dataLifetime = subscriptionInfo.get('DatasetLifetime', 0) or 0
         if custodialFlag:
             sites = subscriptionInfo['CustodialSites']
-            phedex_group = subscriptionInfo['CustodialGroup']
-            isMove = 1 if subscriptionInfo['CustodialSubType'] == 'Move' else 0
         else:
             sites = subscriptionInfo['NonCustodialSites']
-            phedex_group = subscriptionInfo['NonCustodialGroup']
-            isMove = 1 if subscriptionInfo['NonCustodialSubType'] == 'Move' else 0
-        if not isMove:
-            delete_blocks = 1 if subscriptionInfo.get('DeleteFromSource', False) else None
+        delete_blocks = 1 if subscriptionInfo.get('DeleteFromSource', False) else None
 
         binds = []
         for site in sites:
             bind = {'id': datasetID,
                     'site': site,
                     'custodial': 1 if custodialFlag else 0,
                     'auto_approve': 1 if site in subscriptionInfo['AutoApproveSites'] else 0,
-                    'move': isMove,
                     'priority': subscriptionInfo['Priority'],
-                    'phedex_group': phedex_group,
                     'delete_blocks': delete_blocks,
                     'dataset_lifetime': dataLifetime}
             binds.append(bind)

diff --git a/src/python/WMComponent/DBS3Buffer/Oracle/Create.py b/src/python/WMComponent/DBS3Buffer/Oracle/Create.py
@@ -44,14 +44,12 @@ def __init__(self, logger = None, dbi = None, params = None):
                  site               VARCHAR(100) NOT NULL,
                  custodial          INTEGER      DEFAULT 0,
                  auto_approve       INTEGER      DEFAULT 0,
-                 move               INTEGER      DEFAULT 0,
                  priority           VARCHAR(10)  DEFAULT 'Low',
                  subscribed         INTEGER      DEFAULT 0,
-                 phedex_group       VARCHAR(100),
                  delete_blocks      INTEGER,
                  dataset_lifetime   INTEGER      DEFAULT 0 NOT NULL,
                  PRIMARY KEY (id),
-                 CONSTRAINT uq_dbs_dat_sub UNIQUE (dataset_id, site, custodial, auto_approve, move, priority)
+                 CONSTRAINT uq_dbs_dat_sub UNIQUE (dataset_id, site, custodial, auto_approve, priority)
                )"""
 
         self.create[len(self.create)] = \

diff --git a/src/python/WMComponent/DBS3Buffer/Oracle/NewSubscription.py b/src/python/WMComponent/DBS3Buffer/Oracle/NewSubscription.py
@@ -18,9 +18,9 @@ class NewSubscription(MySQLNewSubscription):
     """
 
     sql = """INSERT INTO dbsbuffer_dataset_subscription
-             (id, dataset_id, site, custodial, auto_approve, move, priority, subscribed, phedex_group, delete_blocks, dataset_lifetime)
+             (id, dataset_id, site, custodial, auto_approve, priority, subscribed, delete_blocks, dataset_lifetime)
              SELECT dbsbuffer_dataset_sub_seq.nextval, :id, :site, :custodial, :auto_approve,
-                    :move, :priority, 0, :phedex_group, :delete_blocks, :dataset_lifetime
+                    :priority, 0, :delete_blocks, :dataset_lifetime
              FROM DUAL
              WHERE NOT EXISTS
                ( SELECT *
@@ -29,7 +29,6 @@ class NewSubscription(MySQLNewSubscription):
                  AND site = :site
                  AND custodial = :custodial
                  AND auto_approve = :auto_approve
-                 AND move = :move
                  AND priority = :priority
                  AND dataset_lifetime = :dataset_lifetime )
              """