Changeset: 968eb7322d55 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=968eb7322d55
Modified Files:
gdk/gdk_storage.c
monetdb5/modules/mal/querylog.c
Branch: geo
Log Message:
merge with default
diffs (35 lines):
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -44,6 +44,19 @@
#include <fcntl.h>
#endif
+/* GDKfilepath returns a newly allocated string containing the path
+ * name of a database farm.
+ * The arguments are the farmID or -1, the name of a subdirectory
+ * within the farm (i.e., something like BATDIR or BAKDIR -- see
+ * gdk.h) or NULL, the name of a BAT (i.e. the name that is store in
+ * BBP.dir -- something like 07/714), and finally the file extension.
+ *
+ * If farmid is >= 0, GDKfilepath returns the complete path to the
+ * specified farm concatenated with the other arguments with
+ * appropriate separators. If farmid is -1, it returns the
+ * concatenation of its other arguments (in this case, the result
+ * cannot be used to access a file directly -- the farm needs to be
+ * prepended in some other place). */
char *
GDKfilepath(int farmid, const char *dir, const char *name, const char *ext)
{
diff --git a/monetdb5/modules/mal/querylog.c b/monetdb5/modules/mal/querylog.c
--- a/monetdb5/modules/mal/querylog.c
+++ b/monetdb5/modules/mal/querylog.c
@@ -145,7 +145,7 @@ QLOGcreate(str hnme, str tnme, int tt)
if (b)
return b;
- b = BATnew(TYPE_void, tt, 1 << 16, TRANSIENT);
+ b = BATnew(TYPE_void, tt, 1 << 16, PERSISTENT);
if (b == NULL)
return NULL;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
