Changeset: f0dbb33f7759 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/f0dbb33f7759 Added Files: sql/backends/monet5/vaults/csv/CMakeLists.txt sql/backends/monet5/vaults/csv/csv.c Modified Files: monetdb5/mal/mal_embedded.c monetdb5/mal/mal_linker.c sql/backends/monet5/CMakeLists.txt sql/backends/monet5/rel_bin.c sql/backends/monet5/rel_bin.h sql/backends/monet5/vaults/CMakeLists.txt sql/server/rel_dump.c sql/server/rel_select.c sql/server/rel_updates.c sql/server/sql_parser.y tools/mserver/mserver5.c Branch: parquet Log Message:
add csv loading v0.01 select * from '/..../air-traffic-bm/data/On_Time_On_Time_Performance_1988_10.csv' ontime; seems to do some loading .. diffs (truncated from 14720 to 300 lines): diff --git a/.editorconfig b/.editorconfig --- a/.editorconfig +++ b/.editorconfig @@ -23,3 +23,7 @@ charset = utf-8 indent_style = space indent_size = 2 trim_trailing_whitespace = true + +[{clients/{mapilib,odbc},gdk}/**.{c,h}{,.in}] +tab_width = 8 +max_line_length = 72 diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -787,8 +787,11 @@ 44e45c9a451f6afd933773094ec25723f713d3be 44e45c9a451f6afd933773094ec25723f713d3be Jan2022_SP5_release 43d4a717410d6f6692a16a878640fc7e0f248725 Jan2022_25 43d4a717410d6f6692a16a878640fc7e0f248725 Jan2022_SP6_release +700e099bfee85318da09aabcd78ec7ea6e8fb6ef Jul2021_29 5c50a4071c86d1621e20a885a51cc36f2f23eec4 Sep2022_9 41ca60d96bd0198ca5d74937630a442a5fbaf1cd Sep2022_11 41ca60d96bd0198ca5d74937630a442a5fbaf1cd Sep2022_SP1_release e8b0e5558313f4d98bc48316368299decc55ed4e Sep2022_13 e8b0e5558313f4d98bc48316368299decc55ed4e Sep2022_SP2_release +8a95168e853382b9b89ac7b67e343788ea837f3a Jul2021_31 +8a95168e853382b9b89ac7b67e343788ea837f3a Jul2021_SP9_release diff --git a/clients/Tests/MAL-signatures-hge.test b/clients/Tests/MAL-signatures-hge.test --- a/clients/Tests/MAL-signatures-hge.test +++ b/clients/Tests/MAL-signatures-hge.test @@ -33395,12 +33395,12 @@ PCREreplacefirst_bat_wrap; (empty) batpyapi3 eval -unsafe pattern batpyapi3.eval(X_0:lng, X_1:ptr, X_2:str):any... +unsafe pattern batpyapi3.eval(X_0:lng, X_1:ptr, X_2:str):bat[:any_1] PYAPI3PyAPIevalStd; Execute a simple Python script value batpyapi3 eval -unsafe pattern batpyapi3.eval(X_0:ptr, X_1:str, X_2:any...):any... +unsafe pattern batpyapi3.eval(X_0:ptr, X_1:str, X_2:any...):bat[:any]... PYAPI3PyAPIevalStd; Execute a simple Python script value batpyapi3 @@ -46769,11 +46769,6 @@ pattern json.renderobject(X_0:any...):js JSONrenderobject; (empty) json -resultSet -command json.resultSet(X_0:bat[:uuid], X_1:bat[:lng], X_2:bat[:json]):json -JSONresultSet; -Converts the json store into a single json string: -json str command json.str(X_0:json):str JSONjson2str; @@ -48179,16 +48174,6 @@ pattern optimizer.deadcode(X_0:str, X_1: OPTwrapper; Dead code optimizer optimizer -default_fast -function optimizer.default_fast():void; -(empty) -(empty) -optimizer -default_pipe -function optimizer.default_pipe():void; -(empty) -(empty) -optimizer defaultfast pattern optimizer.defaultfast():str OPTwrapper; @@ -48274,26 +48259,6 @@ pattern optimizer.inline(X_0:str, X_1:st OPTwrapper; Expand inline functions optimizer -jit -pattern optimizer.jit():str -OPTwrapper; -(empty) -optimizer -jit -pattern optimizer.jit(X_0:str, X_1:str):str -OPTwrapper; -Propagate candidate lists in just-in-time optimization -optimizer -json -pattern optimizer.json():str -OPTwrapper; -(empty) -optimizer -json -pattern optimizer.json(X_0:str, X_1:str):str -OPTwrapper; -Unroll the mat.pack operation -optimizer macro pattern optimizer.macro(X_0:str, X_1:str):void OPTmacro; @@ -48304,16 +48269,6 @@ pattern optimizer.macro(X_0:str, X_1:str OPTmacro; Inline a target function used in a specific function. optimizer -mask -pattern optimizer.mask():str -OPTwrapper; -(empty) -optimizer -mask -pattern optimizer.mask(X_0:str, X_1:str):str -OPTwrapper; -Manipulate the MSK objects -optimizer matpack pattern optimizer.matpack():str OPTwrapper; @@ -48334,16 +48289,6 @@ pattern optimizer.mergetable(X_0:str, X_ OPTwrapper; Resolve the multi-table definitions optimizer -minimal_fast -function optimizer.minimal_fast():void; -(empty) -(empty) -optimizer -minimal_pipe -function optimizer.minimal_pipe():void; -(empty) -(empty) -optimizer minimalfast pattern optimizer.minimalfast():str OPTwrapper; @@ -48374,11 +48319,6 @@ pattern optimizer.multiplex(X_0:str, X_1 OPTwrapper; Compiler for multiplexed instructions optimizer -no_mitosis_pipe -function optimizer.no_mitosis_pipe():void; -(empty) -(empty) -optimizer optimize pattern optimizer.optimize(X_0:str, X_1:str):void QOToptimize; @@ -48484,11 +48424,6 @@ pattern optimizer.reorder(X_0:str, X_1:s OPTwrapper; Reorder by dataflow dependencies optimizer -sequential_pipe -function optimizer.sequential_pipe():void; -(empty) -(empty) -optimizer strimps pattern optimizer.strimps():str OPTwrapper; @@ -48645,7 +48580,7 @@ CMDstopTrace; Stop collecting trace information pyapi3 eval -unsafe pattern pyapi3.eval(X_0:ptr, X_1:str):any +unsafe pattern pyapi3.eval(X_0:ptr, X_1:str):any_1 PYAPI3PyAPIevalStd; Execute a simple Python script returning a single value pyapi3 @@ -49446,7 +49381,7 @@ Write db snapshot to the given tar(.gz) sql hot_snapshot unsafe pattern sql.hot_snapshot(X_0:str, X_1:bit):void -SQLhot_snapshot_wrap; +SQLhot_snapshot; Write db snapshot to the given tar(.gz/.lz4/.bz/.xz) file on either server or client sql importColumn @@ -49734,6 +49669,21 @@ unsafe pattern sql.setVariable(X_0:int, setVariable; Set the value of a session variable sql +set_count_distinct +unsafe pattern sql.set_count_distinct(X_0:str, X_1:str, X_2:str, X_3:lng):void +sql_set_count_distinct; +Set count distinct for column +sql +set_max +unsafe pattern sql.set_max(X_0:str, X_1:str, X_2:str, X_3:any_1):void +sql_set_max; +Set max for column +sql +set_min +unsafe pattern sql.set_min(X_0:str, X_1:str, X_2:str, X_3:any_1):void +sql_set_min; +Set min for column +sql set_protocol unsafe pattern sql.set_protocol(X_0:int):int SQLset_protocol; diff --git a/clients/Tests/MAL-signatures.test b/clients/Tests/MAL-signatures.test --- a/clients/Tests/MAL-signatures.test +++ b/clients/Tests/MAL-signatures.test @@ -24590,12 +24590,12 @@ PCREreplacefirst_bat_wrap; (empty) batpyapi3 eval -unsafe pattern batpyapi3.eval(X_0:lng, X_1:ptr, X_2:str):any... +unsafe pattern batpyapi3.eval(X_0:lng, X_1:ptr, X_2:str):bat[:any_1] PYAPI3PyAPIevalStd; Execute a simple Python script value batpyapi3 eval -unsafe pattern batpyapi3.eval(X_0:ptr, X_1:str, X_2:any...):any... +unsafe pattern batpyapi3.eval(X_0:ptr, X_1:str, X_2:any...):bat[:any]... PYAPI3PyAPIevalStd; Execute a simple Python script value batpyapi3 @@ -35204,11 +35204,6 @@ pattern json.renderobject(X_0:any...):js JSONrenderobject; (empty) json -resultSet -command json.resultSet(X_0:bat[:uuid], X_1:bat[:lng], X_2:bat[:json]):json -JSONresultSet; -Converts the json store into a single json string: -json str command json.str(X_0:json):str JSONjson2str; @@ -36609,16 +36604,6 @@ pattern optimizer.deadcode(X_0:str, X_1: OPTwrapper; Dead code optimizer optimizer -default_fast -function optimizer.default_fast():void; -(empty) -(empty) -optimizer -default_pipe -function optimizer.default_pipe():void; -(empty) -(empty) -optimizer defaultfast pattern optimizer.defaultfast():str OPTwrapper; @@ -36704,26 +36689,6 @@ pattern optimizer.inline(X_0:str, X_1:st OPTwrapper; Expand inline functions optimizer -jit -pattern optimizer.jit():str -OPTwrapper; -(empty) -optimizer -jit -pattern optimizer.jit(X_0:str, X_1:str):str -OPTwrapper; -Propagate candidate lists in just-in-time optimization -optimizer -json -pattern optimizer.json():str -OPTwrapper; -(empty) -optimizer -json -pattern optimizer.json(X_0:str, X_1:str):str -OPTwrapper; -Unroll the mat.pack operation -optimizer macro pattern optimizer.macro(X_0:str, X_1:str):void OPTmacro; @@ -36734,16 +36699,6 @@ pattern optimizer.macro(X_0:str, X_1:str OPTmacro; Inline a target function used in a specific function. optimizer -mask -pattern optimizer.mask():str -OPTwrapper; -(empty) -optimizer -mask -pattern optimizer.mask(X_0:str, X_1:str):str -OPTwrapper; -Manipulate the MSK objects -optimizer matpack pattern optimizer.matpack():str OPTwrapper; @@ -36764,16 +36719,6 @@ pattern optimizer.mergetable(X_0:str, X_ OPTwrapper; Resolve the multi-table definitions optimizer -minimal_fast -function optimizer.minimal_fast():void; -(empty) -(empty) -optimizer -minimal_pipe -function optimizer.minimal_pipe():void; _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org