Changeset: 2d0490d95329 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2d0490d95329 Modified Files: sql/benchmarks/ATIS/Tests/load.stable.out sql/benchmarks/ATIS/load.sql Branch: Nov2019 Log Message:
Use csv import instead of single inserts diffs (truncated from 39678 to 300 lines): diff --git a/sql/benchmarks/ATIS/Tests/load.stable.out b/sql/benchmarks/ATIS/Tests/load.stable.out --- a/sql/benchmarks/ATIS/Tests/load.stable.out +++ b/sql/benchmarks/ATIS/Tests/load.stable.out @@ -23,19577 +23,502 @@ stdout of test 'load` in directory 'sql/ # clients.quit(); #end main; - -# 10:33:58 > -# 10:33:58 > Mtimeout -timeout 180 MapiClient --language=sql -u monetdb -P monetdb --host=pictor --port=58607 < load.sql -# 10:33:58 > +#START TRANSACTION; +#create table aircraft (aircraft_code char(3) NOT NULL,aircraft_type char(64) NOT NULL,engines decimal(1) NOT NULL,category char(10) NOT NULL,wide_body char(3) NOT NULL,wing_span float(6,2) NOT NULL,length1 float(6,2) NOT NULL,weight integer NOT NULL,capacity decimal(3) NOT NULL,pay_load integer NOT NULL,cruising_speed decimal(5) NOT NULL,range_miles decimal(5) NOT NULL,pressurized char(3) NOT NULL,PRIMARY KEY (aircraft_code)); +#create table airline (airline_code char(2) NOT NULL,airline_name char(64) NOT NULL,notes char(38) NOT NULL,PRIMARY KEY (airline_code)); +#create table airport (airport_code char(3) NOT NULL,airport_name char(40) NOT NULL,location char(36) NOT NULL,state_code char(2) NOT NULL,country_name char(25) NOT NULL,time_zone_code char(3) NOT NULL,PRIMARY KEY (airport_code)); +#create table airport_service (city_code char(4) NOT NULL,airport_code char(3) NOT NULL,miles_distant float(4,1) NOT NULL,direction char(3) NOT NULL,minutes_distant decimal(3) NOT NULL,PRIMARY KEY (city_code, airport_code)); +#create table city (city_code char(4) NOT NULL,city_name char(25) NOT NULL,state_code char(2) NOT NULL,country_name char(25) NOT NULL,time_zone_code char(3) NOT NULL,PRIMARY KEY (city_code)); +#create table class_of_service (class_code char(2) NOT NULL,rank decimal(2) NOT NULL,class_description char(80) NOT NULL,PRIMARY KEY (class_code)); +#create table code_description (code char(5) NOT NULL,description char(110) NOT NULL,PRIMARY KEY (code)); +#create table compound_class (fare_class char(3) NOT NULL,base_class char(2) NOT NULL,class_type char(10) NOT NULL,premium char(3) NOT NULL,economy char(3) NOT NULL,discounted char(3) NOT NULL,night char(3) NOT NULL,season_fare char(4) NOT NULL,class_days char(7) NOT NULL,PRIMARY KEY (fare_class)); +#create table connect_leg (connect_code integer NOT NULL,leg_number decimal(1) NOT NULL,flight_code integer NOT NULL,PRIMARY KEY (connect_code, leg_number, flight_code)); +#create table fconnection (connect_code integer NOT NULL,from_airport char(3) NOT NULL,to_airport char(3) NOT NULL,departure_time decimal(4) NOT NULL,arrival_time decimal(4) NOT NULL,flight_days char(7) NOT NULL,stops decimal(1) NOT NULL,connections decimal(1) NOT NULL,time_elapsed decimal(4) NOT NULL,PRIMARY KEY (connect_code)); +#create table day_name (day_code decimal(1) NOT NULL,day_name char(9) NOT NULL,PRIMARY KEY (day_code)); +#create table dual_carrier (main_airline char(2) NOT NULL,dual_airline char(2) NOT NULL,low_flight decimal(4) NOT NULL,high_flight decimal(4) NOT NULL,fconnection_name char(64) NOT NULL,PRIMARY KEY (main_airline, dual_airline, low_flight)); +#create table fare (fare_code char(8) NOT NULL,from_airport char(3) NOT NULL,to_airport char(3) NOT NULL,fare_class char(3) NOT NULL,fare_airline char(2) NOT NULL,restrict_code char(5) NOT NULL,one_way_cost float(7,2) NOT NULL,rnd_trip_cost float(8,2) NOT NULL,PRIMARY KEY (fare_code)); +#create table flight (flight_code integer NOT NULL,flight_days char(7) NOT NULL,from_airport char(3) NOT NULL,to_airport char(3) NOT NULL,departure_time decimal(4) NOT NULL,arrival_time decimal(4) NOT NULL,airline_code char(2) NOT NULL,flight_number decimal(4) NOT NULL,class_string char(8) NOT NULL,aircraft_code char(3) NOT NULL,meal_code char(7) NOT NULL,stops decimal(1) NOT NULL,dual_carrier char(1) NOT NULL,time_elapsed decimal(4) NOT NULL,PRIMARY KEY (flight_code)); +#create table flight_class (flight_code integer NOT NULL,fare_class char(3) NOT NULL,PRIMARY KEY (flight_code, fare_class)); +#create table flight_day (day_mask char(7) NOT NULL,day_code decimal(1) NOT NULL,day_name char(9) NOT NULL,PRIMARY KEY (day_mask, day_code)); +#create table flight_fare (flight_code integer NOT NULL,fare_code char(8) NOT NULL,PRIMARY KEY (flight_code, fare_code)); +#create table food_service (meal_code char(4) NOT NULL,meal_number decimal(1) NOT NULL,meal_class char(10) NOT NULL,meal_description char(10) NOT NULL,PRIMARY KEY (meal_code, meal_number, meal_class)); +#create table ground_service (city_code char(4) NOT NULL,airport_code char(3) NOT NULL,transport_code char(1) NOT NULL,ground_fare float(6,2) NOT NULL,PRIMARY KEY (city_code, airport_code, transport_code)); +#create table time_interval (period char(20) NOT NULL,begin_time decimal(4) NOT NULL,end_time decimal(4) NOT NULL,PRIMARY KEY (period, begin_time)); +#create table month_name (month_number decimal(2) NOT NULL,month_name char(9) NOT NULL,PRIMARY KEY (month_number)); +#create table restrict_carrier (restrict_code char(5) NOT NULL,airline_code char(2) NOT NULL,PRIMARY KEY (restrict_code, airline_code)); +#create table restrict_class (restrict_code char(5) NOT NULL,ex_fare_class char(12) NOT NULL,PRIMARY KEY (restrict_code, ex_fare_class)); +#create table restriction (restrict_code char(5) NOT NULL,application char(80) NOT NULL,no_discounts char(80) NOT NULL,reserve_ticket decimal(3) NOT NULL,stopovers char(1) NOT NULL,return_min decimal(3) NOT NULL,return_max decimal(3) NOT NULL,PRIMARY KEY (restrict_code)); +#create table state (state_code char(2) NOT NULL,state_name char(25) NOT NULL,country_name char(25) NOT NULL,PRIMARY KEY (state_code)); +#create table stop1 (flight_code integer NOT NULL,stop_number decimal(1) NOT NULL,stop_flight integer NOT NULL,PRIMARY KEY (flight_code, stop_number)); +#create table time_zone (time_zone_code char(3) NOT NULL,time_zone_name char(32) NOT NULL,PRIMARY KEY (time_zone_code, time_zone_name)); +#create table transport (transport_code char(1) NOT NULL,transport_desc char(32) NOT NULL,PRIMARY KEY (transport_code)); +#COPY 135 RECORDS INTO "sys"."aircraft" FROM stdin USING DELIMITERS E'\t',E'\n','"'; +#"ATR" "AEROSPATIALE/AERITALIA (ALL SERIES)" 2 "TURBOPROP" "NO" 80.58 73.83 32446 49 10603 277 0 "YES" +#"SSC" "AEROSPATIALE-BRITISH AEROSPACE (BAC) CONCORDE" 4 "JET" "NO" 83.83 203.75 400000 128 25000 1400 3800 "YES" +#"CRV" "AEROSPATIALE CARAVELLE (ALL SERIES)" 2 "JET" "NO" 112.5 118.83 127870 140 29100 512 2150 "YES" +#"ND2" "AEROSPATIALE N 262/FRAKES MOHAWK 298" 2 "TURBOPROP" "NO" 71.83 63.25 23370 27 5810 240 500 "YES" +#"NDH" "AEROSPATIALE SA 365 DAUPHIN 2" 1 "HELICOPTER" "NO" 0 43.5 6615 14 0 196 423 "NO" +[ 135 ] +#COPY 314 RECORDS INTO "sys"."airline" FROM stdin USING DELIMITERS E'\t',E'\n','"'; +#"AA" "AMERICAN AIRLINES" "" +#"AC" "AIR CANADA" "" +#"AD" "EXEC EXPRESS II,INC." "" +#"AF" "AIR FRANCE" "" +#"AG" "ATLANTIC AIRWAYS LIMITED" "" +#"AM" "AEROMEXICO - AEROVIAS DE MEXICO S.A. DE C.V." "" +#"AP" "ASPEN AIRWAYS,INC." "" +#"AQ" "ALOHA AIRLINES INC." "" +#"AR" "AEROLINEAS ARGENTINAS" "" +#"AS" "ALASKA AIRLINES" "" +#"AT" "ROYAL AIR MAROC" "" +#"AV" "AVIANCA" "" +#"AY" "FINNAIR" "" +#"AZ" "ALITALIA" "" +#"BA" "BRITISH AIRWAYS" "" +#"BE" "ENTERPRISE AIRLINES,INC." "" +[ 314 ] +#COPY 9 RECORDS INTO "sys"."airport" FROM stdin USING DELIMITERS E'\t',E'\n','"'; +#"ATL" "WILLIAM B. HARTSFIELD" "ATLANTA,GEORGIA" "GA" "USA" "EST" +#"BOS" "LOGAN INTERNATIONAL" "BOSTON,MASSACHUSETTS" "MA" "USA" "EST" +#"BWI" "BALTIMORE/WASHINGTON INTERNATIONAL" "BALTIMORE,MARYLAND" "MD" "USA" "EST" +#"DEN" "STAPLETON INTERNATIONAL" "DENVER,COLORADO" "CO" "USA" "MST" +#"DFW" "DALLAS/FORT WORTH INTERNATIONAL" "DALLAS/FT. WORTH,TEXAS" "TX" "USA" "CST" +#"OAK" "METROPOLITAN OAKLAND INTERNATIONAL" "OAKLAND,CALIFORNIA" "CA" "USA" "PST" +[ 9 ] +#COPY 14 RECORDS INTO "sys"."airport_service" FROM stdin USING DELIMITERS E'\t',E'\n','"'; +#"MATL" "ATL" 9 "S" 45 +#"BBOS" "BOS" 3 "NE" 30 +#"DDFW" "DFW" 13 "NW" 70 +#"FDFW" "DFW" 17 "E" 55 +#"DDEN" "DEN" 6.5 "NE" 30 +#"PPHL" "PHL" 7 "SW" 35 +#"PPIT" "PIT" 17 "W" 55 +#"OOAK" "OAK" 10 "SE" 15 +#"OOAK" "SFO" 24 "SW" 60 +#"SSFO" "SFO" 8 "SE" 30 +#"SSFO" "OAK" 18 "SE" 60 +#"WWAS" "BWI" 32 "NE" 50 +#"BBWI" "BWI" 10 "S" 25 +#"" "" 0 "" 0 +[ 14 ] +#COPY 11 RECORDS INTO "sys"."city" FROM stdin USING DELIMITERS E'\t',E'\n','"'; +#"MATL" "ATLANTA" "GA" "USA" "EST" +#"BBOS" "BOSTON" "MA" "USA" "EST" +#"DDFW" "DALLAS" "TX" "USA" "CST" +#"FDFW" "FORT WORTH" "TX" "USA" "CST" +#"DDEN" "DENVER" "CO" "USA" "MST" +#"PPHL" "PHILADELPHIA" "PA" "USA" "EST" +#"PPIT" "PITTSBURGH" "PA" "USA" "EST" +#"SSFO" "SAN FRANCISCO" "CA" "USA" "PST" +#"OOAK" "OAKLAND" "CA" "USA" "PST" +#"WWAS" "WASHINGTON" "DC" "USA" "EST" +#"BBWI" "BALTIMORE" "MD" "USA" "EST" +[ 11 ] +#COPY 27 RECORDS INTO "sys"."class_of_service" FROM stdin USING DELIMITERS E'\t',E'\n','"'; +#"R" 1 "SUPERSONIC AIRCRAFT" +#"P" 2 "FIRST CLASS PREMIUM" +#"F" 3 "FIRST CLASS" +#"A" 4 "FIRST CLASS DISCOUNTED" +#"J" 5 "BUSINESS CLASS PREMIUM" +#"C" 6 "BUSINESS CLASS" +#"D" 7 "BUSINESS CLASS DISCOUNTED" +#"S" 8 "STANDARD CLASS" +#"W" 9 "COACH ECONOMY CLASS PREMIUM" +#"FN" 10 "FIRST CLASS NIGHT SERVICE" +#"Y" 11 "COACH ECONOMY CLASS" +#"CN" 12 "BUSINESS CLASS NIGHT SERVICE" +#"YN" 13 "COACH ECONOMY CLASS NIGHT SERVICE" +#"B" 14 "COACH ECONOMY CLASS DISCOUNTED" +[ 27 ] +#COPY 15 RECORDS INTO "sys"."code_description" FROM stdin USING DELIMITERS E'\t',E'\n','"'; +#"-" "A DASH IN A DAY CODE POSITION INDICATES NON-OPERATION ON THAT DAY" +#"AP" "ADVANCE PURCHASE EXCURSION FARE" +#"CAD" "CANADIAN DOLLARS" +#"EX" "EXCURSION FARE" +#"H" "HIGHEST LEVEL OF FARE HAVING MORE THAN ONE SEASONAL LEVEL" +#"J" "THIRD LEVEL OF FARE HAVING MORE THAN THREE SEASONAL LEVELS" +#"K" "SECOND LEVEL OF A FARE HAVING MORE THAN TWO SEASONAL LEVELS" +#"L" "LOWEST LEVEL OF FARE HAVING MORE THAN ONE SEASONAL LEVEL" +#"MEP" "MEXICAN PESOS" +[ 15 ] +#COPY 149 RECORDS INTO "sys"."compound_class" FROM stdin USING DELIMITERS E'\t',E'\n','"'; +#"A" "A" "FIRST" "NO" "NO" "YES" "NO" "NONE" "1234567" +#"AH" "A" "FIRST" "NO" "NO" "YES" "NO" "HIGH" "1234567" +#"AJ" "A" "FIRST" "NO" "NO" "YES" "NO" "MID" "1234567" +#"AL" "A" "FIRST" "NO" "NO" "YES" "NO" "LOW" "1234567" +#"B" "B" "COACH" "NO" "YES" "YES" "NO" "NONE" "1234567" +#"BH" "B" "COACH" "NO" "YES" "YES" "NO" "HIGH" "1234567" +#"BHW" "B" "COACH" "NO" "YES" "YES" "NO" "HIGH" "-----67" +#"BHX" "B" "COACH" "NO" "YES" "YES" "NO" "HIGH" "12345--" +[ 149 ] +#COPY 351 RECORDS INTO "sys"."connect_leg" FROM stdin USING DELIMITERS E'\t',E'\n','"'; +#305276 1 106231 +#305276 2 137225 +#305277 1 106237 +#305277 2 137231 +#305280 1 106247 +#305280 2 137237 +#305416 1 112030 +#305416 1 112031 +#305416 2 112773 +#305424 1 112033 +#305424 2 112784 +#305429 1 112040 +#305429 2 112793 +#305429 2 112794 +#305435 1 112046 +#305435 2 112806 +#305436 1 112051 +#305436 2 112808 +#306026 1 133430 +#306026 2 111891 +#306031 1 133432 +#306031 2 111896 +#306304 1 144155 +#306304 2 112766 +#306307 1 144143 +#306307 2 111891 +#306309 1 144158 +[ 351 ] +#COPY 164 RECORDS INTO "sys"."fconnection" FROM stdin USING DELIMITERS E'\t',E'\n','"'; +#312733 "ATL" "BOS" 740 1127 "1234567" 0 1 227 +#312734 "ATL" "BOS" 1200 1548 "1234567" 0 1 228 +#312737 "ATL" "BOS" 1650 2053 "1234567" 0 1 243 +#333051 "ATL" "DEN" 630 910 "1234567" 0 1 280 +#333054 "ATL" "DEN" 1000 1245 "1234567" 0 1 285 +#333059 "ATL" "DEN" 1319 1554 "1234567" 0 1 275 +#333067 "ATL" "DEN" 2029 2320 "1234567" 0 1 291 +#393490 "ATL" "OAK" 1000 1339 "1234567" 0 1 399 +#420730 "ATL" "SFO" 630 955 "1234567" 0 1 385 +#420735 "ATL" "SFO" 1000 1325 "1234567" 0 1 385 +[ 164 ] +#COPY 7 RECORDS INTO "sys"."day_name" FROM stdin USING DELIMITERS E'\t',E'\n','"'; +#1 "MONDAY" +#2 "TUESDAY" +#3 "WEDNESDAY" +#4 "THURSDAY" +#5 "FRIDAY" +#6 "SATURDAY" +#7 "SUNDAY" +[ 7 ] +#COPY 114 RECORDS INTO "sys"."dual_carrier" FROM stdin USING DELIMITERS E'\t',E'\n','"'; +#"AA" "AA" 3000 5799 "AMERICAN EAGLE" +#"AC" "RJ" 1001 1010 "AIR CANADA" +#"AC" "CS" 1100 1199 "AIR CANADA" +#"AC" "GX" 1200 1499 "AIR CANADA" +#"AC" "ZX" 1500 1799 "AIR CANADA" +#"AC" "QK" 1800 1899 "AIR CANADA" +#"AC" "3J" 1900 1949 "AIR CANADA" +#"AC" "3J" 1977 1981 "AIR CANADA" +#"AC" "3J" 1990 1999 "AIR CANADA" +#"AC" "NV" 1950 1976 "AIR CANADA" +#"AC" "NV" 1982 1989 "AIR CANADA" +#"AQ" "WP" 1000 1999 "ALOHA AIRLINES,INC" +#"AS" "QX" 2000 2199 "ALASKA AIRLINES COMMUTER SERVICE" +[ 114 ] +#COPY 534 RECORDS INTO "sys"."fare" FROM stdin USING DELIMITERS E'\t',E'\n','"'; +#"7100001" "ATL" "BOS" "F" "" "" 497 994 +#"7100002" "ATL" "BOS" "FN" "" "" 348 696 +#"7100003" "ATL" "BOS" "Y" "" "" 331 662 +#"7100004" "ATL" "BOS" "YN" "" "" 266 532 +#"7100005" "ATL" "BOS" "K" "" "AP/57" 0 388 +#"7100006" "ATL" "BOS" "KO" "" "AP/57" 0 368 +#"7100007" "ATL" "BOS" "QW" "" "AP/57" 0 268 +#"7100008" "ATL" "BOS" "QX" "" "AP/57" 0 248 +#"7100009" "ATL" "BOS" "B" "" "VU/1" 230 0 +#"7100010" "ATL" "BOS" "Y" "" "VU/1" 226 0 +#"7100011" "ATL" "BWI" "F" "" "" 428 856 +[ 534 ] +#COPY 579 RECORDS INTO "sys"."flight" FROM stdin USING DELIMITERS E'\t',E'\n','"'; +#101908 "1234567" "ATL" "BOS" 636 1000 "DL" 296 "FNYNBNMQ" "72S" "B" 1 "N" 204 +#101909 "1234567" "ATL" "BOS" 641 855 "DL" 314 "FNYNBNMQ" "72S" "B" 0 "N" 134 +#101910 "1234567" "ATL" "BOS" 755 1019 "EA" 140 "FYHQK" "D9S" "B" 0 "N" 144 +#101911 "1234567" "ATL" "BOS" 920 1150 "EA" 534 "FYHQK" "D9S" "B" 0 "N" 150 +#101912 "1234567" "ATL" "BOS" 959 1215 "DL" 410 "FYBMQ" "757" "B" 0 "N" 136 +#101913 "1234567" "ATL" "BOS" 1010 1355 "DL" 726 "FYBMQ" "72S" "S" 1 "N" 225 +[ 579 ] +#COPY 2895 RECORDS INTO "sys"."flight_class" FROM stdin USING DELIMITERS E'\t',E'\n','"'; +#101909 "FN" +#101909 "YN" +#101909 "BN" +#101909 "M" +#101909 "Q" +#101910 "F" +#101910 "Y" +#101910 "H" +#101910 "Q" +#101910 "K" +#101911 "F" +#101911 "Y" +#101911 "H" +#101911 "Q" +#101911 "K" +#101912 "F" +#101912 "Y" +#101912 "B" +#101912 "M" +#101912 "Q" +#101914 "Y" +#101914 "H" +#101914 "Q" +#101914 "K" +#101914 "L" +#101915 "F" +#101915 "Y" +#101915 "H" +#101915 "Q" +#101915 "K" +#101916 "F" +#101916 "Y" +#101916 "B" +#101916 "M" +#101916 "Q" +#101917 "F" +#101917 "Y" +#101917 "B" +#101917 "M" +[ 2895 ] +#COPY 448 RECORDS INTO "sys"."flight_day" FROM stdin USING DELIMITERS E'\t',E'\n','"'; +#"1234567" 1 "MONDAY" +#"1234567" 2 "TUESDAY" +#"1234567" 3 "WEDNESDAY" +#"1234567" 4 "THURSDAY" +#"1234567" 5 "FRIDAY" +#"1234567" 6 "SATURDAY" +#"1234567" 7 "SUNDAY" +#"-234567" 2 "TUESDAY" +#"-234567" 3 "WEDNESDAY" +#"-234567" 4 "THURSDAY" +#"-234567" 5 "FRIDAY" +#"-234567" 6 "SATURDAY" +#"-234567" 7 "SUNDAY" +#"1-34567" 1 "MONDAY" +#"1-34567" 3 "WEDNESDAY" +#"1-34567" 4 "THURSDAY" +#"1-34567" 5 "FRIDAY" +#"1-34567" 6 "SATURDAY" +#"1-34567" 7 "SUNDAY" +#"--34567" 3 "WEDNESDAY" +[ 448 ] +#COPY 2998 RECORDS INTO "sys"."flight_fare" FROM stdin USING DELIMITERS E'\t',E'\n','"'; +#101910 "7100001" +#101911 "7100001" +#101912 "7100001" +#101915 "7100001" +#101916 "7100001" +#101917 "7100001" +#101918 "7100001" +#101922 "7100001" +#101923 "7100001" +#101925 "7100001" +#101926 "7100001" _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
