diff --git a/MonetDB.py b/MonetDB.py index 95ab535..10be8f4 100644 --- a/MonetDB.py +++ b/MonetDB.py @@ -65,6 +65,8 @@ def connect_monetdb(): return connection, cursor def create_table_monetdb(): + start_time = 0 + end_time = 0 try: connect = connect_monetdb() with connect[0] as conn: @@ -82,6 +84,8 @@ def create_table_monetdb(): return end_time-start_time def load_data_monetdb(): + start_time = 0 + end_time = 0 try: connect = connect_monetdb() with connect[0] as conn: @@ -99,6 +103,8 @@ def load_data_monetdb(): return end_time-start_time def requete_monetdb(str): + start_time = 0 + end_time = 0 try: connect=connect_monetdb() with connect[0] as conn: @@ -114,6 +120,8 @@ def requete_monetdb(str): return end_time-start_time def reset_data_monetdb(): + start_time = 0 + end_time = 0 try: connect = connect_monetdb() with connect[0] as conn: diff --git a/main.py b/main.py index c2eae2c..cef9445 100644 --- a/main.py +++ b/main.py @@ -43,9 +43,8 @@ def initMonetDB(): time = create_table_monetdb() print("[MonetDB] create table: time = ", time, "s\n") - start_time = time.time() - load_data_monetdb() - end_time = time.time() + time = load_data_monetdb() + print("[MonetDB] load data : time = ", time, "s\n") def execMonetDB(str): @@ -86,16 +85,16 @@ def initPostgreSQL(): def execPostgreSQL(str): start_time = time.time() - requete_monetdb(str) + requete_postgres(str) end_time = time.time() return end_time-start_time def runPostgreSQL(): - execForMonetDB(5,[requeteSelect1PostgreSQL]) - execForMonetDB(5,[requeteSelect2PostgreSQL]) - execForMonetDB(5,[requeteSelect3PostgreSQL]) - execForMonetDB(5,[requeteSelect4PostgreSQL]) - execForMonetDB(5,[requeteCreateTable10PostgreSQL,requeteDeletePostgreSQL,requeteInsertPostgreSQL,requeteDropflight10MonetSQL]) + execForPostgreSQL(5,[requeteSelect1PostgreSQL]) + execForPostgreSQL(5,[requeteSelect2PostgreSQL]) + execForPostgreSQL(5,[requeteSelect3PostgreSQL]) + execForPostgreSQL(5,[requeteSelect4PostgreSQL]) + execForPostgreSQL(5,[requeteCreateTable10PostgreSQL,requeteDeletePostgreSQL,requeteInsertPostgreSQL,requeteDropflight10MonetSQL]) # execute n fois les n requĂȘtes def execForPostgreSQL(n, tabReq):