Use DbSchemas as default property, remove hdb/tdb

Author: sergirubio

PyTangoArchiving/hdbpp/maintenance.py

@@ -305,14 +305,16 @@ def decimate_into_new_db(db_in, db_out, min_period = 1, min_array_period = 3,
             period = min_period
 
         try:
+            db_out.warning('Disabling keys on %s' % table)
             db_out.Query("ALTER TABLE `%s` DISABLE KEYS;" % table)
 
             decimate_into_new_table(db_in,db_out,table,
                 tbegin,tend,min_period=period, max_period = max_period,
                 method = method,remove_nones = remove_nones,
                 server_dec = server_dec, bunch = bunch,
                 use_files = use_files)
-            
+
+            db_out.warning('Reenabling keys on %s' % table)
             db_out.Query("ALTER TABLE `%s` ENABLE KEYS;" % table)
 
             done.append(table)

PyTangoArchiving/schemas.py

@@ -134,11 +134,12 @@ def load(k,tango='',prop='',logger=None):
         schemas = prop or tangodb.get_property('PyTangoArchiving',
                     ['DbSchemas','Schemas'])
 
-        pname = 'DbSchemas' if 'DbSchemas' in schemas else 'Schemas'
-        schemas = schemas.get(pname,[])
+        schemas = schemas.get('DbSchemas',[])
+        if not schemas:
+            schemas = schemas.get('Schemas', []) or []
 
         if not schemas:
-            schemas = ['tdb','hdb']
+            schemas = ['hdbpp']
             tangodb.put_property('PyTangoArchiving',{'DbSchemas':schemas})
 
         #print('Loading %s from tango@%s ... ' % (pname, tangodb.get_db_host()))