Changeset: 58161ddf481c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=58161ddf481c Modified Files: monetdb5/extras/pyapi/Tests/pyapi_types_string.malC monetdb5/extras/pyapi/Tests/pyapi_types_string.stable.err monetdb5/extras/pyapi/Tests/pyapi_types_string.stable.out Branch: pyapi Log Message:
Test string conversions for all numeric types, instead of just longs. diffs (truncated from 356 to 300 lines): diff --git a/monetdb5/extras/pyapi/Tests/pyapi_types_string.malC b/monetdb5/extras/pyapi/Tests/pyapi_types_string.malC --- a/monetdb5/extras/pyapi/Tests/pyapi_types_string.malC +++ b/monetdb5/extras/pyapi/Tests/pyapi_types_string.malC @@ -31,26 +31,6 @@ io.print(rstr); rstr:bat[:oid,:str] := pyapi.eval(nil:ptr,"return([[\"Hello\", \"World\"]])"); io.print(rstr); -# convert int to string -bint:= bat.new(:oid,:int); -bat.append(bint,1804289383:int); -bat.append(bint,846930886:int); -bat.append(bint,1681692777:int); -bat.append(bint,1714636915:int); -bat.append(bint,nil:int); -rstr:bat[:oid,:str] := pyapi.eval(nil:ptr,"return(arg1)",bint); -io.print(rstr); - -# convert float to string -bflt:= bat.new(:oid,:flt); -bat.append(bflt,18042.89383:flt); -bat.append(bflt,846.930886:flt); -bat.append(bflt,16.81692777:flt); -bat.append(bflt,1714636.915:flt); -bat.append(bflt,nil:flt); -rstr:bat[:oid,:str] := pyapi.eval(nil:ptr,"return(arg1)",bflt); -io.print(rstr); - # convert boolean to string rstr:bat[:oid,:str] := pyapi.eval(nil:ptr,"return([[True, True, False]])"); io.print(rstr); @@ -76,6 +56,16 @@ bat.append(bsht,82:sht); rsht:bat[:oid,:str] := pyapi.eval(nil:ptr,"return(arg1)",bsht); io.print(rsht); +# convert int to string +bint:= bat.new(:oid,:int); +bat.append(bint,1804289383:int); +bat.append(bint,846930886:int); +bat.append(bint,1681692777:int); +bat.append(bint,1714636915:int); +bat.append(bint,nil:int); +rstr:bat[:oid,:str] := pyapi.eval(nil:ptr,"return(arg1)",bint); +io.print(rstr); + # convert word to string bwrd:= bat.new(:oid,:wrd); bat.append(bwrd,1804289383:wrd); @@ -90,6 +80,16 @@ bat.append(blng,846930886L); rlng:bat[:oid,:str] := pyapi.eval(nil:ptr,"return(arg1)",blng); io.print(rlng); +# convert float to string +bflt:= bat.new(:oid,:flt); +bat.append(bflt,18042.89383:flt); +bat.append(bflt,846.930886:flt); +bat.append(bflt,16.81692777:flt); +bat.append(bflt,1714636.915:flt); +bat.append(bflt,nil:flt); +rstr:bat[:oid,:str] := pyapi.eval(nil:ptr,"return(arg1)",bflt); +io.print(rstr); + # convert dbl to string bdbl:= bat.new(:oid,:dbl); bat.append(bdbl,18042.89383:dbl); @@ -99,3 +99,68 @@ bat.append(bdbl,1714636.915:dbl); bat.append(bdbl,nil:dbl); rstr:bat[:oid,:str] := pyapi.eval(nil:ptr,"return(arg1)",bdbl); io.print(rstr); + +# convert bit to string +bstr:= bat.new(:oid,:str); +bat.append(bstr,"1":str); +bat.append(bstr,"0":str); +rbit:bat[:oid,:bit] := pyapi.eval(nil:ptr,"return(arg1)",bstr); +io.print(rbit); + +# convert bte to string +#bstr:= bat.new(:oid,:str); +#bat.append(bstr,"42":str); +#bat.append(bstr,"84":str); +#rbte:bat[:oid,:bte] := pyapi.eval(nil:ptr,"return(arg1)",bstr); +#io.print(rbte); + +# convert short to string +bstr:= bat.new(:oid,:str); +bat.append(bstr,"42":str); +bat.append(bstr,"82":str); +rsht:bat[:oid,:sht] := pyapi.eval(nil:ptr,"return(arg1)",bstr); +io.print(rsht); + +# convert int to string +bstr:= bat.new(:oid,:str); +bat.append(bstr,"1804289383":str); +bat.append(bstr,"846930886":str); +bat.append(bstr,"1681692777":str); +bat.append(bstr,"1714636915":str); +bat.append(bstr,nil:str); +rstr:bat[:oid,:int] := pyapi.eval(nil:ptr,"return(arg1)",bstr); +io.print(rstr); + +# convert word to string +#bstr:= bat.new(:oid,:str); +#bat.append(bstr,"1804289383":str); +#bat.append(bstr,"846930886":str); +#rwrd:bat[:oid,:wrd] := pyapi.eval(nil:ptr,"return(arg1)",bstr); +#io.print(rwrd); + +# convert long to string +bstr:= bat.new(:oid,:str); +bat.append(bstr,"1804289383":str); +bat.append(bstr,"846930886":str); +rlng:bat[:oid,:lng] := pyapi.eval(nil:ptr,"return(arg1)",bstr); +io.print(rlng); + +# convert float to string +bstr:= bat.new(:oid,:str); +bat.append(bstr,"18042.89383":str); +bat.append(bstr,"846.930886":str); +bat.append(bstr,"16.81692777":str); +bat.append(bstr,"1714636.915":str); +bat.append(bstr,nil:str); +rstr:bat[:oid,:flt] := pyapi.eval(nil:ptr,"return(arg1)",bstr); +io.print(rstr); + +# convert dbl to string +bstr:= bat.new(:oid,:str); +bat.append(bstr,"18042.89383":str); +bat.append(bstr,"846.930886":str); +bat.append(bstr,"16.81692777":str); +bat.append(bstr,"1714636.915":str); +bat.append(bstr,nil:str); +rstr:bat[:oid,:dbl] := pyapi.eval(nil:ptr,"return(arg1)",bstr); +io.print(rstr); diff --git a/monetdb5/extras/pyapi/Tests/pyapi_types_string.stable.err b/monetdb5/extras/pyapi/Tests/pyapi_types_string.stable.err --- a/monetdb5/extras/pyapi/Tests/pyapi_types_string.stable.err +++ b/monetdb5/extras/pyapi/Tests/pyapi_types_string.stable.err @@ -1,11 +1,11 @@ stderr of test 'pyapi_types_string` in directory 'monetdb5/extras/pyapi` itself: -# 00:51:32 > -# 00:51:32 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=37216" "--set" "mapi_usock=/var/tmp/mtest-31570/.s.monetdb.37216" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/home/mytherin/opt/var/mTests_monetdb5_extras_pyapi" "--set" "mal_listing=2" "--set" "embedded_r=true" "--set" "embedded_py=true" -# 00:51:32 > +# 18:14:04 > +# 18:14:04 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34518" "--set" "mapi_usock=/var/tmp/mtest-9443/.s.monetdb.34518" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch2/raasveld/build/var/MonetDB/mTests_monetdb5_extras_pyapi" "--set" "mal_listing=2" "--set" "embedded_r=true" "--set" "embedded_py=true" +# 18:14:04 > -# builtin opt gdk_dbpath = /home/mytherin/opt/var/monetdb5/dbfarm/demo +# builtin opt gdk_dbpath = /export/scratch2/raasveld/build/var/monetdb5/dbfarm/demo # builtin opt gdk_debug = 0 # builtin opt gdk_vmtrim = no # builtin opt monet_prompt = > @@ -17,22 +17,22 @@ stderr of test 'pyapi_types_string` in d # builtin opt sql_debug = 0 # cmdline opt gdk_nr_threads = 0 # cmdline opt mapi_open = true -# cmdline opt mapi_port = 37216 -# cmdline opt mapi_usock = /var/tmp/mtest-31570/.s.monetdb.37216 +# cmdline opt mapi_port = 34518 +# cmdline opt mapi_usock = /var/tmp/mtest-9443/.s.monetdb.34518 # cmdline opt monet_prompt = # cmdline opt mal_listing = 2 -# cmdline opt gdk_dbpath = /home/mytherin/opt/var/mTests_monetdb5_extras_pyapi +# cmdline opt gdk_dbpath = /export/scratch2/raasveld/build/var/MonetDB/mTests_monetdb5_extras_pyapi # cmdline opt mal_listing = 2 # cmdline opt embedded_r = true # cmdline opt embedded_py = true # cmdline opt gdk_debug = 536870922 -# 00:51:32 > -# 00:51:32 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-31570" "--port=37216" -# 00:51:32 > +# 18:14:05 > +# 18:14:05 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-9443" "--port=34518" +# 18:14:05 > -# 00:51:32 > -# 00:51:32 > "Done." -# 00:51:32 > +# 18:14:05 > +# 18:14:05 > "Done." +# 18:14:05 > diff --git a/monetdb5/extras/pyapi/Tests/pyapi_types_string.stable.out b/monetdb5/extras/pyapi/Tests/pyapi_types_string.stable.out --- a/monetdb5/extras/pyapi/Tests/pyapi_types_string.stable.out +++ b/monetdb5/extras/pyapi/Tests/pyapi_types_string.stable.out @@ -1,29 +1,32 @@ stdout of test 'pyapi_types_string` in directory 'monetdb5/extras/pyapi` itself: -# 00:51:32 > -# 00:51:32 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=37216" "--set" "mapi_usock=/var/tmp/mtest-31570/.s.monetdb.37216" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/home/mytherin/opt/var/mTests_monetdb5_extras_pyapi" "--set" "mal_listing=2" "--set" "embedded_r=true" "--set" "embedded_py=true" -# 00:51:32 > +# 18:14:04 > +# 18:14:04 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34518" "--set" "mapi_usock=/var/tmp/mtest-9443/.s.monetdb.34518" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch2/raasveld/build/var/MonetDB/mTests_monetdb5_extras_pyapi" "--set" "mal_listing=2" "--set" "embedded_r=true" "--set" "embedded_py=true" +# 18:14:04 > -# MonetDB 5 server v11.20.0 +# MonetDB 5 server v11.22.0 # This is an unreleased version # Serving database 'mTests_monetdb5_extras_pyapi', using 8 threads # Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked -# Found 7.684 GiB available main-memory. +# Found 15.590 GiB available main-memory. # Copyright (c) 1993-July 2008 CWI. # Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved # Visit http://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://mytherin-N750JV:37216/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-31570/.s.monetdb.37216 +# Listening for connection requests on mapi:monetdb://lyon.ins.cwi.nl:34518/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-9443/.s.monetdb.34518 +# MonetDB/GIS module loaded +# Start processing logs sql/sql_logs version 52200 +# Finished processing logs sql/sql_logs # MonetDB/SQL module loaded # MonetDB/Python module loaded # MonetDB/R module loaded Ready. -# 00:51:32 > -# 00:51:32 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-31570" "--port=37216" -# 00:51:32 > +# 18:14:05 > +# 18:14:05 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-9443" "--port=34518" +# 18:14:05 > #io.print(rstr); #--------------------------# @@ -65,11 +68,54 @@ Ready. # h t # name # void str # type #--------------------------# +[ 0@0, "1" ] +[ 1@0, "1" ] +[ 2@0, "0" ] +#io.print(rbit); +#--------------------------# +# h t # name +# void str # type +#--------------------------# +[ 0@0, "1" ] +[ 1@0, "0" ] +#io.print(rbte); +#--------------------------# +# h t # name +# void str # type +#--------------------------# +[ 0@0, "42" ] +[ 1@0, "84" ] +#io.print(rsht); +#--------------------------# +# h t # name +# void str # type +#--------------------------# +[ 0@0, "42" ] +[ 1@0, "82" ] +#io.print(rstr); +#--------------------------# +# h t # name +# void str # type +#--------------------------# [ 0@0, "1804289383" ] [ 1@0, "846930886" ] [ 2@0, "1681692777" ] [ 3@0, "1714636915" ] [ 4@0, nil ] +#io.print(rwrd); +#--------------------------# +# h t # name +# void str # type +#--------------------------# +[ 0@0, "1804289383" ] +[ 1@0, "846930886" ] +#io.print(rlng); +#--------------------------# +# h t # name +# void str # type +#--------------------------# +[ 0@0, "1804289383" ] +[ 1@0, "846930886" ] #io.print(rstr); #--------------------------# # h t # name @@ -85,11 +131,64 @@ Ready. # h t # name # void str # type #--------------------------# -[ 0@0, "1" ] -[ 1@0, "1" ] -[ 2@0, "0" ] +[ 0@0, "18042.893830" ] +[ 1@0, "846.930886" ] +[ 2@0, "16.816928" ] +[ 3@0, "1714636.915000" ] +[ 4@0, nil ] +#io.print(rbit); +#--------------------------# +# h t # name _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
