Changeset: 453efd75f1a2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=453efd75f1a2
Modified Files:
sql/src/backends/monet5/sql_optimizer.mx
sql/src/server/rel_optimizer.mx
sql/src/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.bat
sql/src/test/BugTracker-2008/Tests/insert-null-byte.SF-2233581.SQL.sh
sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.SQL.bat
sql/src/test/BugTracker-2009/Tests/dumping_tables.SF-2776908.SQL.sh
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975018/Tests/alter-table-restart-crash.SF-2975018-1.sql
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975018/Tests/alter-table-restart-crash.SF-2975018-1.stable.err
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975018/Tests/alter-table-restart-crash.SF-2975018-1.stable.out
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975018/Tests/alter-table-restart-crash.SF-2975018-2.sql
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975018/Tests/alter-table-restart-crash.SF-2975018-2.stable.err
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975018/Tests/alter-table-restart-crash.SF-2975018-2.stable.out
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975022/Tests/alter-table-restart-crash.SF-2975022-1.sql
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975022/Tests/alter-table-restart-crash.SF-2975022-1.stable.err
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975022/Tests/alter-table-restart-crash.SF-2975022-1.stable.out
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975022/Tests/alter-table-restart-crash.SF-2975022-2.sql
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975022/Tests/alter-table-restart-crash.SF-2975022-2.stable.err
sql/src/test/BugTracker-2010/alter-table-restart-crash.SF-2975022/Tests/alter-table-restart-crash.SF-2975022-2.stable.out
sql/src/test/Tests/like_tests.SQL.bat
sql/src/test/Tests/like_tests.SQL.sh
sql/src/test/Tests/null-byte-hang.SQL.bat
sql/src/test/Tests/null-byte-hang.SQL.sh
sql/src/test/Tests/zones2.SQL.bat
sql/src/test/Tests/zones2.SQL.sh
Branch: default
Log Message:
merge
diffs (truncated from 11017 to 300 lines):
diff -r 32ef46b52453 -r 453efd75f1a2
MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj
--- a/MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj Thu Aug 19 18:05:06
2010 +0200
+++ b/MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj Thu Aug 19 18:05:43
2010 +0200
@@ -187,7 +187,7 @@
{
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0F567DEF0CA64069BF1409C4AC7228E3"
{
- "SourcePath" = "8:C:\\bzip2-1.0.5.win32\\bin\\libbz2.dll"
+ "SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.5.win32\\bin\\libbz2.dll"
"TargetName" = "8:libbz2.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -227,7 +227,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_29FE781523A94CBDA5CD53F7A319B4D8"
{
- "SourcePath" = "8:C:\\openssl-0.9.8k.win32\\bin\\ssleay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win32\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -267,7 +267,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_61B2E04FDCD84F34A63853B93B1DCD7B"
{
- "SourcePath" = "8:C:\\zlib-1.2.3.win32\\bin\\zlib1.dll"
+ "SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win32\\bin\\zlib1.dll"
"TargetName" = "8:zlib1.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -287,7 +287,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_926BCA1A727C4F29B3DA99D425D895EA"
{
- "SourcePath" = "8:C:\\openssl-0.9.8k.win32\\bin\\libeay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win32\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -307,7 +307,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BB4791ABAA4349E4A0DE1EDA0772E622"
{
- "SourcePath" = "8:C:\\pthreads\\lib\\pthreadVC2.dll"
+ "SourcePath" = "8:C:\\Libraries\\Pthreads\\lib\\pthreadVC2.dll"
"TargetName" = "8:pthreadVC2.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -447,7 +447,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DE40D199E1B2498F84A1EB70CBD21614"
{
- "SourcePath" = "8:C:\\iconv-1.11.1.win32\\bin\\iconv.dll"
+ "SourcePath" =
"8:C:\\Libraries\\iconv-1.11.1.win32\\bin\\iconv.dll"
"TargetName" = "8:iconv.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
diff -r 32ef46b52453 -r 453efd75f1a2
MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj
--- a/MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj Thu Aug 19 18:05:06
2010 +0200
+++ b/MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj Thu Aug 19 18:05:43
2010 +0200
@@ -207,7 +207,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_43E49CA0EC774DEF94E2596DAC7364FB"
{
- "SourcePath" = "8:C:\\openssl-0.9.8k.win64\\bin\\libeay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win64\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -247,7 +247,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_61B2E04FDCD84F34A63853B93B1DCD7B"
{
- "SourcePath" = "8:C:\\zlib-1.2.3.win64\\bin\\zlib1.dll"
+ "SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win64\\bin\\zlib1.dll"
"TargetName" = "8:zlib1.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -267,7 +267,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_61BDF3C1EF544447820D9544098DD817"
{
- "SourcePath" = "8:C:\\openssl-0.9.8k.win64\\bin\\ssleay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win64\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -287,7 +287,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BB4791ABAA4349E4A0DE1EDA0772E622"
{
- "SourcePath" = "8:C:\\pthreads\\lib64\\pthreadVC2.dll"
+ "SourcePath" = "8:C:\\Libraries\\Pthreads\\lib64\\pthreadVC2.dll"
"TargetName" = "8:pthreadVC2.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -407,7 +407,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DC301A823AB94F7D92F5D30466B8E3B0"
{
- "SourcePath" = "8:C:\\bzip2-1.0.5.win64\\bin\\libbz2.dll"
+ "SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.5.win64\\bin\\libbz2.dll"
"TargetName" = "8:libbz2.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -447,7 +447,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DE40D199E1B2498F84A1EB70CBD21614"
{
- "SourcePath" = "8:C:\\iconv-1.11.1.win64\\bin\\iconv.dll"
+ "SourcePath" =
"8:C:\\Libraries\\iconv-1.11.1.win64\\bin\\iconv.dll"
"TargetName" = "8:iconv.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
diff -r 32ef46b52453 -r 453efd75f1a2 MonetDB/debian/changelog
--- a/MonetDB/debian/changelog Thu Aug 19 18:05:06 2010 +0200
+++ b/MonetDB/debian/changelog Thu Aug 19 18:05:43 2010 +0200
@@ -49,23 +49,23 @@
monetdb (1.38.1-20100618) unstable; urgency=low
* Made compilation of "testing" (and "java") independent of MonetDB.
- This is mainly for Windows, but also on other systems, "testing" can now be
- built independently of (and hence before) "MonetDB".
- Files that mimic configure functionality on Windows were moved from
- "MonetDB" to "buildtools"; hence, this affects all packages on Windows,
- requiring a complete rebuild from scratch on Windows.
- getopt() support in testing has changed; hence, (most probably) requiring a
- rebuild from scratch of testing on other systems.
+ This is mainly for Windows, but also on other systems, "testing"
+ can now be built independently of (and hence before) "MonetDB".
+ Files that mimic configure functionality on Windows were moved
+ from "MonetDB" to "buildtools"; hence, this affects all packages
+ on Windows, requiring a complete rebuild from scratch on Windows.
+ getopt() support in testing has changed; hence, (most probably)
+ requiring a rebuild from scratch of testing on other systems.
-- Stefan Manegold <maneg...@cwi.nl> Tue, 20 Apr 2010 10:58:37 +0200
monetdb (1.38.1-20100618) unstable; urgency=low
- * Implemented build directory support for Windows,
- i.e., like on Unix/Linux also on Windows we can now build in a separate
- build directory as alternative to ...<package>NT, and thus keep the
- latter clean from files generated during the build.
- On Windows, the build directory must be a sibling of ...<package>NT .
+ * Implemented build directory support for Windows, i.e., like on
+ Unix/Linux also on Windows we can now build in a separate build
+ directory as alternative to ...<package>NT, and thus keep the
+ latter clean from files generated during the build. On Windows,
+ the build directory must be a sibling of ...<package>NT .
-- Stefan Manegold <maneg...@cwi.nl> Tue, 20 Apr 2010 10:58:37 +0200
@@ -77,22 +77,23 @@
monetdb (1.36.5-20100420) unstable; urgency=low
- * Fixed a bug that could cause a crash when string BATs are combined.
- (SF bug 2947763.)
+ * Fixed a bug that could cause a crash when string BATs are
+ combined. (SF bug 2947763.)
-- Sjoerd Mullender <sjo...@acm.org> Thu, 15 Apr 2010 10:46:13 +0200
monetdb (1.36.5-20100420) unstable; urgency=low
- * Fixed a potential file leak: under certain conditions, files in the
- database might not get deleted when they should (they would be
+ * Fixed a potential file leak: under certain conditions, files in
+ the database might not get deleted when they should (they would be
deleted when the server restarts).
-- Niels Nes <ni...@cwi.nl> Sun, 11 Apr 2010 10:46:13 +0200
monetdb (1.36.5-20100420) unstable; urgency=low
- * Fix regression introduced in Feb2010-SP1 causing UDP connections to
malfunction, in particular affecting the stethoscope tool.
+ * Fix regression introduced in Feb2010-SP1 causing UDP connections
+ to malfunction, in particular affecting the stethoscope tool.
-- Fabian Groffen <fab...@cwi.nl> Mon, 29 Mar 2010 10:46:13 +0200
@@ -104,7 +105,8 @@
monetdb (1.36.3-20100322) unstable; urgency=low
- * Fixed bug in UDP stream creation causing UDP connections to already
+ * Fixed bug in UDP stream creation causing UDP connections to
+ already
-- Fabian Groffen <fab...@cwi.nl> Mon, 01 Mar 2010 11:35:46 +0100
@@ -117,18 +119,18 @@
monetdb (1.36.1-20100223) unstable; urgency=low
* Various concurrency bugs were fixed.
- * Various changes were made to run better on systems that don't have enough
- memory to keep everything in core that was touched during query processing.
- This is done by having the higher layers giving hints to the database
- kernel about future use, and the database kernel giving hings to the
- operating system kernel about how (virtual) memory is going to be used.
+ * Various changes were made to run better on systems that don't have
+ enough memory to keep everything in core that was touched during
+ query processing. This is done by having the higher layers giving
+ hints to the database kernel about future use, and the database
+ kernel giving hings to the operating system kernel about how
+ (virtual) memory is going to be used.
-- Sjoerd Mullender <sjo...@acm.org> Mon, 22 Feb 2010 15:14:34 +0100
monetdb (1.36.1-20100223) unstable; urgency=low
- * Fixed bug in mergejoin implementation.
- This fixes bug #2952191.
+ * Fixed bug in mergejoin implementation. This fixes bug #2952191.
-- Stefan Manegold <stefan.maneg...@cwi.nl> Thu, 18 Feb 2010 15:14:34 +0100
@@ -141,34 +143,34 @@
monetdb (1.36.1-20100223) unstable; urgency=low
- * Fix compilation issue when configured with --with-curl.
- This fixes bug #2924999.
+ * Fix compilation issue when configured with --with-curl. This
+ fixes bug #2924999.
-- Sjoerd Mullender <sjo...@acm.org> Thu, 21 Jan 2010 15:14:34 +0100
monetdb (1.36.1-20100223) unstable; urgency=low
- * Added implementation of MT_getrss() for Solaris. This yields in the
- kernel knowing about its (approximate) memory usage to try and help
- the operating system to free that memory that is best to free, instead
- of a random page, e.g. the work of the vmtrim thread.
+ * Added implementation of MT_getrss() for Solaris. This yields in
+ the kernel knowing about its (approximate) memory usage to try and
+ help the operating system to free that memory that is best to
+ free, instead of a random page, e.g. the work of the vmtrim
+ thread.
-- Fabian Groffen <fab...@cwi.nl> Thu, 21 Jan 2010 15:14:34 +0100
monetdb (1.36.1-20100223) unstable; urgency=low
- * Implemented a "fast" string BAT append:
- Under certain conditions, instead of inserting values one-by-one,
- we now concatenate the string heap wholesale and just manipulate
- the offsets.
- This works both for BATins and BATappend.
+ * Implemented a "fast" string BAT append: Under certain conditions,
+ instead of inserting values one-by-one, we now concatenate the
+ string heap wholesale and just manipulate the offsets. This works
+ both for BATins and BATappend.
-- Sjoerd Mullender <sjo...@cwi.nl> Wed, 20 Jan 2010 15:14:34 +0100
monetdb (1.36.1-20100223) unstable; urgency=low
- * Changed the string heap implementation to also contain the hashes of
- strings.
+ * Changed the string heap implementation to also contain the hashes
+ of strings.
* Changed the implementation of the string offset columns to be
dynamically sized.
diff -r 32ef46b52453 -r 453efd75f1a2 MonetDB/src/gdk/gdk_bat.mx
--- a/MonetDB/src/gdk/gdk_bat.mx Thu Aug 19 18:05:06 2010 +0200
+++ b/MonetDB/src/gdk/gdk_bat.mx Thu Aug 19 18:05:43 2010 +0200
@@ -1898,6 +1898,7 @@
BUN r, s;
BATiter ui = bat_iterator(u);
+ BATaccessBegin(u, USE_HEAD | USE_TAIL, MMAP_SEQUENTIAL);
BATloop(u, r, s) {
oid updid = *(oid *) BUNhead(ui, r);
ptr val = BUNtail(ui, r);
@@ -1906,6 +1907,7 @@
return BUN_NONE;
nr++;
}
+ BATaccessEnd(u, USE_HEAD | USE_TAIL, MMAP_SEQUENTIAL);
return nr;
}
diff -r 32ef46b52453 -r 453efd75f1a2 MonetDB/src/gdk/gdk_bbp.mx
--- a/MonetDB/src/gdk/gdk_bbp.mx Thu Aug 19 18:05:06 2010 +0200
+++ b/MonetDB/src/gdk/gdk_bbp.mx Thu Aug 19 18:05:43 2010 +0200
@@ -114,7 +114,9 @@
/* update interface */
gdk_export void BBPclear(bat bid);
-gdk_export bat BBPinsert(BATstore *bs);
+#ifdef LIBGDK /* only used within GDK */
+extern bat BBPinsert(BATstore *bs);
+#endif
gdk_export void BBPcacheit(BATstore *bs, int lock);
gdk_export void BBPuncacheit(bat bid);
gdk_export int BBPreclaim(BAT *b);
@@ -151,16 +153,16 @@
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
