correction monetDB

MonetDB.py

@@ -69,51 +69,63 @@ def create_table_monetdb():
         connect = connect_monetdb()
         with connect[0] as conn:
             with connect[1] as cursor:
+                start_time = time.time()
                 cursor.execute(createAirline)
                 cursor.execute(createAirports)
                 cursor.execute(createFlights)
                 conn.commit()
+                end_time = time.time()
                 cursor.close()
                 conn.close()
     except(pymonetdb.DatabaseError,Exception) as error:
         print(error)
+    return end_time-start_time
 
 def load_data_monetdb():
     try:
         connect = connect_monetdb()
         with connect[0] as conn:
             with connect[1] as cursor:
+                start_time = time.time()
                 cursor.execute(peuplementAirports)
                 cursor.execute(peuplementAirlines)
                 cursor.execute(peuplementFlights)
                 conn.commit()
+                end_time = time.time()
                 cursor.close()
                 conn.close()
     except(pymonetdb.DatabaseError,Exception) as error:
         print(error)
+    return end_time-start_time
 
 def requete_monetdb(str):
     try:
         connect=connect_monetdb()
         with connect[0] as conn:
             with connect[1] as cursor:
+                start_time = time.time()
                 cursor.execute(str)
                 conn.commit()
+                end_time = time.time()
                 cursor.close()
                 conn.close()
     except(pymonetdb.DatabaseError, Exception) as error:
         print(error)
+    return end_time-start_time
 
 def reset_data_monetdb():
     try:
         connect = connect_monetdb()
         with connect[0] as conn:
             with connect[1] as cursor:
+                start_time = time.time()
                 cursor.execute("DROP TABLE IF EXISTS airlines")
                 cursor.execute("DROP TABLE IF EXISTS airports")
                 cursor.execute("DROP TABLE IF EXISTS flights")
                 conn.commit()
+                end_time = time.time()
                 cursor.close()
                 conn.close()
     except(pymonetdb.DatabaseError, Exception) as error:
-        print(error)
+        print(error)
+    return end_time-start_time

main.py

@@ -10,7 +10,7 @@ requeteSelect2MonetDB = """SELECT * FROM flights;"""
 requeteSelect3MonetDB = """SELECT * FROM flights WHERE "DAY" > 10;"""
 requeteSelect4MonetDB = """SELECT * FROM flights WHERE "DAY" > 30;"""
 
-requeteCreateTableMonetDB = """CREATE TABLE flights10 AS SELECT * FROM FLIGHTS WHERE "DAY" > 10;"""
+requeteCreateTable10MonetDB = """CREATE TABLE flights10 AS SELECT * FROM FLIGHTS WHERE "DAY" > 10;"""
 requeteDeleteMonetDB = """DELETE FROM flights WHERE "DAY" > 10;"""
 requeteInsertMonetDB = """INSERT INTO flights SELECT * FROM flights10;"""
 requeteDropflight10MonetDB = """DROP TABLE flights10;"""
@@ -49,28 +49,23 @@ def display_table(data, headers):
 
 def initMonetDB():
     reset_data_monetdb()
-    start_time = time.time()
+    time = create_table_monetdb()
-    create_table_monetdb()
+    print("[MonetDB] create table: time = ", time, "s\n")
-    end_time = time.time()
-    print("[MonetDB] create table: time = ", (end_time - start_time), "s\n")
 
     start_time = time.time()
     load_data_monetdb()
     end_time = time.time()
-    print("[MonetDB] load data : time = ", (end_time - start_time), "s\n")
+    print("[MonetDB] load data : time = ", time, "s\n")
 
 def execMonetDB(str):
-    start_time = time.time()
+    return requete_monetdb(str)
-    requete_monetdb(str)
-    end_time = time.time()
-    return end_time-start_time
 
 def runMonetDB():
     execForMonetDB(5,[requeteSelect1MonetDB])
     execForMonetDB(5,[requeteSelect2MonetDB])
     execForMonetDB(5,[requeteSelect3MonetDB])
     execForMonetDB(5,[requeteSelect4MonetDB])
-    execForMonetDB(5,[requeteDropflight10MonetDB,requeteCreateTableMonetDB,requeteDeleteMonetDB,requeteInsertPostgreSQL])
+    execForMonetDB(5,[requeteCreateTable10MonetDB,requeteDeleteMonetDB,requeteInsertMonetDB,requeteDropflight10MonetDB])
 
 
 #execute n fois les n requêtes
@@ -113,8 +108,9 @@ def runPostgreSQL():
     data.append([requeteSelect4PostgreSQL,execPostgreSQL(requeteSelect4PostgreSQL)])
 
 if __name__ == '__main__':
-    #initMonetDB()
+    initMonetDB()
-    #runMonetDB()
+    runMonetDB()
+
     #initPostgreSQL()
 
     runPostgreSQL()