Changeset: ce80063462b4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ce80063462b4
Added Files:
sql/backends/monet5/Tests/int_notation_1e5.sql
sql/backends/monet5/Tests/int_notation_1e5.stable.err
sql/backends/monet5/Tests/int_notation_1e5.stable.out
sql/backends/monet5/Tests/pyapi31.stable.err
sql/backends/monet5/Tests/pyapi31.stable.out
sql/backends/monet5/Tests/pyloader01.sql
sql/backends/monet5/Tests/pyloader01.stable.err
sql/backends/monet5/Tests/pyloader01.stable.out
sql/backends/monet5/Tests/pyloader02.sql
sql/backends/monet5/Tests/pyloader02.stable.err
sql/backends/monet5/Tests/pyloader02.stable.out
sql/backends/monet5/Tests/pyloader03.sql
sql/backends/monet5/Tests/pyloader03.stable.err
sql/backends/monet5/Tests/pyloader03.stable.out
sql/backends/monet5/Tests/pyloader04.sql
sql/backends/monet5/Tests/pyloader04.stable.err
sql/backends/monet5/Tests/pyloader04.stable.out
sql/backends/monet5/Tests/pyloader05.sql
sql/backends/monet5/Tests/pyloader05.stable.err
sql/backends/monet5/Tests/pyloader05.stable.out
sql/backends/monet5/Tests/pyloader07.sql
sql/backends/monet5/Tests/pyloader07.stable.err
sql/backends/monet5/Tests/pyloader07.stable.out
sql/backends/monet5/UDF/pyapi/convert_loops.h
sql/backends/monet5/UDF/pyapi/emit.c
sql/backends/monet5/UDF/pyapi/emit.h
sql/backends/monet5/UDF/pyapi/pyloader.c
Modified Files:
gdk/gdk_atoms.c
monetdb5/extras/rapi/rapi.c
monetdb5/optimizer/opt_support.c
sql/backends/monet5/Tests/All
sql/backends/monet5/Tests/pyapi30.stable.out
sql/backends/monet5/UDF/pyapi/Makefile.ag
sql/backends/monet5/UDF/pyapi/connection.c
sql/backends/monet5/UDF/pyapi/connection.h
sql/backends/monet5/UDF/pyapi/formatinput.c
sql/backends/monet5/UDF/pyapi/formatinput.h
sql/backends/monet5/UDF/pyapi/pyapi.c
sql/backends/monet5/UDF/pyapi/pyapi.h
sql/backends/monet5/UDF/pyapi/pyapi.mal
sql/backends/monet5/UDF/pyapi/pytypes.h
sql/backends/monet5/UDF/pyapi/type_conversion.c
sql/backends/monet5/UDF/pyapi/type_conversion.h
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql.h
sql/backends/monet5/sql_gencode.c
sql/include/sql_catalog.h
sql/server/rel_psm.c
sql/server/rel_select.c
sql/server/rel_semantic.c
sql/server/rel_updates.c
sql/server/sql_mvc.h
sql/server/sql_parser.h
sql/server/sql_parser.y
sql/server/sql_scan.c
testing/Mtest.py.in
Branch: default
Log Message:
Merge with pythonloader.
diffs (truncated from 5316 to 300 lines):
diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -578,6 +578,7 @@ batWrite(const bat *a, stream *s, size_t
return mnstr_writeIntArray(s, (const int *) a, cnt) ? GDK_SUCCEED :
GDK_FAIL;
}
+
/*
* numFromStr parses the head of the string for a number, accepting an
* optional sign. The code has been prepared to continue parsing by
@@ -592,9 +593,11 @@ numFromStr(const char *src, int *len, vo
int sz = ATOMsize(tp);
#ifdef HAVE_HGE
hge base = 0;
+ hge expbase = -1;
const hge maxdiv10 = GDK_hge_max / 10;
#else
lng base = 0;
+ lng expbase = -1;
const lng maxdiv10 = LL_CONSTANT(922337203685477580); /*7*/
#endif
const int maxmod10 = 7; /* max value % 10 */
@@ -636,8 +639,37 @@ numFromStr(const char *src, int *len, vo
}
base = 10 * base + base10(*p);
p++;
+ /* Special case: xEy = x*10^y handling part 1 */
+ if (*p == 'E' || *p == 'e') {
+ // if there is a second E in the string we give up
+ if (expbase > -1) {
+ memcpy(*dst, ATOMnilptr(tp), sz);
+ return 0;
+ }
+ expbase = base;
+ base = 0;
+ p++;
+ }
} while (num10(*p));
+ /* Special case: xEy = x*10^y handling part 2 */
+ if (expbase > -1) {
+#ifdef HAVE_HGE
+ hge res = expbase;
+#else
+ lng res = expbase;
+#endif
+ while (base > 0) {
+ if (res > maxdiv10) {
+ memcpy(*dst, ATOMnilptr(tp), sz);
+ return 0;
+ }
+ res *= 10L;
+ base--;
+ }
+ base = res;
+ }
base *= sign;
+
switch (sz) {
case 1: {
bte **dstbte = (bte **) dst;
diff --git a/monetdb5/extras/rapi/rapi.c b/monetdb5/extras/rapi/rapi.c
--- a/monetdb5/extras/rapi/rapi.c
+++ b/monetdb5/extras/rapi/rapi.c
@@ -229,7 +229,7 @@ rapi_export str RAPIevalAggr(Client cntx
}
str RAPIeval(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, bit
grouped) {
- sql_func * sqlfun = *(sql_func**) getArgReference_ptr(stk, pci,
pci->retc);
+ sql_func * sqlfun = NULL;
str exprStr = *getArgReference_str(stk, pci, pci->retc + 1);
SEXP x, env, retval;
@@ -258,6 +258,13 @@ str RAPIeval(Client cntxt, MalBlkPtr mb,
rapi_enableflag);
}
+ if (!grouped) {
+ sql_subfunc *sqlmorefun = (*(sql_subfunc**)
getArgReference(stk, pci, pci->retc));
+ if (sqlmorefun) sqlfun = (*(sql_subfunc**) getArgReference(stk,
pci, pci->retc))->func;
+ } else {
+ sqlfun = *(sql_func**) getArgReference(stk, pci, pci->retc);
+ }
+
rcalllen = strlen(exprStr) + sizeof(argnames) + 100;
rcall = malloc(rcalllen);
if (rcall == NULL) {
diff --git a/monetdb5/optimizer/opt_support.c b/monetdb5/optimizer/opt_support.c
--- a/monetdb5/optimizer/opt_support.c
+++ b/monetdb5/optimizer/opt_support.c
@@ -559,6 +559,11 @@ hasSideEffects(InstrPtr p, int strict)
getModuleId(p) == semaRef ||
getModuleId(p) == alarmRef)
return TRUE;
+
+ if( getModuleId(p) == pyapiRef ||
+ getModuleId(p) == pyapimapRef ||
+ getModuleId(p) == rapiRef)
+ return TRUE;
if (getModuleId(p) == sqlRef){
if (getFunctionId(p) == tidRef) return FALSE;
diff --git a/sql/backends/monet5/Tests/All b/sql/backends/monet5/Tests/All
--- a/sql/backends/monet5/Tests/All
+++ b/sql/backends/monet5/Tests/All
@@ -50,8 +50,17 @@ HAVE_LIBPY?pyapi26
HAVE_LIBPY?pyapi27
HAVE_LIBPY?pyapi28
HAVE_LIBPY?pyapi29
+HAVE_LIBPY?pyapi30
HAVE_LIBPY?pyapi32
+HAVE_LIBPY?pyloader01
+HAVE_LIBPY?pyloader02
+HAVE_LIBPY?pyloader03
+HAVE_LIBPY?pyloader04
+HAVE_LIBPY?pyloader05
+HAVE_LIBPY?pyloader06
+HAVE_LIBPY?pyloader07
+
# should this work?
#inlineUDF
@@ -60,3 +69,5 @@ HAVE_LIBPY?pyapi32
simpleSQL
limithack
+
+HAVE_HGE?int_notation_1e5
diff --git a/sql/backends/monet5/Tests/int_notation_1e5.sql
b/sql/backends/monet5/Tests/int_notation_1e5.sql
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/int_notation_1e5.sql
@@ -0,0 +1,13 @@
+START TRANSACTION;
+CREATE TABLE t1e4 (a HUGEINT, b HUGEINT);
+COPY 7 RECORDS INTO t1e4 FROM STDIN NULL AS '';
+01E4|10000|
+1E4|10000|
+1E5|100000|
+-2E5|-200000|
+-002E015|-2000000000000000|
+1E38|100000000000000000000000000000000000000|
+-42E36|-42000000000000000000000000000000000000|
+
+SELECT *, a-b AS diff FROM t1e4;
+ROLLBACK;
diff --git a/sql/backends/monet5/Tests/int_notation_1e5.stable.err
b/sql/backends/monet5/Tests/int_notation_1e5.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/int_notation_1e5.stable.err
@@ -0,0 +1,36 @@
+stderr of test 'int_notation_1e5` in directory 'sql/backends/monet5` itself:
+
+
+# 11:11:20 >
+# 11:11:20 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37652" "--set"
"mapi_usock=/var/tmp/mtest-6682/.s.monetdb.37652" "--set" "monet_prompt="
"--forcemito" "--dbpath=/tmp/fuckit/var/MonetDB/mTests_sql_backends_monet5"
"--set" "embedded_r=yes" "--set" "embedded_py=true"
+# 11:11:20 >
+
+# builtin opt gdk_dbpath = /tmp/fuckit/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 37652
+# cmdline opt mapi_usock = /var/tmp/mtest-6682/.s.monetdb.37652
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath = /tmp/fuckit/var/MonetDB/mTests_sql_backends_monet5
+# cmdline opt embedded_r = yes
+# cmdline opt embedded_py = true
+# cmdline opt gdk_debug = 536870922
+
+# 11:11:20 >
+# 11:11:20 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-6682" "--port=37652"
+# 11:11:20 >
+
+
+# 11:11:20 >
+# 11:11:20 > "Done."
+# 11:11:20 >
+
diff --git a/sql/backends/monet5/Tests/int_notation_1e5.stable.out
b/sql/backends/monet5/Tests/int_notation_1e5.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/int_notation_1e5.stable.out
@@ -0,0 +1,92 @@
+stdout of test 'int_notation_1e5` in directory 'sql/backends/monet5` itself:
+
+
+# 11:11:20 >
+# 11:11:20 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37652" "--set"
"mapi_usock=/var/tmp/mtest-6682/.s.monetdb.37652" "--set" "monet_prompt="
"--forcemito" "--dbpath=/tmp/fuckit/var/MonetDB/mTests_sql_backends_monet5"
"--set" "embedded_r=yes" "--set" "embedded_py=true"
+# 11:11:20 >
+
+# MonetDB 5 server v11.24.0
+# This is an unreleased version
+# Serving database 'mTests_sql_backends_monet5', using 4 threads
+# Compiled for x86_64-apple-darwin15.5.0/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 16.000 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2016 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://dakar.da.cwi.nl:37652/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-6682/.s.monetdb.37652
+# MonetDB/SQL module loaded
+# MonetDB/Python module loaded
+# MonetDB/R module loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_querylog.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_temporal.sql
+# loading sql script: 18_index.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 24_zorder.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 26_sysmon.sql
+# loading sql script: 27_rejects.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 39_analytics_hge.sql
+# loading sql script: 40_json.sql
+# loading sql script: 40_json_hge.sql
+# loading sql script: 41_md5sum.sql
+# loading sql script: 45_uuid.sql
+# loading sql script: 46_gsl.sql
+# loading sql script: 46_profiler.sql
+# loading sql script: 51_sys_schema_extension.sql
+# loading sql script: 72_fits.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 80_udf_hge.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 90_generator_hge.sql
+# loading sql script: 99_system.sql
+
+# 11:11:20 >
+# 11:11:20 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-6682" "--port=37652"
+# 11:11:20 >
+
+#START TRANSACTION;
+#CREATE TABLE t1e4 (a HUGEINT, b HUGEINT);
+#COPY 7 RECORDS INTO t1e4 FROM STDIN NULL AS '';
+#01E4|10000|
+#1E4|10000|
+#1E5|100000|
+#-2E5|-200000|
+#-002E015|-2000000000000000|
+#1E38|100000000000000000000000000000000000000|
+#-42E36|-42000000000000000000000000000000000000|
+[ 7 ]
+#SELECT *, a-b AS diff FROM t1e4;
+% sys.t1e4, sys.t1e4, sys.L # table_name
+% a, b, diff # name
+% hugeint, hugeint, hugeint # type
+% 39, 39, 1 # length
+[ 10000, 10000, 0 ]
+[ 10000, 10000, 0 ]
+[ 100000, 100000, 0 ]
+[ -200000, -200000, 0 ]
+[ -2000000000000000, -2000000000000000, 0 ]
+[ 100000000000000000000000000000000000000,
100000000000000000000000000000000000000, 0 ]
+[ -42000000000000000000000000000000000000,
-42000000000000000000000000000000000000, 0 ]
+#ROLLBACK;
+
+# 11:11:20 >
+# 11:11:20 > "Done."
+# 11:11:20 >
+
diff --git a/sql/backends/monet5/Tests/pyapi31.stable.err
b/sql/backends/monet5/Tests/pyapi31.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/Tests/pyapi31.stable.err
@@ -0,0 +1,36 @@
+stderr of test 'pyapi31` in directory 'sql/backends/monet5` itself:
+
+
+# 17:26:46 >
+# 17:26:46 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31854" "--set"
"mapi_usock=/var/tmp/mtest-90579/.s.monetdb.31854" "--set" "monet_prompt="
"--forcemito" "--dbpath=/tmp/fuckit/var/MonetDB/mTests_sql_backends_monet5"
"--set" "embedded_r=yes" "--set" "embedded_py=true"
+# 17:26:46 >
+
+# builtin opt gdk_dbpath = /tmp/fuckit/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
