diff --git a/MonetDB.py b/MonetDB.py index abf7a80..76d4bd0 100644 --- a/MonetDB.py +++ b/MonetDB.py @@ -103,7 +103,7 @@ def requete_monetdb(str): except(pymonetdb.DatabaseError, Exception) as error: print(error) -def reset_data_monetdb(connection,cursor): +def reset_data_monetdb(): try: with connect_monetdb()[0] as conn: with connect_monetdb()[1] as cursor: diff --git a/main.py b/main.py index 943b09b..386d0c3 100644 --- a/main.py +++ b/main.py @@ -5,8 +5,8 @@ import time #Monet DB requeteSelect1MonetDB = """SELECT * FROM flights WHERE "AIRLINE" = 'AA';""" requeteSelect2MonetDB = """SELECT * FROM flights;""" -requeteSelect3MonetDB = """SELECT * FROM flight WHERE “DAY” > 10;""" -requeteSelect4MonetDB = """SELECT * FROM flight WHERE “DAY” > 30;""" +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;""" requeteDeleteMonetDB = """DELETE FROM flights WHERE "DAY" > 10;""" @@ -15,8 +15,8 @@ requeteInsertMonetDB = """INSERT INTO flights SELECT * FROM flights10;""" #Postgre SQL requeteSelect1PostgreSQL = """SELECT * FROM public.flights WHERE airline = 'AA'""" requeteSelect2PostgreSQL = """SELECT * FROM public.flights""" -requeteSelect3PostgreSQL = """SELECT * FROM public.flight WHERE “DAY” > 10""" -requeteSelect4PostgreSQL = """SELECT * FROM public.flight WHERE “DAY” > 30""" +requeteSelect3PostgreSQL = """SELECT * FROM public.flight WHERE "DAY" > 10""" +requeteSelect4PostgreSQL = """SELECT * FROM public.flight WHERE "DAY" > 30""" requeteCreateTablePostgreSQL = """CREATE TABLE flights10 AS SELECT * FROM FLIGHTS WHERE "DAY" > 10""" requeteDeletePostgreSQL = """DELETE FROM flights WHERE "DAY" > 10""" @@ -38,19 +38,46 @@ def display_table(data, headers): for row in data: print(" | ".join(header.ljust(max_len) for header in row)) + +#start_time = time.time() +#end_time = time.time() +#print(end_time - start_time) + + +def initMonetDB(): + reset_data_monetdb() + start_time = time.time() + create_table_monetdb() + end_time = time.time() + print("[MonetDB] creat table: time = ", (end_time - start_time), "s") + + start_time = time.time() + load_data_monetdb() + end_time = time.time() + print("[MonetDB] load data : time = ", (end_time - start_time), "s") + +def execMonetDB(str): + start_time = time.time() + requete_monetdb(str) + end_time = time.time() + print("[MonetDB] requete :", str , "\n time = ", (end_time - start_time), "s") + def runMonetDB(): conn, cursor =connect_monetdb() start = time.time() - initMonetDB(conn,cursor) + initMonetDB() print(time.time() - start) + execMonetDB(conn,cursor,requeteSelect1MonetDB) + execMonetDB(conn,cursor,requeteSelect2MonetDB) + execMonetDB(conn,cursor,requeteSelect3MonetDB) + execMonetDB(conn,cursor,requeteSelect4MonetDB) + #execMoneDB(conn,cursor,requeteSelect1MonetDB) def runPostgreSQL(): reset_database_postgres() - start_time = time.time() create_tables_postgres() create_data_postgres() - print(time.time() - start_time) #requete_postgres(str) if __name__ == '__main__':