Changeset: f7f9c699514b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f7f9c699514b
Modified Files:
Branch: default
Log Message:
Merge changes in recycler.
diffs (truncated from 1229 to 300 lines):
diff -r 8ba2f13eedd8 -r f7f9c699514b MonetDB/ChangeLog.Jun2010
--- a/MonetDB/ChangeLog.Jun2010 Fri May 28 14:44:53 2010 +0200
+++ b/MonetDB/ChangeLog.Jun2010 Mon May 31 12:50:33 2010 +0200
@@ -1,6 +1,9 @@
# ChangeLog file for MonetDB
# This file is updated with Maddlog
+* Mon May 31 2010 Sjoerd Mullender <sjo...@acm.org>
+- Updated Vendor information.
+
* Wed Mar 31 2010 Stefan Manegold <maneg...@cwi.nl>
- 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 8ba2f13eedd8 -r f7f9c699514b MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec Fri May 28 14:44:53 2010 +0200
+++ b/MonetDB/MonetDB.spec Mon May 31 12:50:33 2010 +0200
@@ -21,7 +21,7 @@
Version: %{version}
Release: %{release}
Summary: MonetDB - Monet Database Management System
-Vendor: MonetDB BV <mo...@cwi.nl>
+Vendor: MonetDB BV <i...@monetdb.org>
Group: Applications/Databases
License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
diff -r 8ba2f13eedd8 -r f7f9c699514b MonetDB4/ChangeLog.Jun2010
--- a/MonetDB4/ChangeLog.Jun2010 Fri May 28 14:44:53 2010 +0200
+++ b/MonetDB4/ChangeLog.Jun2010 Mon May 31 12:50:33 2010 +0200
@@ -1,6 +1,9 @@
# ChangeLog file for MonetDB4
# This file is updated with Maddlog
+* Mon May 31 2010 Sjoerd Mullender <sjo...@acm.org>
+- Updated Vendor information.
+
* Wed Mar 31 2010 Stefan Manegold <maneg...@cwi.nl>
- 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 8ba2f13eedd8 -r f7f9c699514b MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec Fri May 28 14:44:53 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec Mon May 31 12:50:33 2010 +0200
@@ -21,7 +21,7 @@
Version: %{version}
Release: %{release}
Summary: MonetDB - Monet Database Management System
-Vendor: MonetDB BV <mo...@cwi.nl>
+Vendor: MonetDB BV <i...@monetdb.org>
Group: Applications/Databases
License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
diff -r 8ba2f13eedd8 -r f7f9c699514b MonetDB4/license.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MonetDB4/license.txt Mon May 31 12:50:33 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 8ba2f13eedd8 -r f7f9c699514b MonetDB5/ChangeLog.Jun2010
--- a/MonetDB5/ChangeLog.Jun2010 Fri May 28 14:44:53 2010 +0200
+++ b/MonetDB5/ChangeLog.Jun2010 Mon May 31 12:50:33 2010 +0200
@@ -1,6 +1,9 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
+* Mon May 31 2010 Sjoerd Mullender <sjo...@acm.org>
+- Updated Vendor information.
+
* Wed May 19 2010 Sjoerd Mullender <sjo...@acm.org>
- Created a new RPM MonetDB5-server-rdf for the optional MonetDB/RDF module.
diff -r 8ba2f13eedd8 -r f7f9c699514b MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec Fri May 28 14:44:53 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec Mon May 31 12:50:33 2010 +0200
@@ -21,7 +21,7 @@
Version: %{version}
Release: %{release}
Summary: MonetDB - Monet Database Management System
-Vendor: MonetDB BV <mo...@cwi.nl>
+Vendor: MonetDB BV <i...@monetdb.org>
Group: Applications/Databases
License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
diff -r 8ba2f13eedd8 -r f7f9c699514b MonetDB5/license.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MonetDB5/license.txt Mon May 31 12:50:33 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 8ba2f13eedd8 -r f7f9c699514b MonetDB5/src/mal/mal.mx
--- a/MonetDB5/src/mal/mal.mx Fri May 28 14:44:53 2010 +0200
+++ b/MonetDB5/src/mal/mal.mx Mon May 31 12:50:33 2010 +0200
@@ -276,6 +276,7 @@
mal_export MT_Lock mal_contextLock;
mal_export MT_Lock mal_remoteLock;
mal_export MT_Lock mal_profileLock ;
+mal_export MT_Lock mal_copyLock ;
mal_export int mal_init(void);
@@ -327,6 +328,7 @@
MT_Lock mal_contextLock;
MT_Lock mal_remoteLock;
MT_Lock mal_profileLock ;
+MT_Lock mal_copyLock;
@-
Initialization of the MAL context
The compiler directive STRUCT_ALIGNED tells that the
@@ -362,6 +364,7 @@
MT_lock_init( &mal_contextLock, "mal_contextLock");
MT_lock_init( &mal_remoteLock, "mal_remoteLock");
MT_lock_init( &mal_profileLock, "mal_profileLock");
+ MT_lock_init( &mal_copyLock, "mal_copyLock");
GDKprotect();
tstAligned();
diff -r 8ba2f13eedd8 -r f7f9c699514b MonetDB5/src/mal/mal_linker.mx
--- a/MonetDB5/src/mal/mal_linker.mx Fri May 28 14:44:53 2010 +0200
+++ b/MonetDB5/src/mal/mal_linker.mx Mon May 31 12:50:33 2010 +0200
@@ -324,9 +324,13 @@
an environment variable.
@c
static int
-cmpstr(const void *p1, const void *p2)
+cmpstr(const void *_p1, const void *_p2)
{
- return strcmp(*(char* const*)p1, *(char* const*)p2);
+ const char *p1 = *(char* const*)_p1;
+ const char *p2 = *(char* const*)_p2;
+ const char *f1 = strrchr(p1, (int) DIR_SEP);
+ const char *f2 = strrchr(p2, (int) DIR_SEP);
+ return strcmp(f1?f1:p1, f2?f2:p2);
}
#define MAXMULTISCRIPT 48
@@ -377,7 +381,6 @@
/* see if this is a directory, if so, recurse */
if (recurse == 1 && (rdir = opendir(fullname)) != NULL) {
struct dirent *e;
- int ps = lasts;
/* list *ext, sort, return */
while ((e = readdir(rdir)) != NULL) {
if (strcmp(e->d_name, "..") == 0 ||
strcmp(e->d_name, ".") == 0)
@@ -398,10 +401,6 @@
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);
} else {
strcat(fullname + i + 1, ext);
@@ -418,6 +417,8 @@
if (lasts > 0) {
size_t i = 0;
int c;
+ /* assure that an ordering such as 10_first, 20_second works */
+ qsort(strs, lasts, sizeof(char *), cmpstr);
for (c = 0; c < lasts; c++)
i += strlen(strs[c]) + 1; /* PATH_SEP or \0 */
fullname = GDKrealloc(fullname, i);
diff -r 8ba2f13eedd8 -r f7f9c699514b MonetDB5/src/modules/mal/tablet_sql.mx
--- a/MonetDB5/src/modules/mal/tablet_sql.mx Fri May 28 14:44:53 2010 +0200
+++ b/MonetDB5/src/modules/mal/tablet_sql.mx Mon May 31 12:50:33 2010 +0200
@@ -197,39 +197,39 @@
str err = 0;
/* watch out for concurrent threads */
- mal_set_lock(mal_contextLock,"tablet insert value");
+ mal_set_lock(mal_copyLock,"tablet insert value");
if ( BATcapacity(fmt[col].c[0]) < BATcount(fmt[col].c[0]) + task->next
) {
if ( (fmt[col].c[0] = BATextend(fmt[col].c[0],
BATgrows(fmt[col].c[0]) + task->limit)) == NULL){
if (task->as->error == NULL)
task->as->error = GDKstrdup("Failed to extend
the BAT, perhaps disk full");
- mal_unset_lock(mal_contextLock,"tablet insert value");
+ mal_unset_lock(mal_copyLock,"tablet insert value");
stream_printf(GDKout,"Failed to extend the BAT, perhaps
disk full");
return -1;
}
}
- mal_unset_lock(mal_contextLock,"tablet insert value");
+ mal_unset_lock(mal_copyLock,"tablet insert value");
for ( i = 0; i< task->next ; i++)
if ( task->fields[col][i] ) { /* no errors */
if (SQLinsert_val(&fmt[col], task->fields[col][i], task->quote,
NULL, &err, col+1)) {
assert(err != NULL);
- mal_set_lock(mal_contextLock,"tablet insert value");
+ mal_set_lock(mal_copyLock,"tablet insert value");
if (!task->as->tryall){
/* watch out for concurrent threads */
if (task->as->error == NULL)
task->as->error = err; /* restore for
upper layers */
} else
BUNins(task->as->complaints, NULL, err, TRUE);
- mal_unset_lock(mal_contextLock,"tablet insert value");
+ mal_unset_lock(mal_copyLock,"tablet insert value");
}
}
if (err) {
/* watch out for concurrent threads */
- mal_set_lock(mal_contextLock,"tablet insert value");
+ mal_set_lock(mal_copyLock,"tablet insert value");
if (task->as->error == NULL)
task->as->error = err; /* restore for upper layers */
- mal_unset_lock(mal_contextLock,"tablet insert value");
+ mal_unset_lock(mal_copyLock,"tablet insert value");
}
return err ? -1 : 0;
}
@@ -288,7 +288,7 @@
fmt->sep, BATcount(fmt->c[0]) + 1 +
task->next, i);
errors:
/* we save all errors detected */
- mal_set_lock(mal_contextLock,"tablet line break");
+ mal_set_lock(mal_copyLock,"tablet line break");
if (as->tryall)
BUNins(as->complaints, NULL, errmsg, TRUE);
if ( as->error){
@@ -297,7 +297,7 @@
GDKfree(s);
}
as->error = GDKstrdup(errmsg);
- mal_unset_lock(mal_contextLock,"tablet line break");
+ mal_unset_lock(mal_copyLock,"tablet line break");
for (i = 0; i < as->nr_attrs ; i++)
task->fields[i][idx] = NULL ;
break;
diff -r 8ba2f13eedd8 -r f7f9c699514b buildtools/Mx/Code.c
--- a/buildtools/Mx/Code.c Fri May 28 14:44:53 2010 +0200
+++ b/buildtools/Mx/Code.c Mon May 31 12:50:33 2010 +0200
@@ -375,6 +375,7 @@
case Clex:
case CCyacc:
case CClex:
+ case MALcode:
break;
case Haskell:
diff -r 8ba2f13eedd8 -r f7f9c699514b buildtools/Mx/Mx.h
--- a/buildtools/Mx/Mx.h Fri May 28 14:44:53 2010 +0200
+++ b/buildtools/Mx/Mx.h Mon May 31 12:50:33 2010 +0200
@@ -83,6 +83,7 @@
char *ext;
} Directive;
+extern char *inputdir;
extern char *outputdir;
extern Directive str2dir[];
diff -r 8ba2f13eedd8 -r f7f9c699514b buildtools/Mx/disclaimer.c
--- a/buildtools/Mx/disclaimer.c Fri May 28 14:44:53 2010 +0200
+++ b/buildtools/Mx/disclaimer.c Mon May 31 12:50:33 2010 +0200
@@ -23,23 +23,50 @@
#include <string.h>
#include <limits.h>
+#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;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
