Changeset: 811d909b512c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=811d909b512c
Added Files:
sql/test/BugTracker-2015/Tests/left_shift_inet.Bug-3730.sql
sql/test/BugTracker-2015/Tests/left_shift_inet.Bug-3730.stable.err
sql/test/BugTracker-2015/Tests/left_shift_inet.Bug-3730.stable.out
sql/test/BugTracker-2015/Tests/outerjoin_project.Bug-3725.sql
sql/test/BugTracker-2015/Tests/outerjoin_project.Bug-3725.stable.err
sql/test/BugTracker-2015/Tests/outerjoin_project.Bug-3725.stable.out
sql/test/BugTracker-2015/Tests/string_split.Bug-3564.sql
sql/test/BugTracker-2015/Tests/string_split.Bug-3564.stable.err
sql/test/BugTracker-2015/Tests/string_split.Bug-3564.stable.out
sql/test/BugTracker-2015/Tests/true_or_predicate.Bug-3733.sql
sql/test/BugTracker-2015/Tests/true_or_predicate.Bug-3733.stable.err
sql/test/BugTracker-2015/Tests/true_or_predicate.Bug-3733.stable.out
sql/test/remote/Tests/partition_elim.sql
sql/test/remote/Tests/partition_elim.stable.err
sql/test/remote/Tests/partition_elim.stable.out
Modified Files:
.hgtags
MonetDB.spec
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
NT/rules.msc
clients/R/MonetDB.R/DESCRIPTION
clients/R/MonetDB.R/NEWS
clients/R/MonetDB.R/R/dbi.R
clients/R/Tests/dbi.R
clients/R/Tests/dplyr.R
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
clients/mapilib/mapi.rc
clients/nodejs/Tests/nodetest.js
clients/nodejs/monetdb/mapiclient.js
clients/nodejs/monetdb/package.json
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
clients/python2/setup.py
clients/python3/setup.py
configure.ag
debian/changelog
gdk/gdk.h
gdk/gdk_bbp.c
gdk/gdk_calc_private.h
gdk/gdk_logger.c
gdk/gdk_search.c
gdk/gdk_search.h
gdk/libbat.rc
geom/monetdb5/geom.c
geom/monetdb5/geom.mal
geom/sql/40_geom.sql
libversions
monetdb5/modules/atoms/str.c
monetdb5/modules/atoms/str.h
monetdb5/modules/atoms/str.mal
monetdb5/modules/mal/joinpath.c
monetdb5/tools/libmonetdb5.rc
sql/backends/monet5/Tests/rapi12.sql
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.mal
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_scenario.c
sql/common/sql_types.c
sql/server/rel_exp.c
sql/server/rel_exp.h
sql/server/rel_optimizer.c
sql/server/rel_select.c
sql/server/rel_select.h
sql/server/rel_updates.c
sql/server/sql_atom.c
sql/server/sql_atom.h
sql/server/sql_parser.y
sql/server/sql_scan.c
sql/storage/bat/bat_logger.c
sql/storage/bat/bat_utils.c
sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.out.oid32
sql/test/BugTracker-2015/Tests/All
sql/test/BugTracker-2015/Tests/case_aggr.Bug-3705.sql
sql/test/BugTracker-2015/Tests/case_aggr.Bug-3705.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
vertoo.data
Branch: transaction-replication
Log Message:
Merge with default branch
Resolve gdk_logger conflics due to new flushing before logger creation
diffs (truncated from 4812 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -593,3 +593,6 @@ 0529873485e7ec8e4c723f8bf7fc14020a7390b2
f59ba5dedd0122403ab175cd1d44a88ab6b3be02 Oct2014_SP3_release
027c8ada676bad1e7af0703ae48c27c6fb8433a0 Oct2014_13
027c8ada676bad1e7af0703ae48c27c6fb8433a0 Oct2014_SP4_release
+a1a48562a4651b1beb3168290777cbeb91f474d8 Oct2014_15
+027c8ada676bad1e7af0703ae48c27c6fb8433a0 Oct2014_SP4_release
+a1a48562a4651b1beb3168290777cbeb91f474d8 Oct2014_SP4_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -970,6 +970,13 @@ mv %{buildroot}%{_datadir}/doc/MonetDB-S
%postun -p /sbin/ldconfig
%changelog
+* Wed Jun 03 2015 Sjoerd Mullender <sjo...@acm.org> - 11.19.15-20150603
+- Rebuilt.
+- BZ#3707: var() possibly not working in debug builds
+- BZ#3720: Incorrect results on joining with same table
+- BZ#3725: LEFT JOIN bug with CONST value
+- BZ#3731: left shift for IP addresses not available to non-system users
+
* Tue May 19 2015 Sjoerd Mullender <sjo...@acm.org> - 11.19.13-20150519
- Rebuilt.
- BZ#3712: Concurrency issue on querying the SQL catalog
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
@@ -330,7 +330,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_779449EF5BAD4B068A50802402E52278"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1k.win32\\bin\\libeay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.2a.win32\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -370,7 +370,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B1B1C0011D7945F892A77F529772EA72"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1k.win32\\bin\\ssleay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.2a.win32\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
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
@@ -1770,7 +1770,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2E0FEE7726DA47369758C263666F3DB1"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1k.win32\\lib\\libeay32.lib"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.2a.win32\\lib\\libeay32.lib"
"TargetName" = "8:libeay32.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -1970,7 +1970,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_45C820B6483D494EBFE6F9A28A30760C"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1k.win32\\bin\\ssleay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.2a.win32\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
"Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
@@ -2150,7 +2150,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_52DCEC5806254D3F9246489B9C5DFC27"
{
- "SourcePath" = "8:C:\\Libraries\\pcre-8.36.win32\\bin\\pcre.dll"
+ "SourcePath" = "8:C:\\Libraries\\pcre-8.37.win32\\bin\\pcre.dll"
"TargetName" = "8:pcre.dll"
"Tag" = "8:"
"Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
@@ -2490,7 +2490,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_732094CE07974147A084EDD6A5F43C6F"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1k.win32\\lib\\ssleay32.lib"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.2a.win32\\lib\\ssleay32.lib"
"TargetName" = "8:ssleay32.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -2870,7 +2870,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A3D31DA50E0F4AE1873E390D5B7F1F33"
{
- "SourcePath" = "8:C:\\Libraries\\pcre-8.36.win32\\lib\\pcre.lib"
+ "SourcePath" = "8:C:\\Libraries\\pcre-8.37.win32\\lib\\pcre.lib"
"TargetName" = "8:pcre.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -3650,7 +3650,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E80B0549492B4D76B7EB93941A6BF89D"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1k.win32\\bin\\libeay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.2a.win32\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
"Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
diff --git a/NT/installer64/MonetDB-ODBC-Installer.vdproj
b/NT/installer64/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer64/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer64/MonetDB-ODBC-Installer.vdproj
@@ -330,7 +330,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_779449EF5BAD4B068A50802402E52278"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1k.win64\\bin\\libeay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.2a.win64\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -370,7 +370,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B1B1C0011D7945F892A77F529772EA72"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1k.win64\\bin\\ssleay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.2a.win64\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -1770,7 +1770,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2E0FEE7726DA47369758C263666F3DB1"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1k.win64\\lib\\libeay32.lib"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.2a.win64\\lib\\libeay32.lib"
"TargetName" = "8:libeay32.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -1970,7 +1970,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_45C820B6483D494EBFE6F9A28A30760C"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1k.win64\\bin\\ssleay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.2a.win64\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
"Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
@@ -2150,7 +2150,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_52DCEC5806254D3F9246489B9C5DFC27"
{
- "SourcePath" = "8:C:\\Libraries\\pcre-8.36.win64\\bin\\pcre.dll"
+ "SourcePath" = "8:C:\\Libraries\\pcre-8.37.win64\\bin\\pcre.dll"
"TargetName" = "8:pcre.dll"
"Tag" = "8:"
"Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
@@ -2490,7 +2490,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_732094CE07974147A084EDD6A5F43C6F"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1k.win64\\lib\\ssleay32.lib"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.2a.win64\\lib\\ssleay32.lib"
"TargetName" = "8:ssleay32.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -2870,7 +2870,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A3D31DA50E0F4AE1873E390D5B7F1F33"
{
- "SourcePath" = "8:C:\\Libraries\\pcre-8.36.win64\\lib\\pcre.lib"
+ "SourcePath" = "8:C:\\Libraries\\pcre-8.37.win64\\lib\\pcre.lib"
"TargetName" = "8:pcre.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -3650,7 +3650,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E80B0549492B4D76B7EB93941A6BF89D"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1k.win64\\bin\\libeay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.2a.win64\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
"Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
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
@@ -1036,19 +1036,23 @@ typedef unsigned __int64 uint64_t;
#ifdef HAVE_LONG_LONG
typedef long long lng;
+typedef unsigned long long ulng;
# define SIZEOF_LNG SIZEOF_LONG_LONG
#else
typedef __int64 lng;
+typedef unsigned __int64 ulng;
# define SIZEOF_LNG SIZEOF___INT64
#endif
#ifdef HAVE___INT128
typedef __int128 hge;
+typedef unsigned __int128 uhge;
# define HAVE_HGE 1
# define SIZEOF_HGE SIZEOF___INT128
#else
# if defined(HAVE___INT128_T) && defined(HAVE___UINT128_T)
typedef __int128_t hge;
+typedef __uint128_t uhge;
# define HAVE_HGE 1
# define SIZEOF_HGE SIZEOF___INT128_T
# endif
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -86,18 +86,6 @@ PYTHON3LIB=python32.lib
PYTHON3_LIBDIR=share\MonetDB\python3
!IFDEF HAVE_PERL
-!IFNDEF LIBPERL
-!IF $(bits) == 32
-LIBPERL = C:\Perl
-!ELSE
-LIBPERL = C:\Perl64
-!ENDIF
-!ENDIF
-!IFNDEF PERLLIB
-PERLLIB = perl510.lib
-!ENDIF
-PERL_INCS = -I$(LIBPERL)\lib\CORE -DWIN32
-PERL_LIBS = $(LIBPERL)\lib\CORE\$(PERLLIB)
PERL_LIBDIR = share\MonetDB\perl
!ENDIF
diff --git a/clients/R/MonetDB.R/DESCRIPTION b/clients/R/MonetDB.R/DESCRIPTION
--- a/clients/R/MonetDB.R/DESCRIPTION
+++ b/clients/R/MonetDB.R/DESCRIPTION
@@ -1,5 +1,5 @@
Package: MonetDB.R
-Version: 0.9.8
+Version: 0.9.9
Title: Connect MonetDB to R
Authors@R: c(person("Hannes Muehleisen", role = c("aut", "cre"),email =
"han...@cwi.nl"),
person("Thomas Lumley", role = "ctb"),
diff --git a/clients/R/MonetDB.R/NEWS b/clients/R/MonetDB.R/NEWS
--- a/clients/R/MonetDB.R/NEWS
+++ b/clients/R/MonetDB.R/NEWS
@@ -1,3 +1,6 @@
+0.9.9
+- dbWriteTable now quotes column names
+
0.9.8
- Added support for esoteric data types such as MONTH_INTERVAL (Thanks, Roman)
- Cleaned up SQL to R type mapping (we had this twice)
diff --git a/clients/R/MonetDB.R/R/dbi.R b/clients/R/MonetDB.R/R/dbi.R
--- a/clients/R/MonetDB.R/R/dbi.R
+++ b/clients/R/MonetDB.R/R/dbi.R
@@ -319,7 +319,7 @@ setMethod("dbWriteTable", "MonetDBConnec
}
if (!dbExistsTable(conn, qname)) {
fts <- sapply(value, dbDataType, dbObj=conn)
- fdef <- paste(make.db.names(conn, names(value)), fts, collapse=', ')
+ fdef <- paste('"', make.db.names(conn, names(value)), '"', fts,
collapse=', ')
ct <- paste("CREATE TABLE ", qname, " (", fdef, ")", sep= '')
dbSendUpdate(conn, ct)
}
diff --git a/clients/R/Tests/dbi.R b/clients/R/Tests/dbi.R
--- a/clients/R/Tests/dbi.R
+++ b/clients/R/Tests/dbi.R
@@ -180,6 +180,12 @@ stopifnot(!dbIsValid(conn))
stopifnot(identical(dbDisconnect(con),TRUE))
stopifnot(identical(dbDisconnect(con),TRUE))
+# reserved words in data frame column names
+stopifnot(dbIsValid(conn))
+dbBegin(conn)
+dbWriteTable(conn, "evilt", data.frame(year=42,month=12, day=24),
transaction=F)
+stopifnot(dbExistsTable(conn, "evilt"))
+dbRollback(conn)
#test merovingian control code
diff --git a/clients/R/Tests/dplyr.R b/clients/R/Tests/dplyr.R
--- a/clients/R/Tests/dplyr.R
+++ b/clients/R/Tests/dplyr.R
@@ -98,10 +98,39 @@ print(nrow(head(anti_join(player_info, h
}))
# TODO: set ops
+
# sample functions
print(nrow(sample_n(player_info, 24L)))
print(nrow(head(sample_frac(player_info, .5), n=25L)))
+
+dbWriteTable(dps$con, "mtcars", mtcars)
+my_tbl <- tbl(dps, "mtcars")
+
+# https://github.com/hadley/dplyr/issues/1165
+my_tbl %>%
+ group_by( cyl , gear ) %>%
+ summarise( n = n() )
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
