Changeset 1431 for branch/ggpolo/umitDB/Store.py

Timestamp:

08/19/07 04:05:09 (6 years ago)

Author:

ggpolo

Message:

Huge speed gain on XML insertion into databaseng, including insertion on Inventory and calculating changes.

Files:

• branch/ggpolo/umitDB/Store.py (modified) (33 diffs)

branch/ggpolo/umitDB/Store.py

@@ -55 +55 @@
                     scan_d["hosts_down"], scan_d["scanner"]))
 
-        self.conn.commit()
-
     
     def insert_scaninfo_db(self, scaninfo):
@@ -69 +67 @@
                         scaninfo["services"], scaninfo["fk_scan"],
                         scaninfo["type"], scaninfo["protocol"]))
-        self.conn.commit()
 
 
@@ -80 +77 @@
         self.cursor.execute("INSERT INTO scan_type (name) VALUES \
                                  (?)", (scan_name, ))
-        self.conn.commit()
 
 
@@ -91 +87 @@
         self.cursor.execute("INSERT INTO scanner (name, version) VALUES \
                                  (?, ?)", (scanner_name, scanner_version))
-        self.conn.commit()
         
 
@@ -105 +100 @@
                        (portid, service_info_id, protocol_id,
                         port_state_id))
-        self.conn.commit()
             
     
@@ -116 +110 @@
         self.cursor.execute("INSERT INTO port_state (state) VALUES \
                                 (?)", (port_state, ))
-        self.conn.commit()
     
     
@@ -127 +120 @@
         self.cursor.execute("INSERT INTO protocol (name) VALUES \
                                  (?)", (protocol, ))
-        self.conn.commit()
         
     
@@ -138 +130 @@
         self.cursor.execute("INSERT INTO _host_port (fk_host, fk_port) \
                     VALUES (?, ?)", (fk_host, fk_port))
-        self.conn.commit()
         
 
@@ -150 +141 @@
                             fk_port_state) VALUES (?, ?, ?)",
                             (count, fk_host, fk_port_state))
-        self.conn.commit()
 
 
@@ -163 +153 @@
                         fk_protocol, fk_host) VALUES (?, ?, ?, ?)",
                         (portid, fk_port_state, fk_protocol, fk_host))
-        self.conn.commit()
 
 
@@ -177 +166 @@
                         (?, ?, ?, ?, ?, ?)", (osclass_accuracy, fk_osgen,
                         fk_osfamily, fk_osvendor, fk_ostype, fk_host))
-        self.conn.commit()
 
    
@@ -190 +178 @@
                     fk_host) VALUES (?, ?, ?, ?)", (osmatch["name"], 
                     osmatch["accuracy"], osmatch["line"], host))
-        self.conn.commit()
         
         
@@ -200 +187 @@
         
         self.cursor.execute("INSERT INTO osgen (gen) VALUES (?)", (osgen, ))
-        self.conn.commit()
+
         
     def insert_osfamily_db(self, osfamily):
@@ -210 +197 @@
         self.cursor.execute("INSERT INTO osfamily (family) VALUES (?)", 
                         (osfamily, ))
-        self.conn.commit()
             
 
@@ -221 +207 @@
         self.cursor.execute("INSERT INTO osvendor (vendor) VALUES (?)", 
                         (osvendor, ))
-        self.conn.commit()
 
     
@@ -232 +217 @@
         self.cursor.execute("INSERT INTO ostype (type) VALUES (?)", 
                         (ostype, ))
-        self.conn.commit()
         
 
@@ -244 +228 @@
                      fk_host_state) VALUES (?, ?, ?)", (host_d["distance"],
                      host_d["fk_scan"], host_d["fk_host_state"]))
-        self.conn.commit()
 
 
@@ -255 +238 @@
         self.cursor.execute("INSERT INTO _host_address (fk_host, fk_address) \
                             VALUES (?, ?)", (fk_host, fk_address))
-        self.conn.commit()
 
 
@@ -267 +249 @@
                                 fk_hostname) VALUES (?, ?)", (fk_host, 
                                 fk_hostname))
-        self.conn.commit()
     
     
@@ -279 +260 @@
                                  (?, ?)", (hostname["hostname_type"], 
                                            hostname["hostname"]))
-        self.conn.commit()
    
 
@@ -302 +282 @@
                 ip_id_sequence_value, fk_host) VALUES (?, ?, ?, ?, ?, ?, ?, \
                 ?, ?, ?, ?)", (data))
-        self.conn.commit()
 
     
@@ -313 +292 @@
         self.cursor.execute("INSERT INTO service_name (name) VALUES \
                             (?)", (service_name, ))
-        self.conn.commit()
         
         
@@ -325 +303 @@
                     extrainfo, method, conf, fk_service_name) VALUES (?, ?, ?,\
                     ?, ?, ?)", service_data)
-        self.conn.commit()
         
     
@@ -337 +314 @@
                         fk_vendor) VALUES (?, ?, ?)", (address_addr,
                         address_type, vendor))
-        self.conn.commit()
 
     
@@ -348 +324 @@
         self.cursor.execute("INSERT INTO vendor (name) \
                                          VALUES (?)", (vendor_name, ))
-        self.conn.commit()
 
         
@@ -359 +334 @@
         self.cursor.execute("INSERT INTO host_state (state) \
                         VALUES (?)", (host_state, ))
-        self.conn.commit()
 
 
@@ -372 +346 @@
                         tcpseq_dict["index"], tcpseq_dict["class"], 
                         tcpseq_dict["difficulty"], tcpseq_dict["values"]))
-        self.conn.commit()
 
 
@@ -385 +358 @@
                       tcp_ts_values)  VALUES (?, ?)", (tcptsseq_dict["class"], 
                       tcptsseq_dict["values"]))
-        self.conn.commit()
 
 
@@ -397 +369 @@
                       ip_id_values)  VALUES (?, ?)", (ipidseq_dict["class"], 
                       ipidseq_dict["values"]))
-        self.conn.commit()
 
 
@@ -408 +379 @@
         self.cursor.execute("INSERT INTO inventory (name) VALUES (?)", 
                     (inventory, ))
-        self.conn.commit()
         
     
@@ -419 +389 @@
         self.cursor.execute("INSERT INTO _inventory_scan (fk_scan, \
                     fk_inventory) VALUES (?, ?)", (scan, inventory))
-        self.conn.commit()
         
         
@@ -431 +400 @@
         self.cursor.execute("INSERT INTO inventory_change_category (name) \
                              VALUES (?)", (category, ))
-        self.conn.commit()
         
     
@@ -448 +416 @@
                                                       short_descr, fk_inventory,
                                                       fk_category, fk_address))
-        self.conn.commit()
-         
+