Changeset: d0b1c80f8b05 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d0b1c80f8b05
Added Files:
debian/monetdb-client-tools.install
Modified Files:
MonetDB.spec
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
clients/Tests/exports.stable.out
debian/control
debian/monetdb-client.install
debian/monetdb5-sql.install
gdk/gdk.h
gdk/gdk_join.c
gdk/gdk_private.h
gdk/gdk_relop.mx
gdk/gdk_select.c
gdk/gdk_system.c
gdk/gdk_system.h
monetdb5/modules/kernel/algebra.mx
sql/backends/monet5/Tests/optimizers.stable.out
sql/server/sql_parser.y
sql/server/sql_qc.c
sql/test/ADT2006/Tests/bram.stable.out
sql/test/BugDay_2005-10-06_2.8/Tests/string_quotes.SF-919539.stable.out
sql/test/BugDay_2005-10-06_2.9.3/Tests/UNION_JOIN_vs_plain_set_UNION-2.SF-920585.stable.out
sql/test/BugDay_2005-10-06_2.9.3/Tests/basic_arithmetics.SF-922252.stable.out
sql/test/BugDay_2005-10-06_2.9.3/Tests/case.SF-929151.stable.out
sql/test/BugDay_2005-10-06_2.9.3/Tests/jdbc_crashes_on_getTables.SF_944316.stable.out
sql/test/BugDay_2005-10-06_2.9.3/Tests/simple_union.SF-1005596.stable.out
sql/test/BugDay_2005-10-06_2.9.3/Tests/variable_arg_substring.SF_942981.stable.out
sql/test/BugDay_2005-11-09_2.8/Tests/crash_in_case.SF-1097749.stable.out
sql/test/BugDay_2005-11-09_2.9.3/Tests/sql_server_crash.SF-1080024.stable.out
sql/test/BugDay_2005-11-09_2.9.3/Tests/union-duplicates.SF-1119186.stable.out
sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.stable.out
sql/test/BugTracker-2009/Tests/IS_NULL_in_CASE.stable.out
sql/test/BugTracker-2009/Tests/group_by_on_values.SF-2837561.stable.out
sql/test/BugTracker-2009/Tests/not_equal.SF-2678502.stable.out
sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.stable.out
sql/test/BugTracker-2009/Tests/push_select_down_crash.stable.out
sql/test/BugTracker-2009/Tests/utf8_bug.SF-2822855.stable.out
sql/test/BugTracker-2010/Tests/crash_on_where_in.Bug-2333.stable.out
sql/test/BugTracker-2010/Tests/order_by_on_single_row_view.SF-2950453.stable.out
sql/test/BugTracker-2010/Tests/substring_display_width.Bug-2683.stable.out
sql/test/BugTracker-2011/Tests/case-when-alias.Bug-2848.stable.out
sql/test/BugTracker/Tests/assert_fails_on_algebra_version.SF-2019349.stable.out
sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.stable.err
sql/test/BugTracker/Tests/crash_on_delete.SF-1639108.stable.out
sql/test/BugTracker/Tests/crash_on_delete.SF-1651567.stable.out
sql/test/BugTracker/Tests/crash_on_insert.SF-1639113.stable.out
sql/test/BugTracker/Tests/insert_not_exists.SF-1380287.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Skyserver/Tests/Skyserver.stable.out
sql/test/Tests/coalesce.stable.out
sql/test/VOC/Tests/VOC.stable.out
sql/test/bugs/Tests/crash_order_by.stable.out
sql/test/bugs/Tests/select_from_values.stable.out
sql/test/bugs/Tests/simple_view.stable.out
sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out
sql/test/bugs/Tests/subselect_single_value-bug-sf-941791.stable.out
sql/test/bugs/Tests/subselect_union-bug-sf-941826.stable.out
sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.out
sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_MapiClient.stable.out
sql/test/bugs/Tests/union_all-bug-sf-941788.stable.out
sql/test/bugs/Tests/union_all_where_1=1-bug-sf-936386.stable.out
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check0_nogeom.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1_nogeom.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2_nogeom.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3_nogeom.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4_nogeom.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5_nogeom.stable.out
sql/test/leaks/Tests/drop3.stable.out
sql/test/leaks/Tests/drop3_nogeom.stable.out
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp1_nogeom.stable.out
sql/test/leaks/Tests/temp2.stable.out
sql/test/leaks/Tests/temp2_nogeom.stable.out
sql/test/leaks/Tests/temp3.stable.out
sql/test/leaks/Tests/temp3_nogeom.stable.out
sql/test/pg_regress/Tests/char.stable.out
sql/test/pg_regress/Tests/strings_concat.stable.out
sql/test/pg_regress/Tests/text.stable.out
sql/test/pg_regress/Tests/varchar.stable.out
sql/test/rdf/Tests/q2_28_v.stable.out
sql/test/rdf/Tests/q2_v.stable.out
sql/test/rdf/Tests/q3_28_v.stable.out
sql/test/rdf/Tests/q3_v.stable.out
sql/test/rdf/Tests/q4_28_v.stable.out
sql/test/rdf/Tests/q4_v.stable.out
sql/test/rdf/Tests/q6_28_v.stable.out
sql/test/rdf/Tests/q6_v.stable.out
Branch: rdf
Log Message:
Merge with default branch
diffs (truncated from 3667 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -143,11 +143,28 @@ MonetDB, you will very likely need this
%defattr(-,root,root)
%{_bindir}/mclient
%{_bindir}/msqldump
-%{_bindir}/stethoscope
%{_libdir}/libmapi.so.*
%doc %{_mandir}/man1/mclient.1.gz
%doc %{_mandir}/man1/msqldump.1.gz
+%package client-tools
+Summary: MonetDB - Monet Database Management System Client Programs
+Group: Applications/Databases
+Requires: %{name}-client = %{version}-%{release}
+
+%description client-tools
+MonetDB is a database management system that is developed from a
+main-memory perspective with use of a fully decomposed storage model,
+automatic index management, extensibility of data types and search
+accelerators. It also has an SQL frontend.
+
+This package contains stethoscope and tomograph.
+
+%files client-tools
+%defattr(-,root,root)
+%{_bindir}/stethoscope
+%{_bindir}/tomograph
+
%package client-devel
Summary: MonetDB - Monet Database Management System Client Programs
Group: Applications/Databases
@@ -688,7 +705,6 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir
# .la files
rm -f $RPM_BUILD_ROOT%{_libdir}/monetdb5/*.la
# internal development stuff
-rm -f $RPM_BUILD_ROOT%{_bindir}/calibrator
rm -f $RPM_BUILD_ROOT%{_bindir}/Maddlog
rm -f $RPM_BUILD_ROOT%{_libdir}/libbat.la
rm -f $RPM_BUILD_ROOT%{_libdir}/libbat.so
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
@@ -231,6 +231,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_399DA9FEC3D14CA1ABCAA84D75F3532E"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_3B793520B49D47C18CC14D2B737DA38C"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1721,6 +1727,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_399DA9FEC3D14CA1ABCAA84D75F3532E"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\createdb\\75_storagemodel.sql"
+ "TargetName" = "8:75_storagemodel.sql"
+ "Tag" = "8:"
+ "Folder" = "8:_7F962DDBDF894636B6CAFE6FE4887567"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3B793520B49D47C18CC14D2B737DA38C"
{
"SourcePath" = "8:lib\\monetdb5\\microbenchmark.mal"
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
@@ -369,12 +369,6 @@
}
"Entry"
{
- "MsmKey" = "8:_FEC2A3A2B0AE4D0990D6AE908F876EE4"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_6B9091C26D034EFD92BB0864ADB05B61"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -699,6 +693,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_BE5D88D9A25C4ED1A987747ABA28C358"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_BF77ED0A7E9C49478C26BAF11A3F2C37"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -915,6 +915,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_FEC2A3A2B0AE4D0990D6AE908F876EE4"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_FF4ED691FBAF49DEA4726DF1C1C90785"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -2181,26 +2187,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FEC2A3A2B0AE4D0990D6AE908F876EE4"
- {
- "SourcePath" = "8:lib\\monetdb5\\iterator.mal"
- "TargetName" = "8:iterator.mal"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6B9091C26D034EFD92BB0864ADB05B61"
{
"SourcePath" = "8:lib\\monetdb5\\json.mal"
@@ -3261,6 +3247,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BE5D88D9A25C4ED1A987747ABA28C358"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\createdb\\75_storagemodel.sql"
+ "TargetName" = "8:75_storagemodel.sql"
+ "Tag" = "8:"
+ "Folder" = "8:_7F962DDBDF894636B6CAFE6FE4887567"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BF77ED0A7E9C49478C26BAF11A3F2C37"
{
"SourcePath" = "8:lib\\monetdb5\\constraints.mal"
@@ -3981,6 +3987,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FEC2A3A2B0AE4D0990D6AE908F876EE4"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\iterator.mal"
+ "TargetName" = "8:iterator.mal"
+ "Tag" = "8:"
+ "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FF4ED691FBAF49DEA4726DF1C1C90785"
{
"SourcePath" = "8:lib\\monetdb5\\lib_udf.dll"
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -194,6 +194,7 @@ BAT *BATsort(BAT *b);
BAT *BATsort_rev(BAT *b);
BAT *BATssort(BAT *b);
BAT *BATssort_rev(BAT *b);
+gdk_return BATsubhashjoin(BAT **r1, BAT **r2, BAT *l, BAT *r, BAT *sl, BAT
*sr);
gdk_return BATsubmergejoin(BAT **r1, BAT **r2, BAT *l, BAT *r, BAT *sl, BAT
*sr);
BAT *BATsubselect(BAT *b, BAT *s, const void *tl, const void *th, int li, int
hi, int anti);
gdk_return BATsubsort(BAT **sorted, BAT **order, BAT **groups, BAT *b, BAT *o,
BAT *g, int reverse, int stable);
@@ -277,10 +278,6 @@ int GDKnr_threads;
void GDKqsort(void *h, void *t, const void *base, size_t n, int hs, int ts,
int tpe);
void GDKqsort_rev(void *h, void *t, const void *base, size_t n, int hs, int
ts, int tpe);
void *GDKrealloc(void *pold, size_t size);
-ATOMIC_TYPE volatile GDKsemacnt;
-MT_Sema *volatile GDKsemalist;
-ATOMIC_TYPE volatile GDKsemasleepcnt;
-ATOMIC_TYPE volatile GDKsemawaitcnt;
void GDKsetenv(str name, str value);
ssize_t GDKstrFromStr(unsigned char *dst, const unsigned char *src, ssize_t
len);
str GDKstrdup(const char *s);
@@ -826,6 +823,8 @@ str ALGssort(int *result, int *bid);
str ALGssort_rev(int *result, int *bid);
str ALGstdev(dbl *res, int *bid);
str ALGstdevp(dbl *res, int *bid);
+str ALGsubhashjoin(bat *r1, bat *r2, bat *l, bat *r);
+str ALGsubhashjoin4(bat *r1, bat *r2, bat *l, bat *r, bat *sl, bat *sr);
str ALGsubmergejoin(bat *r1, bat *r2, bat *l, bat *r);
str ALGsubmergejoin4(bat *r1, bat *r2, bat *l, bat *r, bat *sl, bat *sr);
str ALGsubsample(int *result, int *bid, int *param);
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -97,6 +97,17 @@ Description: MonetDB database client
database so that it can be loaded back later. If you want to use
MonetDB, you will very likely need this package.
+Package: monetdb-client-tools
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, monetdb-client
+Description: MonetDB database client
+ MonetDB is a database management system that is developed from a
+ main-memory perspective with use of a fully decomposed storage model,
+ automatic index management, extensibility of data types and search
+ accelerators. It also has an SQL frontend.
+ .
+ This package contains stethoscope and tomograph.
+
Package: libmonetdb-client-odbc
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/monetdb-client-tools.install
b/debian/monetdb-client-tools.install
new file mode 100644
--- /dev/null
+++ b/debian/monetdb-client-tools.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/bin/stethoscope usr/bin
+debian/tmp/usr/bin/tomograph usr/bin
diff --git a/debian/monetdb-client.install b/debian/monetdb-client.install
--- a/debian/monetdb-client.install
+++ b/debian/monetdb-client.install
@@ -1,3 +1,2 @@
debian/tmp/usr/bin/mclient usr/bin
debian/tmp/usr/bin/msqldump usr/bin
-debian/tmp/usr/bin/stethoscope usr/bin
diff --git a/debian/monetdb5-sql.install b/debian/monetdb5-sql.install
--- a/debian/monetdb5-sql.install
+++ b/debian/monetdb5-sql.install
@@ -4,6 +4,9 @@ debian/tmp/usr/lib/monetdb5/*.sql usr/li
debian/tmp/usr/lib/monetdb5/autoload/*_sql.mal usr/lib/monetdb5/autoload
debian/tmp/usr/lib/monetdb5/sql.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/lib_sql.so usr/lib/monetdb5
+debian/tmp/var/monetdb5/dbfarm/.merovingian_properties var/monetdb5/dbfarm
+
+# usr/lib/monetdb5/createdb/*.sql EXCEPT: *_geom.sql
debian/tmp/usr/lib/monetdb5/createdb/09_like.sql usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/10_math.sql usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/11_times.sql usr/lib/monetdb5/createdb
@@ -22,6 +25,6 @@ debian/tmp/usr/lib/monetdb5/createdb/23_
debian/tmp/usr/lib/monetdb5/createdb/24_zorder.sql usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/25_debug.sql usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/39_analytics.sql usr/lib/monetdb5/createdb
+debian/tmp/usr/lib/monetdb5/createdb/75_storagemodel.sql
usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/80_udf.sql usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/99_system.sql usr/lib/monetdb5/createdb
-debian/tmp/var/monetdb5/dbfarm/.merovingian_properties var/monetdb5/dbfarm
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -3165,7 +3165,9 @@ gdk_export BAT *BATleftjoin(BAT *l, BAT
gdk_export BAT *BATouterjoin(BAT *l, BAT *r, BUN estimate);
gdk_export BAT *BATcross(BAT *l, BAT *r);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
