Changeset: 6d8a4ce4bb4e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6d8a4ce4bb4e
Added Files:
debian/monetdb-client-tools.docs
debian/monetdb5-server.docs
sql/backends/monet5/Tests/rapi13.sql
Modified Files:
MonetDB.spec
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
clients/mapiclient/Makefile.ag
clients/mapiclient/tomograph.c
configure.ag
debian/monetdb5-sql.docs
gdk/gdk_group.c
gdk/gdk_join.c
gdk/gdk_logger.c
gdk/gdk_search.c
gdk/gdk_select.c
gdk/gdk_storage.c
gdk/gdk_unique.c
monetdb5/optimizer/opt_remap.c
sql/Makefile.ag
sql/backends/monet5/sql.c
sql/storage/bat/bat_storage.c
sql/storage/bat/bat_table.c
sql/storage/sql_storage.h
sql/storage/store.c
tools/mserver/Makefile.ag
vertoo.config
Branch: HTM
Log Message:
Merge with default
diffs (truncated from 1003 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -265,6 +265,9 @@ tools can be used to monitor the MonetDB
%{_bindir}/stethoscope
%{_bindir}/tachograph
%{_bindir}/tomograph
+%dir %{_datadir}/doc/MonetDB-client-tools
+%docdir %{_datadir}/doc/MonetDB-client-tools
+%{_datadir}/doc/MonetDB-client-tools/*
%package client-devel
Summary: MonetDB - Monet Database Management System Client Programs
@@ -664,6 +667,9 @@ fi
%exclude %{_libdir}/monetdb5/lib_sql.so
%{_libdir}/monetdb5/*.so
%doc %{_mandir}/man1/mserver5.1.gz
+%dir %{_datadir}/doc/MonetDB
+%docdir %{_datadir}/doc/MonetDB
+%{_datadir}/doc/MonetDB/*
%package -n MonetDB5-server-hugeint
Summary: MonetDB - 128-bit integer support for MonetDB5-server
@@ -763,15 +769,9 @@ systemd-tmpfiles --create %{_sysconfdir}
%{_libdir}/monetdb5/sql*.mal
%doc %{_mandir}/man1/monetdb.1.gz
%doc %{_mandir}/man1/monetdbd.1.gz
-%if (0%{?fedora} >= 20)
%dir %{_datadir}/doc/MonetDB-SQL
%docdir %{_datadir}/doc/MonetDB-SQL
%{_datadir}/doc/MonetDB-SQL/*
-%else
-%dir %{_datadir}/doc/MonetDB-SQL-%{version}
-%docdir %{_datadir}/doc/MonetDB-SQL-%{version}
-%{_datadir}/doc/MonetDB-SQL-%{version}/*
-%endif
%package SQL-server5-hugeint
Summary: MonetDB5 128 bit integer (hugeint) support for SQL
@@ -961,10 +961,6 @@ rm -f %{buildroot}%{_libdir}/monetdb5/*.
# internal development stuff
rm -f %{buildroot}%{_bindir}/Maddlog
-%if 0%{?fedora} >= 20
-mv %{buildroot}%{_datadir}/doc/MonetDB-SQL-%{version}
%{buildroot}%{_datadir}/doc/MonetDB-SQL
-%endif
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
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
@@ -2390,7 +2390,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.22.0\\dump-restore.txt"
+ "SourcePath" = "8:share\\doc\\MonetDB-SQL\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -2970,7 +2970,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.22.0\\dump-restore.html"
+ "SourcePath" = "8:share\\doc\\MonetDB-SQL\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -4194,7 +4194,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.22.0"
+ "Name" = "8:MonetDB-SQL"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
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
@@ -2390,7 +2390,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.22.0\\dump-restore.txt"
+ "SourcePath" = "8:share\\doc\\MonetDB-SQL\\dump-restore.txt"
"TargetName" = "8:dump-restore.txt"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -2970,7 +2970,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
{
- "SourcePath" =
"8:share\\doc\\MonetDB-SQL-11.22.0\\dump-restore.html"
+ "SourcePath" = "8:share\\doc\\MonetDB-SQL\\dump-restore.html"
"TargetName" = "8:dump-restore.html"
"Tag" = "8:"
"Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -4194,7 +4194,7 @@
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
{
- "Name" = "8:MonetDB-SQL-11.22.0"
+ "Name" = "8:MonetDB-SQL"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "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
@@ -60,6 +60,9 @@
/* location where binaries are installed */
/* #undef BINDIR */
+/* read-only architecture-independent data */
+#define DATA_DIR PREFIX "\\share"
+
/* Directory separator */
#define DIR_SEP '\\'
diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c
--- a/clients/mapiclient/tomograph.c
+++ b/clients/mapiclient/tomograph.c
@@ -1184,6 +1184,23 @@ updatecolormap(int idx)
/* gnuplot defaults */
static int height = 160;
+static char *
+findlogo(void)
+{
+#ifdef _MSC_VER
+ static char buf[512];
+ int i;
+
+ snprintf(buf, sizeof(buf), "%s", DATA_DIR
"\\doc\\MonetDB\\monetdblogo.png");
+ for (i = 0; buf[i]; i++)
+ if (buf[i] == '\\')
+ buf[i] = '/';
+ return buf;
+#else
+ return DATA_DIR "/doc/MonetDB/monetdblogo.png";
+#endif
+}
+
static void
gnuplotheader(char *filename)
{
@@ -1204,8 +1221,7 @@ gnuplotheader(char *filename)
fprintf(gnudata,"unset border\n");
fprintf(gnudata,"unset xtics\n");
fprintf(gnudata,"unset ytics\n");
- // REPLACE THE HARDCODED NAME
- fprintf(gnudata,"plot \"/ufs/mk/monetdb-final.png\" binary filetype=png
dx=0.5 dy=0.5 notitle with rgbimage\n");
+ fprintf(gnudata,"plot \"%s\" binary filetype=png dx=0.5 dy=0.5 notitle
with rgbimage\n", findlogo());
fprintf(gnudata,"unset title\n");
}
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -3034,6 +3034,8 @@ fi
Qdatadir="$datadir"
Xdatadir="`$translatepath "$datadir"`"
QXdatadir="`echo "$Xdatadir" | sed 's/\\\\/\\\\\\\\/g'`"
+eval "Edatadir=${Xdatadir}"
+QEdatadir="`echo "$Edatadir" | sed 's/\\\\/\\\\\\\\/g'`"
AC_SUBST(Qdatadir)
AC_SUBST(Xdatadir)
AC_SUBST(QXdatadir)
@@ -3069,6 +3071,7 @@ AC_SUBST(QSOURCE)
AC_SUBST(XSOURCE)
AC_SUBST(QXSOURCE)
AC_DEFINE_UNQUOTED(LOCALSTATEDIR,"$QElocalstatedir",[modifiable single-machine
data])
+AC_DEFINE_UNQUOTED(DATA_DIR,"$QEdatadir",[read-only architecture-independent
data])
AC_DEFINE_UNQUOTED(BINDIR,"$QEbindir",[location where binaries are installed])
dnl On Solaris, libxml2 enables threading only when _REENTRANT, __MT__
diff --git a/debian/monetdb-client-tools.docs b/debian/monetdb-client-tools.docs
new file mode 100644
--- /dev/null
+++ b/debian/monetdb-client-tools.docs
@@ -0,0 +1,1 @@
+debian/tmp/usr/share/doc/MonetDB-client-tools/*
diff --git a/debian/monetdb5-server.docs b/debian/monetdb5-server.docs
new file mode 100644
--- /dev/null
+++ b/debian/monetdb5-server.docs
@@ -0,0 +1,1 @@
+debian/tmp/usr/share/doc/MonetDB/*
diff --git a/debian/monetdb5-sql.docs b/debian/monetdb5-sql.docs
--- a/debian/monetdb5-sql.docs
+++ b/debian/monetdb5-sql.docs
@@ -1,1 +1,1 @@
-debian/tmp/usr/share/doc/MonetDB-SQL-*/*
+debian/tmp/usr/share/doc/MonetDB-SQL/*
diff --git a/gdk/gdk_group.c b/gdk/gdk_group.c
--- a/gdk/gdk_group.c
+++ b/gdk/gdk_group.c
@@ -778,7 +778,7 @@ BATgroup_internal(BAT **groups, BAT **ex
e ? BATgetId(e) : "NULL", e ? BATcount(e) : 0,
h ? BATgetId(h) : "NULL", h ? BATcount(h) : 0,
subsorted);
- if ((parent = VIEWtparent(b)) != 0) {
+ if (b->T->hash == NULL && (parent = VIEWtparent(b)) != 0) {
/* b is a view on another bat (b2 for now).
* calculate the bounds [lo, hi) in the parent
* that b uses */
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -1012,6 +1012,9 @@ mergejoin(BAT *r1, BAT *r2, BAT *l, BAT
rcandorig = rcand;
rstartorig = rstart;
+
+ if (sl)
+ r1->tdense = sl->tdense;
while (lcand ? lcand < lcandend : lstart < lend) {
if (!nil_on_miss && !must_match && lscan > 0) {
/* If l is sorted (lscan > 0), we look at the
@@ -1822,6 +1825,9 @@ hashjoin(BAT *r1, BAT *r2, BAT *l, BAT *
r2->trevsorted = 0;
r2->tdense = 0;
+ if (sl)
+ r1->tdense = sl->tdense;
+
if (lstart == lend || (!nil_on_miss && rstart == rend)) {
/* nothing to do: there are no matches */
if (must_match && lstart < lend) {
@@ -1839,12 +1845,26 @@ hashjoin(BAT *r1, BAT *r2, BAT *l, BAT *
return GDK_SUCCEED;
}
+ rl = BUNfirst(r);
if (VIEWtparent(r)) {
BAT *b = BBPdescriptor(-VIEWtparent(r));
- rl = (BUN) ((r->T->heap.base - b->T->heap.base) >> r->T->shift)
+ BUNfirst(r);
- r = b;
- } else {
- rl = BUNfirst(r);
+ if (b->batPersistence == PERSISTENT || BATcheckhash(b)) {
+ /* only use parent's hash if it is persistent
+ * or already has a hash */
+ ALGODEBUG
+ fprintf(stderr, "#hashjoin(%s#"BUNFMT"): "
+ "using parent(%s#"BUNFMT") for hash\n",
+ BATgetId(r), BATcount(r),
+ BATgetId(b), BATcount(b));
+ rl = (BUN) ((r->T->heap.base - b->T->heap.base) >>
r->T->shift) + BUNfirst(r);
+ r = b;
+ } else {
+ ALGODEBUG
+ fprintf(stderr, "#hashjoin(%s#"BUNFMT"): not "
+ "using parent(%s#"BUNFMT") for hash\n",
+ BATgetId(r), BATcount(r),
+ BATgetId(b), BATcount(b));
+ }
}
rh = rl + rend;
rl += rstart;
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -787,6 +787,7 @@ la_apply(logger *lg, logaction *c)
la_bat_clear(lg, c);
break;
}
+ lg->changes++;
}
static void
@@ -1001,7 +1002,6 @@ logger_readlog(logger *lg, char *filenam
}
if (name)
GDKfree(name);
- lg->changes++;
}
logger_close(lg);
@@ -1664,7 +1664,6 @@ logger_new(int debug, const char *fn, co
}
}
#endif
- lg->changes++;
logger_readlogs(lg, fp, filename);
fclose(fp);
fp = NULL;
diff --git a/gdk/gdk_search.c b/gdk/gdk_search.c
--- a/gdk/gdk_search.c
+++ b/gdk/gdk_search.c
@@ -315,17 +315,6 @@ BAThash(BAT *b, BUN masksize)
BAT *o = NULL;
lng t0 = 0, t1 = 0;
- if (VIEWtparent(b)) {
- bat p = -VIEWtparent(b);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
