Исправлена работа апдейтера.

aore/updater/updater.py

@@ -3,11 +3,14 @@
 import logging
 from os import walk, path
 
-from aore.dbutils.dbschemas import allowed_tables
+from aore.config import db_conf
+from aore.dbutils.dbimpl import DBImpl
+from aore.dbutils.dbschemas import allowed_tables, db_shemas
 from aore.updater.aodataparser import AoDataParser
 from aore.updater.aorar import AoRar
 from aore.updater.aoxmltableentry import AoXmlTableEntry
 from aore.updater.dbhandler import DbHandler
+import psycopg2
 
 
 class Updater:
@@ -28,6 +31,26 @@ class Updater:
                         yield xmltable
             break
 
+    @classmethod
+    def get_current_fias_version(cls):
+        db = DBImpl(psycopg2, db_conf)
+        try:
+            rows = db.get_rows('SELECT version FROM "CONFIG" WHERE id=0', True)
+            assert len(rows) > 0, "Cannot get a version"
+            return rows[0]['version']
+        finally:
+            db.close()
+
+    @classmethod
+    def __set__update_version(cls, updver = 0):
+        db = DBImpl(psycopg2, db_conf)
+        try:
+            assert type(updver) is int, "Update version must be of int type."
+            db.execute('UPDATE "CONFIG" SET version={} WHERE id=0'.format(updver))
+        finally:
+            db.close()
+
+
     def __get_updates_from_folder(self, foldername):
         # TODO: Вычислять версию, если берем данные из каталога
         yield dict(intver=0, textver="Unknown", delta_url=foldername, complete_url=foldername)
@@ -54,26 +77,41 @@ class Updater:
 
     def create(self, updates_generator):
         self.__init_update_entries(updates_generator)
-        self.db_handler.pre_create()
+        self.db_handler.create_structure()
 
         for update_entry in self.updalist_generator:
-            logging.info("Processing update #{}".format(update_entry['intver']))
+            logging.info("Processing DB #{}".format(update_entry['intver']))
             for table_entry in self.tablelist_generator(update_entry['complete_url']):
                 if table_entry.operation_type == AoXmlTableEntry.OperationType.update:
                     table_entry.operation_type = AoXmlTableEntry.OperationType.create
                 self.process_single_entry(table_entry.operation_type, table_entry)
+            Updater.__set__update_version(update_entry['intver'])
+        else:
+            logging.info("No updates more.")
 
-        self.db_handler.post_create()
+        self.db_handler.create_indexes(db_shemas.keys())
 
         logging.info("Create success")
 
     def update(self, updates_generator):
         self.__init_update_entries(updates_generator)
-        self.db_handler.pre_update()
+
+        # Drop all indexes if updates needed
+        indexes_dropped = False
 
         for update_entry in self.updalist_generator:
+            if not indexes_dropped:
+                self.db_handler.drop_indexes(allowed_tables)
+                indexes_dropped = True
             logging.info("Processing update #{}".format(update_entry['intver']))
             for table_entry in self.tablelist_generator(update_entry['delta_url']):
                 self.process_single_entry(table_entry.operation_type, table_entry)
+            Updater.__set__update_version(update_entry['intver'])
+        else:
+            logging.info("No updates more.")
+
+        # Re-create all indexes (if dropped)
+        if indexes_dropped:
+            self.db_handler.create_indexes(allowed_tables)
 
         logging.info("Update success")