Changeset: 3cb799fa42ab for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3cb799fa42ab Added Files: sql/benchmarks/arno_flt/inserts.flt.sql Removed Files: sql/benchmarks/arno_flt/insert_ATOM.flt.sql sql/benchmarks/arno_flt/insert_BOND.flt.sql sql/benchmarks/arno_flt/insert_MODEL.flt.sql Modified Files: sql/benchmarks/arno/run.all sql/benchmarks/arno_flt/Tests/init.SQL.bat sql/benchmarks/arno_flt/Tests/init.SQL.sh sql/benchmarks/arno_flt/Tests/init.stable.out sql/benchmarks/arno_flt/doCreateDB sql/benchmarks/arno_flt/run.all Branch: Nov2019 Log Message:
Use csv import at arno_flt benchmark diffs (truncated from 31197 to 300 lines): diff --git a/sql/benchmarks/arno/run.all b/sql/benchmarks/arno/run.all --- a/sql/benchmarks/arno/run.all +++ b/sql/benchmarks/arno/run.all @@ -15,14 +15,8 @@ fi echo "creating" $SQL < create_tables.int.isql -echo "insert BONDs" -$SQL < insert_BOND.int.sql -echo $? -echo "insert ATOMs" -$SQL < insert_ATOM.int.sql -echo $? -echo "insert MODELs" -$SQL < insert_MODEL.int.sql +echo "inserts" +$SQL < inserts.sql echo $? echo "check0" $SQL < check0.sql diff --git a/sql/benchmarks/arno_flt/Tests/init.SQL.bat b/sql/benchmarks/arno_flt/Tests/init.SQL.bat --- a/sql/benchmarks/arno_flt/Tests/init.SQL.bat +++ b/sql/benchmarks/arno_flt/Tests/init.SQL.bat @@ -5,10 +5,6 @@ %SQL_CLIENT% < "%TSTSRCDIR%\check0.sql" -%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\insert_MODEL.flt.sql" - -%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\insert_ATOM.flt.sql" - -%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\insert_BOND.flt.sql" +%SQL_CLIENT% < "%TSTSRCBASE%\%TSTDIR%\inserts.flt.sql" %SQL_CLIENT% < "%TSTSRCDIR%\check0.sql" diff --git a/sql/benchmarks/arno_flt/Tests/init.SQL.sh b/sql/benchmarks/arno_flt/Tests/init.SQL.sh --- a/sql/benchmarks/arno_flt/Tests/init.SQL.sh +++ b/sql/benchmarks/arno_flt/Tests/init.SQL.sh @@ -12,17 +12,9 @@ Mlog "$SQL_CLIENT < $TSTSRCDIR/check0.sq # Mlog "$MIL_CLIENT -prelude $TSTSRCDIR/check0a.prelude < $TSTSRCDIR/check0a.milM" # $MIL_CLIENT -prelude $TSTSRCDIR/check0a.prelude < $TSTSRCDIR/check0a.milM -# insert_MODEL -Mlog "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/insert_MODEL.flt.sql" - $SQL_CLIENT < $TSTSRCBASE/$TSTDIR/insert_MODEL.flt.sql - -# insert_ATOM -Mlog "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/insert_ATOM.flt.sql" - $SQL_CLIENT < $TSTSRCBASE/$TSTDIR/insert_ATOM.flt.sql - -# insert_BOND -Mlog "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/insert_BOND.flt.sql" - $SQL_CLIENT < $TSTSRCBASE/$TSTDIR/insert_BOND.flt.sql +# inserts +Mlog "$SQL_CLIENT < $TSTSRCBASE/$TSTDIR/inserts.flt.sql" + $SQL_CLIENT < $TSTSRCBASE/$TSTDIR/inserts.flt.sql # check1 Mlog "$SQL_CLIENT < $TSTSRCDIR/check0.sql" diff --git a/sql/benchmarks/arno_flt/Tests/init.stable.out b/sql/benchmarks/arno_flt/Tests/init.stable.out --- a/sql/benchmarks/arno_flt/Tests/init.stable.out +++ b/sql/benchmarks/arno_flt/Tests/init.stable.out @@ -56,10348 +56,77 @@ stdout of test 'init` in directory 'sql/ % int, int, varchar, varchar, char # type % 1, 1, 0, 0, 3 # length -# 12:33:58 > -# 12:33:58 > Mtimeout -timeout 180 MapiClient -lsql -u monetdb -P monetdb --host=localhost --port=45579 -# 12:33:58 > - -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] - -# 12:33:58 > -# 12:33:58 > Mtimeout -timeout 180 MapiClient -lsql -u monetdb -P monetdb --host=localhost --port=45579 -# 12:33:58 > - -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] -[ 1 ] _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
