date:20140911

MonetDB: Oct2014 - Fix for bug 3563: don't confuse needle and ha...

2014-09-11 Thread Sjoerd Mullender

Changeset: 65a27b2b9306 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=65a27b2b9306
Added Files:
sql/test/BugTracker-2014/Tests/locate-offset.Bug-3563.sql
sql/test/BugTracker-2014/Tests/locate-offset.Bug-3563.stable.err
sql/test/BugTracker-2014/Tests/locate-offset.Bug-3563.stable.out
Modified Files:
monetdb5/modules/atoms/str.c
sql/test/BugTracker-2014/Tests/All
Branch: Oct2014
Log Message:

Fix for bug 3563: don't confuse needle and haystack.


diffs (247 lines):

diff --git a/monetdb5/modules/atoms/str.c b/monetdb5/modules/atoms/str.c
--- a/monetdb5/modules/atoms/str.c
+++ b/monetdb5/modules/atoms/str.c
@@ -1862,12 +1862,12 @@ STRUpper(str *res, str *arg1)
 }
 
 str
-STRstrSearch(int *res, str *arg1, str *arg2)
+STRstrSearch(int *res, str *haystack, str *needle)
 {
 /* 64bit: should return wrd */
char *p;
-   const char *s = *arg1;
-   const char *s2 = *arg2;
+   const char *s = *haystack;
+   const char *s2 = *needle;
 
if (strNil(s) || strNil(s2)) {
*res = int_nil;
@@ -2472,22 +2472,24 @@ STRsuffix(str *ret, str *s, int *l){
int start = (int) (strlen(*s)- *l);
return STRSubString(ret,s,start,l);
 }
+
 str
-STRlocate(int *ret, str *s1, str *s2){
-   int p;
-   STRstrSearch(p, s2, s1);
-   *ret=  p=0? p+1:0;
+STRlocate2(int *ret, str *needle, str *haystack, int *start)
+{
+   int off = *start = 0 ? 1 : *start;
+   char *s = UTF8_strtail(*haystack, off - 1);
+   int res;
+
+   STRstrSearch(res, s, needle);
+   *ret =  res = 0 ? res + off : 0;
return MAL_SUCCEED;
 }
+
 str
-STRlocate2(int *ret, str *s1, str *s2, int *start){
-   int p;
-   str dummy;
-   STRTail(dummy, s1, start);
-   STRstrSearch(p, s2, dummy);
-   if( dummy) GDKfree(dummy);
-   *ret=  p=0? p+1:0;
-   return MAL_SUCCEED;
+STRlocate(int *ret, str *needle, str *haystack)
+{
+   int p = 1;
+   return STRlocate2(ret, needle, haystack, p);
 }
 
 str
diff --git a/sql/test/BugTracker-2014/Tests/All 
b/sql/test/BugTracker-2014/Tests/All
--- a/sql/test/BugTracker-2014/Tests/All
+++ b/sql/test/BugTracker-2014/Tests/All
@@ -39,3 +39,4 @@ subselect-reverse.Bug-3552
 orderby_on_constant.Bug-3554
 div_by_zero_in_return.Bug-3555
 round-sorted.Bug-3562
+locate-offset.Bug-3563
diff --git a/sql/test/BugTracker-2014/Tests/locate-offset.Bug-3563.sql 
b/sql/test/BugTracker-2014/Tests/locate-offset.Bug-3563.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/locate-offset.Bug-3563.sql
@@ -0,0 +1,10 @@
+select locate('@','joeuser@mydatabase@test', 1) as string_position;
+select locate('@','joeuser@mydatabase@test', 2) as string_position;
+select locate('@','joeuser@mydatabase@test', 3) as string_position;
+select locate('@','joeuser@mydatabase@test', 4) as string_position;
+select locate('@','joeuser@mydatabase@test', 8) as string_position;
+select locate('@','joeuser@mydatabase@test', 9) as string_position;
+select locate('@','joeuser@mydatabase@test', -1) as string_position;
+select locate('@','joeuser@mydatabase@test', -2) as string_position;
+select locate('@','joeuser@mydatabase@test', -3) as string_position;
+select locate('@','joeuser@mydatabase@test', -4) as string_position;
diff --git a/sql/test/BugTracker-2014/Tests/locate-offset.Bug-3563.stable.err 
b/sql/test/BugTracker-2014/Tests/locate-offset.Bug-3563.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/locate-offset.Bug-3563.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'locate-offset.Bug-3563` in directory 
'sql/test/BugTracker-2014` itself:
+
+
+# 16:52:45   
+# 16:52:45   mserver5 --debug=10 --set gdk_nr_threads=0 --set 
mapi_open=true --set mapi_port=34206 --set 
mapi_usock=/var/tmp/mtest-5089/.s.monetdb.34206 --set monet_prompt= 
--forcemito --set mal_listing=2 
--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_BugTracker-2014
 --set mal_listing=0 --set embedded_r=yes
+# 16:52:45   
+
+# builtin opt  gdk_dbpath = 
/ufs/sjoerd/Monet-candidate/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 = 5
+# 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 = 34206
+# cmdline opt  mapi_usock = /var/tmp/mtest-5089/.s.monetdb.34206
+# cmdline opt  monet_prompt = 
+# cmdline opt  mal_listing = 2
+# cmdline opt  gdk_dbpath = 
/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_BugTracker-2014
+# cmdline opt  mal_listing = 0
+# cmdline opt  embedded_r = yes
+# cmdline opt  gdk_debug = 536870922
+
+# 16:52:46   
+# 16:52:46   mclient -lsql -ftest -Eutf-8 -i -e 
--host=/var/tmp/mtest-5089 --port=34206
+# 16:52:46   
+
+
+#

MonetDB: default - Merge with Oct2014 branch.

2014-09-11 Thread Sjoerd Mullender

Changeset: 7470a2ba80c1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7470a2ba80c1
Added Files:
sql/test/BugTracker-2014/Tests/locate-offset.Bug-3563.sql
sql/test/BugTracker-2014/Tests/locate-offset.Bug-3563.stable.err
sql/test/BugTracker-2014/Tests/locate-offset.Bug-3563.stable.out
sql/test/BugTracker-2014/Tests/round-sorted.Bug-3562.sql
sql/test/BugTracker-2014/Tests/round-sorted.Bug-3562.stable.err
sql/test/BugTracker-2014/Tests/round-sorted.Bug-3562.stable.out
Modified Files:
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
clients/mapiclient/mclient.c
clients/odbc/driver/ODBCUtil.c
clients/odbc/driver/README
clients/odbc/driver/SQLParamOptions.c
clients/odbc/driver/SQLSetConnectAttr.c
clients/odbc/driver/SQLSetConnectOption.c
clients/odbc/driver/SQLSetDescField.c
clients/odbc/driver/SQLSetEnvAttr.c
clients/odbc/driver/SQLSetStmtAttr.c
clients/odbc/driver/SQLSetStmtOption.c
clients/odbc/samples/arraytest.c
clients/odbc/samples/odbcsample1.c
clients/odbc/samples/testgetinfo.c
clients/odbc/winsetup/setup.c
configure.ag
gdk/gdk.h
gdk/gdk_atoms.c
gdk/gdk_bat.c
gdk/gdk_calc.c
gdk/gdk_group.c
gdk/gdk_heap.c
gdk/gdk_imprints.c
gdk/gdk_private.h
gdk/gdk_setop.c
gdk/gdk_utils.c
monetdb5/modules/atoms/str.c
monetdb5/modules/mal/pcre.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_fround_impl.h
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_optimizer.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statistics.c
sql/include/sql_catalog.h
sql/server/sql_parser.y
sql/storage/bat/bat_storage.c
sql/storage/store.c
sql/test/BugTracker-2014/Tests/All
Branch: default
Log Message:

Merge with Oct2014 branch.


diffs (truncated from 1996 to 300 lines):

diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj 
b/NT/installer32/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer32/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj
@@ -566,8 +566,8 @@
 {
 Name = 8:Microsoft Visual Studio
 ProductName = 8:MonetDB ODBC Driver
-ProductCode = 8:{66BABD32-D69D-4A89-A7F3-2655D4CD0641}
-PackageCode = 8:{D9B2D386-1461-43BC-9A63-93F1BA0D7921}
+ProductCode = 8:{2343A06A-C2EE-4093-A9D0-76BD33BD911E}
+PackageCode = 8:{3D25FE62-3ACA-4E4F-8C44-00F612B05AF2}
 UpgradeCode = 8:{C1F69378-3F5C-4120-8224-32F07D3458F3}
 AspNetVersion = 8:4.0.30319.0
 RestartWWWService = 11:FALSE
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj 
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -420,8 +420,8 @@
 {
 Name = 8:Microsoft Visual Studio
 ProductName = 8:MonetDB5 SQL GIS Module
-ProductCode = 8:{66BABD32-D69D-4A89-A7F3-2655D4CD0641}
-PackageCode = 8:{D9B2D386-1461-43BC-9A63-93F1BA0D7921}
+ProductCode = 8:{C3E5CF14-CA74-4A9C-8051-AC733123C5F6}
+PackageCode = 8:{E77DD8EF-7830-4D56-97BE-26A2296F7008}
 UpgradeCode = 8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}
 AspNetVersion = 8:4.0.30319.0
 RestartWWWService = 11:FALSE
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj 
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -4288,8 +4288,8 @@
 {
 Name = 8:Microsoft Visual Studio
 ProductName = 8:MonetDB5
-ProductCode = 8:{66BABD32-D69D-4A89-A7F3-2655D4CD0641}
-PackageCode = 8:{D9B2D386-1461-43BC-9A63-93F1BA0D7921}
+ProductCode = 8:{38BA5ECB-FCAA-46C3-BBEE-AA6A09D97B92}
+PackageCode = 8:{E537E35E-EB72-4AA5-A2F9-E4A4E5D92635}
 UpgradeCode = 8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}
 AspNetVersion = 8:4.0.30319.0
 RestartWWWService = 11:FALSE
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -99,9 +99,6 @@
 /* there is something very similar to asctime_r on Windows: */
 #define asctime_r(t,b,s)   asctime_s(b,s,t)
 
-/* Define to 1 if the system has the type `bool'. */
-/* #undef HAVE_BOOL */
-
 /* Define if you have the cfitsio library */
 /* #undef HAVE_CFITSIO */
 
@@ -699,7 +696,7 @@
 /* #undef HAVE_XMMINTRIN_H */
 
 /* Define to 1 if the system has the type `_Bool'. */
-#define HAVE__BOOL 1
+/* #undef HAVE__BOOL */
 
 #ifdef _WIN64
 /* Define to 1 if

MonetDB: default - Approved output.

2014-09-11 Thread Sjoerd Mullender

Changeset: c4d0f4161950 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c4d0f4161950
Modified Files:
clients/Tests/MAL-signatures_all.stable.out
clients/Tests/MAL-signatures_all.stable.out.int128
clients/Tests/MAL-signatures_fits_geom.stable.out
clients/Tests/MAL-signatures_fits_geom.stable.out.int128
clients/Tests/MAL-signatures_geom.stable.out
clients/Tests/MAL-signatures_geom.stable.out.int128
clients/Tests/MAL-signatures_none.stable.out
clients/Tests/MAL-signatures_none.stable.out.int128
Branch: default
Log Message:

Approved output.


diffs (truncated from 2169 to 300 lines):

diff --git a/clients/Tests/MAL-signatures_all.stable.out 
b/clients/Tests/MAL-signatures_all.stable.out
--- a/clients/Tests/MAL-signatures_all.stable.out
+++ b/clients/Tests/MAL-signatures_all.stable.out
@@ -2338,6 +2338,10 @@ command algebra.ilikesubselect(s:bat[:oi
 address PCREilike_join_pcre;
 function 
algebra.ilikesubselect(b:bat[:oid,:str],cand:bat[:oid,:oid],pat:str,esc:str,anti:bit):bat[:oid,:oid];
 function 
algebra.ilikesubselect(b:bat[:oid,:str],pat:str,esc:str,anti:bit):bat[:oid,:oid];
+command algebra.ilike(s:str,pat:str):bit 
+address PCREilike2;
+command algebra.ilike(s:str,pat:str,esc:str):bit 
+address PCREilike3;
 command 
algebra.indexjoin(left:bat[:any_1,:any_2],right:bat[:any_2,:any_3]):bat[:any_1,:any_3]
 
 address ALGindexjoin;
 comment Hook directly into the index implementation of the join.
@@ -2401,6 +2405,10 @@ command algebra.likesubselect(b:bat[:oid
 address PCRElikesubselect1;
 comment Select all head values for which the tail value is like  the 
given (SQL-style) pattern.  Input is a dense-headed BAT, output is a 
dense-headed BAT with in   the tail the head value of the input BAT for 
which the  relationship holds.  The output BAT is sorted on the tail value.
 
+command algebra.like(s:str,pat:str):bit 
+address PCRElike2;
+command algebra.like(s:str,pat:str,esc:str):bit 
+address PCRElike3;
 command 
algebra.leftfetchjoin(left:bat[:oid,:oid],right:bat[:oid,:any_3]):bat[:oid,:any_3]
 
 address ALGleftfetchjoin;
 comment Hook directly into the left fetch join implementation.
@@ -2449,6 +2457,14 @@ command algebra.markT(b:bat[:any_1,:any_
 address ALGtmark;
 comment Produces a BAT with fresh unique dense sequense of OIDs in 
the tail that starts at base (i.e. [base,..base+b.count()-1] ).
 
+command algebra.not_ilike(s:str,pat:str):bit 
+address PCREnotilike2;
+command algebra.not_ilike(s:str,pat:str,esc:str):bit 
+address PCREnotilike3;
+command algebra.not_like(s:str,pat:str):bit 
+address PCREnotlike2;
+command algebra.not_like(s:str,pat:str,esc:str):bit 
+address PCREnotlike3;
 command 
algebra.outerjoin(outer:bat[:any_1,:any_2],inner:bat[:any_2,:any_3],estimate:lng):bat[:any_1,:any_3]
 
 address ALGouterjoinestimate;
 command 
algebra.outerjoin(outer:bat[:any_1,:oid],inner:bat[:oid,:any_3]):bat[:any_1,:any_3]
 
@@ -2869,6 +2885,22 @@ command batgeom.point(x:bat[:oid,:dbl],y
 address wkbcreatepoint_bat;
 comment Construct a point-BAT from two geometry-BATs
 
+command batalgebra.ilike(s:bat[:oid,:str],pat:str):bat[:oid,:bit] 
+address BATPCREilike2;
+command batalgebra.ilike(s:bat[:oid,:str],pat:str,esc:str):bat[:oid,:bit] 
+address BATPCREilike;
+command batalgebra.like(s:bat[:oid,:str],pat:str):bat[:oid,:bit] 
+address BATPCRElike2;
+command batalgebra.like(s:bat[:oid,:str],pat:str,esc:str):bat[:oid,:bit] 
+address BATPCRElike;
+command batalgebra.not_ilike(s:bat[:oid,:str],pat:str):bat[:oid,:bit] 
+address BATPCREnotliike2;
+command batalgebra.not_ilike(s:bat[:oid,:str],pat:str,esc:str):bat[:oid,:bit] 
+address BATPCREnotilike;
+command batalgebra.not_like(s:bat[:oid,:str],pat:str):bat[:oid,:bit] 
+address BATPCREnotlike2;
+command batalgebra.not_like(s:bat[:oid,:str],pat:str,esc:str):bat[:oid,:bit] 
+address BATPCREnotlike;
 command batcolor.blue(c:bat[:oid,:color]):bat[:oid,:int] 
 address CLRbatBlue;
 comment Extracts blue component from a color atom
diff --git a/clients/Tests/MAL-signatures_all.stable.out.int128 
b/clients/Tests/MAL-signatures_all.stable.out.int128
--- a/clients/Tests/MAL-signatures_all.stable.out.int128
+++ b/clients/Tests/MAL-signatures_all.stable.out.int128
@@ -2855,6 +2855,10 @@ command algebra.ilikesubselect(s:bat[:oi
 address PCREilike_join_pcre;
 function 
algebra.ilikesubselect(b:bat[:oid,:str],cand:bat[:oid,:oid],pat:str,esc:str,anti:bit):bat[:oid,:oid];
 function 
algebra.ilikesubselect(b:bat[:oid,:str],pat:str,esc:str,anti:bit):bat[:oid,:oid];
+command algebra.ilike(s:str,pat:str):bit 
+address PCREilike2;
+command algebra.ilike(s:str,pat:str,esc:str):bit 
+address PCREilike3;
 command 
algebra.indexjoin(left:bat[:any_1,:any_2],right:bat[:any_2,:any_3]):bat[:any_1,:any_3]
 
 address ALGindexjoin;
 comment Hook directly into the index implementation of the join.
@@ -2918,6 +2922,10 @@ command algebra.likesubselect(b:bat[:oid
 address PCRElikesubselect1;

MonetDB: geo - Merge with default branch.

2014-09-11 Thread Sjoerd Mullender

Changeset: e1fe85b8199a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e1fe85b8199a
Added Files:
sql/test/BugTracker-2014/Tests/locate-offset.Bug-3563.sql
sql/test/BugTracker-2014/Tests/locate-offset.Bug-3563.stable.err
sql/test/BugTracker-2014/Tests/locate-offset.Bug-3563.stable.out
sql/test/BugTracker-2014/Tests/round-sorted.Bug-3562.sql
sql/test/BugTracker-2014/Tests/round-sorted.Bug-3562.stable.err
sql/test/BugTracker-2014/Tests/round-sorted.Bug-3562.stable.out
Modified Files:
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
clients/Tests/MAL-signatures_all.stable.out
clients/Tests/MAL-signatures_all.stable.out.int128
clients/Tests/MAL-signatures_fits_geom.stable.out
clients/Tests/MAL-signatures_fits_geom.stable.out.int128
clients/Tests/MAL-signatures_geom.stable.out
clients/Tests/MAL-signatures_geom.stable.out.int128
clients/Tests/MAL-signatures_none.stable.out
clients/Tests/MAL-signatures_none.stable.out.int128
clients/mapiclient/mclient.c
clients/odbc/driver/ODBCUtil.c
clients/odbc/driver/README
clients/odbc/driver/SQLParamOptions.c
clients/odbc/driver/SQLSetConnectAttr.c
clients/odbc/driver/SQLSetConnectOption.c
clients/odbc/driver/SQLSetDescField.c
clients/odbc/driver/SQLSetEnvAttr.c
clients/odbc/driver/SQLSetStmtAttr.c
clients/odbc/driver/SQLSetStmtOption.c
clients/odbc/samples/arraytest.c
clients/odbc/samples/odbcsample1.c
clients/odbc/samples/testgetinfo.c
clients/odbc/winsetup/setup.c
configure.ag
gdk/gdk.h
gdk/gdk_aggr.c
gdk/gdk_atoms.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_calc.c
gdk/gdk_group.c
gdk/gdk_heap.c
gdk/gdk_imprints.c
gdk/gdk_private.h
gdk/gdk_select.c
gdk/gdk_setop.c
gdk/gdk_utils.c
gdk/gdk_value.c
monetdb5/mal/mal_instruction.c
monetdb5/modules/atoms/str.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/pcre.mal
sql/backends/monet5/LSST/Tests/lsst_htmxmatch.sql
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_fround_impl.h
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_optimizer.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statement.h
sql/backends/monet5/sql_statistics.c
sql/benchmarks/tpch/Tests/02-plan.stable.out
sql/benchmarks/tpch/Tests/09-plan.stable.out.int128
sql/benchmarks/tpch/Tests/13-plan.stable.out
sql/benchmarks/tpch/Tests/16-plan.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
sql/benchmarks/tpch/Tests/17-plan.stable.out.int128
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-plan.stable.out.int128
sql/include/sql_catalog.h
sql/server/rel_dump.c
sql/server/rel_exp.c
sql/server/rel_exp.h
sql/server/rel_optimizer.c
sql/server/rel_select.c
sql/server/sql_parser.y
sql/storage/bat/bat_storage.c
sql/storage/bat/bat_table.c
sql/storage/store.c
sql/test/BugTracker-2009/Tests/primekeyconstraint.SF-2783425.stable.err
sql/test/BugTracker-2014/Tests/All
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check5.stable.out.int128
sql/test/leaks/Tests/select1.stable.out.int128
sql/test/leaks/Tests/select2.stable.out.int128
sql/test/pg_regress/Tests/alter_table.sql
sql/test/pg_regress/Tests/alter_table.stable.err
sql/test/pg_regress/Tests/alter_table.stable.out
sql/test/pg_regress/Tests/float4.sql
sql/test/pg_regress/Tests/float4.stable.err
sql/test/pg_regress/Tests/float4.stable.out
sql/test/pg_regress/Tests/float8.sql
sql/test/pg_regress/Tests/float8.stable.err
sql/test/pg_regress/Tests/float8.stable.out
sql/test/pg_regress/Tests/insert.sql
sql/test/pg_regress/Tests/insert.stable.err
sql/test/pg_regress/Tests/insert.stable.out
sql/test/pg_regress/Tests/oid.sql
sql/test/pg_regress/Tests/oid.stable.err
sql/test/pg_regress/Tests/oid.stable.out
sql/test/pg_regress/Tests/strings.sql
sql/test/pg_regress/Tests/strings.stable.err
sql/test/pg_regress/Tests/strings.stable.out
Branch: geo
Log Message:

Merge with default branch.

MonetDB: transaction-replication - Merge with default branch.

2014-09-11 Thread Sjoerd Mullender

Changeset: 11583e2c959b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=11583e2c959b
Added Files:
sql/test/BugTracker-2014/Tests/locate-offset.Bug-3563.sql
sql/test/BugTracker-2014/Tests/locate-offset.Bug-3563.stable.err
sql/test/BugTracker-2014/Tests/locate-offset.Bug-3563.stable.out
sql/test/BugTracker-2014/Tests/round-sorted.Bug-3562.sql
sql/test/BugTracker-2014/Tests/round-sorted.Bug-3562.stable.err
sql/test/BugTracker-2014/Tests/round-sorted.Bug-3562.stable.out
Modified Files:
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
clients/Tests/MAL-signatures_all.stable.out
clients/Tests/MAL-signatures_all.stable.out.int128
clients/Tests/MAL-signatures_fits_geom.stable.out
clients/Tests/MAL-signatures_fits_geom.stable.out.int128
clients/Tests/MAL-signatures_geom.stable.out
clients/Tests/MAL-signatures_geom.stable.out.int128
clients/Tests/MAL-signatures_none.stable.out
clients/Tests/MAL-signatures_none.stable.out.int128
clients/mapiclient/mclient.c
clients/odbc/driver/ODBCUtil.c
clients/odbc/driver/README
clients/odbc/driver/SQLParamOptions.c
clients/odbc/driver/SQLSetConnectAttr.c
clients/odbc/driver/SQLSetConnectOption.c
clients/odbc/driver/SQLSetDescField.c
clients/odbc/driver/SQLSetEnvAttr.c
clients/odbc/driver/SQLSetStmtAttr.c
clients/odbc/driver/SQLSetStmtOption.c
clients/odbc/samples/arraytest.c
clients/odbc/samples/odbcsample1.c
clients/odbc/samples/testgetinfo.c
clients/odbc/winsetup/setup.c
configure.ag
gdk/gdk.h
gdk/gdk_atoms.c
gdk/gdk_bat.c
gdk/gdk_calc.c
gdk/gdk_group.c
gdk/gdk_heap.c
gdk/gdk_imprints.c
gdk/gdk_private.h
gdk/gdk_setop.c
gdk/gdk_utils.c
monetdb5/modules/atoms/str.c
monetdb5/modules/mal/pcre.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_fround_impl.h
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_optimizer.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statistics.c
sql/include/sql_catalog.h
sql/server/sql_parser.y
sql/storage/bat/bat_storage.c
sql/storage/store.c
sql/test/BugTracker-2014/Tests/All
Branch: transaction-replication
Log Message:

Merge with default branch.


diffs (truncated from 4165 to 300 lines):

diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj 
b/NT/installer32/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer32/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj
@@ -566,8 +566,8 @@
 {
 Name = 8:Microsoft Visual Studio
 ProductName = 8:MonetDB ODBC Driver
-ProductCode = 8:{66BABD32-D69D-4A89-A7F3-2655D4CD0641}
-PackageCode = 8:{D9B2D386-1461-43BC-9A63-93F1BA0D7921}
+ProductCode = 8:{2343A06A-C2EE-4093-A9D0-76BD33BD911E}
+PackageCode = 8:{3D25FE62-3ACA-4E4F-8C44-00F612B05AF2}
 UpgradeCode = 8:{C1F69378-3F5C-4120-8224-32F07D3458F3}
 AspNetVersion = 8:4.0.30319.0
 RestartWWWService = 11:FALSE
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj 
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -420,8 +420,8 @@
 {
 Name = 8:Microsoft Visual Studio
 ProductName = 8:MonetDB5 SQL GIS Module
-ProductCode = 8:{66BABD32-D69D-4A89-A7F3-2655D4CD0641}
-PackageCode = 8:{D9B2D386-1461-43BC-9A63-93F1BA0D7921}
+ProductCode = 8:{C3E5CF14-CA74-4A9C-8051-AC733123C5F6}
+PackageCode = 8:{E77DD8EF-7830-4D56-97BE-26A2296F7008}
 UpgradeCode = 8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}
 AspNetVersion = 8:4.0.30319.0
 RestartWWWService = 11:FALSE
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj 
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -4288,8 +4288,8 @@
 {
 Name = 8:Microsoft Visual Studio
 ProductName = 8:MonetDB5
-ProductCode = 8:{66BABD32-D69D-4A89-A7F3-2655D4CD0641}
-PackageCode = 8:{D9B2D386-1461-43BC-9A63-93F1BA0D7921}
+ProductCode = 8:{38BA5ECB-FCAA-46C3-BBEE-AA6A09D97B92}
+PackageCode = 8:{E537E35E-EB72-4AA5-A2F9-E4A4E5D92635}
 UpgradeCode = 8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}
 AspNetVersion = 8:4.0.30319.0
 RestartWWWService = 11:FALSE
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@

MonetDB: mosaic - Merge with default branch.

2014-09-11 Thread Sjoerd Mullender

Changeset: 2107e12b431c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2107e12b431c
Added Files:
sql/test/BugTracker-2014/Tests/locate-offset.Bug-3563.sql
sql/test/BugTracker-2014/Tests/locate-offset.Bug-3563.stable.err
sql/test/BugTracker-2014/Tests/locate-offset.Bug-3563.stable.out
sql/test/BugTracker-2014/Tests/round-sorted.Bug-3562.sql
sql/test/BugTracker-2014/Tests/round-sorted.Bug-3562.stable.err
sql/test/BugTracker-2014/Tests/round-sorted.Bug-3562.stable.out
Modified Files:
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
clients/Tests/MAL-signatures_all.stable.out
clients/Tests/MAL-signatures_all.stable.out.int128
clients/Tests/MAL-signatures_fits_geom.stable.out
clients/Tests/MAL-signatures_fits_geom.stable.out.int128
clients/Tests/MAL-signatures_geom.stable.out
clients/Tests/MAL-signatures_geom.stable.out.int128
clients/Tests/MAL-signatures_none.stable.out
clients/Tests/MAL-signatures_none.stable.out.int128
clients/mapiclient/mclient.c
clients/odbc/driver/ODBCUtil.c
clients/odbc/driver/README
clients/odbc/driver/SQLParamOptions.c
clients/odbc/driver/SQLSetConnectAttr.c
clients/odbc/driver/SQLSetConnectOption.c
clients/odbc/driver/SQLSetDescField.c
clients/odbc/driver/SQLSetEnvAttr.c
clients/odbc/driver/SQLSetStmtAttr.c
clients/odbc/driver/SQLSetStmtOption.c
clients/odbc/samples/arraytest.c
clients/odbc/samples/odbcsample1.c
clients/odbc/samples/testgetinfo.c
clients/odbc/winsetup/setup.c
configure.ag
gdk/gdk.h
gdk/gdk_aggr.c
gdk/gdk_atoms.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_calc.c
gdk/gdk_group.c
gdk/gdk_heap.c
gdk/gdk_imprints.c
gdk/gdk_private.h
gdk/gdk_select.c
gdk/gdk_setop.c
gdk/gdk_utils.c
gdk/gdk_value.c
monetdb5/mal/mal_instruction.c
monetdb5/modules/atoms/str.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/pcre.mal
sql/backends/monet5/LSST/Tests/lsst_htmxmatch.sql
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_fround_impl.h
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_optimizer.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statement.h
sql/backends/monet5/sql_statistics.c
sql/benchmarks/tpch/Tests/02-plan.stable.out
sql/benchmarks/tpch/Tests/09-plan.stable.out.int128
sql/benchmarks/tpch/Tests/13-plan.stable.out
sql/benchmarks/tpch/Tests/16-plan.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
sql/benchmarks/tpch/Tests/17-plan.stable.out.int128
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-plan.stable.out.int128
sql/include/sql_catalog.h
sql/server/rel_dump.c
sql/server/rel_exp.c
sql/server/rel_exp.h
sql/server/rel_optimizer.c
sql/server/rel_select.c
sql/server/sql_parser.y
sql/storage/bat/bat_storage.c
sql/storage/bat/bat_table.c
sql/storage/store.c
sql/test/BugTracker-2009/Tests/primekeyconstraint.SF-2783425.stable.err
sql/test/BugTracker-2014/Tests/All
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check5.stable.out.int128
sql/test/leaks/Tests/select1.stable.out.int128
sql/test/leaks/Tests/select2.stable.out.int128
sql/test/pg_regress/Tests/alter_table.sql
sql/test/pg_regress/Tests/alter_table.stable.err
sql/test/pg_regress/Tests/alter_table.stable.out
sql/test/pg_regress/Tests/float4.sql
sql/test/pg_regress/Tests/float4.stable.err
sql/test/pg_regress/Tests/float4.stable.out
sql/test/pg_regress/Tests/float8.sql
sql/test/pg_regress/Tests/float8.stable.err
sql/test/pg_regress/Tests/float8.stable.out
sql/test/pg_regress/Tests/insert.sql
sql/test/pg_regress/Tests/insert.stable.err
sql/test/pg_regress/Tests/insert.stable.out
sql/test/pg_regress/Tests/oid.sql
sql/test/pg_regress/Tests/oid.stable.err
sql/test/pg_regress/Tests/oid.stable.out
sql/test/pg_regress/Tests/strings.sql
sql/test/pg_regress/Tests/strings.stable.err
sql/test/pg_regress/Tests/strings.stable.out
Branch: mosaic
Log Message:

Merge with default branch.

MonetDB: BDCC - BDCC bin join can now be done as in select * fro...

2014-09-11 Thread justin

Changeset: d3a3ad91dbab for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d3a3ad91dbab
Modified Files:
sql/backends/monet5/BDCC/Makefile.ag
sql/backends/monet5/BDCC/bdcc.mal
Branch: BDCC
Log Message:

BDCC bin join can now be done as in select * from l, r where [l.c, lmask] 
xtrrevjoin [r.d, rmask] using the MAL function bdcc.xtrrevjoin.


diffs (36 lines):

diff --git a/sql/backends/monet5/BDCC/Makefile.ag 
b/sql/backends/monet5/BDCC/Makefile.ag
--- a/sql/backends/monet5/BDCC/Makefile.ag
+++ b/sql/backends/monet5/BDCC/Makefile.ag
@@ -41,7 +41,7 @@ lib__bdcc = {
 headers_mal = {
HEADERS = mal
DIR = libdir/monetdb5
-   SOURCES = bdcc.mal
+   SOURCES = bdcc.mal gs.mal
 }
 
 # headers_sql = {
@@ -53,7 +53,7 @@ headers_mal = {
 headers_autoload = {
HEADERS = mal
DIR = libdir/monetdb5/autoload
-   SOURCES = 82_bdcc.mal
+   SOURCES = 82_bdcc.mal 83_gs.mal
 }
 
 # EXTRA_DIST_DIR = Tests
diff --git a/sql/backends/monet5/BDCC/bdcc.mal 
b/sql/backends/monet5/BDCC/bdcc.mal
--- a/sql/backends/monet5/BDCC/bdcc.mal
+++ b/sql/backends/monet5/BDCC/bdcc.mal
@@ -3,9 +3,9 @@ module bdcc;
 command xtrRev(b:bat[:oid,:int], mask:int):bat[:oid,:int]
 address BDCCxtrRev;
 
-function xtrJoin(x:bat[:oid,:int], y:bat[:oid,:int], xM:int, yM:int) 
(l:bat[:oid,:oid],r:bat[:oid,:oid]);
+function xtrrevjoin(x:bat[:oid,:int], xM:int, y:bat[:oid,:int], yM:int) 
(l:bat[:oid,:oid],r:bat[:oid,:oid]);
 xRev := xtrRev(x, xM);
 yRev := xtrRev(y, yM);
 (l, r) := algebra.join(xRev, yRev);
 return (l, r);
-end xtrJoin;
+end xtrrevjoin;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: BDCC - Forgot to commit the code for generate_series.

2014-09-11 Thread justin

Changeset: cd9902cfbd76 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cd9902cfbd76
Added Files:
sql/backends/monet5/BDCC/83_gs.mal
sql/backends/monet5/BDCC/gs.mal
Branch: BDCC
Log Message:

Forgot to commit the code for generate_series.


diffs (38 lines):

diff --git a/sql/backends/monet5/BDCC/83_gs.mal 
b/sql/backends/monet5/BDCC/83_gs.mal
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/BDCC/83_gs.mal
@@ -0,0 +1,1 @@
+include gs;
diff --git a/sql/backends/monet5/BDCC/gs.mal b/sql/backends/monet5/BDCC/gs.mal
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/BDCC/gs.mal
@@ -0,0 +1,27 @@
+module gs;
+
+function generate_series(start:int, end:int):bat[:oid, :int];
+i := start;
+res := bat.new(:oid, :int);
+
+barrier b := i=end;
+bat.append(res, i);
+i := i + 1;
+redo b := i=end;
+exit b;
+
+return res;
+end generate_series;
+
+function generate_series(start:int, end:int, inc:int):bat[:oid, :int];
+i := start;
+res := bat.new(:oid, :int);
+
+barrier b := i=end;
+bat.append(res, i);
+i := i + inc;
+redo b := i=end;
+exit b;
+ 
+return res;
+end generate_series;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Oct2014 - Fix for bug 3563: don't confuse needle and ha...

MonetDB: default - Merge with Oct2014 branch.

MonetDB: default - Approved output.

MonetDB: geo - Merge with default branch.

MonetDB: transaction-replication - Merge with default branch.

MonetDB: mosaic - Merge with default branch.

MonetDB: BDCC - BDCC bin join can now be done as in select * fro...

MonetDB: BDCC - Forgot to commit the code for generate_series.

8 matches

Site Navigation

Mail list logo

Footer information