MonetDB: default - Merged from Jun2010
Changeset: 76236eb43c65 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=76236eb43c65
Modified Files:
Branch: default
Log Message:
Merged from Jun2010
diffs (12 lines):
diff -r 22d3d40af00a -r 76236eb43c65 buildtools/conf/Maddlog
--- a/buildtools/conf/Maddlog Thu Aug 26 20:00:09 2010 +0200
+++ b/buildtools/conf/Maddlog Thu Aug 26 20:06:20 2010 +0200
@@ -90,7 +90,7 @@
if [ $# -gt 0 ]; then
msg=$(echo " $*" | fmt)
-mst=${msg# }
+msg=${msg# }
else
nl=$'\n '
echo "Log message (end with ^D or empty line):"
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010
Changeset: ef962eacc773 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ef962eacc773 Modified Files: sql/ChangeLog.Jun2010 Branch: default Log Message: Merged from Jun2010 diffs (276 lines): diff -r e4e456d61e31 -r ef962eacc773 sql/ChangeLog.Jun2010 --- a/sql/ChangeLog.Jun2010 Tue Aug 17 10:18:48 2010 +0200 +++ b/sql/ChangeLog.Jun2010 Tue Aug 17 12:22:41 2010 +0200 @@ -1,10 +1,6 @@ # ChangeLog file for sql # This file is updated with Maddlog -* Fri Aug 16 2010 Niels Nes -- Fixed bug 2657, a regression after the fix for bug 2353. A join with a - single value subquery resulted in an assertion failure. - * Fri Aug 13 2010 Niels Nes - Fixed bug 2643 added more defensive code, when an aggregation function doesn't exist diff -r e4e456d61e31 -r ef962eacc773 sql/src/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.sql --- a/sql/src/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.sql Tue Aug 17 10:18:48 2010 +0200 +++ b/sql/src/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.sql Tue Aug 17 12:22:41 2010 +0200 @@ -39,9 +39,40 @@ insert into slice_test values ( 1, 1, 28323); insert into slice_test values ( 3, 5, 89439); -explain select x,y from slice_test limit 1; +set trace = 'none'; -- non-documented feature to not get any trace output +create function GetTrace() + returns table ( + event integer, -- event counter + clk varchar(20),-- wallclock, no mtime in kernel + pc varchar(50), -- module.function[nr] + thread int, -- thread identifier + ticks integer, -- time in microseconds + reads integer, -- number of blocks read + writes integer, -- number of blocks written + rbytes integer, -- amount of bytes touched + wbytes integer, -- amount of bytes written + type string,-- return types + stmt string -- actual statement executed + ) + external name sql.dump_trace; -explain select cast(x as string)||'-bla-'||cast(y as string) from slice_test limit 1; +TRACE select x,y from slice_test limit 1; +-- When mitosis was activated (i.e., the MAL plan contains mat.*() statements, +-- then there sould also be at least one mat.slice() statement. +SELECT count(*) FROM +( SELECT count(*) AS mat FROM GetTrace() WHERE stmt LIKE '% := mat.%' ) as m, +( SELECT count(*) AS mat_slice FROM GetTrace() WHERE stmt LIKE '% := mat.slice(%' ) as ms +WHERE ( mat = 0 AND mat_slice = 0 ) OR ( mat > 0 AND mat_slice > 0 ); + +TRACE select cast(x as string)||'-bla-'||cast(y as string) from slice_test limit 1; +-- When mitosis was activated (i.e., the MAL plan contains mat.*() statements, +-- then there sould also be at least one mat.slice() statement. +SELECT count(*) FROM +( SELECT count(*) AS mat FROM GetTrace() WHERE stmt LIKE '% := mat.%' ) as m, +( SELECT count(*) AS mat_slice FROM GetTrace() WHERE stmt LIKE '% := mat.slice(%' ) as ms +WHERE ( mat = 0 AND mat_slice = 0 ) OR ( mat > 0 AND mat_slice > 0 ); + +drop function GetTrace; drop table slice_test; diff -r e4e456d61e31 -r ef962eacc773 sql/src/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.stable.out --- a/sql/src/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.stable.out Tue Aug 17 10:18:48 2010 +0200 +++ b/sql/src/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.stable.out Tue Aug 17 12:22:41 2010 +0200 @@ -86,167 +86,52 @@ [ 1] #insert into slice_test values ( 3, 5, 89439); [ 1] -#explain select x,y from slice_test limit 1; -% .explain # table_name -% mal # name +#create function GetTrace() +# returns table ( +# event integer, -- event counter +# clk varchar(20),-- wallclock, no mtime in kernel +# pc varchar(50), -- module.function[nr] +# thread int, -- thread identifier +# ticks integer, -- time in microseconds +# reads integer, -- number of blocks read +# writes integer, -- number of blocks written +# rbytes integer, -- amount of bytes touched +# wbytes integer, -- amount of bytes written +# type string,-- return types +#TRACE select x,y from slice_test limit 1; +% sys.slice_test, sys.slice_test # table_name +% x, y # name +% int, int # type +% 1, 1 # length +[ 0, 1 ] +#SELECT count(*) FROM +#( SELECT count(*) AS mat FROM GetTrace() WHERE stmt LIKE '% := mat.%' ) as m, +#( SELECT count(*) AS mat_slice FROM GetTrace() WHERE stmt LIKE '% := mat.slice(%' ) as ms +#WHERE ( mat = 0 AND mat_slice = 0 ) OR ( mat > 0 AND mat_slice > 0 ); +% .m # table_name +% L6 # name +% wrd # type +% 1 # length +[ 1] +#TRACE select
MonetDB: default - Merged from Jun2010
Changeset: e4e456d61e31 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e4e456d61e31
Modified Files:
clients/src/mapiclient/mclient.mx
sql/ChangeLog.Jun2010
Branch: default
Log Message:
Merged from Jun2010
diffs (32 lines):
diff -r 2a60e5961918 -r e4e456d61e31 clients/src/mapiclient/mclient.mx
--- a/clients/src/mapiclient/mclient.mx Tue Aug 17 10:07:55 2010 +0200
+++ b/clients/src/mapiclient/mclient.mx Tue Aug 17 10:18:48 2010 +0200
@@ -1154,11 +1154,9 @@
/* correct the lengths in case only the headers were
* squeezed, if the content itself is wider, the headers
* will be squeezed to their size (see below) */
- if (lentotal == total) {
- for (i = 0; i < fields; i++)
- if (len[i] < hdr[i])
- len[i] = hdr[i];
- }
+ for (i = 0; i < fields; i++)
+ if (len[i] < hdr[i])
+ len[i] = hdr[i];
/* worst case: lentotal = total, which means it still
* doesn't fit, values will be squeezed next */
diff -r 2a60e5961918 -r e4e456d61e31 sql/ChangeLog.Jun2010
--- a/sql/ChangeLog.Jun2010 Tue Aug 17 10:07:55 2010 +0200
+++ b/sql/ChangeLog.Jun2010 Tue Aug 17 10:18:48 2010 +0200
@@ -1,6 +1,10 @@
# ChangeLog file for sql
# This file is updated with Maddlog
+* Fri Aug 16 2010 Niels Nes
+- Fixed bug 2657, a regression after the fix for bug 2353. A join with a
+ single value subquery resulted in an assertion failure.
+
* Fri Aug 13 2010 Niels Nes
- Fixed bug 2643 added more defensive code, when an aggregation function
doesn't exist
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010
Changeset: 064969be7973 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=064969be7973
Modified Files:
clients/src/mapiclient/mclient.mx
Branch: default
Log Message:
Merged from Jun2010
diffs (176 lines):
diff -r 0c07b9a3714c -r 064969be7973 clients/ChangeLog.Jun2010
--- a/clients/ChangeLog.Jun2010 Fri Aug 13 11:04:22 2010 +0200
+++ b/clients/ChangeLog.Jun2010 Fri Aug 13 15:11:09 2010 +0200
@@ -2,6 +2,7 @@
# This file is updated with Maddlog
* Fri Aug 13 2010 Fabian Groffen
+- Slight rendering improvements to mclient's tabular output when rendering
results larger than the available screen width, headers were previously
unnecessarily squeezed.
- Fix bug #2650, a too small buffer caused the active database as reported by
mclient's welcome message to be truncated
* Wed Jul 21 2010 Fabian Groffen
diff -r 0c07b9a3714c -r 064969be7973 clients/src/mapiclient/mclient.mx
--- a/clients/src/mapiclient/mclient.mx Fri Aug 13 11:04:22 2010 +0200
+++ b/clients/src/mapiclient/mclient.mx Fri Aug 13 15:11:09 2010 +0200
@@ -1026,7 +1026,8 @@
static void
SQLrenderer(MapiHdl hdl, char singleinstr)
{
- int i, total, vartotal, fields, oldfields = 0, max = 1, graphwaste = 0;
+ int i, total, lentotal, vartotal;
+ int fields, oldfields = 0, max = 1, graphwaste = 0;
int *len = NULL, *hdr = NULL, *numeric = NULL;
char **rest = NULL;
char buf[50];
@@ -1061,6 +1062,8 @@
memset(numeric, 0, sizeof(int) * fields);
total = 0;
+ lentotal = 0;
+ vartotal = 0;
for (i = 0; i < fields; i++) {
char *s;
@@ -1083,9 +1086,6 @@
} else {
hdr[i] = 0;
}
- if (hdr[i] < len[i])
- hdr[i] = len[i];
- total += hdr[i];
s = mapi_get_type(hdl, i);
numeric[i] = s != NULL &&
(strcmp(s, "int") == 0 ||
@@ -1095,43 +1095,18 @@
strcmp(s, "smallint") == 0 ||
strcmp(s, "double") == 0 ||
strcmp(s, "float") == 0);
+
+ if (!numeric[i])
+ vartotal += len[i];
+ total += len[i];
+ lentotal += (hdr[i] > len[i] ? hdr[i] : len[i]);
}
+
/* what we waste on space on the display is
* the column separators ' | ', but the edges
* lack the edgespace of course */
graphwaste = ((fields * 3) - 1) + 2;
- /* punish the column headers first until you
-* cannot squeeze */
- while (graphwaste + total > pagewidth) {
- /* pick the column where the header is
-* longest compared to its content */
- max = -1;
- for (i = 0; i < fields; i++) {
- if (hdr[i] > len[i]) {
- if (max == -1 ||
- hdr[max] - len[max] <
hdr[i] - len[i])
- max = i;
- }
- }
- if (max == -1)
- break;
- hdr[max]--;
- total--;
- }
- total = 0;
- vartotal = 0;
- /* punish fields that are longer than the
-* terminal width, can't display them as a
-* whole anyway */
- for (i = 0; i < fields; i++) {
- if (!numeric[i]) {
- /* 4 = left and right borders */
- if (hdr[i] >= pagewidth - 4)
- hdr[i] = pagewidth - 4;
- vartotal += hdr[i];
- }
- total += hdr[i];
- }
+
/* Punishing the value fields is done based on
* how much squeezing will result in. The
* objective is to have at most a single
@@ -1153,11 +1128,41 @@
mypagewidth += pagewid
MonetDB: default - Merged from Jun2010
Changeset: 0c07b9a3714c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0c07b9a3714c
Modified Files:
clients/src/mapiclient/mclient.mx
Branch: default
Log Message:
Merged from Jun2010
diffs (58 lines):
diff -r f4f4ba58c54d -r 0c07b9a3714c clients/ChangeLog.Jun2010
--- a/clients/ChangeLog.Jun2010 Fri Aug 13 10:32:27 2010 +0200
+++ b/clients/ChangeLog.Jun2010 Fri Aug 13 11:04:22 2010 +0200
@@ -1,6 +1,9 @@
# ChangeLog file for clients
# This file is updated with Maddlog
+* Fri Aug 13 2010 Fabian Groffen
+- Fix bug #2650, a too small buffer caused the active database as reported by
mclient's welcome message to be truncated
+
* Wed Jul 21 2010 Fabian Groffen
- Add --version option to mclient.
diff -r f4f4ba58c54d -r 0c07b9a3714c clients/src/mapiclient/mclient.mx
--- a/clients/src/mapiclient/mclient.mx Fri Aug 13 10:32:27 2010 +0200
+++ b/clients/src/mapiclient/mclient.mx Fri Aug 13 11:04:22 2010 +0200
@@ -2639,23 +2639,25 @@
"FROM sys.env() AS env "
"WHERE \"name\" IN ('gdk_dbname',
'monet_version')")) != NULL &&
mapi_error(mid) == MOK) {
- char dbname[24], m5ver[24];
+ char *dbname = NULL, m5ver[24];
char *name, *val;
- dbname[0] = m5ver[0] = '\0';
+ m5ver[0] = '\0';
while (fetch_row(hdl) == 2) {
name = mapi_fetch_field(hdl, 0);
val = mapi_fetch_field(hdl, 1);
if (name != NULL && val != NULL) {
if (strcmp(name, "gdk_dbname") == 0) {
- snprintf(dbname,
sizeof(dbname), "%s", val);
+ dbname = strdup(val);
} else if (strcmp(name,
"monet_version") == 0) {
snprintf(m5ver, sizeof(m5ver),
"%s", val);
}
}
}
mapi_close_handle(hdl);
- if (dbname[0] != '\0' && m5ver[0] != '\0')
+ if (dbname != NULL && *dbname != '\0' && m5ver[0] !=
'\0')
mnstr_printf(toConsole, "Database: MonetDB v%s,
'%s'\n", m5ver, dbname);
+ if (dbname != NULL)
+ free(dbname);
}
mnstr_printf(toConsole, "Type \\q to quit, \\? for a list of
available commands\n");
if (mode == SQL)
diff -r f4f4ba58c54d -r 0c07b9a3714c sql/src/server/rel_sequence.mx
--- a/sql/src/server/rel_sequence.mxFri Aug 13 10:32:27 2010 +0200
+++ b/sql/src/server/rel_sequence.mxFri Aug 13 11:04:22 2010 +0200
@@ -185,7 +185,7 @@
/* first alter the known values */
seq = create_sql_sequence(sql->sa, s, name, seq->start, min, max, inc,
cache, cycle);
- /* restart maybe a query, ie we create a statement
+ /* restart may be a query, i.e. we create a statement
restart(ssname,seqname,value) */
if (start_type == 0) {
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010
Changeset: 3e553302fcfe for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3e553302fcfe
Modified Files:
Branch: default
Log Message:
Merged from Jun2010
diffs (92 lines):
diff -r 7431f248c36a -r 3e553302fcfe java/ChangeLog.Jun2010
--- a/java/ChangeLog.Jun2010Wed Aug 11 14:18:00 2010 +0200
+++ b/java/ChangeLog.Jun2010Wed Aug 11 15:35:07 2010 +0200
@@ -1,6 +1,11 @@
# ChangeLog file for java
# This file is updated with mchangelog (Gentoo echangelog bastard script)
+ 11 Aug 2010; Fabian Groffen release.txt,
+ src/nl/cwi/monetdb/jdbc/MonetResultSet.java:
+ Implemented ResultSet's getCharacterStream methods, since Hibernate seems to
+ call this method for retrieving CLOB columns that we now do support.
+
06 Aug 2010; Fabian Groffen
src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java:
Fix implementation of setBytes method of PreparedStatement, such that bytes
@@ -30,7 +35,7 @@
Enable the merovingian control library for default distribution as it
has been in use for some time without problems now.
- Wed Mar 31 2010 Stefan Manegold configure.ag:
+ 31 Mar 2010; Stefan Manegold configure.ag:
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".
@@ -40,7 +45,7 @@
getopt() support in testing has changed; hence, (most probably) requiring a
rebuild from scratch of testing on other systems.
- Wed Mar 24 2010 Stefan Manegold Makefile.ag:
+ 24 Mar 2010; Stefan Manegold Makefile.ag:
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 ...NT, and thus keep the
diff -r 7431f248c36a -r 3e553302fcfe java/release.txt
--- a/java/release.txt Wed Aug 11 14:18:00 2010 +0200
+++ b/java/release.txt Wed Aug 11 15:35:07 2010 +0200
@@ -62,10 +62,10 @@
* java.sql.ResultSet interface
The next features are not implemented:
- getArray
-- getAsciiStream, getBinaryStream, getUnicodeStream, getCharacterStream
+- getAsciiStream, getBinaryStream, getUnicodeStream
- getRef, getURL
- all methods related to updateable result sets
-* java.sql.ResultSetMetaData interface
+ * java.sql.ResultSetMetaData interface
* java.sql.DatabaseMetaData interface
* java.sql.SavePoint interface
diff -r 7431f248c36a -r 3e553302fcfe
java/src/nl/cwi/monetdb/jdbc/MonetResultSet.java
--- a/java/src/nl/cwi/monetdb/jdbc/MonetResultSet.java Wed Aug 11 14:18:00
2010 +0200
+++ b/java/src/nl/cwi/monetdb/jdbc/MonetResultSet.java Wed Aug 11 15:35:07
2010 +0200
@@ -291,8 +291,37 @@
public InputStream getBinaryStream(String columnName) throws
SQLException { throw new SQLException("Method getBinaryStream not implemented
yet, sorry!"); }
public InputStream getUnicodeStream(int columnIndex) throws
SQLException { throw new SQLException("Method getUnicodeStream not implemented
yet, sorry!"); }
public InputStream getUnicodeStream(String columnName) throws
SQLException { throw new SQLException("Method getUnicodeStream not implemented
yet, sorry!"); }
- public Reader getCharacterStream(int columnIndex) throws SQLException {
throw new SQLException("Method getCharacterStream not implemented yet,
sorry!"); }
- public Reader getCharacterStream(String columnName) throws SQLException
{ throw new SQLException("Method getCharacterStream not implemented yet,
sorry!"); }
+
+ /**
+* Retrieves the value of the designated column in the current row
+* of this ResultSet object as a java.io.Reader object.
+*
+* @param columnIndex the first column is 1, the second is 2, ...
+* @return a java.io.Reader object that contains the column value;
+* if the value is SQL NULL, the value returned is null in
+* the Java programming language.
+* @throws SQLException if a database access error occurs
+*/
+ public Reader getCharacterStream(int columnIndex) throws SQLException {
+ String tmp = getString(columnIndex);
+ if (tmp == null)
+ return(null);
+ return new StringReader(tmp);
+ }
+
+ /**
+* Retrieves the value of the designated column in the current row
+* of this ResultSet object as a java.io.Reader object.
+*
+* @param columnName the name of the column
+* @return a java.io.Reader object that contains the column value;
+* if the value is SQL NULL, the value returned is null in
+* the Java programming language.
+* @throws SQLException if a database access error occurs
+*/
+ public Reader getCharacterStream(String columnName) throws SQLException
{
+ return(getCharacterStream(findColumn(columnName)));
MonetDB: default - Merged from Jun2010, discard any changes
Changeset: 9e0bd4800352 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9e0bd4800352 Modified Files: MonetDB5/conf/monetdb5.conf.in Branch: default Log Message: Merged from Jun2010, discard any changes ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010
Changeset: 200dfbf1734f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=200dfbf1734f
Modified Files:
Branch: default
Log Message:
Merged from Jun2010
diffs (167 lines):
diff -r 19064cee8c53 -r 200dfbf1734f
java/src/nl/cwi/monetdb/jdbc/MonetResultSet.java
--- a/java/src/nl/cwi/monetdb/jdbc/MonetResultSet.java Wed Aug 11 10:47:27
2010 +0200
+++ b/java/src/nl/cwi/monetdb/jdbc/MonetResultSet.java Wed Aug 11 10:58:44
2010 +0200
@@ -280,19 +280,19 @@
return(absolute(1));
}
- public Array getArray(int i) throws SQLException { throw new
SQLException("Method not implemented yet, sorry!"); }
- public Array getArray(String colName) throws SQLException { throw new
SQLException("Method not implemented yet, sorry!"); }
+ public Array getArray(int i) throws SQLException { throw new
SQLException("Method getArray not implemented yet, sorry!"); }
+ public Array getArray(String colName) throws SQLException { throw new
SQLException("Method getArray not implemented yet, sorry!"); }
/* Mapi doesn't allow something for streams at the moment, thus all
not implemented for now */
- public InputStream getAsciiStream(int columnIndex) throws SQLException
{ throw new SQLException("Method not implemented yet, sorry!"); }
- public InputStream getAsciiStream(String columnName) throws
SQLException { throw new SQLException("Method not implemented yet, sorry!"); }
- public InputStream getBinaryStream(int columnIndex) throws SQLException
{ throw new SQLException("Method not implemented yet, sorry!"); }
- public InputStream getBinaryStream(String columnName) throws
SQLException { throw new SQLException("Method not implemented yet, sorry!"); }
- public InputStream getUnicodeStream(int columnIndex) throws
SQLException { throw new SQLException("Method not implemented yet, sorry!"); }
- public InputStream getUnicodeStream(String columnName) throws
SQLException { throw new SQLException("Method not implemented yet, sorry!"); }
- public Reader getCharacterStream(int columnIndex) throws SQLException {
throw new SQLException("Method not implemented yet, sorry!"); }
- public Reader getCharacterStream(String columnName) throws SQLException
{ throw new SQLException("Method not implemented yet, sorry!"); }
+ public InputStream getAsciiStream(int columnIndex) throws SQLException
{ throw new SQLException("Method getAsciiStream not implemented yet, sorry!"); }
+ public InputStream getAsciiStream(String columnName) throws
SQLException { throw new SQLException("Method getAsciiStream not implemented
yet, sorry!"); }
+ public InputStream getBinaryStream(int columnIndex) throws SQLException
{ throw new SQLException("Method getBinaryStream not implemented yet, sorry!");
}
+ public InputStream getBinaryStream(String columnName) throws
SQLException { throw new SQLException("Method getBinaryStream not implemented
yet, sorry!"); }
+ public InputStream getUnicodeStream(int columnIndex) throws
SQLException { throw new SQLException("Method getUnicodeStream not implemented
yet, sorry!"); }
+ public InputStream getUnicodeStream(String columnName) throws
SQLException { throw new SQLException("Method getUnicodeStream not implemented
yet, sorry!"); }
+ public Reader getCharacterStream(int columnIndex) throws SQLException {
throw new SQLException("Method getCharacterStream not implemented yet,
sorry!"); }
+ public Reader getCharacterStream(String columnName) throws SQLException
{ throw new SQLException("Method getCharacterStream not implemented yet,
sorry!"); }
/**
* Retrieves the value of the designated column in the current row
@@ -1384,8 +1384,8 @@
return(getObject(findColumn(colName), map));
}
- public Ref getRef(int i) throws SQLException { throw new
SQLException("Method not implemented yet, sorry!"); }
- public Ref getRef(String colName) throws SQLException { throw new
SQLException("Method not implemented yet, sorry!"); }
+ public Ref getRef(int i) throws SQLException { throw new
SQLException("Method getRef not implemented yet, sorry!"); }
+ public Ref getRef(String colName) throws SQLException { throw new
SQLException("Method getRef not implemented yet, sorry!"); }
/**
* Retrieves the current row number. The first row is number 1, the
second
@@ -2056,64 +2056,64 @@
/* these methods are all related to updateable result sets, which we
currently do not support */
- public void cancelRowUpdates() throws SQLException { throw new
SQLException("Method not implemented yet, sorry!"); }
- public void deleteRow() throws SQLException { throw new
SQLException("Method not implemented yet, sorry!"); }
- public void insertRow() throws SQLException { throw new
SQLException("Method not implemented yet, sorry!"); }
- publ
MonetDB: default - Merged from Jun2010
Changeset: 19064cee8c53 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=19064cee8c53
Modified Files:
Branch: default
Log Message:
Merged from Jun2010
diffs (25 lines):
diff -r 1f889ecdb5f8 -r 19064cee8c53
java/src/nl/cwi/monetdb/util/SQLExporter.java
--- a/java/src/nl/cwi/monetdb/util/SQLExporter.java Wed Aug 11 10:11:52
2010 +0200
+++ b/java/src/nl/cwi/monetdb/util/SQLExporter.java Wed Aug 11 10:47:27
2010 +0200
@@ -67,10 +67,17 @@
if (!tbl.next()) throw new SQLException("Whoops no data
for " + name);
// This will probably only work for MonetDB
- out.print("CREATE " + type + " " +
- (!useSchema ? dq(schema) + "." : "") +
dq(name));
- out.print(" AS ");
-
out.println(tbl.getString("REMARKS").replaceFirst("create view [^ ]+ as",
"").trim());
+ String remarks = tbl.getString("REMARKS");
+ if (remarks == null) {
+ out.println("-- invalid " + type + " " +
+ (!useSchema ? dq(schema) + "."
: "") + dq(name) +
+ ": no definition found");
+ } else {
+ out.print("CREATE " + type + " " +
+ (!useSchema ? dq(schema) + "." : "") +
dq(name));
+ out.print(" AS ");
+ out.println(remarks.replaceFirst("create view
[^ ]+ as", "").trim());
+ }
return;
}
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010, discard any changes
Changeset: 98b9327fd486 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=98b9327fd486 Modified Files: MonetDB5/conf/monetdb5.conf.in Branch: default Log Message: Merged from Jun2010, discard any changes ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010
Changeset: 5da097cf9042 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5da097cf9042
Modified Files:
MonetDB5/conf/monetdb5.conf.in
Branch: default
Log Message:
Merged from Jun2010
diffs (185 lines):
diff -r f30ae497f2c3 -r 5da097cf9042 MonetDB5/conf/monetdb5.conf.in
--- a/MonetDB5/conf/monetdb5.conf.inTue Aug 10 17:17:36 2010 +0200
+++ b/MonetDB5/conf/monetdb5.conf.inWed Aug 11 09:53:46 2010 +0200
@@ -42,24 +42,27 @@
# given below. Use this value to change the overall location
# of your data.
gdk_dbfa...@localstatedir@@dir...@monetdb5@dir...@dbfarm
-
+#
# MonetDB can only handle one database at a time. When you start an
# mserver5 manually without specifying the database name yourself, the
# following database name is used.
#gdk_dbname=demo
-
# Monet Section
#==
# monet_admin=adm #administrator user name
# Prompt when using MAL interface
# monet_prompt=>
+#
# Where do the MonetDB modules reside? The second path is for windows dlls.
monet_mod_pa...@libdir@@dir...@monetdb5@PATHSEP@@libdir@@dir...@monetdb5@dir...@lib@PATHSEP@@libdir@@dir...@monetdb5@dir...@bin
+#
# Start mserver in daemon mode, or start with MAL interactive interface?
#monet_daemon=no
+#
# Display version and copyright information upon startup?
#monet_welcome=yes
+#
# Where is the file that stores the secret key to unlock the password
# vault? The file is read up to the first null-byte ('\0'), so you can
# padd the file with trailing null-bytes to obfuscate the key length.
@@ -69,10 +72,9 @@
# Note: changing this key for an existing database makes that database
# unusable as noone is any longer able to login.
# If you use Merovingian, a per-database vault key is used and this
-# setting ignored.
+# setting is ignored.
#monet_vault_k...@sysconfdir@@dir...@monetdb.secret
-
# Merovingian section
#
# Merovingian logs messages and errors by default to the stdout and
@@ -158,24 +160,28 @@
# opened for some reason, Merovingian will not start.
mero_controlport=50001
-
# Monet Application Interface Section
#
-#mapi_port=5 # default port to address an mserver
-#mapi_autosense=false # if set to 'true': automatically find a free port
- # starting the search at mapi_port and going up
-#mapi_open=false # should be set to 'true' to allow for
- # remote access to a server
+# default TCP port opened by mserver5 for a client to connect to
+#mapi_port=5
+#
+# whether or not to automatically find a free port if mapi_port is
+# already taken by another application
+#mapi_autosense=false
+#
+# whether or not to allow remote access to the server (bind to any
+# interface or just localhost)
+#mapi_open=false
+#
+# mapi_usock is ignored on platforms that do not support UNIX domain
+# sockets, it is disabled by default, but e.g. enabled by Merovingian
#mapi_usock=${gdk_dbfa...@dirsep@mapi_socket
- # mapi_usock is ignored on platforms that do not
- # support UNIX domain sockets, it is disabled by
- # default, but e.g. enabled by Merovingian
# SQL Interface Section
#==
# The SQL debug level (should be disabled for normal use)
-# sql_debug=0
-
+#sql_debug=0
+#
# The default SQL optimizer pipeline can be set per server. See the
# optpipe setting in monetdb(1) when using merovingian. During SQL
# initialization, the optimizer pipeline is checked against the
@@ -185,76 +191,77 @@
# optimizers to run, or one or more variables containing the optimizer
# pipeline to run. The latter is provided for readability purposes
# only.
-
+#
# Set and define the default pipeline
sql_optimizer=default_pipe
-
+#
# The minimal pipeline necessary by the server to operate correctly
minimal_pipe=inline,remap,deadcode,multiplex,garbageCollector
-
+#
# The default pipe line contains as of Feb2010
# mitosis-mergetable-reorder, aimed at large tables and improved access
# locality
default_pipe=inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-
+#
# The no_mitosis pipe line is (and should be kept!) identical to the default
# pipeline, except that optimizer mitosis is omitted. It is use mainly to
# make some tests work deterministically, and to check / debug whether
# "unexpected" problems are related to mitosis (and/or mergetable).
no_mitosis_pipe=inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-
+#
# The sequential pipe line is (and should be kept!) identical to the default
# pipeline, except that optimizers mitosis & dataflow are omitted. It is
# use mainly to make some tests work deterministically, i.e., avoi
MonetDB: default - Merged from Jun2010
Changeset: 8163b954a9fa for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8163b954a9fa
Modified Files:
MonetDB5/src/optimizer/opt_mergetable.mx
sql/ChangeLog.Jun2010
Branch: default
Log Message:
Merged from Jun2010
diffs (85 lines):
diff -r d02d9734c9ba -r 8163b954a9fa MonetDB/src/gdk/gdk_system.mx
--- a/MonetDB/src/gdk/gdk_system.mx Sat Aug 07 17:35:33 2010 +0200
+++ b/MonetDB/src/gdk/gdk_system.mx Mon Aug 09 10:01:06 2010 +0200
@@ -630,10 +630,21 @@
* http://ndevilla.free.fr/threads/ */
#ifdef WIN32
+ /* Detection of number of cores works like this on Windows,
+* however, multi-threaded execution of MonetDB does not
+* work reliably on Windows, most probably as the Windows-
+* implementaion of pthreads and semaphors are not (yet?)
+* up to the task.
+* Hence, we stick to single-threaded execution on Windows
+* for now.
+*/
+/*
SYSTEM_INFO sysinfo;
GetSystemInfo( &sysinfo );
ncpus = sysinfo.dwNumberOfProcessors;
+*/
+ ncpus = 1;
#endif
if (ncpus <= 0)
diff -r d02d9734c9ba -r 8163b954a9fa MonetDB5/src/optimizer/opt_mergetable.mx
--- a/MonetDB5/src/optimizer/opt_mergetable.mx Sat Aug 07 17:35:33 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_mergetable.mx Mon Aug 09 10:01:06 2010 +0200
@@ -1756,8 +1756,7 @@
(m = isMATalias(getArg(p, 1), mat, mtop)) >= 0)
{
/* inject new mat.pack() operation */
- MATpackAll(mb, NULL, mat, m, &mtop);
- q = getInstrPtr(mb, mb->stop - 1);
+ q = MATpackAll(mb, NULL, mat, m, &mtop);
/* rename mat.pack() to mat.slice() */
setFunctionId(q, sliceRef);
/* insert bounds from algebra.slice() into mat.slice()
*/
diff -r d02d9734c9ba -r 8163b954a9fa MonetDB5/src/tools/monet_version.c.in
--- a/MonetDB5/src/tools/monet_version.c.in Sat Aug 07 17:35:33 2010 +0200
+++ b/MonetDB5/src/tools/monet_version.c.in Mon Aug 09 10:01:06 2010 +0200
@@ -53,11 +53,18 @@
printf("Copyright (c) 1993-July 2008 CWI\n"
"Copyright (c) August 2008-2010 MonetDB B.V., all
rights reserved\n");
printf("Visit http://monetdb.cwi.nl/ for further information\n");
+#ifdef WIN32
+ /* Detection of cpus is fine on windows, but multithreading doesn't
+* work, so it's forced to 1. Don't suggest we misdetect #cpus.
+* See: MonetDB/src/gdk/gdk_system.mx */
+ printf("Found %.1fGiB available memory\n", sz_mem_gb);
+#else
printf("Found %.1fGiB available memory, %d available cpu core%s\n",
sz_mem_gb, cores, cores != 1 ? "s" : "");
/* don't want to GDKinit just for this
"using %d thread%s\n",
GDKnr_threads, GDKnr_threads != 1 ? "s" : ""); */
+#endif
printf("Configured for prefix: " MONETDB5_PREFIX "\n");
printf("Libraries:\n");
#ifdef HAVE_LIBPCRE
diff -r d02d9734c9ba -r 8163b954a9fa sql/ChangeLog.Jun2010
--- a/sql/ChangeLog.Jun2010 Sat Aug 07 17:35:33 2010 +0200
+++ b/sql/ChangeLog.Jun2010 Mon Aug 09 10:01:06 2010 +0200
@@ -1,14 +1,19 @@
# ChangeLog file for sql
# This file is updated with Maddlog
+* Fri Aug 6 2010 Fabian Groffen
+- Fixed bug #2641, The SQL server now handles Unicode BOM sequences
+ occurring in any place. Previously an "unexpected character (U+FEFF)"
+ error would be returned.
+
* Fri Jul 30 2010 Niels Nes
-- fix Bug 2611. Fixed check for multiple functions without parameters.
+- Fix Bug 2611. Fixed check for multiple functions without parameters.
- Fixed bug 2569 (except/union/intersect right after
insert/delete/update. We now correctly fallback to the more general
subquery case (not only simple selects (SQL_SELECT)).
* Thu Jul 29 2010 Niels Nes
-- Fixed ORdER BY over UNION etc. (bug 2606) by
+- Fixed ORDER BY over UNION etc. (bug 2606) by
automatically adding select * around select x union select y order by z.
* Thu Jul 29 2010 Niels Nes
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010 (manual)
Changeset: c6b4b2d6fc5c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c6b4b2d6fc5c
Modified Files:
MonetDB5/src/optimizer/Tests/tst4730.stable.out
MonetDB5/src/optimizer/opt_costModel.mx
MonetDB5/src/optimizer/opt_emptySet.mx
MonetDB5/src/optimizer/opt_mergetable.mx
MonetDB5/src/optimizer/opt_mitosis.mx
MonetDB5/src/optimizer/opt_pushranges.mx
MonetDB5/src/optimizer/opt_support.mx
sql/src/backends/monet5/sql_optimizer.mx
sql/src/server/rel_bin.mx
sql/src/server/sql_scan.mx
sql/src/server/sql_statement.mx
sql/src/test/BugTracker-2010/Tests/All
Branch: default
Log Message:
Merged from Jun2010 (manual)
I manually resolved the conflicts that happened for Niels' rowsProp
change.
diffs (truncated from 841 to 300 lines):
diff -r 76dd9fabceef -r c6b4b2d6fc5c MonetDB5/src/modules/kernel/algebra.mx
--- a/MonetDB5/src/modules/kernel/algebra.mxFri Aug 06 11:27:43 2010 +0200
+++ b/MonetDB5/src/modules/kernel/algebra.mxFri Aug 06 12:47:46 2010 +0200
@@ -1871,6 +1871,8 @@
GDKerror("CMDslice: start position of slice should >= 0\n");
return GDK_FAIL;
}
+ if (end == wrd_nil)
+ end = BATcount(b);
if (start > (lng) BUN_MAX || end >= (lng) BUN_MAX) {
GDKerror("CMDslice: argument out of range\n");
return GDK_FAIL;
diff -r 76dd9fabceef -r c6b4b2d6fc5c
MonetDB5/src/optimizer/Tests/CMexample.stable.out
--- a/MonetDB5/src/optimizer/Tests/CMexample.stable.out Fri Aug 06 11:27:43
2010 +0200
+++ b/MonetDB5/src/optimizer/Tests/CMexample.stable.out Fri Aug 06 12:47:46
2010 +0200
@@ -26,9 +26,9 @@
# Cost model example
r{rows=100} := bat.new(:oid,:int); # 2 r:bat[:oid,:int] :=
CMDBATnew(_4:oid, _5:int) {G}
s{rows=1000} := bat.new(:oid,:int); # 3 s:bat[:oid,:int] :=
CMDBATnew(_4:oid, _8:int) {G}
-rs{rows=501:lng} := algebra.select(s{rows=1000},1,1);# 4
rs:bat[:oid,:int] := ALGselect(s:bat[:oid,:int], _10:int, _10:int) {G}
-rr{rows=100:lng} := bat.reverse(r{rows=100});# 5 rr:bat[:int,:oid] :=
BKCreverse(r:bat[:oid,:int]) {G}
-j{rows=100:lng} := algebra.join(rs{rows=501:lng},rr{rows=100:lng});# 6
j:bat[:oid,:oid] := ALGjoin(rs:bat[:oid,:int], rr:bat[:int,:oid]) {G}
+rs{rows=501} := algebra.select(s{rows=1000},1,1);# 4 rs:bat[:oid,:int] :=
ALGselect(s:bat[:oid,:int], _10:int, _10:int) {G}
+rr{rows=100} := bat.reverse(r{rows=100});# 5 rr:bat[:int,:oid] :=
BKCreverse(r:bat[:oid,:int]) {G}
+j{rows=100} := algebra.join(rs{rows=501},rr{rows=100});# 6
j:bat[:oid,:oid] := ALGjoin(rs:bat[:oid,:int], rr:bat[:int,:oid]) {G}
mdb.List(); # 7 _14:void := MDBlistDetail()
end main; # 8
diff -r 76dd9fabceef -r c6b4b2d6fc5c
MonetDB5/src/optimizer/Tests/emptyset00.stable.out
--- a/MonetDB5/src/optimizer/Tests/emptyset00.stable.outFri Aug 06
11:27:43 2010 +0200
+++ b/MonetDB5/src/optimizer/Tests/emptyset00.stable.outFri Aug 06
12:47:46 2010 +0200
@@ -28,9 +28,9 @@
function user.main():void; # 0 main:void := user.main() {G}
b := bat.new(:oid,:int);# 1 b:bat[:oid,:int] :=
CMDBATnew(_2:oid, _3:int) {G}
s1 := algebra.select(b,80,90); # 2 s1:bat[:oid,:int] :=
ALGselect(b:bat[:oid,:int], _5:int, _6:int) {G}
-s2{rows=0:lng} := bat.new(:oid,:int);# 3 s2:bat[:oid,:int] :=
CMDBATnew(_2:oid, _3:int) {G}
-s3{rows=0:lng} := bat.new(:oid,:int);# 4 s3:bat[:oid,:int] :=
CMDBATnew(_2:oid, _3:int) {G}
-io.print(s3{rows=0:lng}); # 5 _9:void :=
IOprint_val(s3:bat[:oid,:int]) {G}
+s2{rows=0} := bat.new(:oid,:int); # 3 s2:bat[:oid,:int] :=
CMDBATnew(_2:oid, _3:int) {G}
+s3{rows=0} := bat.new(:oid,:int); # 4 s3:bat[:oid,:int] :=
CMDBATnew(_2:oid, _3:int) {G}
+io.print(s3{rows=0}); # 5 _9:void :=
IOprint_val(s3:bat[:oid,:int]) {G}
mdb.List(); # 6 _12:void := MDBlistDetail()
end main; # 7
diff -r 76dd9fabceef -r c6b4b2d6fc5c
MonetDB5/src/optimizer/Tests/emptyset01.stable.out
--- a/MonetDB5/src/optimizer/Tests/emptyset01.stable.outFri Aug 06
11:27:43 2010 +0200
+++ b/MonetDB5/src/optimizer/Tests/emptyset01.stable.outFri Aug 06
12:47:46 2010 +0200
@@ -39,7 +39,7 @@
V1 := bat.new(:oid,:int); # 1 V1:bat[:oid,:int] :=
CMDBATnew(_2:oid, _3:int) {G}
V7 := bat.new(:oid,:int); # 2 V7:bat[:oid,:int] :=
CMDBATnew(_2:oid, _3:int) {G}
V10{rows=0:lng} := bat.new(:int,:oid);# 3 V10:bat[:int,:oid] :=
CMDBATnew(_3:int, _2:oid) {G}
-V11{rows=0:lng} := bat.reverse(V10{rows=0:lng});# 4 V11:bat[:oid,:int] :=
BKCreverse(V10:bat[:int,:oid]) {G}
+V11{rows=0} := bat.reverse(V10{rows=0:lng});# 4 V11:bat[:oid,:int] :=
BKCreverse(V10:bat[:int,:oid]) {G}
V12 := V7; # 5 V
MonetDB: default - Merged from Jun2010
Changeset: 632c7d473ee8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=632c7d473ee8
Modified Files:
sql/src/backends/monet5/merovingian/merovingian_forkmserver.c
Branch: default
Log Message:
Merged from Jun2010
diffs (62 lines):
diff -r 3fa6164e3adc -r 632c7d473ee8 clients/src/mapilib/Mapi.mx
--- a/clients/src/mapilib/Mapi.mx Mon Jul 26 12:41:51 2010 +0200
+++ b/clients/src/mapilib/Mapi.mx Mon Jul 26 20:32:02 2010 +0200
@@ -2339,9 +2339,12 @@
#ifdef HAVE_SYS_UN_H
if (mid->hostname == NULL) {
struct stat st;
+ struct sockaddr_un s; /* just for sizeof(s.sun_path) */ (void)s;
snprintf(errbuf, sizeof(errbuf),
CLIENTS_PREFIX "/var/MonetDB5/dbfarm/mapi_socket");
- if (stat(errbuf, &st) != 1 && S_ISSOCK(st.st_mode))
+ if (strlen(errbuf) <= sizeof(s.sun_path) &&
+ stat(errbuf, &st) != 1 &&
+ S_ISSOCK(st.st_mode))
mid->hostname = strdup(errbuf);
}
if (mid->hostname && mid->hostname[0] == '/') {
diff -r 3fa6164e3adc -r 632c7d473ee8
sql/src/backends/monet5/merovingian/ChangeLog.Jun2010
--- a/sql/src/backends/monet5/merovingian/ChangeLog.Jun2010 Mon Jul 26
12:41:51 2010 +0200
+++ b/sql/src/backends/monet5/merovingian/ChangeLog.Jun2010 Mon Jul 26
20:32:02 2010 +0200
@@ -1,9 +1,12 @@
# ChangeLog file for sql/src/backends/monet5/merovingian
# This file is updated with mchangelog
- 26 Jul 2010; Fabian Groffen merovingian.c, monetdb.c:
+ 26 Jul 2010; Fabian Groffen merovingian.c,
+ merovingian_forkmserver.c, monetdb.c:
On installs with (very) long prefixes, the UNIX domain sockets could get
truncated, causing merovingian to become unavailable to monetdb and mclient.
+ Similarly, a fall back to a regular TCP socket for mapi connections is
+ used for forked mservers in this case.
21 Jul 2010; Fabian Groffen merovingian.c:
Really shutdown when an argument to merovingian was given, instead of
diff -r 3fa6164e3adc -r 632c7d473ee8
sql/src/backends/monet5/merovingian/merovingian_forkmserver.c
--- a/sql/src/backends/monet5/merovingian/merovingian_forkmserver.c Mon Jul
26 12:41:51 2010 +0200
+++ b/sql/src/backends/monet5/merovingian/merovingian_forkmserver.c Mon Jul
26 20:32:02 2010 +0200
@@ -299,11 +299,21 @@
argv[c++] = dbname;
argv[c++] = "--set"; argv[c++] = muri;
if (mydoproxy == 1) {
+ struct sockaddr_un s; /* only for sizeof(s.sun_path) :(
*/ (void)s;
argv[c++] = "--set"; argv[c++] = "mapi_open=false";
/* we "proxy", so we can just solely use UNIX domain
sockets
-* internally */
- snprintf(port, 24, "mapi_port=0");
- snprintf(usock, 512, "mapi_usock=%s/.mapi.sock",
(*stats)->path);
+* internally. Before we hit our head, check if we can
+* actually use a UNIX socket (due to pathlength) */
+ if (strlen((*stats)->path) + 11 < sizeof(s.sun_path)) {
+ snprintf(port, 24, "mapi_port=0");
+ snprintf(usock, 512, "mapi_usock=%s/.mapi.sock",
+ (*stats)->path);
+ } else {
+ argv[c++] = "--set"; argv[c++] =
"mapi_autosense=true";
+ /* for logic here, see comment below */
+ snprintf(port, 24, "mapi_port=%d", _mero_port +
1);
+ snprintf(usock, 512, "mapi_usock=");
+ }
} else {
argv[c++] = "--set"; argv[c++] = "mapi_open=true";
argv[c++] = "--set"; argv[c++] = "mapi_autosense=true";
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010
Changeset: 3fa6164e3adc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3fa6164e3adc
Modified Files:
sql/src/backends/monet5/merovingian/merovingian.c
Branch: default
Log Message:
Merged from Jun2010
diffs (229 lines):
diff -r 19ba7a116100 -r 3fa6164e3adc MonetDB5/src/mal/mal_errors.mx
--- a/MonetDB5/src/mal/mal_errors.mxMon Jul 26 11:20:21 2010 +0200
+++ b/MonetDB5/src/mal/mal_errors.mxMon Jul 26 12:41:51 2010 +0200
@@ -98,7 +98,7 @@
#define RUNTIME_OBJECT_UNDEFINED "Object not found"
#define RUNTIME_UNKNOWN_INSTRUCTION "Instruction type not supported"
#define RUNTIME_QRY_TIMEOUT "Query aborted due to timeout"
-#define OPERATION_FAILED "Operation failed"
+#define OPERATION_FAILED "operation failed"
#define BOX_CLOSED "Box is not open"
diff -r 19ba7a116100 -r 3fa6164e3adc MonetDB5/src/modules/mal/mal_mapi.mx
--- a/MonetDB5/src/modules/mal/mal_mapi.mx Mon Jul 26 11:20:21 2010 +0200
+++ b/MonetDB5/src/modules/mal/mal_mapi.mx Mon Jul 26 12:41:51 2010 +0200
@@ -675,20 +675,20 @@
usockfile = GDKstrdup(*Usockfile);
#else
usockfile = NULL;
- throw(IO, "mal_mapi.listen", OPERATION_FAILED " Unix domain
sockets are not supported");
+ throw(IO, "mal_mapi.listen", OPERATION_FAILED ": UNIX domain
sockets are not supported");
#endif
}
maxusers = *Maxusers;
maxusers = (maxusers ? maxusers : SERVERMAXUSERS);
if (port <= 0 && usockfile == NULL)
- throw(IO, "mal_mapi.listen", OPERATION_FAILED " No port or
socket file specified");
+ throw(IO, "mal_mapi.listen", OPERATION_FAILED ": no port or
socket file specified");
if (port > 0) {
sock = socket(AF_INET, SOCK_STREAM, 0);
if (sock == INVALID_SOCKET)
throw(IO, "mal_mapi.listen",
- OPERATION_FAILED " Creation of stream
socket failed: %s",
+ OPERATION_FAILED ": creation of stream
socket failed: %s",
strerror(errno));
setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *) &on, sizeof
on);
@@ -728,7 +728,7 @@
if (getsockname(sock, (SOCKPTR) &server, &length) < 0)
throw(IO, "mal_mapi.listen",
- OPERATION_FAILED " Failed getting
socket name: %s",
+ OPERATION_FAILED ": failed getting
socket name: %s",
strerror(errno));
listen(sock, maxusers);
}
@@ -737,18 +737,26 @@
usock = socket(AF_UNIX, SOCK_STREAM, 0);
if (usock == INVALID_SOCKET ) {
throw(IO, "mal_mapi.listen",
- OPERATION_FAILED " Creation of Unix
socket failed: %s",
+ OPERATION_FAILED ": creation of UNIX
socket failed: %s",
strerror(errno));
}
+
+ /* prevent silent truncation, sun_path is typically around 108
+* chars long :/ */
+ if (strlen(usockfile) > sizeof(userver.sun_path))
+ throw(MAL, "mal_mapi.listen",
+ OPERATION_FAILED ": UNIX socket path
too long: %s",
+ usockfile);
+
userver.sun_family = AF_UNIX;
strncpy(userver.sun_path, usockfile, sizeof(userver.sun_path));
length = (SOCKLEN) sizeof(userver);
unlink(usockfile);
- if (bind(usock, (SOCKPTR) & userver, length) < 0) {
+ if (bind(usock, (SOCKPTR) &userver, length) < 0) {
unlink(usockfile);
throw(IO, "mal_mapi.listen",
- OPERATION_FAILED " Binding to Unix
socket file %s failed: %s",
+ OPERATION_FAILED ": binding to UNIX
socket file %s failed: %s",
usockfile, strerror(errno));
}
listen(usock, maxusers);
@@ -771,7 +779,7 @@
psock[2] = INVALID_SOCKET;
if (MT_create_thread(pidp, (void (*)(void *)) SERVERlistenThread,
psock) < 0) {
GDKfree(psock);
- throw(MAL, "mal_mapi.listen", OPERATION_FAILED " Starting
thread failed");
+ throw(MAL, "mal_mapi.listen", OPERATION_FAILED ": starting
thread failed");
}
#ifdef DEBUG_SERVER
gethostname(host, (int) 512);
@@ -936,7 +944,7 @@
l--;
}
*f=0;
- throw(MAL, "@1", OPERATION_FAILED " Remote error: %s", newerr);
+ throw(MAL, "@1", OPERATION_FAILED ": remote error: %s", newerr);
MonetDB: default - Merged from Jun2010
Changeset: 904a76bfdf47 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=904a76bfdf47 Modified Files: sql/src/backends/monet5/merovingian/merovingian_forkmserver.c Branch: default Log Message: Merged from Jun2010 diffs (14 lines): diff -r b8499e0f6dd0 -r 904a76bfdf47 sql/src/backends/monet5/merovingian/merovingian_forkmserver.c --- a/sql/src/backends/monet5/merovingian/merovingian_forkmserver.c Sun Jul 25 08:17:10 2010 +0200 +++ b/sql/src/backends/monet5/merovingian/merovingian_forkmserver.c Sun Jul 25 14:32:09 2010 +0200 @@ -430,7 +430,9 @@ /* right, it's not there, but it's running */ return(newErr( "database '%s' has inconsistent state " - "(running but dead), review merovingian's " + "(sabaoth administration reports running, " + "but process seems gone), " + "review merovingian's " "logfile for any peculiarities", database)); case SABdbCrashed: return(newErr( ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010
Changeset: b6cf4d771a87 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b6cf4d771a87 Modified Files: Branch: default Log Message: Merged from Jun2010 diffs (15 lines): diff -r 3e0c184174c9 -r b6cf4d771a87 sql/src/backends/monet5/merovingian/ChangeLog.Jun2010 --- a/sql/src/backends/monet5/merovingian/ChangeLog.Jun2010 Thu Jul 22 10:47:39 2010 +0200 +++ b/sql/src/backends/monet5/merovingian/ChangeLog.Jun2010 Thu Jul 22 11:18:57 2010 +0200 @@ -1,6 +1,11 @@ # ChangeLog file for sql/src/backends/monet5/merovingian # This file is updated with mchangelog + 21 Jul 2010; Fabian Groffen merovingian.c: + Really shutdown when an argument to merovingian was given, instead of + ending up in some inconsistent state. This solves all weird behaviour + observed in bug #2628. + 21 Jul 2010; Fabian Groffen merovingian.c, monetdb.c: Report MonetDB release on --version flags and in the logs. ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010
Changeset: cb34dceea691 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cb34dceea691
Modified Files:
Branch: default
Log Message:
Merged from Jun2010
diffs (57 lines):
diff -r fcd4d75a3c50 -r cb34dceea691 java/src/nl/cwi/monetdb/jdbc/MonetClob.java
--- a/java/src/nl/cwi/monetdb/jdbc/MonetClob.java Wed Jul 21 15:05:40
2010 +0200
+++ b/java/src/nl/cwi/monetdb/jdbc/MonetClob.java Wed Jul 21 15:06:43
2010 +0200
@@ -182,4 +182,15 @@
public void truncate(long len) {
// this command is a no-op
}
+
+ /**
+* Returns the String behind this Clob. This is a MonetClob
+* extension that does not violate nor is described in the Clob
+* interface.
+*
+* @return the String this Clob wraps.
+*/
+ public String toString() {
+ return(buf.toString());
+ }
}
diff -r fcd4d75a3c50 -r cb34dceea691 java/tests/Test_Rmetadata.java
--- a/java/tests/Test_Rmetadata.javaWed Jul 21 15:05:40 2010 +0200
+++ b/java/tests/Test_Rmetadata.javaWed Jul 21 15:06:43 2010 +0200
@@ -84,10 +84,11 @@
}
private static String isInstance(Object obj, String type) {
- if (obj == null) return("(null)");
+ if (obj == null)
+ return("(null)");
try {
Class c = Class.forName(type);
- if (obj.getClass() == c) {
+ if (c.isInstance(obj)) {
return(obj.getClass().getName() + " is an
instance of " + type);
} else {
return(obj.getClass().getName() + " is NOT an
instance of " + type);
diff -r fcd4d75a3c50 -r cb34dceea691
sql/src/jdbc/tests/Tests/Test_Rmetadata.stable.out
--- a/sql/src/jdbc/tests/Tests/Test_Rmetadata.stable.outWed Jul 21
15:05:40 2010 +0200
+++ b/sql/src/jdbc/tests/Tests/Test_Rmetadata.stable.outWed Jul 21
15:06:43 2010 +0200
@@ -107,7 +107,7 @@
signedfalse
writable false
5. mTests_src_jdbc_tests
- classname java.lang.String
+ classname java.sql.Clob
displaysize 11
label myclob
name myclob
@@ -135,7 +135,7 @@
6. java.lang.Double is an instance of java.lang.Double
6. java.lang.Boolean is an instance of java.lang.Boolean
6. java.lang.String is an instance of java.lang.String
-6. java.lang.String is an instance of java.lang.String
+6. nl.cwi.monetdb.jdbc.MonetClob is an instance of java.sql.Clob
# 09:09:21 >
# 09:09:21 > Done.
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010
Changeset: ce1fc98015a5 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ce1fc98015a5 Modified Files: java/configure.ag Branch: default Log Message: Merged from Jun2010 diffs (26 lines): diff -r 5c69faba35f2 -r ce1fc98015a5 java/ChangeLog.Jun2010 --- a/java/ChangeLog.Jun2010Tue Jul 20 21:48:51 2010 +0200 +++ b/java/ChangeLog.Jun2010Wed Jul 21 10:09:00 2010 +0200 @@ -1,6 +1,10 @@ # ChangeLog file for java # This file is updated with mchangelog (Gentoo echangelog bastard script) + 21 Jul 2010; Fabian Groffen configure.ag: + merocontrol Java library requires Java 2 Platform 1.5 and up, due to enum + and boxing/unboxing. Bug #2627 + 20 Jul 2010; Fabian Groffen Makefile.ag, NT/rules.msc, build.properties, release.txt, +src/nl/cwi/monetdb/jdbc/MonetBlob.java, src/nl/cwi/monetdb/jdbc/MonetResultSet.java: diff -r 5c69faba35f2 -r ce1fc98015a5 java/configure.ag --- a/java/configure.ag Tue Jul 20 21:48:51 2010 +0200 +++ b/java/configure.ag Wed Jul 21 10:09:00 2010 +0200 @@ -106,7 +106,7 @@ have_java_control=no if test "x$enable_control" != xno; then - req_java_ver_min=1.4 # >= $req_java_ver_min required + req_java_ver_min=1.5 # >= $req_java_ver_min required unset req_java_ver_max # < $req_java_ver_max required AM_MONETDB_ANT_JAVA($req_java_ver_min, $req_java_ver_max) if test "x$have_java" = xno; then ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010
Changeset: 6e3ecd892bf9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6e3ecd892bf9
Modified Files:
Branch: default
Log Message:
Merged from Jun2010
diffs (55 lines):
diff -r 6282c75f134f -r 6e3ecd892bf9 java/ChangeLog.Jun2010
--- a/java/ChangeLog.Jun2010Tue Jul 20 15:16:12 2010 +0200
+++ b/java/ChangeLog.Jun2010Tue Jul 20 15:20:22 2010 +0200
@@ -6,7 +6,7 @@
src/nl/cwi/monetdb/jdbc/MonetResultSet.java:
Implement missing Blob support (readonly), since getObject will blindly
return a BLOB instance as String, which is causing applications to wrongly
- believe a BLOB instance is a string. Bump version to 1.17.
+ believe a BLOB instance is a string.
16 Jul 2010; Fabian Groffen
stc/nl/cwi/monetdb/jdbc/MonetConnection.java:
@@ -14,6 +14,8 @@
an error with a typo that was not typed in by the user, such as
ioo.printf when io.printf was typed.
+*Jun2010-SP1
+
16 Apr 2010; Fabian Groffen build.xml, configure.ag,
Makefile.ag:
Enable the merovingian control library for default distribution as it
diff -r 6282c75f134f -r 6e3ecd892bf9 java/Makefile.ag
--- a/java/Makefile.ag Tue Jul 20 15:16:12 2010 +0200
+++ b/java/Makefile.ag Tue Jul 20 15:20:22 2010 +0200
@@ -30,7 +30,7 @@
ant_distjdbc = {
COND = HAVE_JAVAJDBC
DIR = datadir/MonetDB/lib
- FILES = monetdb-1.6-mcl.jar monetdb-1.17-jdbc.jar jdbcclient.jar
+ FILES = monetdb-1.6-mcl.jar monetdb-1.16-jdbc.jar jdbcclient.jar
}
ant_distxrpc = {
diff -r 6282c75f134f -r 6e3ecd892bf9 java/build.properties
--- a/java/build.properties Tue Jul 20 15:16:12 2010 +0200
+++ b/java/build.properties Tue Jul 20 15:20:22 2010 +0200
@@ -19,7 +19,7 @@
# major release number
JDBC_MAJOR=1
# minor release number
-JDBC_MINOR=17
+JDBC_MINOR=16
# an additional identifying string
JDBC_VER_SUFFIX=Magnistipula
# the default port to connect on, if no port given when using SQL
diff -r 6282c75f134f -r 6e3ecd892bf9 java/release.txt
--- a/java/release.txt Tue Jul 20 15:16:12 2010 +0200
+++ b/java/release.txt Tue Jul 20 15:20:22 2010 +0200
@@ -1,5 +1,5 @@
RELEASE NOTES
-MonetDB JDBC driver version 1.17 (Magnistipula/MCL-1.6)
+MonetDB JDBC driver version 1.16 (Magnistipula/MCL-1.6)
Fabian Groffen
Release date: 2010-07-20
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010
Changeset: 6282c75f134f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6282c75f134f
Modified Files:
Branch: default
Log Message:
Merged from Jun2010
diffs (truncated from 381 to 300 lines):
diff -r a76947a0304a -r 6282c75f134f java/ChangeLog.Jun2010
--- a/java/ChangeLog.Jun2010Tue Jul 20 14:48:59 2010 +0200
+++ b/java/ChangeLog.Jun2010Tue Jul 20 15:16:12 2010 +0200
@@ -1,6 +1,19 @@
# ChangeLog file for java
# This file is updated with mchangelog (Gentoo echangelog bastard script)
+ 20 Jul 2010; Fabian Groffen Makefile.ag, NT/rules.msc,
+ build.properties, release.txt, +src/nl/cwi/monetdb/jdbc/MonetBlob.java,
+ src/nl/cwi/monetdb/jdbc/MonetResultSet.java:
+ Implement missing Blob support (readonly), since getObject will blindly
+ return a BLOB instance as String, which is causing applications to wrongly
+ believe a BLOB instance is a string. Bump version to 1.17.
+
+ 16 Jul 2010; Fabian Groffen
+ stc/nl/cwi/monetdb/jdbc/MonetConnection.java:
+ Fix problem when using the MAL language. Any statement would return
+ an error with a typo that was not typed in by the user, such as
+ ioo.printf when io.printf was typed.
+
16 Apr 2010; Fabian Groffen build.xml, configure.ag,
Makefile.ag:
Enable the merovingian control library for default distribution as it
@@ -23,6 +36,3 @@
latter clean from files generated during the build.
On Windows, the build directory must be a sibling of ...NT .
-* Fri Jul 16 2010 Fabian Groffen
-- Fix problem when using the MAL language. Any statement would return an
error with a typo that was not typed in by the user, such as ioo.printf when
io.printf was typed.
-
diff -r a76947a0304a -r 6282c75f134f java/Makefile.ag
--- a/java/Makefile.ag Tue Jul 20 14:48:59 2010 +0200
+++ b/java/Makefile.ag Tue Jul 20 15:16:12 2010 +0200
@@ -30,7 +30,7 @@
ant_distjdbc = {
COND = HAVE_JAVAJDBC
DIR = datadir/MonetDB/lib
- FILES = monetdb-1.6-mcl.jar monetdb-1.16-jdbc.jar jdbcclient.jar
+ FILES = monetdb-1.6-mcl.jar monetdb-1.17-jdbc.jar jdbcclient.jar
}
ant_distxrpc = {
diff -r a76947a0304a -r 6282c75f134f java/NT/rules.msc
--- a/java/NT/rules.msc Tue Jul 20 14:48:59 2010 +0200
+++ b/java/NT/rules.msc Tue Jul 20 15:16:12 2010 +0200
@@ -28,6 +28,6 @@
!INCLUDE $(RULESMSC)
pkg = java
-VERSION=20100716
+VERSION=20100720
ODBC_LIBS = odbccp32.lib user32.lib
diff -r a76947a0304a -r 6282c75f134f java/build.properties
--- a/java/build.properties Tue Jul 20 14:48:59 2010 +0200
+++ b/java/build.properties Tue Jul 20 15:16:12 2010 +0200
@@ -19,7 +19,7 @@
# major release number
JDBC_MAJOR=1
# minor release number
-JDBC_MINOR=16
+JDBC_MINOR=17
# an additional identifying string
JDBC_VER_SUFFIX=Magnistipula
# the default port to connect on, if no port given when using SQL
diff -r a76947a0304a -r 6282c75f134f java/release.txt
--- a/java/release.txt Tue Jul 20 14:48:59 2010 +0200
+++ b/java/release.txt Tue Jul 20 15:16:12 2010 +0200
@@ -1,8 +1,8 @@
RELEASE NOTES
-MonetDB JDBC driver version 1.16 (Magnistipula/MCL-1.6)
+MonetDB JDBC driver version 1.17 (Magnistipula/MCL-1.6)
Fabian Groffen
-Release date: 2010-07-16
+Release date: 2010-07-20
This JDBC driver is designed for use with MonetDB, a main-memory
@@ -63,7 +63,6 @@
The next features are not implemented:
- getArray
- getAsciiStream, getBinaryStream, getUnicodeStream, getCharacterStream
-- getBlob
- getRef, getURL
- all methods related to updateable result sets
* java.sql.ResultSetMetaData interface
diff -r a76947a0304a -r 6282c75f134f java/src/nl/cwi/monetdb/jdbc/MonetBlob.java
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/java/src/nl/cwi/monetdb/jdbc/MonetBlob.java Tue Jul 20 15:16:12
2010 +0200
@@ -0,0 +1,203 @@
+/*
+ * The contents of this file are subject to the MonetDB Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * The Original Code is the MonetDB Database System.
+ *
+ * The Initial Developer of the Original Code is CWI.
+ * Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
+ * Copyright August 2008-2010 MonetDB B.V.
+ * All Rights Reserved.
+ */
+
+package nl.cwi.monetdb.jdbc;
+
+import java.sql.*;
+import java.io.*;
+
+/**
+ * The MonetBlob class implements the java.sql.Blob interface. Because
+ * MonetDB/SQL currently has no support for streams, this class is a
+ * shallow wrapper of a StringBuffer. It is more or less supplied to
+ * enable an application that depends on it to run. It may be obvious
+ * that it is a real resource expens
MonetDB: default - Merged from Jun2010
Changeset: fa6199240d8a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fa6199240d8a
Modified Files:
Branch: default
Log Message:
Merged from Jun2010
diffs (71 lines):
diff -r 0aecddfa8e81 -r fa6199240d8a java/ChangeLog.Jun2010
--- a/java/ChangeLog.Jun2010Fri Jul 16 14:24:20 2010 +0200
+++ b/java/ChangeLog.Jun2010Fri Jul 16 14:50:13 2010 +0200
@@ -23,3 +23,6 @@
latter clean from files generated during the build.
On Windows, the build directory must be a sibling of ...NT .
+* Fri Jul 16 2010 Fabian Groffen
+- Fix problem when using the MAL language. Any statement would return an
error with a typo that was not typed in by the user, such as ioo.printf when
io.printf was typed.
+
diff -r 0aecddfa8e81 -r fa6199240d8a java/Makefile.ag
--- a/java/Makefile.ag Fri Jul 16 14:24:20 2010 +0200
+++ b/java/Makefile.ag Fri Jul 16 14:50:13 2010 +0200
@@ -30,7 +30,7 @@
ant_distjdbc = {
COND = HAVE_JAVAJDBC
DIR = datadir/MonetDB/lib
- FILES = monetdb-1.6-mcl.jar monetdb-1.15-jdbc.jar jdbcclient.jar
+ FILES = monetdb-1.6-mcl.jar monetdb-1.16-jdbc.jar jdbcclient.jar
}
ant_distxrpc = {
diff -r 0aecddfa8e81 -r fa6199240d8a java/NT/rules.msc
--- a/java/NT/rules.msc Fri Jul 16 14:24:20 2010 +0200
+++ b/java/NT/rules.msc Fri Jul 16 14:50:13 2010 +0200
@@ -28,6 +28,6 @@
!INCLUDE $(RULESMSC)
pkg = java
-VERSION=20100331
+VERSION=20100716
ODBC_LIBS = odbccp32.lib user32.lib
diff -r 0aecddfa8e81 -r fa6199240d8a java/build.properties
--- a/java/build.properties Fri Jul 16 14:24:20 2010 +0200
+++ b/java/build.properties Fri Jul 16 14:50:13 2010 +0200
@@ -19,7 +19,7 @@
# major release number
JDBC_MAJOR=1
# minor release number
-JDBC_MINOR=15
+JDBC_MINOR=16
# an additional identifying string
JDBC_VER_SUFFIX=Magnistipula
# the default port to connect on, if no port given when using SQL
diff -r 0aecddfa8e81 -r fa6199240d8a java/release.txt
--- a/java/release.txt Fri Jul 16 14:24:20 2010 +0200
+++ b/java/release.txt Fri Jul 16 14:50:13 2010 +0200
@@ -1,8 +1,8 @@
RELEASE NOTES
-MonetDB JDBC driver version 1.15 (Magnistipula/MCL-1.6)
+MonetDB JDBC driver version 1.16 (Magnistipula/MCL-1.6)
Fabian Groffen
-Release date: 2010-03-31
+Release date: 2010-07-16
This JDBC driver is designed for use with MonetDB, a main-memory
diff -r 0aecddfa8e81 -r fa6199240d8a
java/src/nl/cwi/monetdb/jdbc/MonetConnection.java
--- a/java/src/nl/cwi/monetdb/jdbc/MonetConnection.java Fri Jul 16 14:24:20
2010 +0200
+++ b/java/src/nl/cwi/monetdb/jdbc/MonetConnection.java Fri Jul 16 14:50:13
2010 +0200
@@ -254,7 +254,7 @@
commandTempl[2] = "\nX";// separator
} else if (lang == LANG_MIL || lang == LANG_MAL) {
queryTempl[0] = null;
- queryTempl[1] = ";";
+ queryTempl[1] = ";\n";
queryTempl[2] = ";\n";
commandTempl[0] = null; // pre
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010
Changeset: 09db8a46c67e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=09db8a46c67e
Modified Files:
sql/src/server/rel_semantic.mx
sql/src/storage/sql_catalog.mx
sql/src/storage/store.mx
Branch: default
Log Message:
Merged from Jun2010
diffs (138 lines):
diff -r 091e939109be -r 09db8a46c67e sql/src/server/rel_semantic.mx
--- a/sql/src/server/rel_semantic.mxWed Jul 14 11:08:54 2010 +0200
+++ b/sql/src/server/rel_semantic.mxWed Jul 14 12:40:13 2010 +0200
@@ -315,7 +315,7 @@
}
stack_pop_frame(sql);
return r;
- }
+ }
case SQL_PREP:
{
dnode *d = s->data.lval->h;
diff -r 091e939109be -r 09db8a46c67e sql/src/server/sql_psm.mx
--- a/sql/src/server/sql_psm.mx Wed Jul 14 11:08:54 2010 +0200
+++ b/sql/src/server/sql_psm.mx Wed Jul 14 12:40:13 2010 +0200
@@ -536,7 +536,7 @@
if (sname && !(s = mvc_bind_schema(sql, sname)))
return sql_error(sql, 02, "CREATE %s: no such schema '%s'", F,
sname);
- if(s == NULL)
+ if (s == NULL)
s = cur_schema(sql);
if (res)
@@ -573,7 +573,9 @@
list_destroy(type_list);
if (create && !schema_privs(sql->role_id, s)) {
- return sql_error(sql, 02, "CREATE FUNCTION:
insufficient privileges for user '%s' in schema '%s'", stack_get_string(sql,
"current_user"), s->base.name);
+ return sql_error(sql, 02, "CREATE %s: insufficient
privileges "
+ "for user '%s' in schema '%s'", F,
+ stack_get_string(sql, "current_user"),
s->base.name);
} else {
if (params)
for (n = params->h; n; n = n->next) {
@@ -601,12 +603,14 @@
if (is_func && restype && !has_return(b)) {
sql_destroy_params(sql);
list_destroy(l);
- return sql_error(sql, 01, "Missing
return statement");
+ return sql_error(sql, 01,
+ "CREATE %s: missing
return statement", F);
}
if (!is_func && !restype && has_return(b)) {
sql_destroy_params(sql);
list_destroy(l);
- return sql_error(sql, 01, "It is a
procedure so it cannot have a return statement!!");
+ return sql_error(sql, 01, "CREATE %s:
procedures "
+ "cannot have return
statements", F);
}
/* in execute mode we instantiate the function
*/
@@ -616,15 +620,19 @@
list_destroy(l);
return b;
} else if (create) {
- f = mvc_create_func(sql,
sql->session->schema, fname, l, restype, TRUE, is_aggr, "user", q, is_func);
+ f = mvc_create_func(sql,
sql->session->schema, fname,
+ l, restype, TRUE,
is_aggr, "user", q, is_func);
if (b) {
id_col_l =
stmt_list_dependencies(b, COLUMN_DEPENDENCY);
id_func_l =
stmt_list_dependencies(b, FUNC_DEPENDENCY);
view_id_l =
stmt_list_dependencies(b, VIEW_DEPENDENCY);
- mvc_create_dependencies(sql,
id_col_l, f->base.id, f->is_func ? FUNC_DEPENDENCY : PROC_DEPENDENCY);
- mvc_create_dependencies(sql,
id_func_l, f->base.id, f->is_func ? FUNC_DEPENDENCY : PROC_DEPENDENCY);
- mvc_create_dependencies(sql,
view_id_l, f->base.id, f->is_func ? FUNC_DEPENDENCY : PROC_DEPENDENCY);
+ mvc_create_dependencies(sql,
id_col_l, f->base.id,
+ f->is_func ?
FUNC_DEPENDENCY : PROC_DEPENDENCY);
+ mvc_create_dependencies(sql,
id_func_l, f->base.id,
+ f->is_func ?
FUNC_DEPENDENCY : PROC_DEPENDENCY);
+ mvc_create_dependencies(sql,
view_id_l, f->base.id,
+
MonetDB: default - Merged from Jun2010 (looks ok, hopefully it i...
Changeset: 10eadeef2526 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=10eadeef2526 Modified Files: sql/ChangeLog.Jun2010 Branch: default Log Message: Merged from Jun2010 (looks ok, hopefully it is after my hgrepo got corrupted) diffs (11 lines): diff -r b5d877dd223c -r 10eadeef2526 sql/ChangeLog.Jun2010 --- a/sql/ChangeLog.Jun2010 Mon Jul 12 10:53:00 2010 +0200 +++ b/sql/ChangeLog.Jun2010 Mon Jul 12 11:16:39 2010 +0200 @@ -5,6 +5,5 @@ - Make queries like (SELECT ...) UNION ALL (SELECT ...) ORDER BY ...; work, again, that were broken since Jun 22 2010 - triggering errors like - "!ORDER BY: missing select operator" + triggering errors like "ORDER BY: missing select operator" ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010 (ignore any differences)
Changeset: 1fb46778df7a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1fb46778df7a Modified Files: sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj sql/NT/MonetDB5-SQL/MonetDB5-SQL.vdproj sql/NT/MonetDB5-SQL/MonetDB5-SQL64.vdproj sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj Branch: default Log Message: Merged from Jun2010 (ignore any differences) ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010
Changeset: 6d9e3fcff77c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6d9e3fcff77c Modified Files: Branch: default Log Message: Merged from Jun2010 diffs (13 lines): diff -r 647fe7705b69 -r 6d9e3fcff77c sql/src/test/BugTracker-2010/Tests/crashonschema.Bug-2547.stable.err --- a/sql/src/test/BugTracker-2010/Tests/crashonschema.Bug-2547.stable.err Sat Jul 10 10:02:43 2010 +0200 +++ b/sql/src/test/BugTracker-2010/Tests/crashonschema.Bug-2547.stable.err Sat Jul 10 10:04:50 2010 +0200 @@ -80,9 +80,6 @@ MAPI = mone...@alf:39317 QUERY = drop schema intro2; ERROR = !SQLException:sql.catalog:DROP SCHEMA: name intro2 does not exist -MAPI = mone...@alf:39317 -QUERY = create schema intro3 -ERROR = !sql_stmt symbol(7f74f4007a98)->token = CREATE_SCHEMA # 18:47:50 > # 18:47:50 > Done. ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010 (ignore any differences)
Changeset: 0038563b3569 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0038563b3569 Modified Files: sql/src/backends/monet5/sql_scenario.mx sql/src/sql/Makefile.ag sql/src/test/BugTracker-2010/Tests/All Branch: default Log Message: Merged from Jun2010 (ignore any differences) ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010
Changeset: b88ded813860 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b88ded813860 Modified Files: clients/src/mapiclient/mclient.mx Branch: default Log Message: Merged from Jun2010 ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010
Changeset: e51b97960b05 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e51b97960b05
Modified Files:
MonetDB5/src/mal/mal_authorize.mx
Branch: default
Log Message:
Merged from Jun2010
diffs (12 lines):
diff -r bfd7df8db821 -r e51b97960b05 MonetDB5/src/mal/mal_authorize.mx
--- a/MonetDB5/src/mal/mal_authorize.mx Fri Jul 09 10:39:19 2010 +0200
+++ b/MonetDB5/src/mal/mal_authorize.mx Fri Jul 09 10:41:48 2010 +0200
@@ -927,7 +927,7 @@
oid id;
BATiter i;
str tmp;
- str passwd;
+ str passwd = NULL;
rethrow("getPasswordHash", tmp, AUTHrequireAdmin(c));
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010
Changeset: d70597e58c01 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d70597e58c01
Modified Files:
sql/ChangeLog.Jun2010
sql/src/server/rel_select.mx
Branch: default
Log Message:
Merged from Jun2010
diffs (127 lines):
diff -r 9b2fd9544969 -r d70597e58c01 sql/ChangeLog.Jun2010
--- a/sql/ChangeLog.Jun2010 Thu Jul 08 15:47:07 2010 +0200
+++ b/sql/ChangeLog.Jun2010 Thu Jul 08 17:39:21 2010 +0200
@@ -1,6 +1,9 @@
# ChangeLog file for sql
# This file is updated with Maddlog
+* Thu Jul 8 2010 Fabian Groffen
+- Improved error message for certain type-related problems by including the
affected column name.
+
* Wed Jul 7 2010 Fabian Groffen
- Make TEXT a separate keyword, separating it from CLOB, such that we can
sloppily allow TEXT to appear as a column name, since it seems not to be in the
standard as reserved keyword.
diff -r 9b2fd9544969 -r d70597e58c01 sql/src/server/rel_select.mx
--- a/sql/src/server/rel_select.mx Thu Jul 08 15:47:07 2010 +0200
+++ b/sql/src/server/rel_select.mx Thu Jul 08 17:39:21 2010 +0200
@@ -1758,15 +1758,16 @@
if (err) {
sql_exp *res = sql_error(
sql, 03,
- "types %s(%d,%d) (%s) and %s(%d,%d) (%s) are not equal",
+ "types %s(%d,%d) and %s(%d,%d) are not equal%s%s%s",
fromtype->type->sqlname,
fromtype->digits,
fromtype->scale,
- fromtype->type->base.name,
t->type->sqlname,
t->digits,
t->scale,
- t->type->base.name
+ (exp->type == e_column ? " for column '" : ""),
+ (exp->type == e_column ? exp->name : ""),
+ (exp->type == e_column ? "'" : "")
);
if (exp)
exp_destroy(exp);
diff -r 9b2fd9544969 -r d70597e58c01
sql/src/test/BugTracker/Tests/between_with_column.SF-1959410.stable.err
--- a/sql/src/test/BugTracker/Tests/between_with_column.SF-1959410.stable.err
Thu Jul 08 15:47:07 2010 +0200
+++ b/sql/src/test/BugTracker/Tests/between_with_column.SF-1959410.stable.err
Thu Jul 08 17:39:21 2010 +0200
@@ -12,9 +12,9 @@
# 10:53:08 > mclient -lsql -umonetdb -Pmonetdb --host=alviss --port=39845
# 10:53:08 >
-MAPI = mone...@alf:30201
+MAPI = mone...@volund:38056
QUERY = select yea from t4, t5 where age between 0.03 and id < 30 ;
-ERROR = !types boolean(1,0) (bit) and double(53,2) (dbl) are not equal
+ERROR = !types boolean(1,0) and double(53,2) are not equal
# 10:53:08 >
# 10:53:08 > Done.
diff -r 9b2fd9544969 -r d70597e58c01
sql/src/test/BugTracker/Tests/insert_date.SF-1838785.stable.err
--- a/sql/src/test/BugTracker/Tests/insert_date.SF-1838785.stable.err Thu Jul
08 15:47:07 2010 +0200
+++ b/sql/src/test/BugTracker/Tests/insert_date.SF-1838785.stable.err Thu Jul
08 17:39:21 2010 +0200
@@ -10,9 +10,9 @@
# 00:53:56 > mclient -lsql -umonetdb -Pmonetdb --host=koala --port=35202
# 00:53:56 >
-MAPI = mone...@amelia:38636
+MAPI = mone...@volund:38056
QUERY = insert into test1838785(id,name,date33)
-ERROR = !types smallint(16,0) (sht) and date(0,0) (date) are not equal
+ERROR = !types smallint(16,0) and date(0,0) are not equal
# 00:53:56 >
# 00:53:56 > Done.
diff -r 9b2fd9544969 -r d70597e58c01
sql/src/test/BugTracker/Tests/set_operation_coersions.SF-1543216.stable.err
---
a/sql/src/test/BugTracker/Tests/set_operation_coersions.SF-1543216.stable.err
Thu Jul 08 15:47:07 2010 +0200
+++
b/sql/src/test/BugTracker/Tests/set_operation_coersions.SF-1543216.stable.err
Thu Jul 08 17:39:21 2010 +0200
@@ -10,12 +10,13 @@
# 11:19:45 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb
--host=localhost --port=36646 < set_operation_coersions.SF-1543216.sql
# 11:19:45 >
-MAPI = mone...@localhost:36646
+MAPI = mone...@volund:32544
QUERY = select * from t1543216 union select * from s1543216;
-ERROR = !types varchar(23,0) (str) and int(32,0) (int) are not equal
-MAPI = mone...@localhost:36646
+ERROR = !types varchar(23,0) and int(32,0) are not equal for column 'id'
+MAPI = mone...@volund:32544
QUERY = select * from f1543216 union select * from b1543216;
-ERROR = !types boolean(1,0) (bit) and double(53,0) (dbl) are not equal
+ERROR = !types boolean(1,0) and double(53,0) are not equal for column 'id'
+
# 11:19:45 >
# 11:19:45 > Done.
diff -r 9b2fd9544969 -r d70597e58c01
sql/src/test/Via-m/Tests/event_s11.stable.err
--- a/sql/src/test/Via-m/Tests/event_s11.stable.err Thu Jul 08 15:47:07
2010 +0200
+++ b/sql/src/test/Via-m/Tests/event_s11.stable.err Thu Jul 08 17:39:21
2010 +0200
@@ -67,16 +67,16 @@
# 15:59:49 > mclient -lsql -umonetdb -Pmonetdb --host=yngling --port=32412
# 15:59:49 >
-MAPI = mone...@alf:37695
+MAPI = mone...@volund:38056
QUER
MonetDB: default - Merged from Jun2010 (no actual changes)
Changeset: ca9420679474 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ca9420679474 Modified Files: MonetDB5/src/modules/mal/remote.mx Branch: default Log Message: Merged from Jun2010 (no actual changes) ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010
Changeset: 7ea43e530974 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7ea43e530974 Modified Files: Branch: default Log Message: Merged from Jun2010 diffs (36 lines): diff -r 21f12530f270 -r 7ea43e530974 sql/src/backends/monet5/merovingian/merovingian.1.in --- a/sql/src/backends/monet5/merovingian/merovingian.1.in Fri Jul 02 09:56:47 2010 +0200 +++ b/sql/src/backends/monet5/merovingian/merovingian.1.in Fri Jul 02 11:52:18 2010 +0200 @@ -9,8 +9,8 @@ .SH DESCRIPTION .B merovingian is the MonetDB Database Server daemon. It is not meant to be used in -interactive environments, and hence has no help or version commands nor -flags. The typical use of +interactive environments, and hence has no help command or flag. +The typical use of .B merovingian is to be started from a startup script, such as from .I /etc/init.d/ @@ -304,7 +304,8 @@ .B merovingian returns exit code .B 0 -if it was able to successfully launch the background process. When an +if it was able to successfully launch the background process or when the +version information was printed. When an error occurs during startup that prevents .B merovingian from functioning properly, an exit code diff -r 21f12530f270 -r 7ea43e530974 sql/src/backends/monet5/merovingian/merovingian.c --- a/sql/src/backends/monet5/merovingian/merovingian.c Fri Jul 02 09:56:47 2010 +0200 +++ b/sql/src/backends/monet5/merovingian/merovingian.c Fri Jul 02 11:52:18 2010 +0200 @@ -679,7 +679,7 @@ (_mero_controlport != 0 ? "yes" : "no")); Mfprintf(stderr, " performs neighbour discovery: %s\n", (discoveryport != 0 ? "yes" : "no")); - MERO_EXIT(1); + MERO_EXIT(0); } /* seed the randomiser for when we create a database, send responses ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010
Changeset: 5c7a10ceb231 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5c7a10ceb231
Modified Files:
Branch: default
Log Message:
Merged from Jun2010
diffs (51 lines):
diff -r a4492dce5fce -r 5c7a10ceb231
sql/src/backends/monet5/merovingian/ChangeLog.Jun2010
--- a/sql/src/backends/monet5/merovingian/ChangeLog.Jun2010 Thu Jul 01
15:01:02 2010 +0200
+++ b/sql/src/backends/monet5/merovingian/ChangeLog.Jun2010 Thu Jul 01
15:02:41 2010 +0200
@@ -1,7 +1,12 @@
# ChangeLog file for sql/src/backends/monet5/merovingian
# This file is updated with mchangelog
-#*June2010
+ 01 Jul 2010; Fabian Groffen merovingian.c:
+ When a startup failure causes a shutdown, make sure we log this
+ incident in the logfile, together with a message that the deamon was
+ shut down due to this fatal condition.
+
+*Jun2010
01 Jun 2010; Fabian Groffen merovingian.c, utils.c:
Fixed an issue where Merovingian's strict umask was applied too early
diff -r a4492dce5fce -r 5c7a10ceb231
sql/src/backends/monet5/merovingian/merovingian.c
--- a/sql/src/backends/monet5/merovingian/merovingian.c Thu Jul 01 15:01:02
2010 +0200
+++ b/sql/src/backends/monet5/merovingian/merovingian.c Thu Jul 01 15:02:41
2010 +0200
@@ -518,8 +518,11 @@
if (write(retfd, &s, 1) != 1 || close(retfd) != 0) { \
Mfprintf(stderr, "could not write to parent\n"); \
} \
- if (status != 0) \
- return(status); \
+ if (status != 0) { \
+ Mfprintf(stderr, "fatal startup condition encountered, " \
+ "aborting startup\n"); \
+ goto shutdown; \
+ } \
}
readConfFile(ckv, cnf);
@@ -1000,13 +1003,14 @@
if (e != NO_ERR) {
/* console */
- Mfprintf(stderr, "%s\n", argv[0], e);
Mfprintf(oerr, "%s: %s\n", argv[0], e);
- MERO_EXIT(1);
/* logfile */
Mfprintf(stderr, "%s\n", e);
+ MERO_EXIT(1);
}
+shutdown:
+
/* we don't need merovingian itself */
d = d->next;
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010
Changeset: e7fc78bf3887 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e7fc78bf3887
Modified Files:
Branch: default
Log Message:
Merged from Jun2010
diffs (truncated from 309 to 300 lines):
diff -r b257e57f9473 -r e7fc78bf3887 MonetDB5/ChangeLog.Jun2010
--- a/MonetDB5/ChangeLog.Jun2010Thu Jul 01 14:29:32 2010 +0200
+++ b/MonetDB5/ChangeLog.Jun2010Thu Jul 01 14:42:59 2010 +0200
@@ -1,6 +1,10 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
+* Thr Jul 01 2010 Fabian Groffen
+- Return a correct URI for local connection from Sabaoth when the
+ connection is a UNIX domain socket. Partial fix for bug #2567.
+
* Wed Jun 30 2010 Stefan Manegold
- various performance fixes in grouping and grouped aggregation code
(MonetDB5/src/modules/kernel/group.mx, MonetDB5/src/modules/kernel/aggr*.mx)
diff -r b257e57f9473 -r e7fc78bf3887 MonetDB5/src/mal/mal_sabaoth.mx
--- a/MonetDB5/src/mal/mal_sabaoth.mx Thu Jul 01 14:29:32 2010 +0200
+++ b/MonetDB5/src/mal/mal_sabaoth.mx Thu Jul 01 14:42:59 2010 +0200
@@ -349,7 +349,13 @@
if (stats == NULL || stats->conns == NULL || stats->conns->val == NULL)
{
*ret = GDKstrdup(str_nil);
} else {
- snprintf(data, sizeof(data), "%s%s", stats->conns->val,
stats->dbname);
+ if (stats->conns->val[15] == '/') {
+ snprintf(data, sizeof(data), "%s?database=%s",
+ stats->conns->val, stats->dbname);
+ } else {
+ snprintf(data, sizeof(data), "%s%s",
+ stats->conns->val, stats->dbname);
+ }
*ret = GDKstrdup(data);
}
diff -r b257e57f9473 -r e7fc78bf3887 MonetDB5/src/modules/mal/Tests/All
--- a/MonetDB5/src/modules/mal/Tests/AllThu Jul 01 14:29:32 2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/AllThu Jul 01 14:42:59 2010 +0200
@@ -39,6 +39,10 @@
remote10
+# this will always return something else
+#sabaoth00
+sabaoth01
+
partition
printf
#some remote related tests
diff -r b257e57f9473 -r e7fc78bf3887
MonetDB5/src/modules/mal/Tests/sabaoth01.mal
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/MonetDB5/src/modules/mal/Tests/sabaoth01.mal Thu Jul 01 14:42:59
2010 +0200
@@ -0,0 +1,4 @@
+u := sabaoth.getLocalConnectionURI();
+# if all is well, we can make a connection to ourself
+c := remote.connect(u, "monetdb", "monetdb");
+remote.disconnect(c);
diff -r b257e57f9473 -r e7fc78bf3887
MonetDB5/src/modules/mal/Tests/sabaoth01.stable.err
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/MonetDB5/src/modules/mal/Tests/sabaoth01.stable.err Thu Jul 01
14:42:59 2010 +0200
@@ -0,0 +1,72 @@
+stderr of test 'sabaoth01` in directory 'src/modules/mal` itself:
+
+
+# 14:37:48 >
+# 14:37:48 > mserver5
"--config=/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5:/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5/lib:/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5/bin"
--set
"gdk_dbfarm=/net/volund.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-Jun2010-volund.ins.cwi.nl/five/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=38787 --set
xrpc_port=40577 --set monet_prompt= --set mal_listing=2 --trace
--dbname=mTests_src_modules_mal sabaoth01.mal
+# 14:37:48 >
+
+# builtin opt gdk_arch = 64bitx86_64-pc-linux-gnu
+# builtin opt gdk_version = 1.38.1
+# builtin opt prefix = /ufs/fabian/scratch/monetdb/Jun2010/program-x86_64
+# builtin opt exec_prefix = ${prefix}
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_admin = adm
+# builtin opt monet_prompt = >
+# builtin opt monet_welcome = yes
+# builtin opt monet_mod_path =
/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB
+# builtin opt monet_daemon = no
+# builtin opt host = localhost
+# builtin opt mapi_port = 5
+# builtin opt mapi_clients = 2
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_debug = 0
+# builtin opt standoff_ns =
+# builtin opt standoff_start = start
+# builtin opt standoff_end = end
+# config opt prefix = /ufs/fabian/scratch/monetdb/Jun2010/program-x86_64
+# config opt config = ${prefix}/etc/monetdb5.conf
+# config opt prefix = /ufs/fabian/scratch/monetdb/Jun2010/program-x86_64
+# config opt exec_prefix = ${prefix}
+# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
+# config opt monet_mod_path =
/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5:/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5/lib:/ufs/fabian/scratch/monetd
MonetDB: default - Merged from Jun2010
Changeset: 0f0a9f9fe1bc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0f0a9f9fe1bc
Modified Files:
Branch: default
Log Message:
Merged from Jun2010
diffs (34 lines):
diff -r ea2b44d8b8a5 -r 0f0a9f9fe1bc MonetDB/src/gdk/gdk_system.mx
--- a/MonetDB/src/gdk/gdk_system.mx Wed Jun 30 14:22:49 2010 +0200
+++ b/MonetDB/src/gdk/gdk_system.mx Wed Jun 30 15:39:11 2010 +0200
@@ -372,22 +372,19 @@
# if defined(HAVE_SYSCONF) && defined(_SC_PHYS_PAGES)
_MT_npages = sysconf(_SC_PHYS_PAGES);
# else
-# if defined(HAVE_GETRLIMIT) && defined(RLIMIT_RSS)
+# if defined(HAVE_SYS_SYSCTL_H) && defined(HW_USERMEM)
{
- struct rlimit rl;
+ uint64_t size;
+ size_t len = sizeof(size);
- /* Specifies the limit (in pages) of the process's resident set
-* (the number of virtual pages resident in RAM). This limit
-* only has effect in Linux 2.4.x, x < 30, and there only
-* affects calls to madvise() specifying MADV_WILLNEED */
- /* FIXME: this looks like a total wrong thing to check in any
-* case to me */
- getrlimit(RLIMIT_RSS, &rl);
- _MT_npages = rl.rlim_cur / _MT_pagesize;
+ /* This is the 'non-kernel memory', e.g. what's left to a user
+* process to allocate. */
+ sysctlbyname("hw.usermem", &size, &len, NULL, 0);
+ _MT_npages = size / _MT_pagesize;
}
# else
#error "don't know how to get the amount of physical memory for your OS"
-# endif /* getrlimit */
+# endif /* sysctl */
# endif /* sysconf */
# endif/* GlobalMemoryStatus */
#endif /* GlobalMemoryStatusEx */
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010 branch.
Changeset: 4a2b13902748 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4a2b13902748 Modified Files: sql/debian/monetdb5-sql.init.d sql/src/server/sql_parser.mx Branch: default Log Message: Merged from Jun2010 branch. diffs (20 lines): diff -r dd95b836c486 -r 4a2b13902748 sql/debian/monetdb5-sql.init.d --- a/sql/debian/monetdb5-sql.init.dTue Jun 22 11:47:40 2010 +0200 +++ b/sql/debian/monetdb5-sql.init.dTue Jun 22 13:13:32 2010 +0200 @@ -1,6 +1,15 @@ #! /bin/sh +### BEGIN INIT INFO +# Provides: mserver5-sql +# Required-Start:$remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: MonetDB SQL service +# Description: MonetDB SQL service "merovingian". +### END INIT INFO -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +PATH=/sbin:/usr/sbin:/bin:/usr/bin DAEMON=/usr/bin/merovingian NAME=merovingian DESC="MonetDB SQL server" ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010 branch
Changeset: 00e27361f6fe for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=00e27361f6fe
Modified Files:
MonetDB/MonetDB.spec
MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj
MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj
MonetDB/NT/rules.msc
MonetDB/configure.ag
MonetDB/src/gdk/libbat.rc
MonetDB/vertoo.data
MonetDB4/MonetDB-server.spec
MonetDB4/NT/MonetDB.iss
MonetDB4/NT/MonetDB4-Server/MonetDB4-Server.vdproj
MonetDB4/NT/MonetDB4-Server/MonetDB4-Server64.vdproj
MonetDB4/NT/rules.msc
MonetDB4/VERSION
MonetDB4/configure.ag
MonetDB4/src/monet/libmonet.rc
MonetDB4/vertoo.data
MonetDB5/MonetDB-server.spec
MonetDB5/NT/MonetDB5-Server/MonetDB5-Server.vdproj
MonetDB5/NT/MonetDB5-Server/MonetDB5-Server64.vdproj
MonetDB5/NT/rules.msc
MonetDB5/VERSION
MonetDB5/conf/monetdb5.conf.in
MonetDB5/configure.ag
MonetDB5/src/mal/libmonetdb5.rc
MonetDB5/vertoo.data
clients/MonetDB-client.spec
clients/NT/MonetDB-Clients/MonetDB-Clients.vdproj
clients/NT/MonetDB-Clients/MonetDB-Clients64.vdproj
clients/NT/rules.msc
clients/configure.ag
clients/src/mapilib/Mapi.rc
clients/src/odbc/driver/driver.rc
clients/src/odbc/winsetup/setup.rc
clients/vertoo.data
geom/MonetDB-geom.spec
geom/NT/rules.msc
geom/configure.ag
geom/vertoo.data
java/configure.ag
java/vertoo.data
pathfinder/MonetDB-XQuery.spec
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery.vdproj
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery64.vdproj
pathfinder/NT/rules.msc
pathfinder/VERSION
pathfinder/configure.ag
pathfinder/runtime/pathfinder.mx
pathfinder/runtime/xrpc/admin/title.html.in
pathfinder/vertoo.data
sql/ChangeLog.Jun2010
sql/MonetDB-SQL.spec
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL/MonetDB5-SQL.vdproj
sql/NT/MonetDB5-SQL/MonetDB5-SQL64.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
sql/NT/rules.msc
sql/VERSION
sql/configure.ag
sql/vertoo.data
template/configure.ag
template/vertoo.data
testing/MonetDB-testing.spec
testing/NT/rules.msc
testing/configure.ag
testing/vertoo.data
Branch: default
Log Message:
Merged from Jun2010 branch
diffs (truncated from 1252 to 300 lines):
diff -r b0b10e8fd731 -r 00e27361f6fe MonetDB/ChangeLog.Jun2010
--- a/MonetDB/ChangeLog.Jun2010 Fri Jun 18 10:25:16 2010 +0200
+++ b/MonetDB/ChangeLog.Jun2010 Fri Jun 18 12:59:57 2010 +0200
@@ -1,23 +1,3 @@
# ChangeLog file for MonetDB
# This file is updated with Maddlog
-* Mon May 31 2010 Sjoerd Mullender
-- Updated Vendor information.
-
-* Wed Mar 31 2010 Stefan Manegold
-- Made compilation of "testing" (and "java") independent of MonetDB.
- This is mainy 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.
-
-* Wed Mar 24 2010 Stefan Manegold
-- 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 ...NT, and thus keep the
- latter clean from files generated during the build.
- On Windows, the build directory must be a sibling of ...NT .
-
diff -r b0b10e8fd731 -r 00e27361f6fe MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec Fri Jun 18 10:25:16 2010 +0200
+++ b/MonetDB/MonetDB.spec Fri Jun 18 12:59:57 2010 +0200
@@ -106,6 +106,29 @@
%{_libdir}/libbat.so
%changelog
+* Fri Jun 18 2010 Sjoerd Mullender - 1.38.1-20100618
+- Rebuilt.
+
+* Mon May 31 2010 Sjoerd Mullender - 1.38.1-20100618
+- Updated Vendor information.
+
+* Tue Apr 20 2010 Stefan Manegold - 1.38.1-20100618
+- Made compilation of "testing" (and "java") independent of MonetDB.
+ This is mainy 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.
+
+* Tue Apr 20 2010 Stefan Manegold - 1.38.1-20100618
+- Implemented build directory support for Windows,
+
MonetDB: default - Merged from Jun2010 branch: Stethoscope was m...
Changeset: b0b10e8fd731 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b0b10e8fd731 Modified Files: MonetDB5/debian/monetdb5-server.install Branch: default Log Message: Merged from Jun2010 branch: Stethoscope was moved to clients. diffs (16 lines): diff -r c6588462d7ab -r b0b10e8fd731 MonetDB5/debian/monetdb5-server.install --- a/MonetDB5/debian/monetdb5-server.install Fri Jun 18 09:39:35 2010 +0200 +++ b/MonetDB5/debian/monetdb5-server.install Fri Jun 18 10:25:16 2010 +0200 @@ -1,4 +1,3 @@ debian/tmp/etc/monetdb5.conf etc debian/tmp/usr/bin/Mbeddedmal usr/bin debian/tmp/usr/bin/mserver5 usr/bin -debian/tmp/usr/bin/stethoscope usr/bin diff -r c6588462d7ab -r b0b10e8fd731 clients/debian/monetdb-client.install --- a/clients/debian/monetdb-client.install Fri Jun 18 09:39:35 2010 +0200 +++ b/clients/debian/monetdb-client.install Fri Jun 18 10:25:16 2010 +0200 @@ -1,3 +1,4 @@ debian/tmp/usr/bin/mclient usr/bin debian/tmp/usr/bin/msqldump usr/bin +debian/tmp/usr/bin/stethoscope usr/bin debian/tmp/usr/share/man/man1/mclient.1 usr/share/man/man1 ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010 branch: Updated debian co...
Changeset: c6588462d7ab for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c6588462d7ab Modified Files: Branch: default Log Message: Merged from Jun2010 branch: Updated debian config files. diffs (19 lines): diff -r 2ec4097dee10 -r c6588462d7ab geom/debian/libmonetdb5-server-geom0.install --- a/geom/debian/libmonetdb5-server-geom0.install Thu Jun 17 22:38:36 2010 +0200 +++ b/geom/debian/libmonetdb5-server-geom0.install Fri Jun 18 09:39:35 2010 +0200 @@ -1,2 +1,3 @@ debian/tmp/usr/lib/MonetDB5/geom.mal /usr/lib/MonetDB5 +debian/tmp/usr/lib/MonetDB5/autoload/*.mal /usr/lib/MonetDB5/autoload debian/tmp/usr/lib/MonetDB5/lib/lib_geom.so* /usr/lib/MonetDB5/lib diff -r 2ec4097dee10 -r c6588462d7ab sql/debian/monetdb5-sql.install --- a/sql/debian/monetdb5-sql.install Thu Jun 17 22:38:36 2010 +0200 +++ b/sql/debian/monetdb5-sql.install Fri Jun 18 09:39:35 2010 +0200 @@ -2,6 +2,7 @@ debian/tmp/usr/bin/merovingian usr/bin debian/tmp/usr/bin/monetdb usr/bin debian/tmp/usr/lib/MonetDB5/*.mal usr/lib/MonetDB5 +debian/tmp/usr/lib/MonetDB5/*.sql usr/lib/MonetDB5 +debian/tmp/usr/lib/MonetDB5/autoload/*.mal usr/lib/MonetDB5/autoload debian/tmp/usr/share/man/man1/merovingian.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/monetdb.1 usr/share/man/man1 -debian/tmp/usr/share/MonetDB/sql/* usr/share/MonetDB/sql ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010 branch.
Changeset: 0790d8a684bd for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0790d8a684bd Modified Files: MonetDB5/NT/MonetDB5-Server/MonetDB5-Server.vdproj MonetDB5/NT/MonetDB5-Server/MonetDB5-Server64.vdproj clients/NT/MonetDB-Clients/MonetDB-Clients.vdproj clients/NT/MonetDB-Clients/MonetDB-Clients64.vdproj sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj sql/NT/MonetDB5-SQL/MonetDB5-SQL.vdproj sql/NT/MonetDB5-SQL/MonetDB5-SQL64.vdproj sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj Branch: default Log Message: Merged from Jun2010 branch. ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010
Changeset: d49ee783f84d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d49ee783f84d
Modified Files:
MonetDB5/src/modules/kernel/status.mx
sql/src/test/BugTracker-2010/Tests/All
Branch: default
Log Message:
Merged from Jun2010
diffs (138 lines):
diff -r c82ff214897c -r d49ee783f84d sql/src/test/BugTracker-2010/Tests/All
--- a/sql/src/test/BugTracker-2010/Tests/AllMon Jun 14 15:18:22 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/AllMon Jun 14 15:45:39 2010 +0200
@@ -10,3 +10,4 @@
reorder.SF-2995671
crashonschema
connectto
+copy-into-too-long-string.Bug-2358
diff -r c82ff214897c -r d49ee783f84d
sql/src/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.sql
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/sql/src/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.sql
Mon Jun 14 15:45:39 2010 +0200
@@ -0,0 +1,5 @@
+create table t (c varchar(3));
+
+COPY 1 RECORDS INTO t FROM STDIN USING DELIMITERS '|','
+','"' NULL AS '';"abcd"
+
diff -r c82ff214897c -r d49ee783f84d
sql/src/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.stable.err
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++
b/sql/src/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.stable.err
Mon Jun 14 15:45:39 2010 +0200
@@ -0,0 +1,82 @@
+stderr of test 'copy-into-too-long-string.Bug-2358` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 15:34:26 >
+# 15:34:26 > mserver5
"--config=/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5:/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5/lib:/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5/bin"
--set
"gdk_dbfarm=/net/volund.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-Jun2010-volund.ins.cwi.nl/sql/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=32555 --set
xrpc_port=45116 --set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 15:34:26 >
+
+# builtin opt gdk_arch = 64bitx86_64-pc-linux-gnu
+# builtin opt gdk_version = 1.38.0
+# builtin opt prefix = /ufs/fabian/scratch/monetdb/Jun2010/program-x86_64
+# builtin opt exec_prefix = ${prefix}
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_admin = adm
+# builtin opt monet_prompt = >
+# builtin opt monet_welcome = yes
+# builtin opt monet_mod_path =
/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB
+# builtin opt monet_daemon = no
+# builtin opt host = localhost
+# builtin opt mapi_port = 5
+# builtin opt mapi_clients = 2
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_debug = 0
+# builtin opt standoff_ns =
+# builtin opt standoff_start = start
+# builtin opt standoff_end = end
+# config opt prefix = /ufs/fabian/scratch/monetdb/Jun2010/program-x86_64
+# config opt config = ${prefix}/etc/monetdb5.conf
+# config opt prefix = /ufs/fabian/scratch/monetdb/Jun2010/program-x86_64
+# config opt exec_prefix = ${prefix}
+# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
+# config opt monet_mod_path =
/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5:/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5/lib:/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5/bin
+# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
+# config opt mero_controlport = 50001
+# config opt sql_optimizer = default_pipe
+# config opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector
+# config opt default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt nov2009_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt replication_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
+# config opt accumulator_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,accumulators,dataflow,history,multiplex,garbageCollector
+# config opt recycler_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,deadcode,recycle,reduce,dataflow,history,multiplex,garbageCollector
+# config opt cracker_pipe =
inline,remap,evaluate,costModel
MonetDB: default - Merged from Jun2010 (backport of default comm...
Changeset: 89c9bd2aec13 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=89c9bd2aec13 Modified Files: Branch: default Log Message: Merged from Jun2010 (backport of default commit, since somehow my Jun2010 repo got resetted to default) ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010 branch.
Changeset: 4dd1701e7f19 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4dd1701e7f19
Modified Files:
MonetDB/src/gdk/gdk.mx
MonetDB/src/gdk/gdk_batop.mx
MonetDB/src/gdk/gdk_bbp.mx
MonetDB/src/gdk/gdk_logger.mx
MonetDB/src/gdk/gdk_relop.mx
MonetDB/src/gdk/gdk_storage.mx
MonetDB5/src/modules/kernel/bat5.mx
pathfinder/runtime/pathfinder.mx
sql/src/include/sql_catalog.h
sql/src/server/sql_mvc.mx
sql/src/storage/sql_storage.h
sql/src/storage/store.mx
Branch: default
Log Message:
Merged from Jun2010 branch.
diffs (truncated from 2095 to 300 lines):
diff -r 697999a64eaf -r 4dd1701e7f19 MonetDB/src/gdk/gdk.mx
--- a/MonetDB/src/gdk/gdk.mxSat Jun 05 16:56:57 2010 +0200
+++ b/MonetDB/src/gdk/gdk.mxMon Jun 07 10:10:45 2010 +0200
@@ -1012,8 +1012,6 @@
#define tsortedT->sorted
#define hdense H->dense
#define tdense T->dense
-#define hheap H->vheap
-#define theap T->vheap
#define hident H->id
#define tident T->id
#define halign H->align
@@ -3209,7 +3207,7 @@
If so, we can just compare integer index numbers instead of strings:
@h
#define HASHloop_fstr(bi, h, hb, idx, v) \
- for (hb = h->hash[strHash(v)&h->mask], idx =
strLocate((bi.b)->hheap,v); \
+ for (hb = h->hash[strHash(v)&h->mask], idx =
strLocate((bi.b)->H->vheap,v); \
hb != BUN_NONE; hb = h->link[hb]) \
if (VarHeapValRaw((bi).b->H->heap.base, hb, (bi).b->H->width)
== idx)
@
diff -r 697999a64eaf -r 4dd1701e7f19 MonetDB/src/gdk/gdk_bat.mx
--- a/MonetDB/src/gdk/gdk_bat.mxSat Jun 05 16:56:57 2010 +0200
+++ b/MonetDB/src/gdk/gdk_bat.mxMon Jun 07 10:10:45 2010 +0200
@@ -1959,7 +1959,7 @@
}
@= dohash
-ATOMstorage(@1->@2type) != TYPE_chr && (ATOMstorage(@1->@2type) !=
TYPE_str || !GDK_ELIMDOUBLES(@1->@2heap))
+ATOMstorage(@1->@2->type) != TYPE_chr && (ATOMstorage(@1->@2->type) !=
TYPE_str || !GDK_ELIMDOUBLES(@1->@2->vheap))
@c
BUN
BUNlocate(BAT *b, ptr x, ptr y)
@@ -2034,16 +2034,16 @@
/* regrettably MonetDB support only single-column hashes
* strategy: create a hash on both columns, and select the
column with the best distribution
*/
- if ((b->T->hash && b->H->hash == NULL) || !(@:dohash(b,h)@))
+ if ((b->T->hash && b->H->hash == NULL) || !(@:dohash(b,H)@))
@:swap()@
if (b->H->hash == NULL && (v = VIEWcreate_(b, b, TRUE)) !=
NULL) {
/* As we are going to remove the worst hash table
later, we must do everything
* in a view, as it is not permitted to remove a hash
table from a read-only
* operation (like BUNlocate). Other threads might then
crash.
*/
- if (@:dohash(v,h)@)
+ if (@:dohash(v,H)@)
(void) BATprepareHash(v);
- if (@:dohash(v,t)@)
+ if (@:dohash(v,T)@)
(void) BATprepareHash(BATmirror(v));
if (v->H->hash && v->T->hash) { /* we can choose
between two hash tables */
BUN hcnt = 0, tcnt = 0;
diff -r 697999a64eaf -r 4dd1701e7f19 MonetDB/src/gdk/gdk_batop.mx
--- a/MonetDB/src/gdk/gdk_batop.mx Sat Jun 05 16:56:57 2010 +0200
+++ b/MonetDB/src/gdk/gdk_batop.mx Mon Jun 07 10:10:45 2010 +0200
@@ -906,7 +906,7 @@
q++;
}
@= stringselect
- if (strElimDoubles(b->hheap)) {
+ if (strElimDoubles(b->H->vheap)) {
BUN p;
size_t j;
@@ -1840,7 +1840,7 @@
@:chk_order(dbl,@3,@5)@
} else {
/* check sortedness tuple-by-tuple */
- if (b->hheap) {
+ if (b->H->vheap) {
char *base = Hbase(b);
char *prv = base + BUNhvaroff(bi, cur);
@@ -1999,7 +1999,7 @@
b = BATrevert(b);
return b;
}
- g...@7sort@3(Hloc(b,BUNfirst(b)), Tloc(b,BUNfirst(b)),
(b->hheap)?b->H->vheap->base:NULL, BATcount(b), Hsize(b), Tsize(b), b->htype);
+ g...@7sort@3(Hloc(b,BUNfirst(b)), Tloc(b,BUNfirst(b)),
(b->H->vheap)?b->H->vheap->base:NULL, BATcount(b), Hsize(b), Tsize(b),
b->htype);
HASHdestroy(b);
ALIGNdel(b, "bator...@3", FALSE);
b->hsorted = (bit) gdk_sor...@2;
@@ -3054,7 +3054,7 @@
BATcheck(b, "BAThistogram");
- tricky = (b->ttype == TYPE_str && strElimDoubles(b->theap));
+ tricky = (b->ttype == TYPE_str && strElimDoubles(b->T->vheap));
if (b->ta
MonetDB: default - Merged from Jun2010 branch: Ported Mdebootstr...
Changeset: 30f35cac46cf for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=30f35cac46cf Modified Files: Branch: default Log Message: Merged from Jun2010 branch: Ported Mdebootstrap to Mercurial. diffs (31 lines): diff -r 9960db314a23 -r 30f35cac46cf buildtools/conf/Mdebootstrap --- a/buildtools/conf/Mdebootstrap Wed Jun 02 12:42:09 2010 +0200 +++ b/buildtools/conf/Mdebootstrap Wed Jun 02 16:34:29 2010 +0200 @@ -52,7 +52,7 @@ if [ "x$x" = 'xy' ]; then ( /bin/rm -f $R $* && echo "$n files deleted." ) || echo "rm failed." else - echo "rm canceled, no files/directories deleted." + echo "rm cancelled, no files/directories deleted." fi fi } @@ -79,8 +79,16 @@ RM -rf autom4*.cache `find .[^.]* [^_]* -name Makefile.\* | egrep -v '(\.(|ag|standalone|rules|bsd|svr4|sun4|PL|inc|svn-base)|burg/Makefile.orig)$' ; find .[^.]* [^_]* -name \*.class -o -name \*.orig -o -name \*.rej -o -name .cache -o -name .incs.\* -o -name \*.pyc -o -name \*~ -o -name .\*~ -o -name .#\* -o -name \*.bak | grep -v 'burg/Makefile.orig$'` ./install.lst ./doc.lst ./acout.in ./configure.in ./aclocal.m4 ./configure ./stamp-h.in ./conf/depcomp ./conf/mkinstalldirs ./conf/stamp-h.in ./conf/config.h.in ./conf/install-sh ./conf/config.guess ./conf/config.sub ./conf/ltconfig ./conf/ltmain.sh ./conf/missing ./conf/compile ./acconfig.h ./*_config.h.in fi -echo ' +if [ -d CVS ]; then +echo ' It might be a good idea to run "cvs -q diff --brief", now, -to check whether required files have been removed accidently. +to check whether required files have been removed accidentally. If so, these files can be restored by "cvs update ". ' +else +echo ' +It might be a good idea to run "hg status -d", now, +to check whether required files have been removed accidentally. +If so, these files can be restored by "hg revert ". +' +fi ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010
Changeset: fffaf17cfe20 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fffaf17cfe20
Modified Files:
Branch: default
Log Message:
Merged from Jun2010
diffs (273 lines):
diff -r 74ee41649425 -r fffaf17cfe20
sql/src/backends/monet5/merovingian/ChangeLog.Jun2010
--- a/sql/src/backends/monet5/merovingian/ChangeLog.Jun2010 Tue Jun 01
11:37:25 2010 +0200
+++ b/sql/src/backends/monet5/merovingian/ChangeLog.Jun2010 Tue Jun 01
12:34:02 2010 +0200
@@ -3,6 +3,21 @@
#*June2010
+ 01 Jun 2010; Fabian Groffen merovingian.c, utils.c:
+ Fixed an issue where Merovingian's strict umask was applied too early
+ causing files to be inaccessible. Now the .merovingian_control socket
+ file is accessible to both user and group of the merovingian process,
+ and the .mapi_socket file is accessible to everyone like a TCP socket
+ is. Fixes bug #2550.
+
+ 01 Jun 2010; Fabian Groffen merovingian.c:
+ Properly clean up .merovingian_control file in dbfarm.
+
+ 01 Jun 2010; Fabian Groffen merovingian.1.in,
+ merovingian.c:
+ Removed database pre-starting (mis-)feature, any argument to
+ merovingian now yields in a version message followed by a server exit.
+
07 Apr 2010; Fabian Groffen monetdb.c:
Sort output returned by discover, status and get commands based on url
or dbname.
diff -r 74ee41649425 -r fffaf17cfe20
sql/src/backends/monet5/merovingian/merovingian.1.in
--- a/sql/src/backends/monet5/merovingian/merovingian.1.in Tue Jun 01
11:37:25 2010 +0200
+++ b/sql/src/backends/monet5/merovingian/merovingian.1.in Tue Jun 01
12:34:02 2010 +0200
@@ -1,12 +1,11 @@
.\" Process this file with
.\" groff -man -Tascii foo.1
.\"
-.TH MEROVINGIAN 1 "APRIL 2010" Application "MonetDB Applications"
+.TH MEROVINGIAN 1 "JUNE 2010" Application "MonetDB Applications"
.SH NAME
merovingian \- the MonetDB Database Server daemon
.SH SYNOPSIS
.B merovingian
-[database ...]
.SH DESCRIPTION
.B merovingian
is the MonetDB Database Server daemon. It is not meant to be used in
@@ -37,14 +36,11 @@
.B merovingian
runs in the background, sending log messages to
.IR @MERO_LOG@ ,
-until being sent a stop, terminate or interrupt signal. All arguments
+until being sent a stop, terminate or interrupt signal. Any arguments
given when starting
.B merovingian
-are considered to be databases to be pre-started. Pre-started databases
-are started as part of the startup of
-.BR merovingian ,
-which means their startup is not delayed until the first client
-requests for them.
+cause the version to be printed followed by a shutdown of
+.BR merovingian .
.P
.B merovingian
uses a neighbour discovery scheme to detect other
diff -r 74ee41649425 -r fffaf17cfe20
sql/src/backends/monet5/merovingian/merovingian.c
--- a/sql/src/backends/monet5/merovingian/merovingian.c Tue Jun 01 11:37:25
2010 +0200
+++ b/sql/src/backends/monet5/merovingian/merovingian.c Tue Jun 01 12:34:02
2010 +0200
@@ -427,7 +427,6 @@
FILE *cnf = NULL, *pidfile = NULL;
char buf[1024];
char bufu[1024];
- sabdb* stats = NULL;
dpair d;
int pfd[2];
int retfd = -1;
@@ -501,10 +500,6 @@
}
#endif
- /* Paranoia umask, but good, because why would people have to sniff
-* our private parts? */
- umask(S_IRWXG | S_IRWXO);
-
/* hunt for the config file, and read it, allow the caller to
* specify where to look using the MONETDB5CONF environment variable */
p = getenv("MONETDB5CONF");
@@ -518,13 +513,14 @@
/* store this conffile for later use in forkMserver */
_mero_conffile = p;
-#define MERO_EXIT(status) \
- buf[0] = status; \
- if (write(retfd, &buf, 1) != 1 || close(retfd) != 0) { \
+#define MERO_EXIT(status) { \
+ char s = status; \
+ if (write(retfd, &s, 1) != 1 || close(retfd) != 0) { \
Mfprintf(stderr, "could not write to parent\n"); \
} \
if (status != 0) \
- return(status);
+ return(status); \
+}
readConfFile(ckv, cnf);
fclose(cnf);
@@ -667,6 +663,22 @@
MERO_EXIT(1);
}
+ /* figure out our hostname */
+ gethostname(_mero_hostname, 128);
+
+ if (argc > 1) {
+ Mfprintf(stderr, "Merovingian %s on host %s\n", MERO_VERSION,
+ _mero_hostname /*FIXME not yet set*/);
+ Mfprintf(stderr, "Using config file: %s\n", _mero_conffile);
+ Mfprintf(stderr, " monitoring dbfarm: %s\n", dbfarm);
+ Mfprintf(stderr, " forking mserver5: %s\n", _mero_mserver);
+ Mfprintf(stderr, " allows remote control: %s\n",
+ (_mero_controlport != 0 ? "yes" : "no"));
+ Mfprintf(stderr, " performs neighbour discovery: %s\n",
+ (discoveryport != 0 ? "yes" : "no"));
+ MERO_EXIT(1);
+ }
+
MonetDB: default - Merged from Jun2010 branch: Typo in comment.
Changeset: 8adaed9d8a97 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8adaed9d8a97
Modified Files:
pathfinder/runtime/pathfinder.mx
Branch: default
Log Message:
Merged from Jun2010 branch: Typo in comment.
diffs (12 lines):
diff -r f7c9a3659dd6 -r 8adaed9d8a97 pathfinder/runtime/pathfinder.mx
--- a/pathfinder/runtime/pathfinder.mx Mon May 31 15:31:10 2010 +0200
+++ b/pathfinder/runtime/pathfinder.mx Mon May 31 15:50:34 2010 +0200
@@ -5703,7 +5703,7 @@
* these persist accross sessions as the generated PROCs refer to them.
* This mostly for leakage monitoring purposes, such that dir(); does
* not show any tmp_X bats. Not doing this would not cause a leak; next
- * session the old values are overwritten (and cleant up in MIL).
+ * session the old values are overwritten (and cleaned up in MIL).
*/
Variable v = monet_cntxt[ctx->stk].var;
while(v && strcmp(v->name, "v_vid000")) {
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010 branch: Added Mock config...
Changeset: 40b307447188 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=40b307447188 Modified Files: Branch: default Log Message: Merged from Jun2010 branch: Added Mock configuration files for Fedora 13. diffs (100 lines): diff -r 5961b4c8349e -r 40b307447188 buildtools/conf/mock/fedora-13-i386-monetdb.cfg --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/buildtools/conf/mock/fedora-13-i386-monetdb.cfg Mon May 31 10:58:22 2010 +0200 @@ -0,0 +1,44 @@ +config_opts['root'] = 'fedora-13-i386' +config_opts['target_arch'] = 'i686' +config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' +config_opts['dist'] = 'fc13' # only useful for --resultdir variable subst + +config_opts['yum.conf'] = """ +[main] +cachedir=/var/cache/yum +debuglevel=1 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 + +# repos + +[fedora] +name=fedora +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-13&arch=i386 +failovermethod=priority + +[updates-released] +name=updates +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f13&arch=i386 +failovermethod=priority + +[local] +name=local +baseurl=http://kojipkgs.fedoraproject.org/repos/dist-f13-build/latest/i386/ +cost=2000 +enabled=0 + +[monetdb] +name=monetdb +baseurl=http://localhost/MonetDB-repo/Fedora/13/i386/ +metadata_expire=1 +http_caching=none +exclude=*debuginfo* +""" + + + diff -r 5961b4c8349e -r 40b307447188 buildtools/conf/mock/fedora-13-x86_64-monetdb.cfg --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/buildtools/conf/mock/fedora-13-x86_64-monetdb.cfg Mon May 31 10:58:22 2010 +0200 @@ -0,0 +1,48 @@ +config_opts['root'] = 'fedora-13-x86_64' +config_opts['target_arch'] = 'x86_64' +config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' +config_opts['dist'] = 'fc13' # only useful for --resultdir variable subst + +config_opts['yum.conf'] = """ +[main] +cachedir=/var/cache/yum +debuglevel=1 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +# grub/syslinux on x86_64 need glibc-devel.i386 which pulls in glibc.i386, need to exclude all +# .i?86 packages except these. +#exclude=[0-9A-Za-fh-z]*.i?86 g[0-9A-Za-km-z]*.i?86 gl[0-9A-Za-hj-z]*.i?86 gli[0-9A-Zac-z]*.i?86 glib[0-9A-Za-bd-z]*.i?86 +# The above is not needed anymore with yum multilib policy of "best" which is the default in Fedora. + +# repos + +[fedora] +name=fedora +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-13&arch=x86_64 +failovermethod=priority + +[updates-released] +name=updates +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f13&arch=x86_64 +failovermethod=priority + +[local] +name=local +baseurl=http://kojipkgs.fedoraproject.org/repos/dist-f13-build/latest/x86_64/ +cost=2000 +enabled=0 + +[monetdb] +name=monetdb +baseurl=http://localhost/MonetDB-repo/Fedora/13/x86_64/ +metadata_expire=1 +http_caching=none +exclude=*debuginfo* +""" + + + ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010 branch: Updated Vendor in...
Changeset: 5961b4c8349e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5961b4c8349e
Modified Files:
MonetDB/MonetDB.spec
MonetDB4/MonetDB-server.spec
MonetDB5/MonetDB-server.spec
clients/MonetDB-client.spec
geom/MonetDB-geom.spec
pathfinder/MonetDB-XQuery.spec
sql/MonetDB-SQL.spec
testing/MonetDB-testing.spec
Branch: default
Log Message:
Merged from Jun2010 branch: Updated Vendor information.
diffs (230 lines):
diff -r b71fdf74b459 -r 5961b4c8349e MonetDB/ChangeLog.Jun2010
--- a/MonetDB/ChangeLog.Jun2010 Sun May 30 15:13:18 2010 +0200
+++ b/MonetDB/ChangeLog.Jun2010 Mon May 31 10:55:28 2010 +0200
@@ -1,6 +1,9 @@
# ChangeLog file for MonetDB
# This file is updated with Maddlog
+* Mon May 31 2010 Sjoerd Mullender
+- Updated Vendor information.
+
* Wed Mar 31 2010 Stefan Manegold
- Made compilation of "testing" (and "java") independent of MonetDB.
This is mainy for Windows, but also on other systems, "testing" can now be
diff -r b71fdf74b459 -r 5961b4c8349e MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec Sun May 30 15:13:18 2010 +0200
+++ b/MonetDB/MonetDB.spec Mon May 31 10:55:28 2010 +0200
@@ -21,7 +21,7 @@
Version: %{version}
Release: %{release}
Summary: MonetDB - Monet Database Management System
-Vendor: MonetDB BV
+Vendor: MonetDB BV
Group: Applications/Databases
License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
diff -r b71fdf74b459 -r 5961b4c8349e MonetDB4/ChangeLog.Jun2010
--- a/MonetDB4/ChangeLog.Jun2010Sun May 30 15:13:18 2010 +0200
+++ b/MonetDB4/ChangeLog.Jun2010Mon May 31 10:55:28 2010 +0200
@@ -1,6 +1,9 @@
# ChangeLog file for MonetDB4
# This file is updated with Maddlog
+* Mon May 31 2010 Sjoerd Mullender
+- Updated Vendor information.
+
* Wed Mar 31 2010 Stefan Manegold
- Made compilation of "testing" (and "java") independent of MonetDB.
This is mainy for Windows, but also on other systems, "testing" can now be
diff -r b71fdf74b459 -r 5961b4c8349e MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec Sun May 30 15:13:18 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec Mon May 31 10:55:28 2010 +0200
@@ -21,7 +21,7 @@
Version: %{version}
Release: %{release}
Summary: MonetDB - Monet Database Management System
-Vendor: MonetDB BV
+Vendor: MonetDB BV
Group: Applications/Databases
License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
diff -r b71fdf74b459 -r 5961b4c8349e MonetDB5/ChangeLog.Jun2010
--- a/MonetDB5/ChangeLog.Jun2010Sun May 30 15:13:18 2010 +0200
+++ b/MonetDB5/ChangeLog.Jun2010Mon May 31 10:55:28 2010 +0200
@@ -1,6 +1,9 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
+* Mon May 31 2010 Sjoerd Mullender
+- Updated Vendor information.
+
* Wed May 19 2010 Sjoerd Mullender
- Created a new RPM MonetDB5-server-rdf for the optional MonetDB/RDF module.
diff -r b71fdf74b459 -r 5961b4c8349e MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec Sun May 30 15:13:18 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec Mon May 31 10:55:28 2010 +0200
@@ -21,7 +21,7 @@
Version: %{version}
Release: %{release}
Summary: MonetDB - Monet Database Management System
-Vendor: MonetDB BV
+Vendor: MonetDB BV
Group: Applications/Databases
License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
diff -r b71fdf74b459 -r 5961b4c8349e buildtools/conf/MonetDB-release.spec
--- a/buildtools/conf/MonetDB-release.spec Sun May 30 15:13:18 2010 +0200
+++ b/buildtools/conf/MonetDB-release.spec Mon May 31 10:55:28 2010 +0200
@@ -1,6 +1,6 @@
Name: MonetDB-release
Version: 1.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: MonetDB YUM Repository
Group: Applications/Databases
@@ -9,7 +9,7 @@
Source0:
http://monetdb.cwi.nl/downloads/sources/%{name}-%{version}.tar.gz
BuildArch: noarch
-Vendor:MonetDB B.V.
+Vendor:MonetDB BV
Requires: fedora-release
@@ -49,6 +49,9 @@
%changelog
+* Mon May 31 2010 Sjoerd Mullender - 1.0-4
+- Updated Vendor information.
+
* Fri Dec 11 2009 Sjoerd Mullender - 1.0-3
- Added a testing repository (for release candidates).
diff -r b71fdf74b459 -r 5961b4c8349e clients/ChangeLog.Jun2010
--- a/clients/ChangeLog.Jun2010 Sun May 30 15:13:18 2010 +0200
+++ b/clients/ChangeLog.Jun2010 Mon May 31 10:55:28 2010 +0200
@@ -1,6 +1,9 @@
# ChangeLog file for clients
# This file is updated with Maddlog
+* Mon May 31 2010 Sjoerd Mullender
+- Updated Vendor information.
+
* Thu Apr 8 2010 Sjoerd Mullender
- The MonetDB ODBC driver now no longer depends on its own copy of the
standard ODBC include files but instead depends on system include files
diff -r b71fdf74b459 -r 5961b4c8349e clients/MonetDB-client.spec
--- a/clients/MonetDB-client.spec Sun May 30 15:13:18 2010 +0200
+++ b/clients/MonetDB-cli
MonetDB: default - Merged from Jun2010
Changeset: ad3ed6d74a63 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ad3ed6d74a63 Modified Files: Branch: default Log Message: Merged from Jun2010 diffs (20 lines): diff -r 4ae76a341924 -r ad3ed6d74a63 buildtools/mel/license.txt --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/buildtools/mel/license.txtSat May 29 17:24:30 2010 +0200 @@ -0,0 +1,16 @@ +The contents of this file are subject to the MonetDB Public License +Version 1.1 (the "License"); you may not use this file except in +compliance with the License. You may obtain a copy of the License at +http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html + +Software distributed under the License is distributed on an "AS IS" +basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the +License for the specific language governing rights and limitations +under the License. + +The Original Code is the MonetDB Database System. + +The Initial Developer of the Original Code is CWI. +Portions created by CWI are Copyright (C) 1997-July 2008 CWI. +Copyright August 2008-2010 MonetDB B.V. +All Rights Reserved. ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010
Changeset: 2c294ece5222 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2c294ece5222
Modified Files:
Branch: default
Log Message:
Merged from Jun2010
diffs (252 lines):
diff -r 2c61c25c8af9 -r 2c294ece5222 MonetDB4/license.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/MonetDB4/license.txt Fri May 28 17:04:21 2010 +0200
@@ -0,0 +1,16 @@
+The contents of this file are subject to the MonetDB Public License
+Version 1.1 (the "License"); you may not use this file except in
+compliance with the License. You may obtain a copy of the License at
+http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
+
+Software distributed under the License is distributed on an "AS IS"
+basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+License for the specific language governing rights and limitations
+under the License.
+
+The Original Code is the MonetDB Database System.
+
+The Initial Developer of the Original Code is CWI.
+Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
+Copyright August 2008-2010 MonetDB B.V.
+All Rights Reserved.
diff -r 2c61c25c8af9 -r 2c294ece5222 MonetDB5/license.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/MonetDB5/license.txt Fri May 28 17:04:21 2010 +0200
@@ -0,0 +1,16 @@
+The contents of this file are subject to the MonetDB Public License
+Version 1.1 (the "License"); you may not use this file except in
+compliance with the License. You may obtain a copy of the License at
+http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
+
+Software distributed under the License is distributed on an "AS IS"
+basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+License for the specific language governing rights and limitations
+under the License.
+
+The Original Code is the MonetDB Database System.
+
+The Initial Developer of the Original Code is CWI.
+Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
+Copyright August 2008-2010 MonetDB B.V.
+All Rights Reserved.
diff -r 2c61c25c8af9 -r 2c294ece5222 buildtools/Mx/Code.c
--- a/buildtools/Mx/Code.c Fri May 28 15:42:03 2010 +0200
+++ b/buildtools/Mx/Code.c Fri May 28 17:04:21 2010 +0200
@@ -375,6 +375,7 @@
case Clex:
case CCyacc:
case CClex:
+ case MALcode:
break;
case Haskell:
diff -r 2c61c25c8af9 -r 2c294ece5222 buildtools/Mx/Mx.h
--- a/buildtools/Mx/Mx.hFri May 28 15:42:03 2010 +0200
+++ b/buildtools/Mx/Mx.hFri May 28 17:04:21 2010 +0200
@@ -83,6 +83,7 @@
char *ext;
} Directive;
+extern char *inputdir;
extern char *outputdir;
extern Directive str2dir[];
diff -r 2c61c25c8af9 -r 2c294ece5222 buildtools/Mx/disclaimer.c
--- a/buildtools/Mx/disclaimer.cFri May 28 15:42:03 2010 +0200
+++ b/buildtools/Mx/disclaimer.cFri May 28 17:04:21 2010 +0200
@@ -23,23 +23,50 @@
#include
#include
+#include "Mx.h"
#include "disclaimer.h"
-int disclaimer = 0;
+int disclaimer = 1;
char *disclaimerfile;
-static const char defaultfile[] = "COPYRIGHT";
+static const char defaultfile[] = "license.txt";
static FILE *
openDisclaimerFile(const char *filename)
{
- FILE *fp;
+ FILE *fp = NULL;
if (!filename || strlen(filename) < 1)
filename = defaultfile;
- if ((fp = fopen(filename, "r")) == 0)
- fprintf(stderr, "Mx: can't open disclaimer file '%s'
(skipping).\n", filename);
+ if (*filename == DIR_SEP) {
+ fp = fopen(filename, "r");
+ } else {
+ char buf[8096];
+ size_t len;
+ buf[0] = '\0';
+ strncat(buf, inputdir, 8096 - 1);
+ len = strlen(buf);
+ if (len < 8095 && buf[len - 1] != DIR_SEP)
+ buf[len++] = DIR_SEP;
+ /* search backwards, such that we can find the license.txt
+* file in the root of each module */
+ strncat(buf, filename, 8095 - len);
+ while (len > 0 && (fp = fopen(buf, "r")) == 0) {
+ /* remove last path */
+ len--; /* the trailing slash */
+ while (len > 0) {
+ if (buf[--len] == '/') {
+ buf[++len] = '\0';
+ break;
+ }
+ }
+ strncat(buf, filename, 8096 - len - 1);
+ }
+ }
+
+ if (fp == NULL)
+ fprintf(stderr, "Mx: can't open licence file '%s'
(skipping).\n", filename);
return fp;
}
@@ -104,8 +131,9 @@
"c", "/*", " * ", " */",}, {
"h", "/*", " * ", " */",}, {
MX_CXX_SUFFIX, "/*", " * ", " */",}, {
- "html", "",}, {
+ "html", "",}, {
"tex", "", "% ", "",}, {
+ "mal", "", "# ", "",}, {
MonetDB: default - Merged from Jun2010
Changeset: 4b8403864365 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4b8403864365
Modified Files:
MonetDB5/src/mal/mal_linker.mx
Branch: default
Log Message:
Merged from Jun2010
diffs (96 lines):
diff -r f3c2b85025ce -r 4b8403864365 MonetDB5/src/mal/mal_linker.mx
--- a/MonetDB5/src/mal/mal_linker.mxThu May 27 20:00:37 2010 +0200
+++ b/MonetDB5/src/mal/mal_linker.mxThu May 27 22:12:16 2010 +0200
@@ -329,6 +329,7 @@
return strcmp(*(char* const*)p1, *(char* const*)p2);
}
+#define MAXMULTISCRIPT 48
static char *
locate_file(const char *basename, const char *ext, const bit recurse)
{
@@ -336,6 +337,8 @@
char *fullname;
size_t fullnamelen;
size_t filelen = strlen(basename) + strlen(ext);
+ str strs[MAXMULTISCRIPT]; /* hardwired limit */
+ int lasts = 0;
if (mod_path == NULL)
return NULL;
@@ -374,9 +377,7 @@
/* see if this is a directory, if so, recurse */
if (recurse == 1 && (rdir = opendir(fullname)) != NULL) {
struct dirent *e;
- str strs[48]; /* hardwired limit */
- int lasts = 0;
- int c;
+ int ps = lasts;
/* list *ext, sort, return */
while ((e = readdir(rdir)) != NULL) {
if (strcmp(e->d_name, "..") == 0 ||
strcmp(e->d_name, ".") == 0)
@@ -394,38 +395,42 @@
fullname, DIR_SEP,
GDKstrdup(e->d_name));
lasts++;
}
- if (lasts >= 48)
+ if (lasts >= MAXMULTISCRIPT)
break;
}
+ if (lasts - ps > 0) {
+ /* assure that an ordering such as 10_first,
20_second works */
+ qsort(strs + ps, lasts - ps, sizeof(char *),
cmpstr);
+ }
(void)closedir(rdir);
- if (lasts > 0) {
- /* assure that an ordering such as 10_first,
20_second works */
- qsort(strs, lasts, sizeof(char *), cmpstr);
- i = 0;
- for (c = 0; c < lasts; c++)
- i += strlen(strs[c]) + 1; /* PATH_SEP
or \0 */
- fullname = GDKrealloc(fullname, i);
- i = 0;
- for (c = 0; c < lasts; c++) {
- strcpy(fullname + i, strs[c]);
- i += strlen(strs[c]);
- fullname[i++] = PATH_SEP;
- GDKfree(strs[c]);
- }
- fullname[i - 1] = '\0';
- return fullname;
+ } else {
+ strcat(fullname + i + 1, ext);
+ if ((fd = open(fullname, O_RDONLY)) >= 0) {
+ close(fd);
+ return GDKrealloc(fullname, strlen(fullname) +
1);
}
}
- strcat(fullname + i + 1, ext);
- if ((fd = open(fullname, O_RDONLY)) >= 0) {
- close(fd);
- return GDKrealloc(fullname, strlen(fullname) + 1);
- }
if ((mod_path = p) == NULL)
break;
while (*mod_path == PATH_SEP)
mod_path++;
}
+ if (lasts > 0) {
+ int i = 0;
+ int c;
+ for (c = 0; c < lasts; c++)
+ i += strlen(strs[c]) + 1; /* PATH_SEP or \0 */
+ fullname = GDKrealloc(fullname, i);
+ i = 0;
+ for (c = 0; c < lasts; c++) {
+ strcpy(fullname + i, strs[c]);
+ i += strlen(strs[c]);
+ fullname[i++] = PATH_SEP;
+ GDKfree(strs[c]);
+ }
+ fullname[i - 1] = '\0';
+ return fullname;
+ }
/* not found */
GDKfree(fullname);
return NULL;
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010: Initialize new Heap stru...
Changeset: 81a6eb449108 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=81a6eb449108
Modified Files:
Branch: default
Log Message:
Merged from Jun2010: Initialize new Heap structure.
diffs (12 lines):
diff -r eb356b332056 -r 81a6eb449108 MonetDB4/src/modules/plain/decimal.mx
--- a/MonetDB4/src/modules/plain/decimal.mx Fri May 21 11:39:30 2010 +0200
+++ b/MonetDB4/src/modules/plain/decimal.mx Fri May 21 13:20:02 2010 +0200
@@ -1887,6 +1887,8 @@
return GDK_FAIL;
bm = BATmirror(bn);
+ memset(&hp, 0, sizeof hp);
+
/* create space for decimals */
if (prec) {
yy = MIN(PREC(dv) + MAX(1, *prec) - 1, PRECISION_MAX) + 1;
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010
Changeset: be997ba28e69 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=be997ba28e69
Modified Files:
Branch: default
Log Message:
Merged from Jun2010
diffs (18 lines):
diff -r 01d9cdfed78a -r be997ba28e69 clients/src/mapilib/Mapi.mx
--- a/clients/src/mapilib/Mapi.mx Wed May 19 15:11:43 2010 +0200
+++ b/clients/src/mapilib/Mapi.mx Wed May 19 15:11:53 2010 +0200
@@ -2170,8 +2170,13 @@
free(mid->hostname);
mid->hostname = host ? strdup(host) : NULL;
- if (port == 0)
+ if (port == 0) {
port = 5; /* hardwired default */
+ } else {
+ /* make sure we won't search for a unix socket first */
+ if (mid->hostname == NULL)
+ mid->hostname = strdup("localhost");
+ }
/* fill some defaults for user/pass, this should actually never happen
*/
if (username == NULL)
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010
Changeset: 34fc3178d924 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=34fc3178d924 Modified Files: MonetDB5/src/modules/mal/mal_init.mx MonetDB5/src/optimizer/Makefile.ag Branch: default Log Message: Merged from Jun2010 ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010
Changeset: 967528656691 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=967528656691
Modified Files:
MonetDB5/src/mal/mal_import.mx
Branch: default
Log Message:
Merged from Jun2010
diffs (23 lines):
diff -r ff4f8c3a851c -r 967528656691 MonetDB5/src/mal/mal_import.mx
--- a/MonetDB5/src/mal/mal_import.mxFri May 14 12:31:30 2010 +0200
+++ b/MonetDB5/src/mal/mal_import.mxFri May 14 12:42:40 2010 +0200
@@ -65,10 +65,18 @@
malResolveFile(str fname)
{
char path[PATHLENGTH];
+ str script;
snprintf(path, PATHLENGTH, "%s", fname);
slash_2_dir_sep(path);
- return MSP_locate_script(path);
+ if ((script = MSP_locate_script(path)) == NULL) {
+ /* this function is also called for scripts that are not located
+* in the modpath, so if we can't find it, just default to
+* whatever was given, as it can be in current dir, or an
+* absolute location to somewhere */
+ script = GDKstrdup(fname);
+ }
+ return script;
}
static stream *
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010
Changeset: ceffca7891b3 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ceffca7891b3 Modified Files: sql/src/sql/createdb.mx Branch: default Log Message: Merged from Jun2010 ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010
Changeset: 9a3cce78fb1b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9a3cce78fb1b
Modified Files:
MonetDB5/src/mal/mal_linker.mx
sql/src/backends/monet5/sql_scenario.mx
Branch: default
Log Message:
Merged from Jun2010
diffs (21 lines):
diff -r 850d797d30c8 -r 9a3cce78fb1b MonetDB5/src/modules/kernel/group.mx
--- a/MonetDB5/src/modules/kernel/group.mx Thu May 13 19:55:07 2010 +0200
+++ b/MonetDB5/src/modules/kernel/group.mx Thu May 13 20:04:52 2010 +0200
@@ -2804,7 +2804,7 @@
/* scan b, and add increment totals for true values */
if (range > SMALL_AGGR_MAX) {
- if (*ignore_nils) {
+ if (*ignore_nils && !b->T->nonil) {
ALGODEBUG THRprintf(GDKout, "#CMDaggr_count: range(="
OIDFMT ") > SMALL_AGGR_MAX(=%d) => large_aggr_count(if
(ATOMcmp(btt,t,bt_nil)))\n", range, SMALL_AGGR_MAX);
@:large_aggr_count(if(ATOMcmp(btt,t,bt_nil)))@
@@ -2814,7 +2814,7 @@
@:large_aggr_count()@
}
} else {
- if (*ignore_nils) {
+ if (*ignore_nils && !b->T->nonil) {
ALGODEBUG THRprintf(GDKout, "#CMDaggr_count: range(="
OIDFMT ") <= SMALL_AGGR_MAX(=%d) => small_aggr_count(if
(ATOMcmp(btt,t,bt_nil)))\n", range, SMALL_AGGR_MAX);
@:small_aggr_count(if(ATOMcmp(btt,t,bt_nil)))@
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010
Changeset: 648f82dc6024 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=648f82dc6024
Modified Files:
MonetDB/configure.ag
Branch: default
Log Message:
Merged from Jun2010
diffs (31 lines):
diff -r 31b8605731cf -r 648f82dc6024 MonetDB/configure.ag
--- a/MonetDB/configure.ag Tue May 11 15:16:49 2010 +0200
+++ b/MonetDB/configure.ag Tue May 11 15:22:35 2010 +0200
@@ -94,17 +94,16 @@
# Checks for library functions.
-# OSX 10.6 (Snow Leopard) somehow makes configure believe that fdatasync
-# exists, in reality however, it does not on this platform.
-AC_CACHE_CHECK([for fdatasync],[ac_cv_func_fdatasync],[
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-#include
- ]],[[
-fdatasync(4);
- ]])],
- [ac_cv_func_fdatasync=yes],
- [ac_cv_func_fdatasync=no])
-])
+case $host in
+ *-darwin10*)
+ # OSX 10.6 (Snow Leopard) somehow makes configure believe that
fdatasync
+ # exists, in reality however, it does not on this platform.
+ ac_cv_func_fdatasync=no
+ ;;
+ *)
+ AC_CHECK_FUNCS([fdatasync])
+ ;;
+esac
AS_IF([test "x${ac_cv_func_fdatasync}" = "xyes"],
[AC_DEFINE([HAVE_FDATASYNC],[1],[If the system has a working fdatasync])])
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010
Changeset: febe35e5a5c3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=febe35e5a5c3
Modified Files:
sql/src/backends/monet5/sql_gencode.mx
sql/src/backends/monet5/sql_scenario.mx
Branch: default
Log Message:
Merged from Jun2010
diffs (61 lines):
diff -r 8cfd3fd03926 -r febe35e5a5c3 sql/ChangeLog.Feb2010
--- a/sql/ChangeLog.Feb2010 Mon May 10 12:43:46 2010 +0200
+++ b/sql/ChangeLog.Feb2010 Tue May 11 14:55:49 2010 +0200
@@ -1,6 +1,10 @@
# ChangeLog file for sql
# This file is updated with Maddlog
+* Tue May 11 2010 Fabian Groffen
+- Prepared statement and function calls now report which argument is of
+ the wrong type, bug #2533.
+
* Sun Apr 25 2010 Niels Nes
- Fixed a bug when loading data from CSV files when separators occur
in quoted fields. (SourceForge bug #2991400).
diff -r 8cfd3fd03926 -r febe35e5a5c3 sql/src/backends/monet5/sql_gencode.mx
--- a/sql/src/backends/monet5/sql_gencode.mxMon May 10 12:43:46 2010 +0200
+++ b/sql/src/backends/monet5/sql_gencode.mxTue May 11 14:55:49 2010 +0200
@@ -2186,7 +2186,10 @@
if (!atom_cast(a, pt)) {
char buf[BUFSIZ];
- snprintf(buf, BUFSIZ, "wrong argument for
function call (expected %s instead of %s)\n", pt->type->sqlname,
atom_type(a)->type->sqlname);
+ snprintf(buf, BUFSIZ, "wrong type for argument
%d of "
+ "function call: %s, expected %s\n",
+ i + 1, atom_type(a)->type->sqlname,
+ pt->type->sqlname);
sql_error(m, 003, buf);
break;
}
diff -r 8cfd3fd03926 -r febe35e5a5c3 sql/src/backends/monet5/sql_scenario.mx
--- a/sql/src/backends/monet5/sql_scenario.mx Mon May 10 12:43:46 2010 +0200
+++ b/sql/src/backends/monet5/sql_scenario.mx Tue May 11 14:55:49 2010 +0200
@@ -1377,19 +1377,22 @@
GDKfree(argrec);
throw(SQL, "sql.prepare", "wrong number of arguments for
prepared statement: %d, expected %d", argc, parc);
} else {
- for (i = 0; iargc; i++){
+ for (i = 0; i < m->argc; i++) {
atom *arg = m->args[i];
- sql_subtype *pt = q->params+i;
+ sql_subtype *pt = q->params + i;
if (!atom_cast(arg, pt)) {
/*sql_error(c, 003, buf); */
- if( pci->argc >= MAXARG)
+ if (pci->argc >= MAXARG)
GDKfree(argv);
- if( pci->retc >= MAXARG)
+ if (pci->retc >= MAXARG)
GDKfree(argrec);
- throw(SQL, "sql.prepare", "wrong argument for
prepared statement (expected %s instead of %s)", pt->type->sqlname,
atom_type(arg)->type->sqlname);
+ throw(SQL, "sql.prepare", "wrong type for
argument %d of "
+ "prepared statement: %s,
expected %s",
+ i + 1,
atom_type(arg)->type->sqlname,
+ pt->type->sqlname);
}
- argv[pci->retc+i]= &arg->data;
+ argv[pci->retc + i] = &arg->data;
}
}
glb = (MalStkPtr)(q->stk);
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010
Changeset: a94bfcb24ca0 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a94bfcb24ca0 Modified Files: Branch: default Log Message: Merged from Jun2010 diffs (12 lines): diff -r fe0dbb18dff8 -r a94bfcb24ca0 sql/src/backends/monet5/merovingian/merovingian_forkmserver.c --- a/sql/src/backends/monet5/merovingian/merovingian_forkmserver.c Mon May 10 08:09:22 2010 +0200 +++ b/sql/src/backends/monet5/merovingian/merovingian_forkmserver.c Mon May 10 08:17:55 2010 +0200 @@ -226,7 +226,7 @@ str master = NULL; str slave = NULL; str pipeline = NULL; - str argv[27]; /* for the exec arguments */ + str argv[26]; /* for the exec arguments */ confkeyval *ckv, *kv; int c = 0; ___ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merged from Jun2010
Changeset: 9aa607a857f8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9aa607a857f8
Modified Files:
Branch: default
Log Message:
Merged from Jun2010
diffs (182 lines):
diff -r 79fd0cb5dbf9 -r 9aa607a857f8 buildtools/ChangeLog.Feb2010
--- a/buildtools/ChangeLog.Feb2010 Fri May 07 19:59:36 2010 +0200
+++ b/buildtools/ChangeLog.Feb2010 Fri May 07 21:10:33 2010 +0200
@@ -1,6 +1,9 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
+* Fri May 7 2010 Fabian Groffen
+- Fixed Maddlog script to work under our new Mercurial setup. The --email and
--fullname options have disappeared as we can relibably get them from Mercurial
now.
+
* Thu Dec 6 2007 Fabian Groffen
- Implemented rudimentary conditional support for ant targets
diff -r 79fd0cb5dbf9 -r 9aa607a857f8 buildtools/conf/Maddlog
--- a/buildtools/conf/Maddlog Fri May 07 19:59:36 2010 +0200
+++ b/buildtools/conf/Maddlog Fri May 07 21:10:33 2010 +0200
@@ -10,43 +10,27 @@
d=../$d
done
CL=$d/ChangeLog
-if [ -f $d/CVS/Tag ]; then
-tag=$(< $d/CVS/Tag)
+if hg root >& /dev/null ; then
+tag=$(hg branch)
case $tag in
-T*)CL=$CL.${tag#?};;
+ default) : ;;
+ *) CL=$CL.${tag} ;;
esac
+ root=$(hg root)
+ root=$(cd $root && \pwd -P)
+ dir=$(cd $d && \pwd -P)
+ proj=${dir#${root}/}
+
+ PROJECT=${proj%%/*}
+ IDENTITY=$(hg showconfig ui.username)
+else
+ echo "Cannot use this script outside a Mercurial repository" >
/dev/stder
+ exit -1
fi
-PROJECT=$(< $d/CVS/Repository)
nocommit=
while [ $# -gt 0 ]; do
case "$1" in
---email=*)
- EMAIL=${1#--email=}
- shift
- ;;
---email|-e)
- EMAIL=$2
- shift
- shift
- ;;
--e*)
- EMAIL=${1#-e}
- shift
- ;;
---fullname=*)
- FULLNAME=${1#--fullname=}
- shift
- ;;
---fullname|-n)
- FULLNAME=$2
- shift
- shift
- ;;
--n*)
- FULLNAME=${1#-n}
- shift
- ;;
--logfile=*)
CL=${1#--logfile=}
shift
@@ -72,8 +56,6 @@
cat >&2 <<-EOF
$0: unknown option $1
Valid options are:
- --email=u...@domain (-e u...@domain)
- --fullname=FullName (-n FullName)
--logfile=filename (-f filename)
--nocommit
EOF
@@ -96,50 +78,6 @@
done
fi
-# figure out full name and email address
-# use $FULLNAME and $EMAIL if set in the environment, else find full
-# name using the finger command and regenerate an email address from
-# user name and domain
-: ${USER:=$(whoami)}
-
-if [ -z "$FULLNAME" ] ; then
- # First try it the Python way, as that should work on the most
- # platforms, except Windows, hence the try/except.
- if [ -x $(type -P python) ] ; then
- FULLNAME=$(python << EOF
-import os, pwd
-try:
- print pwd.getpwuid(os.getuid())[4]
-except:
- pass
-EOF
- )
- fi
- if [ -z "$FULLNAME" ] ; then
- # this matches Linux finger output (which is different from
e.g. Solaris)
- FULLNAME=$(finger -l $USER | sed -n "s/Login: $USER .*Name:
\\(.*\\)/\\1/p")
- fi
- if [ -z "$FULLNAME" ] ; then
- # warn
- echo "could not determine your full name, please set FULLNAME
in your environment" > /dev/stderr
- fi
-fi
-
-# Try to find the mail domain from some files first, then resort to
-# domainname function
-if [ -z "$EMAIL" ] ; then
- if [ -f /etc/mailname ] ; then
- email=$u...@$(< /etc/mailname)
- elif [ -f /etc/postfix ] ; then
- email=$u...@$(postconf -h mydomain)
- elif [ -n $(type -P domainname) ] ; then
- email=$u...@$(domainname)
- else
- # warn
- echo "could not determine your hostname, please set EMAIL in
your environment" > /dev/stderr
- fi
-fi
-
file=ChangeLog.$RANDOM
case "$CL" in
@@ -148,7 +86,6 @@
CL=${CL##*/}
;;
esac
-cvs update "$CL"
if [ -f "$CL" ]; then
sed 's/^/X/' "$CL" | {
@@ -162,11 +99,11 @@
if [ "$first" = true ]; then
date=$(expr "$line" : '\* \(... ... .. \) .*')
user=$(expr "$line" : '\* ... ... .. \(.*\)')
- if [ "$date" = "$(date +'%a %b %_d %Y')" -a "$user" =
"$FULLNAME <$EMAIL>" ]; then
+ if [ "$date" = "$(date +'%a %b %_d %Y')" -a "$user" =
"$IDENTITY" ]; then
echo "$line"
echo "- $msg"
else
- echo "* $(date +'%a %b %_d %Y') $FULLNAME <$EMAIL>"
+ echo "* $(date +'%a %b %_d %Y') $IDENTITY"
echo "- $msg"
echo
echo "$line"
@@ -182,7 +119,7 @@
esac
done
if [ "$first" = true ]; then
- echo "* $(date +'%a %b %_d %Y')
MonetDB: default - Merged from Jun2010
Changeset: 2fbf2b9c70f2 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2fbf2b9c70f2 Modified Files: sql/src/backends/monet5/merovingian/ChangeLog Branch: default Log Message: Merged from Jun2010 diffs (truncated from 504 to 300 lines): diff -r aba8b2f8a4ca -r 2fbf2b9c70f2 sql/src/backends/monet5/merovingian/ChangeLog --- a/sql/src/backends/monet5/merovingian/ChangeLog Fri May 07 18:16:43 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 + @@ -1,242 +0,0 @@ -# ChangeLog file for sql/src/backends/monet5/merovingian -# This file is updated with mchangelog - - 07 Apr 2010; Fabian Groffen monetdb.c: - Sort output returned by discover, status and get commands based on url - or dbname. - - 24 Mar 2010; Fabian Groffen merovingian.c, - merovingian_client.c: - Implemented UNIX domain socket listener for Merovingian, found as - mapi_socket in the dbfarm. Client connections can be made over it - like normal TCP connections. - - 17 Mar 2010; Fabian Groffen merovingian_proxy.c: - When a proxy connection is made to a local UNIX domain socket, pass - on the filedescriptor instead of proxying. - - 16 Mar 2010; Fabian Groffen - merovingian_forkmserver.c, merovingian_proxy.c: - Use mserver5's UNIX domain socket support when Merovingian is supposed - to proxy the connection to the database. - -*June2010 - - 16 Mar 2010; Fabian Groffen - merovingian_controlrunner.c: - Enlarged buffer to avoid incomplete output being sent to monetdb(1), - causing commands like status and get to fail on certain - configurations. - - 05 Mar 2010; Fabian Groffen merovingian_client.c: - Avoid running over the allocated buffer space resulting in crashes - when a client connects which IP address cannot be resolved into a - hostname, bug #2964247 - -*Feb2010-SP1 -*Feb2010 -*Nov2009-SP2 - - 21 Jan 2010; Fabian Groffen monetdb.c: - Changed wording of monetdb status -l for last crash to indicate the time - reported is not the crash time, but the time the server was started which - eventually crashed, bug #2900355 - - 13 Jan 2010; Fabian Groffen merovingian.c: - Strip trailing newlines from the control channel password, bug #2931392 - -*Nov2009-SP1 - - 11 Dec 2009; Fabian Groffen merovingian_forkmserver.c, - monetdb.1, properties.c: - The master property of a database now contains an id that is used to - identify the master to the slaves. The id can be given using monetdb set, or - one is generated when no id is supplied (when just setting it to 'yes') - -*Nov2009 - - 26 Oct 2009; Fabian Groffen utils.c - Fix bug that caused monetdb status to list an incorrect uptime in - cases where the uptime was longer than 7 days. - - 08 Oct 2009; Fabian Groffen merovingian.c, - merovingian_forkmserver.c, monetdb.c, properties.c: - Add optpipe setting to control the SQL optimiser pipeline, useful for - experimentation per database - - 08 Oct 2009; Fabian Groffen merovingian_forkmserver.c: - Export the URI the database is reachable from remotely to the database via - merovingian_uri GDKenvironment setting. This can be used by applications - inside the database that need to give a pointer back to themselves. - - 30 Sep 2009; Fabian Groffen merovingian.c, - merovingian_forkmserver.c, monetdb.c, properties.c, utils.c, utils.h: - Add slave property for databases - - 25 Sep 2009; Fabian Groffen monetdb.c: - Implemented global -q option to monetdb to suppress status messages when - performing commands - - 25 Sep 2009; Fabian Groffen glob.c: - Improved globbing to support escapes, such that the literal asterisk symbol - can be matched using \* - - 25 Sep 2009; Fabian Groffen merovingian_discoveryrunner.c, - monetdb.1: - Remote controllable merovingians now announce their controlport. These - control entries show up in monetdb discover output marked with an asterisk. - - 23 Sep 2009; Fabian Groffen monetdb.1, monetdb.c, - merovingian.1, merovingian.c, merovingian_controlrunner.c: - Implemented Feature Request #2830754. monetdb can now control a remote - merovingian using the -h -p and -P global options to monetdb. The password - used is stored at the merovingian site in the .merovingian_pass file in the - controlled dbfarm. - - 18 Sep 2009; Fabian Groffen monetdb.c, monetdb.1: - monetdb now requires merovingian to be running to perform any - operation - - 09 Sep 2009; Fabian Groffen merovingian_discoveryrunner.c: - No longer announce databases that are under maintenance, this allows them to - be pulled out of the cluster easily - - 04 Sep 2009; Fabian Groffen merovingian_forkmserver.c, - monetdb.c, monetdb_get.c, properties.c: - Add master property of boolean value that translates into - replication_master for mserver5 to trigger storing replication logs - - 20 Aug 2009; Fabian Groffen database.c, database.h, - monetdb.c, monetdb.1: - Always put created databases under maintenance, they have to be explicitly - released after creati
