Changeset: 5d255bd86516 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5d255bd86516
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
Modified Files:
gdk/gdk_atoms.c
sql/backends/monet5/Tests/All
Branch: pythonloader
Log Message:
Support for int syntax 4E6 (= 4000000) in COPY INTO
diffs (228 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,24 @@ batWrite(const bat *a, stream *s, size_t
return mnstr_writeIntArray(s, (const int *) a, cnt) ? GDK_SUCCEED :
GDK_FAIL;
}
+#ifdef HAVE_HGE
+static hge h_pow(hge base, hge exp) {
+ hge result = 1;
+#else
+static lng h_pow(lng base, lng exp) {
+ lng result = 1;
+#endif
+ while (exp)
+ {
+ if (exp & 1)
+ result *= base;
+ exp >>= 1;
+ base *= base;
+ }
+ return result;
+}
+
+
/*
* 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 +610,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 +656,22 @@ numFromStr(const char *src, int *len, vo
}
base = 10 * base + base10(*p);
p++;
+ if (*p == 'E' || *p == 'e') {
+ expbase = base;
+ base = 0;
+ p++;
+ }
} while (num10(*p));
+ if (expbase > -1) {
+ dbl checkval = fabs(expbase * pow(10, base));
+ if (checkval >= maxdiv10 * 10) {
+ memcpy(*dst, ATOMnilptr(tp), sz);
+ return 0;
+ }
+ base = expbase * h_pow(10, base);
+ }
base *= sign;
+
switch (sz) {
case 1: {
bte **dstbte = (bte **) dst;
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
@@ -59,3 +59,5 @@ HAVE_LIBPY?pyapi29
simpleSQL
limithack
+
+HAVE_HUGEINT?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 >
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
