From 867faa1123154214aaed0f89d2b7051f1fcfd205 Mon Sep 17 00:00:00 2001 From: Narek Galstyan Date: Mon, 7 Aug 2023 04:16:24 +0000 Subject: [PATCH 1/2] Add a setup script that downloads data and creates recall tables --- README.md | 15 +- db/init/init_results.sql | 5 +- experiments/outputs/results.csv | 479 +----------------- experiments/scripts/create_tables.sql | 38 +- experiments/scripts/create_tables_derived.sql | 39 -- experiments/scripts/create_tables_recall.sql | 98 +--- experiments/scripts/setup_tables.py | 53 ++ 7 files changed, 110 insertions(+), 617 deletions(-) create mode 100644 experiments/scripts/setup_tables.py diff --git a/README.md b/README.md index f5e18e8..06f8d34 100644 --- a/README.md +++ b/README.md @@ -11,4 +11,17 @@ Scripts you can run - experiments/recall_experiment.py - experiments/create_experiment.py - experiments/select_experiment.py -- experiments/disk_usage_experiment.py \ No newline at end of file +- experiments/disk_usage_experiment.py + + +### Examples + +Run recall experiments on Lantern +```bash +python ./experiments/recall_experiment.py --dataset sift --extension pgvector --N 10k 100k +``` + +Use a custom database URL to run the experiments +```bash +DATABASE_URL='postgresql://ngalstyan:abra@localhost:5432/testdb' python ./experiments/recall_experiment.py --dataset sift --extension pgvector --N 10k 100k + ``` diff --git a/db/init/init_results.sql b/db/init/init_results.sql index 1dab825..c70f3e0 100644 --- a/db/init/init_results.sql +++ b/db/init/init_results.sql @@ -1,12 +1,13 @@ +DROP TABLE experiment_results; CREATE TABLE experiment_results ( id SERIAL PRIMARY KEY, database TEXT NOT NULL, dataset TEXT NOT NULL, n INTEGER NOT NULL, - k INTEGER, + k INTEGER NOT NULL DEFAULT 0, out TEXT, err TEXT, metric_type TEXT NOT NULL, metric_value DOUBLE PRECISION NOT NULL, - CONSTRAINT unique_result UNIQUE NULLS NOT DISTINCT (metric_type, database, dataset, n, k) + CONSTRAINT unique_result UNIQUE (metric_type, "database", dataset, n, k) ); \ No newline at end of file diff --git a/experiments/outputs/results.csv b/experiments/outputs/results.csv index 17e404c..707814e 100644 --- a/experiments/outputs/results.csv +++ b/experiments/outputs/results.csv @@ -1,473 +1,8 @@ database,dataset,n,k,metric_type,metric_value -lantern,gist,12000,,insert bulk (latency s),0.09985852241516113 -lantern,gist,11000,,insert bulk (latency s),0.1098642349243164 -lantern,gist,10000,,insert bulk (latency s),0.11260485649108887 -lantern,gist,9000,,insert bulk (latency s),0.14745163917541504 -lantern,gist,8000,,insert bulk (latency s),0.10376787185668945 -lantern,gist,7000,,insert bulk (latency s),0.09929943084716797 -lantern,gist,6000,,insert bulk (latency s),0.08555269241333008 -lantern,gist,5000,,insert bulk (latency s),0.1447148323059082 -lantern,gist,4000,,insert bulk (latency s),0.1021430492401123 -lantern,gist,30000,,insert bulk (latency s),0.15570354461669922 -lantern,gist,29000,,insert bulk (latency s),0.10262560844421387 -lantern,gist,28000,,insert bulk (latency s),0.0907435417175293 -lantern,gist,27000,,insert bulk (latency s),0.10264897346496582 -lantern,gist,26000,,insert bulk (latency s),0.1381218433380127 -lantern,gist,25000,,insert bulk (latency s),0.10488176345825195 -lantern,gist,24000,,insert bulk (latency s),0.10811710357666016 -lantern,gist,23000,,insert bulk (latency s),0.10872912406921387 -lantern,gist,22000,,insert bulk (latency s),0.1562180519104004 -lantern,gist,21000,,insert bulk (latency s),0.10739874839782715 -lantern,gist,20000,,insert bulk (latency s),0.10524940490722656 -lantern,gist,40000,,insert bulk (latency s),0.11602044105529785 -lantern,gist,39000,,insert bulk (latency s),0.11830258369445801 -lantern,gist,38000,,insert bulk (latency s),0.15775203704833984 -lantern,gist,37000,,insert bulk (latency s),0.10667848587036133 -lantern,gist,19000,,insert bulk (latency s),0.1049807071685791 -lantern,gist,18000,,insert bulk (latency s),0.11013078689575195 -lantern,gist,17000,,insert bulk (latency s),0.15178465843200684 -lantern,gist,36000,,insert bulk (latency s),0.10578608512878418 -lantern,gist,35000,,insert bulk (latency s),0.10550093650817871 -lantern,gist,34000,,insert bulk (latency s),0.15807342529296875 -lantern,gist,33000,,insert bulk (latency s),0.10682296752929688 -lantern,gist,32000,,insert bulk (latency s),0.10294628143310547 -lantern,gist,31000,,insert bulk (latency s),0.10397720336914062 -lantern,gist,16000,,insert bulk (latency s),0.10364484786987305 -lantern,gist,3000,,insert bulk (latency s),0.10440444946289062 -lantern,gist,2000,,insert bulk (latency s),0.10284161567687988 -lantern,gist,15000,,insert bulk (latency s),0.10191130638122559 -lantern,gist,14000,,insert bulk (latency s),0.10644888877868652 -lantern,gist,13000,,insert bulk (latency s),0.15383625030517578 -lantern,sift,15000,,insert bulk (latency s),0.01880049705505371 -lantern,sift,2000,,insert bulk (latency s),0.8723170757293701 -lantern,sift,5000,,insert bulk (latency s),0.02341914176940918 -lantern,sift,4000,,insert bulk (latency s),0.02089548110961914 -lantern,sift,3000,,insert bulk (latency s),0.01696181297302246 -lantern,sift,11000,,insert bulk (latency s),0.01740574836730957 -lantern,sift,10000,,insert bulk (latency s),0.017182588577270508 -lantern,sift,9000,,insert bulk (latency s),0.018721818923950195 -lantern,sift,8000,,insert bulk (latency s),0.018316030502319336 -lantern,sift,7000,,insert bulk (latency s),0.018420934677124023 -lantern,sift,6000,,insert bulk (latency s),0.021204471588134766 -lantern,sift,23000,,insert bulk (latency s),0.01672983169555664 -lantern,sift,24000,,insert bulk (latency s),0.016724586486816406 -lantern,sift,25000,,insert bulk (latency s),0.01606464385986328 -lantern,sift,26000,,insert bulk (latency s),0.016621112823486328 -lantern,sift,27000,,insert bulk (latency s),0.016188621520996094 -lantern,sift,28000,,insert bulk (latency s),0.017284870147705078 -lantern,sift,29000,,insert bulk (latency s),0.015018224716186523 -lantern,sift,30000,,insert bulk (latency s),0.01642608642578125 -lantern,sift,31000,,insert bulk (latency s),0.016830921173095703 -lantern,sift,32000,,insert bulk (latency s),0.016602277755737305 -lantern,sift,33000,,insert bulk (latency s),0.018215417861938477 -lantern,sift,22000,,insert bulk (latency s),0.017580032348632812 -lantern,sift,34000,,insert bulk (latency s),0.01842045783996582 -lantern,sift,35000,,insert bulk (latency s),0.014988899230957031 -lantern,sift,36000,,insert bulk (latency s),0.016949892044067383 -lantern,sift,37000,,insert bulk (latency s),0.01686239242553711 -lantern,sift,38000,,insert bulk (latency s),0.018399953842163086 -lantern,sift,39000,,insert bulk (latency s),0.016460418701171875 -lantern,sift,40000,,insert bulk (latency s),0.06326985359191895 -lantern,sift,21000,,insert bulk (latency s),0.01738142967224121 -lantern,sift,20000,,insert bulk (latency s),0.017301559448242188 -lantern,sift,19000,,insert bulk (latency s),0.017869949340820312 -lantern,sift,18000,,insert bulk (latency s),0.017143964767456055 -lantern,sift,17000,,insert bulk (latency s),0.01711297035217285 -lantern,sift,16000,,insert bulk (latency s),0.016283750534057617 -lantern,sift,14000,,insert bulk (latency s),0.01968669891357422 -lantern,sift,13000,,insert bulk (latency s),0.01568770408630371 -lantern,sift,12000,,insert bulk (latency s),0.01824021339416504 -none,gist,29000,,insert bulk (latency s),0.11586785316467285 -none,gist,30000,,insert bulk (latency s),0.11856698989868164 -none,gist,31000,,insert bulk (latency s),0.12192773818969727 -none,gist,32000,,insert bulk (latency s),0.11477446556091309 -none,gist,33000,,insert bulk (latency s),0.12150120735168457 -none,gist,34000,,insert bulk (latency s),0.11640691757202148 -none,gist,35000,,insert bulk (latency s),0.11458992958068848 -none,gist,36000,,insert bulk (latency s),0.1139824390411377 -none,gist,37000,,insert bulk (latency s),0.11713528633117676 -none,gist,38000,,insert bulk (latency s),0.12312078475952148 -none,gist,39000,,insert bulk (latency s),0.12286615371704102 -none,gist,40000,,insert bulk (latency s),0.10986185073852539 -none,gist,25000,,insert bulk (latency s),0.1129763126373291 -none,gist,2000,,insert bulk (latency s),0.12877893447875977 -none,gist,1000,,insert bulk (latency s),0.10325217247009277 -none,gist,3000,,insert bulk (latency s),0.1259758472442627 -none,gist,4000,,insert bulk (latency s),0.13576722145080566 -none,gist,5000,,insert bulk (latency s),0.13521838188171387 -none,gist,6000,,insert bulk (latency s),0.11387944221496582 -none,gist,24000,,insert bulk (latency s),0.12645173072814941 -none,gist,7000,,insert bulk (latency s),0.14167094230651855 -none,gist,8000,,insert bulk (latency s),0.13812899589538574 -none,gist,9000,,insert bulk (latency s),0.1430511474609375 -none,gist,10000,,insert bulk (latency s),0.13673615455627441 -none,gist,11000,,insert bulk (latency s),0.14307260513305664 -none,gist,12000,,insert bulk (latency s),0.12302422523498535 -none,gist,13000,,insert bulk (latency s),0.1287524700164795 -none,gist,14000,,insert bulk (latency s),0.13077855110168457 -none,gist,15000,,insert bulk (latency s),0.11439752578735352 -none,gist,16000,,insert bulk (latency s),0.12464404106140137 -none,gist,17000,,insert bulk (latency s),0.12376904487609863 -none,gist,18000,,insert bulk (latency s),0.1414651870727539 -none,gist,19000,,insert bulk (latency s),0.14151644706726074 -none,gist,20000,,insert bulk (latency s),0.14406418800354004 -none,gist,21000,,insert bulk (latency s),0.1403489112854004 -none,gist,22000,,insert bulk (latency s),0.12592148780822754 -none,gist,26000,,insert bulk (latency s),0.10295295715332031 -none,gist,23000,,insert bulk (latency s),0.13519668579101562 -none,gist,27000,,insert bulk (latency s),0.11329364776611328 -none,gist,28000,,insert bulk (latency s),0.10457563400268555 -none,sift,13000,,insert bulk (latency s),0.022001981735229492 -none,sift,2000,,insert bulk (latency s),0.026711463928222656 -none,sift,3000,,insert bulk (latency s),0.023940324783325195 -none,sift,4000,,insert bulk (latency s),0.02348947525024414 -none,sift,5000,,insert bulk (latency s),0.02367568016052246 -none,sift,6000,,insert bulk (latency s),0.025422334671020508 -none,sift,7000,,insert bulk (latency s),0.022922754287719727 -none,sift,8000,,insert bulk (latency s),0.02181696891784668 -none,sift,9000,,insert bulk (latency s),0.024544954299926758 -none,sift,10000,,insert bulk (latency s),0.024450302124023438 -none,sift,11000,,insert bulk (latency s),0.023330211639404297 -none,sift,12000,,insert bulk (latency s),0.021312236785888672 -none,sift,14000,,insert bulk (latency s),0.02302098274230957 -none,sift,15000,,insert bulk (latency s),0.021040678024291992 -none,sift,16000,,insert bulk (latency s),0.025185823440551758 -none,sift,17000,,insert bulk (latency s),0.022962093353271484 -none,sift,18000,,insert bulk (latency s),0.025930166244506836 -none,sift,19000,,insert bulk (latency s),0.028075456619262695 -none,sift,20000,,insert bulk (latency s),0.028502464294433594 -none,sift,21000,,insert bulk (latency s),0.026275157928466797 -none,sift,22000,,insert bulk (latency s),0.03087925910949707 -none,sift,23000,,insert bulk (latency s),0.025559663772583008 -none,sift,24000,,insert bulk (latency s),0.025669336318969727 -none,sift,25000,,insert bulk (latency s),0.024874210357666016 -none,sift,26000,,insert bulk (latency s),0.025315284729003906 -none,sift,27000,,insert bulk (latency s),0.0267946720123291 -none,sift,1000,,insert bulk (latency s),0.020935773849487305 -none,sift,28000,,insert bulk (latency s),0.026527881622314453 -none,sift,40000,,insert bulk (latency s),0.01968693733215332 -none,sift,29000,,insert bulk (latency s),0.026113033294677734 -none,sift,30000,,insert bulk (latency s),0.02239251136779785 -none,sift,31000,,insert bulk (latency s),0.02446603775024414 -none,sift,32000,,insert bulk (latency s),0.024187564849853516 -none,sift,33000,,insert bulk (latency s),0.024341821670532227 -none,sift,34000,,insert bulk (latency s),0.020433902740478516 -none,sift,35000,,insert bulk (latency s),0.02266383171081543 -none,sift,36000,,insert bulk (latency s),0.02074718475341797 -none,sift,37000,,insert bulk (latency s),0.02060985565185547 -none,sift,38000,,insert bulk (latency s),0.01944112777709961 -none,sift,39000,,insert bulk (latency s),0.02012920379638672 -pgvector,gist,11000,,insert bulk (latency s),0.8538179397583008 -pgvector,gist,2000,,insert bulk (latency s),0.8174755573272705 -pgvector,gist,40000,,insert bulk (latency s),0.9095380306243896 -pgvector,gist,39000,,insert bulk (latency s),0.8122494220733643 -pgvector,gist,38000,,insert bulk (latency s),0.8509202003479004 -pgvector,gist,37000,,insert bulk (latency s),0.8698573112487793 -pgvector,gist,36000,,insert bulk (latency s),0.8466253280639648 -pgvector,gist,35000,,insert bulk (latency s),0.8295230865478516 -pgvector,gist,34000,,insert bulk (latency s),0.8863739967346191 -pgvector,gist,16000,,insert bulk (latency s),0.8226873874664307 -pgvector,gist,15000,,insert bulk (latency s),0.8078358173370361 -pgvector,gist,14000,,insert bulk (latency s),0.8074634075164795 -pgvector,gist,13000,,insert bulk (latency s),0.8490543365478516 -pgvector,gist,12000,,insert bulk (latency s),0.8280658721923828 -pgvector,gist,10000,,insert bulk (latency s),0.8085346221923828 -pgvector,gist,9000,,insert bulk (latency s),0.8086996078491211 -pgvector,gist,8000,,insert bulk (latency s),0.829841136932373 -pgvector,gist,7000,,insert bulk (latency s),0.821098804473877 -pgvector,gist,6000,,insert bulk (latency s),0.8102171421051025 -pgvector,gist,5000,,insert bulk (latency s),0.8070352077484131 -pgvector,gist,4000,,insert bulk (latency s),0.8228466510772705 -pgvector,gist,3000,,insert bulk (latency s),0.816554069519043 -pgvector,gist,33000,,insert bulk (latency s),0.8224880695343018 -pgvector,gist,32000,,insert bulk (latency s),0.8309752941131592 -pgvector,gist,31000,,insert bulk (latency s),0.8799607753753662 -pgvector,gist,30000,,insert bulk (latency s),0.8823933601379395 -pgvector,gist,29000,,insert bulk (latency s),0.8266127109527588 -pgvector,gist,28000,,insert bulk (latency s),0.8303053379058838 -pgvector,gist,27000,,insert bulk (latency s),0.852257251739502 -pgvector,gist,26000,,insert bulk (latency s),0.8049869537353516 -pgvector,gist,25000,,insert bulk (latency s),0.8226749897003174 -pgvector,gist,24000,,insert bulk (latency s),0.8347833156585693 -pgvector,gist,23000,,insert bulk (latency s),0.8665683269500732 -pgvector,gist,22000,,insert bulk (latency s),0.8624093532562256 -pgvector,gist,21000,,insert bulk (latency s),0.8545305728912354 -pgvector,gist,20000,,insert bulk (latency s),0.8693208694458008 -pgvector,gist,19000,,insert bulk (latency s),0.8290514945983887 -pgvector,gist,18000,,insert bulk (latency s),0.8144960403442383 -pgvector,gist,17000,,insert bulk (latency s),0.8228127956390381 -pgvector,gist,1000,,insert bulk (latency s),0.795173168182373 -pgvector,sift,20000,,insert bulk (latency s),0.04646658897399902 -pgvector,sift,38000,,insert bulk (latency s),0.04697823524475098 -pgvector,sift,39000,,insert bulk (latency s),0.04535269737243652 -pgvector,sift,21000,,insert bulk (latency s),0.04736924171447754 -pgvector,sift,40000,,insert bulk (latency s),0.047539472579956055 -pgvector,sift,22000,,insert bulk (latency s),0.046958208084106445 -pgvector,sift,2000,,insert bulk (latency s),0.04799795150756836 -pgvector,sift,3000,,insert bulk (latency s),0.046913862228393555 -pgvector,sift,4000,,insert bulk (latency s),0.04720711708068848 -pgvector,sift,23000,,insert bulk (latency s),0.048592329025268555 -pgvector,sift,24000,,insert bulk (latency s),0.04848361015319824 -pgvector,sift,25000,,insert bulk (latency s),0.050116777420043945 -pgvector,sift,26000,,insert bulk (latency s),0.05106759071350098 -pgvector,sift,27000,,insert bulk (latency s),0.05112028121948242 -pgvector,sift,28000,,insert bulk (latency s),0.05267739295959473 -pgvector,sift,29000,,insert bulk (latency s),0.0479738712310791 -pgvector,sift,30000,,insert bulk (latency s),0.04852747917175293 -pgvector,sift,31000,,insert bulk (latency s),0.04766058921813965 -pgvector,sift,32000,,insert bulk (latency s),0.046495914459228516 -pgvector,sift,33000,,insert bulk (latency s),0.047211647033691406 -pgvector,sift,37000,,insert bulk (latency s),0.04730796813964844 -pgvector,sift,34000,,insert bulk (latency s),0.04675149917602539 -pgvector,sift,35000,,insert bulk (latency s),0.047307491302490234 -pgvector,sift,14000,,insert bulk (latency s),0.04681682586669922 -pgvector,sift,15000,,insert bulk (latency s),0.04699087142944336 -pgvector,sift,36000,,insert bulk (latency s),0.04907727241516113 -pgvector,sift,16000,,insert bulk (latency s),0.04677462577819824 -pgvector,sift,17000,,insert bulk (latency s),0.04759573936462402 -pgvector,sift,18000,,insert bulk (latency s),0.046714067459106445 -pgvector,sift,5000,,insert bulk (latency s),0.047028541564941406 -pgvector,sift,6000,,insert bulk (latency s),0.04867911338806152 -pgvector,sift,7000,,insert bulk (latency s),0.04737567901611328 -pgvector,sift,9000,,insert bulk (latency s),0.048108577728271484 -pgvector,sift,10000,,insert bulk (latency s),0.04828643798828125 -pgvector,sift,11000,,insert bulk (latency s),0.051445722579956055 -pgvector,sift,12000,,insert bulk (latency s),0.0512540340423584 -pgvector,sift,13000,,insert bulk (latency s),0.050266265869140625 -pgvector,sift,1000,,insert bulk (latency s),0.046959638595581055 -pgvector,sift,8000,,insert bulk (latency s),0.04838871955871582 -pgvector,sift,19000,,insert bulk (latency s),0.05255603790283203 -lantern,gist,39000,,insert (latency s),22.875092029571533 -lantern,gist,29000,,insert (latency s),20.894052743911743 -lantern,gist,30000,,insert (latency s),21.966435432434082 -lantern,gist,31000,,insert (latency s),20.658408403396606 -lantern,gist,32000,,insert (latency s),21.894415140151978 -lantern,gist,33000,,insert (latency s),20.60391592979431 -lantern,gist,34000,,insert (latency s),20.912413835525513 -lantern,gist,35000,,insert (latency s),20.27364158630371 -lantern,gist,36000,,insert (latency s),20.803884267807007 -lantern,gist,37000,,insert (latency s),21.652806043624878 -lantern,gist,38000,,insert (latency s),22.060258865356445 -lantern,gist,12000,,insert (latency s),17.908738613128662 -lantern,gist,11000,,insert (latency s),18.130053520202637 -lantern,gist,10000,,insert (latency s),17.71631360054016 -lantern,gist,9000,,insert (latency s),18.01425337791443 -lantern,gist,8000,,insert (latency s),16.91279149055481 -lantern,gist,7000,,insert (latency s),16.57342553138733 -lantern,gist,6000,,insert (latency s),16.04864764213562 -lantern,gist,5000,,insert (latency s),15.627498626708984 -lantern,gist,4000,,insert (latency s),14.660315990447998 -lantern,gist,3000,,insert (latency s),14.918242692947388 -lantern,gist,2000,,insert (latency s),12.433680772781372 -lantern,gist,40000,,insert (latency s),24.638651371002197 -lantern,gist,28000,,insert (latency s),20.48130488395691 -lantern,gist,13000,,insert (latency s),17.54999017715454 -lantern,gist,14000,,insert (latency s),18.725364923477173 -lantern,gist,15000,,insert (latency s),18.61061406135559 -lantern,gist,16000,,insert (latency s),18.50995898246765 -lantern,gist,17000,,insert (latency s),18.65286946296692 -lantern,gist,18000,,insert (latency s),19.51511526107788 -lantern,gist,19000,,insert (latency s),19.279724597930908 -lantern,gist,20000,,insert (latency s),19.26139783859253 -lantern,gist,21000,,insert (latency s),19.415977716445923 -lantern,gist,22000,,insert (latency s),19.515399932861328 -lantern,gist,23000,,insert (latency s),20.02219009399414 -lantern,gist,24000,,insert (latency s),20.179264545440674 -lantern,gist,25000,,insert (latency s),19.81905174255371 -lantern,gist,26000,,insert (latency s),19.575668573379517 -lantern,gist,27000,,insert (latency s),19.719939947128296 -lantern,sift,22000,,insert (latency s),19.145185470581055 -lantern,sift,23000,,insert (latency s),13.544481754302979 -lantern,sift,40000,,insert (latency s),13.010352373123169 -lantern,sift,39000,,insert (latency s),12.696589469909668 -lantern,sift,38000,,insert (latency s),14.091494798660278 -lantern,sift,37000,,insert (latency s),14.482078790664673 -lantern,sift,36000,,insert (latency s),14.712886571884155 -lantern,sift,35000,,insert (latency s),14.846577167510986 -lantern,sift,34000,,insert (latency s),14.765941143035889 -lantern,sift,33000,,insert (latency s),14.51771593093872 -lantern,sift,32000,,insert (latency s),14.6117582321167 -lantern,sift,31000,,insert (latency s),13.697028160095215 -lantern,sift,30000,,insert (latency s),13.597526550292969 -lantern,sift,29000,,insert (latency s),13.664115905761719 -lantern,sift,28000,,insert (latency s),13.791032075881958 -lantern,sift,27000,,insert (latency s),13.350926637649536 -lantern,sift,26000,,insert (latency s),13.624101400375366 -lantern,sift,25000,,insert (latency s),13.010716199874878 -lantern,sift,2000,,insert (latency s),8.92326021194458 -lantern,sift,3000,,insert (latency s),9.561523675918579 -lantern,sift,4000,,insert (latency s),10.130621194839478 -lantern,sift,5000,,insert (latency s),10.28547739982605 -lantern,sift,6000,,insert (latency s),10.25469970703125 -lantern,sift,7000,,insert (latency s),10.511691808700562 -lantern,sift,8000,,insert (latency s),10.386672973632812 -lantern,sift,9000,,insert (latency s),10.98174786567688 -lantern,sift,10000,,insert (latency s),11.320376634597778 -lantern,sift,11000,,insert (latency s),11.449035167694092 -lantern,sift,16000,,insert (latency s),12.310918807983398 -lantern,sift,15000,,insert (latency s),12.478079795837402 -lantern,sift,14000,,insert (latency s),12.432652711868286 -lantern,sift,13000,,insert (latency s),11.816103458404541 -lantern,sift,12000,,insert (latency s),11.65571117401123 -lantern,sift,17000,,insert (latency s),12.387624502182007 -lantern,sift,24000,,insert (latency s),13.226626634597778 -lantern,sift,18000,,insert (latency s),12.612514734268188 -lantern,sift,19000,,insert (latency s),12.977493286132812 -lantern,sift,20000,,insert (latency s),16.173682689666748 -lantern,sift,21000,,insert (latency s),31.22054386138916 -none,gist,23000,,insert (latency s),6.462695121765137 -none,gist,1000,,insert (latency s),6.214303016662598 -none,gist,2000,,insert (latency s),6.269612789154053 -none,gist,3000,,insert (latency s),6.2921812534332275 -none,gist,4000,,insert (latency s),6.487889766693115 -none,gist,5000,,insert (latency s),6.166394472122192 -none,gist,6000,,insert (latency s),6.22326397895813 -none,gist,7000,,insert (latency s),6.3124473094940186 -none,gist,8000,,insert (latency s),6.185592174530029 -none,gist,9000,,insert (latency s),6.260367155075073 -none,gist,10000,,insert (latency s),6.266801118850708 -none,gist,11000,,insert (latency s),6.367795705795288 -none,gist,12000,,insert (latency s),6.145715951919556 -none,gist,13000,,insert (latency s),6.195271968841553 -none,gist,14000,,insert (latency s),6.245370864868164 -none,gist,15000,,insert (latency s),6.252848386764526 -none,gist,16000,,insert (latency s),6.343924283981323 -none,gist,17000,,insert (latency s),6.275736570358276 -none,gist,18000,,insert (latency s),6.188300848007202 -none,gist,19000,,insert (latency s),6.468891859054565 -none,gist,20000,,insert (latency s),6.498507261276245 -none,gist,21000,,insert (latency s),6.590167284011841 -none,gist,22000,,insert (latency s),6.527483224868774 -none,gist,24000,,insert (latency s),6.311777830123901 -none,gist,25000,,insert (latency s),6.332464218139648 -none,gist,26000,,insert (latency s),6.247774600982666 -none,gist,27000,,insert (latency s),6.487606525421143 -none,gist,28000,,insert (latency s),6.473583698272705 -none,gist,29000,,insert (latency s),6.391772747039795 -none,gist,30000,,insert (latency s),6.548486709594727 -none,gist,31000,,insert (latency s),6.287713050842285 -none,gist,32000,,insert (latency s),6.34237003326416 -none,gist,33000,,insert (latency s),6.375743627548218 -none,gist,34000,,insert (latency s),6.386332035064697 -none,gist,35000,,insert (latency s),6.443420886993408 -none,gist,36000,,insert (latency s),6.420262813568115 -none,gist,37000,,insert (latency s),6.347773790359497 -none,gist,38000,,insert (latency s),6.324404239654541 -none,gist,39000,,insert (latency s),6.3008739948272705 -none,sift,1000,,insert (latency s),5.994915723800659 -none,sift,2000,,insert (latency s),5.9889233112335205 -none,sift,3000,,insert (latency s),5.8968424797058105 -none,sift,4000,,insert (latency s),6.241945743560791 -none,sift,5000,,insert (latency s),5.939880132675171 -none,sift,6000,,insert (latency s),6.029419422149658 -none,sift,7000,,insert (latency s),5.930192232131958 -none,sift,8000,,insert (latency s),6.003810882568359 -none,sift,9000,,insert (latency s),6.190083742141724 -none,sift,10000,,insert (latency s),6.157288312911987 -none,sift,11000,,insert (latency s),5.965528726577759 -none,sift,12000,,insert (latency s),5.930405855178833 -none,sift,13000,,insert (latency s),6.042269945144653 -none,sift,14000,,insert (latency s),5.91138482093811 -none,sift,15000,,insert (latency s),5.777734279632568 -none,sift,16000,,insert (latency s),5.822797775268555 -none,sift,17000,,insert (latency s),5.870931148529053 -none,sift,18000,,insert (latency s),5.7897210121154785 -none,sift,19000,,insert (latency s),5.852150917053223 -none,sift,20000,,insert (latency s),5.853980779647827 -none,sift,21000,,insert (latency s),5.892572402954102 -none,sift,22000,,insert (latency s),5.91269063949585 -none,sift,23000,,insert (latency s),5.994536399841309 -none,sift,24000,,insert (latency s),6.117467403411865 -none,sift,25000,,insert (latency s),5.896758794784546 -none,sift,26000,,insert (latency s),5.973222494125366 -none,sift,27000,,insert (latency s),5.864748954772949 -none,sift,28000,,insert (latency s),5.774115324020386 -none,sift,29000,,insert (latency s),5.878494739532471 -none,sift,30000,,insert (latency s),5.926750659942627 -none,sift,31000,,insert (latency s),6.022777318954468 -none,sift,32000,,insert (latency s),5.894284725189209 -none,sift,33000,,insert (latency s),5.826134204864502 -none,sift,34000,,insert (latency s),5.954623460769653 -none,sift,35000,,insert (latency s),5.960406303405762 -none,sift,36000,,insert (latency s),6.024835109710693 -none,sift,37000,,insert (latency s),5.929425001144409 -none,sift,38000,,insert (latency s),6.224157094955444 -none,sift,39000,,insert (latency s),6.0303332805633545 -pgvector,gist,11000,,insert (latency s),8.637391567230225 -pgvector,gist,38000,,insert (latency s),8.427502393722534 -pgvector,gist,37000,,insert (latency s),8.474709033966064 -pgvector,gist,36000,,insert (latency s),8.432061195373535 -pgvector,gist,35000,,insert (latency s),8.360933303833008 -pgvector,gist,34000,,insert (latency s),8.626116752624512 -pgvector,gist,33000,,insert (latency s),8.68990707397461 -pgvector,gist,32000,,insert (latency s),8.53283977508545 -pgvector,gist,31000,,insert (latency s),8.448345184326172 -pgvector,gist,30000,,insert (latency s),8.492002964019775 -pgvector,gist,29000,,insert (latency s),8.407135725021362 -pgvector,gist,28000,,insert (latency s),8.415030241012573 -pgvector,gist,27000,,insert (latency s),8.301539421081543 -pgvector,gist,26000,,insert (latency s),8.211982250213623 -pgvector,gist,25000,,insert (latency s),8.563585996627808 -pgvector,gist,24000,,insert (latency s),8.480040073394775 -pgvector,gist,23000,,insert (latency s),8.434131383895874 -pgvector,gist,22000,,insert (latency s),8.477920293807983 -pgvector,gist,21000,,insert (latency s),8.501293659210205 -pgvector,gist,20000,,insert (latency s),8.427715301513672 -pgvector,gist,19000,,insert (latency s),8.408530473709106 -pgvector,gist,18000,,insert (latency s),8.352077007293701 -pgvector,gist,17000,,insert (latency s),8.372278690338135 -pgvector,gist,16000,,insert (latency s),8.319658756256104 -pgvector,gist,15000,,insert (latency s),8.533291816711426 -pgvector,gist,14000,,insert (latency s),8.414323806762695 -pgvector,gist,13000,,insert (latency s),8.52560806274414 -pgvector,gist,12000,,insert (latency s),8.544894218444824 -pgvector,gist,39000,,insert (latency s),8.438941478729248 -pgvector,gist,10000,,insert (latency s),8.473469972610474 -pgvector,gist,9000,,insert (latency s),8.314244985580444 -pgvector,gist,8000,,insert (latency s),8.385485887527466 -pgvector,gist,7000,,insert (latency s),8.329698324203491 -pgvector,gist,6000,,insert (latency s),8.467110872268677 -pgvector,gist,5000,,insert (latency s),8.40498685836792 -pgvector,gist,4000,,insert (latency s),8.472602367401123 -pgvector,gist,3000,,insert (latency s),8.414515495300293 -pgvector,gist,2000,,insert (latency s),8.254993200302124 -pgvector,gist,1000,,insert (latency s),8.487682342529297 -pgvector,sift,1000,,insert (latency s),7.095586061477661 -pgvector,sift,2000,,insert (latency s),6.993924856185913 -pgvector,sift,3000,,insert (latency s),7.01514458656311 -pgvector,sift,4000,,insert (latency s),7.214370250701904 -pgvector,sift,5000,,insert (latency s),6.968144178390503 -pgvector,sift,6000,,insert (latency s),7.002033710479736 -pgvector,sift,7000,,insert (latency s),7.1243956089019775 -pgvector,sift,8000,,insert (latency s),7.02409815788269 -pgvector,sift,9000,,insert (latency s),7.2461817264556885 -pgvector,sift,10000,,insert (latency s),7.218639850616455 -pgvector,sift,11000,,insert (latency s),7.1706037521362305 -pgvector,sift,12000,,insert (latency s),7.0763959884643555 -pgvector,sift,13000,,insert (latency s),7.360527753829956 -pgvector,sift,14000,,insert (latency s),7.20024299621582 -pgvector,sift,15000,,insert (latency s),7.067759275436401 -pgvector,sift,16000,,insert (latency s),7.013278245925903 -pgvector,sift,17000,,insert (latency s),7.201829671859741 -pgvector,sift,18000,,insert (latency s),6.9853196144104 -pgvector,sift,19000,,insert (latency s),6.986191511154175 -pgvector,sift,20000,,insert (latency s),6.9661383628845215 -pgvector,sift,21000,,insert (latency s),6.9782397747039795 -pgvector,sift,22000,,insert (latency s),7.168933391571045 -pgvector,sift,23000,,insert (latency s),7.119316577911377 -pgvector,sift,24000,,insert (latency s),7.147544860839844 -pgvector,sift,25000,,insert (latency s),7.283205986022949 -pgvector,sift,26000,,insert (latency s),7.386075973510742 -pgvector,sift,27000,,insert (latency s),7.2317259311676025 -pgvector,sift,28000,,insert (latency s),7.168140888214111 -pgvector,sift,29000,,insert (latency s),7.250863552093506 -pgvector,sift,30000,,insert (latency s),7.230395317077637 -pgvector,sift,31000,,insert (latency s),7.065059661865234 -pgvector,sift,32000,,insert (latency s),7.161691904067993 -pgvector,sift,33000,,insert (latency s),7.17588996887207 -pgvector,sift,34000,,insert (latency s),7.102517604827881 -pgvector,sift,35000,,insert (latency s),6.9714515209198 -pgvector,sift,36000,,insert (latency s),7.3807618618011475 -pgvector,sift,37000,,insert (latency s),7.127222537994385 -pgvector,sift,38000,,insert (latency s),7.107661247253418 -pgvector,sift,39000,,insert (latency s),6.889742374420166 +pgvector,sift,10000,1,recall,1.0 +pgvector,sift,10000,3,recall,1.0 +pgvector,sift,10000,5,recall,1.0 +pgvector,sift,10000,10,recall,1.0 +pgvector,sift,10000,20,recall,1.0 +pgvector,sift,10000,40,recall,0.9994999999999999 +pgvector,sift,10000,80,recall,0.99975 diff --git a/experiments/scripts/create_tables.sql b/experiments/scripts/create_tables.sql index 19b3437..30a0dc3 100644 --- a/experiments/scripts/create_tables.sql +++ b/experiments/scripts/create_tables.sql @@ -1,21 +1,21 @@ --- DROP TABLE IF EXISTS sift_base10k; --- DROP TABLE IF EXISTS sift_base1m; --- DROP TABLE IF EXISTS gist_base1m; --- DROP TABLE IF EXISTS sift_base1b; +DROP TABLE IF EXISTS sift_base10k; +DROP TABLE IF EXISTS sift_base1m; +DROP TABLE IF EXISTS gist_base1m; +DROP TABLE IF EXISTS sift_base1b; --- CREATE TABLE IF NOT EXISTS sift_base10k ( --- id SERIAL PRIMARY KEY, --- v VECTOR(128) --- ); +CREATE TABLE IF NOT EXISTS sift_base10k ( + id SERIAL PRIMARY KEY, + v VECTOR(128) +); --- \COPY sift_base10k (v) FROM '/app/data/siftsmall/siftsmall_base.csv' WITH csv; +COPY sift_base10k (v) FROM '/tmp/lanterndb/vector_datasets/siftsmall/siftsmall_base.csv' WITH csv; --- CREATE TABLE IF NOT EXISTS sift_base1m ( --- id SERIAL PRIMARY KEY, --- v VECTOR(128) --- ); +CREATE TABLE IF NOT EXISTS sift_base1m ( + id SERIAL PRIMARY KEY, + v VECTOR(128) +); --- \COPY sift_base1m (v) FROM '/app/data/sift/sift_base.csv' WITH csv; +COPY sift_base1m (v) FROM '/tmp/lanterndb/vector_datasets/sift/sift_base.csv' WITH csv; -- CREATE TABLE IF NOT EXISTS gist_base1m ( -- id SERIAL PRIMARY KEY, @@ -24,9 +24,9 @@ -- \COPY gist_base1m (v) FROM '/app/data/gist/gist_base.csv' WITH csv; -CREATE TABLE IF NOT EXISTS sift_base1b ( - id SERIAL PRIMARY KEY, - v VECTOR(128) -); +-- CREATE TABLE IF NOT EXISTS sift_base1b ( +-- id SERIAL PRIMARY KEY, +-- v VECTOR(128) +-- ); -\COPY sift_base1b (v) FROM '/app/data/siftbig/bigann_base.csv' WITH csv; \ No newline at end of file +-- \COPY sift_base1b (v) FROM '/app/data/siftbig/bigann_base.csv' WITH csv; \ No newline at end of file diff --git a/experiments/scripts/create_tables_derived.sql b/experiments/scripts/create_tables_derived.sql index a7717da..a4d5cb6 100644 --- a/experiments/scripts/create_tables_derived.sql +++ b/experiments/scripts/create_tables_derived.sql @@ -122,42 +122,3 @@ SELECT * FROM sift_base1m WHERE id <= 600000; INSERT INTO sift_base800k SELECT * FROM sift_base1m WHERE id <= 800000; - -INSERT INTO sift_base2m -SELECT * FROM sift_base1b WHERE id <= 2000000; - -INSERT INTO sift_base5m -SELECT * FROM sift_base1b WHERE id <= 5000000; - -INSERT INTO sift_base10m -SELECT * FROM sift_base1b WHERE id <= 10000000; - -INSERT INTO sift_base20m -SELECT * FROM sift_base1b WHERE id <= 20000000; - -INSERT INTO sift_base50m -SELECT * FROM sift_base1b WHERE id <= 50000000; - -INSERT INTO sift_base100m -SELECT * FROM sift_base1b WHERE id <= 100000000; - -INSERT INTO sift_base200m -SELECT * FROM sift_base1b WHERE id <= 200000000; - -INSERT INTO sift_base500m -SELECT * FROM sift_base1b WHERE id <= 500000000; - -INSERT INTO gist_base100k -SELECT * FROM gist_base1m WHERE id <= 100000; - -INSERT INTO gist_base200k -SELECT * FROM gist_base1m WHERE id <= 200000; - -INSERT INTO gist_base400k -SELECT * FROM gist_base1m WHERE id <= 400000; - -INSERT INTO gist_base600k -SELECT * FROM gist_base1m WHERE id <= 600000; - -INSERT INTO gist_base800k -SELECT * FROM gist_base1m WHERE id <= 800000; \ No newline at end of file diff --git a/experiments/scripts/create_tables_recall.sql b/experiments/scripts/create_tables_recall.sql index c43d741..75f2d27 100644 --- a/experiments/scripts/create_tables_recall.sql +++ b/experiments/scripts/create_tables_recall.sql @@ -15,114 +15,44 @@ DROP TABLE IF EXISTS sift_truth200m; DROP TABLE IF EXISTS sift_truth500m; DROP TABLE IF EXISTS sift_truth1b; +-- \set SIFTSMALL_PATH '/tmp/lanterndb/vector_datasets/siftsmall' +-- \set SIFT_PATH '/tmp/lanterndb/vector_datasets/sift' + CREATE TABLE IF NOT EXISTS sift_query10k ( id SERIAL PRIMARY KEY, v VECTOR(128) ); -\COPY sift_query10k (v) FROM '/app/data/siftsmall/siftsmall_query.csv' WITH csv; +COPY sift_query10k (v) FROM '/tmp/lanterndb/vector_datasets/siftsmall/siftsmall_query.csv' WITH csv; CREATE TABLE IF NOT EXISTS sift_query1m ( id SERIAL PRIMARY KEY, v VECTOR(128) ); -\COPY sift_query1m (v) FROM '/app/data/sift/sift_query.csv' WITH csv; +COPY sift_query1m (v) FROM '/tmp/lanterndb/vector_datasets/sift/sift_query.csv' WITH csv; +-- I think the below is the name that some of the scripts expect this table to have... +CREATE TABLE IF NOT EXISTS sift_query100k ( + id SERIAL PRIMARY KEY, + v VECTOR(128) +); +COPY sift_query100k (v) FROM '/tmp/lanterndb/vector_datasets/sift/sift_query.csv' WITH csv; CREATE TABLE IF NOT EXISTS sift_truth10k ( id SERIAL PRIMARY KEY, indices INTEGER[] ); -\COPY sift_truth10k (indices) FROM '/app/data/siftsmall/siftsmall_truth.csv' WITH csv; +COPY sift_truth10k (indices) FROM '/tmp/lanterndb/vector_datasets/siftsmall/siftsmall_truth.csv' WITH csv; CREATE TABLE IF NOT EXISTS sift_truth1m ( id SERIAL PRIMARY KEY, indices INTEGER[] ); -\COPY sift_truth1m (indices) FROM '/app/data/sift/sift_truth.csv' WITH csv; +COPY sift_truth1m (indices) FROM '/tmp/lanterndb/vector_datasets/sift/sift_truth.csv' WITH csv; CREATE TABLE IF NOT EXISTS gist_query1m ( id SERIAL PRIMARY KEY, v VECTOR(960) -); - -\COPY gist_query1m (v) FROM '/app/data/gist/gist_query.csv' WITH csv; - -CREATE TABLE IF NOT EXISTS gist_truth1m ( - id SERIAL PRIMARY KEY, - indices INTEGER[] -); - -\COPY gist_truth1m (indices) FROM '/app/data/gist/gist_truth.csv' WITH csv; - -CREATE TABLE IF NOT EXISTS sift_query1b ( - id SERIAL PRIMARY KEY, - v VECTOR(128) -); - -\COPY sift_query1b (v) FROM '/app/data/siftbig/bigann_query.csv' WITH csv; - -CREATE TABLE IF NOT EXISTS sift_truth2m ( - id SERIAL PRIMARY KEY, - indices INTEGER[] -); - -\COPY sift_truth2m (indices) FROM '/app/data/siftbig/gnd/idx_2M.csv' WITH csv; - -CREATE TABLE IF NOT EXISTS sift_truth5m ( - id SERIAL PRIMARY KEY, - indices INTEGER[] -); - -\COPY sift_truth5m (indices) FROM '/app/data/siftbig/gnd/idx_5M.csv' WITH csv; - -CREATE TABLE IF NOT EXISTS sift_truth10m ( - id SERIAL PRIMARY KEY, - indices INTEGER[] -); - -\COPY sift_truth10m (indices) FROM '/app/data/siftbig/gnd/idx_10M.csv' WITH csv; - -CREATE TABLE IF NOT EXISTS sift_truth20m ( - id SERIAL PRIMARY KEY, - indices INTEGER[] -); - -\COPY sift_truth20m (indices) FROM '/app/data/siftbig/gnd/idx_20M.csv' WITH csv; - -CREATE TABLE IF NOT EXISTS sift_truth50m ( - id SERIAL PRIMARY KEY, - indices INTEGER[] -); - -\COPY sift_truth50m (indices) FROM '/app/data/siftbig/gnd/idx_50M.csv' WITH csv; - -CREATE TABLE IF NOT EXISTS sift_truth100m ( - id SERIAL PRIMARY KEY, - indices INTEGER[] -); - -\COPY sift_truth100m (indices) FROM '/app/data/siftbig/gnd/idx_100M.csv' WITH csv; - -CREATE TABLE IF NOT EXISTS sift_truth200m ( - id SERIAL PRIMARY KEY, - indices INTEGER[] -); - -\COPY sift_truth200m (indices) FROM '/app/data/siftbig/gnd/idx_200M.csv' WITH csv; - -CREATE TABLE IF NOT EXISTS sift_truth500m ( - id SERIAL PRIMARY KEY, - indices INTEGER[] -); - -\COPY sift_truth500m (indices) FROM '/app/data/siftbig/gnd/idx_500M.csv' WITH csv; - -CREATE TABLE IF NOT EXISTS sift_truth1b ( - id SERIAL PRIMARY KEY, - indices INTEGER[] -); - -\COPY sift_truth1b (indices) FROM '/app/data/siftbig/gnd/idx_1000M.csv' WITH csv; \ No newline at end of file +); \ No newline at end of file diff --git a/experiments/scripts/setup_tables.py b/experiments/scripts/setup_tables.py new file mode 100644 index 0000000..d635abd --- /dev/null +++ b/experiments/scripts/setup_tables.py @@ -0,0 +1,53 @@ +import os +import argparse +import urllib.request +import psycopg2 + +parser = argparse.ArgumentParser() +parser.add_argument("-d", "--datapath", default="/tmp/lanterndb/vector_datasets", help="Path to data directory") +args = parser.parse_args() + +data_dir = args.datapath +sift_dir = os.path.join(data_dir, "sift") +siftsmall_dir = os.path.join(data_dir, "siftsmall") + +if not os.path.exists(sift_dir): + print("SIFT directory does not exist. Creating... and downloading sift vectors...") + os.makedirs(sift_dir) + os.makedirs(siftsmall_dir) + + siftsmall_fnames = ['siftsmall_base.csv', 'siftsmall_query.csv', 'siftsmall_truth.csv'] + sift_fnames = ['sift_base.csv', 'sift_query.csv', 'sift_truth.csv'] + + for filename in siftsmall_fnames: + print(f"Downloading SIFTSMALL {filename}") + urllib.request.urlretrieve(f"https://storage.googleapis.com/lanterndata/siftsmall/{filename}", os.path.join(siftsmall_dir, filename)) + for filename in sift_fnames: + print(f"Downloading SIFT {filename}") + urllib.request.urlretrieve(f"https://storage.googleapis.com/lanterndata/sift/{filename}", os.path.join(sift_dir, filename)) +else: + print("SIFT directory exists. Skipping file download.") + +print("Creating tables...") + +conn = psycopg2.connect(os.environ["DATABASE_URL"]) +cur = conn.cursor() + +# with open("create_tables.sql", "r") as sqlfile: +# cur.execute(sqlfile.read()) + +# with open("create_tables_recall.sql", "r") as sqlfile: +# cur.execute(sqlfile.read()) + +#with open("../../db/init/init_results.sql", "r") as sqlfile: +# cur.execute(sqlfile.read()) +#with open("../../db/init/init_util.sql", "r") as sqlfile: +# cur.execute(sqlfile.read()) +with open("create_tables_derived.sql", "r") as sqlfile: + cur.execute(sqlfile.read()) + +conn.commit() +cur.close() +conn.close() + +print("Done!") \ No newline at end of file From 8360a181607ab023ff90ba89557741113662a372 Mon Sep 17 00:00:00 2001 From: Narek Galstyan Date: Mon, 7 Aug 2023 05:41:20 +0000 Subject: [PATCH 2/2] Comment in relevant setup steps --- db/init/init_results.sql | 4 ++-- experiments/scripts/setup_tables.py | 18 ++++++++---------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/db/init/init_results.sql b/db/init/init_results.sql index c70f3e0..750d453 100644 --- a/db/init/init_results.sql +++ b/db/init/init_results.sql @@ -1,4 +1,4 @@ -DROP TABLE experiment_results; +DROP TABLE IF EXISTS experiment_results; CREATE TABLE experiment_results ( id SERIAL PRIMARY KEY, database TEXT NOT NULL, @@ -10,4 +10,4 @@ CREATE TABLE experiment_results ( metric_type TEXT NOT NULL, metric_value DOUBLE PRECISION NOT NULL, CONSTRAINT unique_result UNIQUE (metric_type, "database", dataset, n, k) -); \ No newline at end of file +); diff --git a/experiments/scripts/setup_tables.py b/experiments/scripts/setup_tables.py index d635abd..b78061d 100644 --- a/experiments/scripts/setup_tables.py +++ b/experiments/scripts/setup_tables.py @@ -33,21 +33,19 @@ conn = psycopg2.connect(os.environ["DATABASE_URL"]) cur = conn.cursor() -# with open("create_tables.sql", "r") as sqlfile: -# cur.execute(sqlfile.read()) +with open("create_tables.sql", "r") as sqlfile: + cur.execute(sqlfile.read()) -# with open("create_tables_recall.sql", "r") as sqlfile: -# cur.execute(sqlfile.read()) +with open("create_tables_recall.sql", "r") as sqlfile: + cur.execute(sqlfile.read()) -#with open("../../db/init/init_results.sql", "r") as sqlfile: -# cur.execute(sqlfile.read()) -#with open("../../db/init/init_util.sql", "r") as sqlfile: -# cur.execute(sqlfile.read()) -with open("create_tables_derived.sql", "r") as sqlfile: +with open("../../db/init/init_results.sql", "r") as sqlfile: + cur.execute(sqlfile.read()) +with open("../../db/init/init_util.sql", "r") as sqlfile: cur.execute(sqlfile.read()) conn.commit() cur.close() conn.close() -print("Done!") \ No newline at end of file +print("Done!")