Changeset: 5890ce4c8682 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5890ce4c8682
Added Files:
sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3660.sql
sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3660.stable.err
sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3660.stable.out
Modified Files:
gdk/gdk_select.c
sql/test/BugTracker-2015/Tests/All
Branch: Oct2014
Log Message:
Don't use ATOMstorage if nil or compare function is different.
This fixes bug 3660.
Also added test for the bug.
diffs (266 lines):
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -1087,6 +1087,11 @@ BATsubselect(BAT *b, BAT *s, const void
t = b->ttype;
nil = ATOMnilptr(t);
+ /* can we use the base type? */
+ if (t != ATOMstorage(t) &&
+ nil == ATOMnilptr(ATOMstorage(t)) &&
+ ATOMcompare(t) == ATOMcompare(ATOMstorage(t)))
+ t = ATOMstorage(t);
lnil = ATOMcmp(t, tl, nil) == 0; /* low value = nil? */
lval = !lnil || th == NULL; /* low value used for comparison */
equi = th == NULL || (lval && ATOMcmp(t, tl, th) == 0); /* point
select? */
@@ -1205,29 +1210,28 @@ BATsubselect(BAT *b, BAT *s, const void
}
}
- if (b->ttype == TYPE_oid || b->ttype == TYPE_void) {
+ switch (ATOMtype(t)) {
+ case TYPE_bte:
+ NORMALIZE(bte);
+ break;
+ case TYPE_sht:
+ NORMALIZE(sht);
+ break;
+ case TYPE_int:
+ NORMALIZE(int);
+ break;
+ case TYPE_lng:
+ NORMALIZE(lng);
+ break;
+ case TYPE_flt:
+ NORMALIZE(flt);
+ break;
+ case TYPE_dbl:
+ NORMALIZE(dbl);
+ break;
+ case TYPE_oid:
NORMALIZE(oid);
- } else {
- switch (ATOMstorage(b->ttype)) {
- case TYPE_bte:
- NORMALIZE(bte);
- break;
- case TYPE_sht:
- NORMALIZE(sht);
- break;
- case TYPE_int:
- NORMALIZE(int);
- break;
- case TYPE_lng:
- NORMALIZE(lng);
- break;
- case TYPE_flt:
- NORMALIZE(flt);
- break;
- case TYPE_dbl:
- NORMALIZE(dbl);
- break;
- }
+ break;
}
if (b->tsorted || b->trevsorted) {
@@ -1397,7 +1401,7 @@ BATsubselect(BAT *b, BAT *s, const void
if (equi) {
estimate = 1;
} else if (!anti && lval && hval) {
- switch (ATOMstorage(b->ttype)) {
+ switch (t) {
case TYPE_bte:
estimate = (BUN) (*(bte *) th - *(bte *) tl);
break;
diff --git a/sql/test/BugTracker-2015/Tests/All
b/sql/test/BugTracker-2015/Tests/All
--- a/sql/test/BugTracker-2015/Tests/All
+++ b/sql/test/BugTracker-2015/Tests/All
@@ -4,3 +4,4 @@ name_conflict.Bug-3650
prepare_unop_crash.Bug-3653
and_or_in.Bug-3655
acidity2-fail.Bug-3635
+inet-ordering.Bug-3660
diff --git a/sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3660.sql
b/sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3660.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3660.sql
@@ -0,0 +1,24 @@
+start transaction;
+
+create table "bug"
+(
+ address inet
+);
+
+insert into "bug" values('1.0.0.11');
+insert into "bug" values('2.0.0.10');
+insert into "bug" values('3.0.0.9');
+insert into "bug" values('4.0.0.8');
+insert into "bug" values('5.0.0.7');
+insert into "bug" values('6.0.0.6');
+insert into "bug" values('7.0.0.5');
+insert into "bug" values('8.0.0.4');
+insert into "bug" values('9.0.0.3');
+insert into "bug" values('10.0.0.2');
+insert into "bug" values('11.0.0.1');
+
+select count(*) from bug where address>=inet'4.0.0.0';
+select count(*) from bug where address<inet'8.0.0.0';
+select count(*) from bug where address>=inet'4.0.0.0' and
address<inet'8.0.0.0';
+
+rollback;
diff --git a/sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3660.stable.err
b/sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3660.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3660.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'inet-ordering.Bug-3660` in directory
'sql/test/BugTracker-2015` itself:
+
+
+# 09:33:10 >
+# 09:33:10 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37180" "--set"
"mapi_usock=/var/tmp/mtest-14596/.s.monetdb.37180" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 09:33:10 >
+
+# builtin opt gdk_dbpath = /ufs/sjoerd/Monet-stable/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 = 37180
+# cmdline opt mapi_usock = /var/tmp/mtest-14596/.s.monetdb.37180
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2015
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 09:33:10 >
+# 09:33:10 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-14596" "--port=37180"
+# 09:33:10 >
+
+
+# 09:33:10 >
+# 09:33:10 > "Done."
+# 09:33:10 >
+
diff --git a/sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3660.stable.out
b/sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3660.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3660.stable.out
@@ -0,0 +1,107 @@
+stdout of test 'inet-ordering.Bug-3660` in directory
'sql/test/BugTracker-2015` itself:
+
+
+# 09:33:10 >
+# 09:33:10 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37180" "--set"
"mapi_usock=/var/tmp/mtest-14596/.s.monetdb.37180" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 09:33:10 >
+
+# MonetDB 5 server v11.19.10 (hg id: 0ac3191c46fd+)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2015', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# 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://madrid.ins.cwi.nl:37180/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-14596/.s.monetdb.37180
+# MonetDB/GIS module loaded
+# MonetDB/SQL 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: 19_cluster.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: 39_analytics.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 40_json.sql
+# loading sql script: 41_jsonstore.sql
+# loading sql script: 45_uuid.sql
+# loading sql script: 46_gsl.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 85_bam.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 99_system.sql
+
+# 09:33:10 >
+# 09:33:10 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-14596" "--port=37180"
+# 09:33:10 >
+
+#start transaction;
+#create table "bug"
+#(
+# address inet
+#);
+#insert into "bug" values('1.0.0.11');
+[ 1 ]
+#insert into "bug" values('2.0.0.10');
+[ 1 ]
+#insert into "bug" values('3.0.0.9');
+[ 1 ]
+#insert into "bug" values('4.0.0.8');
+[ 1 ]
+#insert into "bug" values('5.0.0.7');
+[ 1 ]
+#insert into "bug" values('6.0.0.6');
+[ 1 ]
+#insert into "bug" values('7.0.0.5');
+[ 1 ]
+#insert into "bug" values('8.0.0.4');
+[ 1 ]
+#insert into "bug" values('9.0.0.3');
+[ 1 ]
+#insert into "bug" values('10.0.0.2');
+[ 1 ]
+#insert into "bug" values('11.0.0.1');
+[ 1 ]
+#select count(*) from bug where address>=inet'4.0.0.0';
+% sys.L1 # table_name
+% L1 # name
+% wrd # type
+% 1 # length
+[ 8 ]
+#select count(*) from bug where address<inet'8.0.0.0';
+% sys.L1 # table_name
+% L1 # name
+% wrd # type
+% 1 # length
+[ 7 ]
+#select count(*) from bug where address>=inet'4.0.0.0' and
address<inet'8.0.0.0';
+% sys.L1 # table_name
+% L1 # name
+% wrd # type
+% 1 # length
+[ 4 ]
+#rollback;
+
+# 09:33:10 >
+# 09:33:10 > "Done."
+# 09:33:10 >
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
