date:20161014

MonetDB: protocol - Compilation fixes.

2016-10-14 Thread Mark Raasveldt

Changeset: a5797937769b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a5797937769b
Modified Files:
clients/mapiclient/mclient.c
clients/mapilib/mapi.c
common/utils/conversion.c
monetdb5/modules/atoms/blob.c
sql/backends/monet5/sql.c
Branch: protocol
Log Message:

Compilation fixes.


diffs (88 lines):

diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -1048,8 +1048,8 @@ mapi_escape_name(char *name) {
char *buffer = startbuffer;
if (!startbuffer) return NULL;
if (strchr(name, ',') || strchr(name, ' ') || strchr(name, '\t') || 
strchr(name, '#')) {
+   char *p;
*buffer++ = '"';
-   char *p;
for (p = name; *p; p++) {
if (*p == '"') {
*buffer++ = '\\';
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -6236,10 +6236,6 @@ mapi_set_compute_column_width(Mapi mid, 
 
 #define NUMERIC_CONVERSION(fromtpe, totpe, fromname, toname, MIN_VALUE, 
MAX_VALUE) \
case SQL_BINARY_##fromname: {   

\
-   fromtpe val = *((fromtpe*)col->buffer_ptr); 

\
-   if (val < MIN_VALUE || val > MAX_VALUE) {   

\
-   return mapi_setError(hdl->mid, "Overflow when 
converting value.", "mapi_fetch_field_"#toname, MERROR);  \
-   }   

\
*retval = (totpe) *((fromtpe*)col->buffer_ptr); 

\
return MOK; 

\
}
@@ -6251,11 +6247,15 @@ mapi_set_compute_column_width(Mapi mid, 
 #define HGE_CONVERSION(fromtpe, totpe, fromname, toname, MIN_VALUE, MAX_VALUE)
 #endif
 
-float STRTOF(const char *restrict str, char **restrict endptr, int base) {
+static float 
+STRTOF(const char *restrict str, char **restrict endptr, int base) {
+   (void) base;
return strtof(str, endptr);
 }
 
-double STRTOD(const char *restrict str, char **restrict endptr, int base) {
+static double 
+STRTOD(const char *restrict str, char **restrict endptr, int base) {
+   (void) base;
return strtod(str, endptr);
 }
 
@@ -6289,7 +6289,7 @@ mapi_fetch_field_##typename(MapiHdl hdl,
}   

\
}   

\
/* string conversion */ 

\
-   mapi_fetch_field(hdl, fnr); 

\
+   val = mapi_fetch_field(hdl, fnr);   

\
if (hdl->mid->error != MOK) {   

\
return hdl->mid->error; 

\
}

MonetDB: protocol - Approve exports.

2016-10-14 Thread Mark Raasveldt

Changeset: 9d9dd3ff5dab for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9d9dd3ff5dab
Modified Files:
clients/Tests/exports.stable.out
Branch: protocol
Log Message:

Approve exports.


diffs (38 lines):

diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -518,7 +518,21 @@ MapiMsg mapi_explain_result(MapiHdl hdl,
 mapi_int64 mapi_fetch_all_rows(MapiHdl hdl);
 char *mapi_fetch_field(MapiHdl hdl, int fnr);
 char **mapi_fetch_field_array(MapiHdl hdl);
+MapiMsg mapi_fetch_field_bigint(MapiHdl hdl, int fnr, mapi_int64 *result);
+MapiMsg mapi_fetch_field_date(MapiHdl hdl, int fnr, short *year, unsigned 
short *month, unsigned short *day);
+MapiMsg mapi_fetch_field_double(MapiHdl hdl, int fnr, double *result);
+MapiMsg mapi_fetch_field_hge(MapiHdl hdl, int fnr, hge *result);
+MapiMsg mapi_fetch_field_int(MapiHdl hdl, int fnr, signed int *result);
 size_t mapi_fetch_field_len(MapiHdl hdl, int fnr);
+MapiMsg mapi_fetch_field_real(MapiHdl hdl, int fnr, float *result);
+MapiMsg mapi_fetch_field_smallint(MapiHdl hdl, int fnr, signed short *result);
+MapiMsg mapi_fetch_field_time(MapiHdl hdl, int fnr, unsigned short *hour, 
unsigned short *min, unsigned short *sec, unsigned int *nanosecond);
+MapiMsg mapi_fetch_field_timestamp(MapiHdl hdl, int fnr, short *year, unsigned 
short *month, unsigned short *day, unsigned short *hour, unsigned short *min, 
unsigned short *sec, unsigned int *nanosecond);
+MapiMsg mapi_fetch_field_tinyint(MapiHdl hdl, int fnr, signed char *result);
+MapiMsg mapi_fetch_field_ubigint(MapiHdl hdl, int fnr, mapi_uint64 *result);
+MapiMsg mapi_fetch_field_uint(MapiHdl hdl, int fnr, unsigned int *result);
+MapiMsg mapi_fetch_field_usmallint(MapiHdl hdl, int fnr, unsigned short 
*result);
+MapiMsg mapi_fetch_field_utinyint(MapiHdl hdl, int fnr, unsigned char *result);
 char *mapi_fetch_line(MapiHdl hdl);
 MapiMsg mapi_fetch_reset(MapiHdl hdl);
 int mapi_fetch_row(MapiHdl hdl);
@@ -2534,9 +2548,11 @@ stream *append_wstream(const char *filen
 stream *block_stream(stream *s);
 stream *block_stream2(stream *s, size_t bufsiz, compression_method comp, 
column_compression colcomp);
 buffer bs2_buffer(stream *s);
-void *bs2_getbuf(stream *ss);
+column_compression bs2_colcomp(stream *ss);
 void bs2_resetbuf(stream *ss);
+int bs2_resizebuf(stream *ss, size_t bufsiz);
 void bs2_setpos(stream *ss, size_t pos);
+void *bs2_stealbuf(stream *ss);
 stream *bs_stream(stream *s);
 bstream *bstream_create(stream *rs, size_t chunk_size);
 void bstream_destroy(bstream *s);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: protocol - Binary transfer of OIDs.

2016-10-14 Thread Mark Raasveldt

Changeset: 0abd6899dec2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0abd6899dec2
Modified Files:
clients/mapilib/mapi.c
sql/backends/monet5/sql_result.c
Branch: protocol
Log Message:

Binary transfer of OIDs.


diffs (44 lines):

diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -4110,6 +4110,17 @@ mapi_string_conversion_function(int,date
 mapi_string_conversion_function(hge,hge,hugeint,);
 #endif
 
+static char* mapi_convert_oid(struct MapiColumn *col) {
+   int length;
+   if (*((lng*) col->buffer_ptr) == *((lng*) col->null_value)) return NULL;
+   length = conversion_lng_to_string(col->write_buf, COLBUFSIZ, (lng*) 
col->buffer_ptr, *((lng*) col->null_value));
+   if (length < 0) return NULL;
+   col->write_buf[length++] = '@';
+   col->write_buf[length++] = '0';
+   col->write_buf[length++] = '\0';
+   return (char*) col->write_buf;
+}
+
 static char* mapi_convert_decimal(struct MapiColumn *col) {
if (conversion_decimal_to_string(col->buffer_ptr, col->write_buf, 
COLBUFSIZ, col->scale, col->typelen, col->null_value) < 0) {
return NULL;
@@ -4342,6 +4353,9 @@ read_into_cache(MapiHdl hdl, int lookahe
} else if (strcasecmp(type_sql_name, "bigint") 
== 0) {
result->fields[i].sql_type = 
SQL_BINARY_BIGINT;
result->fields[i].converter = 
(mapi_converter) mapi_convert_bigint;
+   } else if (strcasecmp(type_sql_name, "oid") == 
0) {
+   result->fields[i].sql_type = 
SQL_BINARY_BIGINT;
+   result->fields[i].converter = 
(mapi_converter) mapi_convert_oid;
} else if (strcasecmp(type_sql_name, "real") == 
0) {
result->fields[i].sql_type = 
SQL_BINARY_REAL;
result->fields[i].converter = 
(mapi_converter) mapi_convert_real;
diff --git a/sql/backends/monet5/sql_result.c b/sql/backends/monet5/sql_result.c
--- a/sql/backends/monet5/sql_result.c
+++ b/sql/backends/monet5/sql_result.c
@@ -1826,7 +1826,8 @@ static int write_str_term(stream* s, con
 
 static int type_supports_binary_transfer(sql_type *type) {
return 
-   type->eclass == EC_BIT || 
+   type->eclass == EC_BIT ||
+   type->eclass == EC_POS ||
type->eclass == EC_CHAR || 
type->eclass == EC_STRING ||
type->eclass == EC_DEC || 
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: protocol - Always print leading zero for timezone display.

2016-10-14 Thread Mark Raasveldt

Changeset: 4537d302a159 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4537d302a159
Modified Files:
clients/mapiclient/mclient.c
common/utils/conversion.c
common/utils/conversion.h
Branch: protocol
Log Message:

Always print leading zero for timezone display.


diffs (56 lines):

diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -1047,7 +1047,7 @@ mapi_escape_name(char *name) {
char *startbuffer = malloc(strlen(name) * 2 + 2);
char *buffer = startbuffer;
if (!startbuffer) return NULL;
-   if (strchr(name, ',') || strchr(name, '\t') || strchr(name, '#')) {
+   if (strchr(name, ',') || strchr(name, ' ') || strchr(name, '\t') || 
strchr(name, '#')) {
*buffer++ = '"';
char *p;
for (p = name; *p; p++) {
diff --git a/common/utils/conversion.c b/common/utils/conversion.c
--- a/common/utils/conversion.c
+++ b/common/utils/conversion.c
@@ -320,7 +320,7 @@ conversion_time_optional_tz_to_string(ch
diff_hour = timezone_diff / 360;
timezone_diff -= diff_hour * 360;
diff_min = timezone_diff / 6;
-   if ((res = snprintf(dst + (9 + digits), len - (9 + digits), 
"%s%02d:%02d", original_diff >= 0 ? "+" : "", diff_hour, diff_min)) < 0) {
+   if ((res = snprintf(dst + (9 + digits), len - (9 + digits), 
"%s%02d:%02d", original_diff >= 0 ? "+" : "-", abs(diff_hour), diff_min)) < 0) {
return res;
}
return 15 + digits;
@@ -390,7 +390,7 @@ conversion_epoch_optional_tz_to_string(c
diff_hour = timezone_diff / 360;
timezone_diff -= diff_hour * 360;
diff_min = timezone_diff / 6;
-   if ((res = snprintf(dst + res, len - res, "%s%02d:%02d", 
original_diff >= 0 ? "+" : "", diff_hour, diff_min)) < 0) {
+   if ((res = snprintf(dst + res, len - res, "%s%02d:%02d", 
original_diff >= 0 ? "+" : "-", abs(diff_hour), diff_min)) < 0) {
return res;
}
return res;
diff --git a/common/utils/conversion.h b/common/utils/conversion.h
--- a/common/utils/conversion.h
+++ b/common/utils/conversion.h
@@ -66,7 +66,6 @@ void conversion_date_get_data(int date, 
 int conversion_time_to_string(char *dst, int len, const int *src, int 
null_value, int digits);
 int conversion_timetz_to_string(char *dst, int len, const int *src, int 
null_value, int digits, int timezone_diff);
 
-
 void conversion_time_get_data(int time, int timezone_diff, unsigned short 
*hour, unsigned short *minute, unsigned short *second, unsigned int 
*nanosecond);
 
 // timestamp conversion, *src is time since epoch in ms
@@ -75,11 +74,7 @@ int conversion_epoch_tz_to_string(char *
 
 void conversion_timestamp_get_data(lng timestamp, int timezone_diff, short 
*year, unsigned short *month, unsigned short *day, unsigned short *hour, 
unsigned short *minute, unsigned short *second, unsigned int *nanosecond);
 
-
 // blobs are converted to strings in hexadecimal format (i.e. two characters 
per byte)
 int conversion_blob_to_string(char *dst, int len, const char *blobdata, size_t 
nitems);
 
-
-
-
 #endif
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: protocol - Use digits to determine timestamp printing p...

2016-10-14 Thread Mark Raasveldt

Changeset: 51697805b5d0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=51697805b5d0
Modified Files:
clients/mapilib/mapi.c
common/utils/conversion.c
common/utils/conversion.h
sql/backends/monet5/sql_result.c
Branch: protocol
Log Message:

Use digits to determine timestamp printing precision.


diffs (117 lines):

diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -4135,7 +4135,7 @@ static char* mapi_convert_timetz(struct 
 
 static char* mapi_convert_timestamp(struct MapiColumn *col) {
if (*((lng*) col->buffer_ptr) == *((lng*)col->null_value)) return NULL;
-   if (conversion_epoch_to_string(col->write_buf, COLBUFSIZ, (lng*) 
col->buffer_ptr, *((lng*)col->null_value)) < 0) {
+   if (conversion_epoch_to_string(col->write_buf, COLBUFSIZ, (lng*) 
col->buffer_ptr, *((lng*)col->null_value), col->digits) < 0) {
return NULL;
}
return (char*) col->write_buf;
@@ -4143,7 +4143,7 @@ static char* mapi_convert_timestamp(stru
 
 static char* mapi_convert_timestamptz(struct MapiColumn *col) {
if (*((lng*) col->buffer_ptr) == *((lng*)col->null_value)) return NULL;
-   if (conversion_epoch_tz_to_string(col->write_buf, COLBUFSIZ, (lng*) 
col->buffer_ptr, *((lng*)col->null_value), col->timezone) < 0) {
+   if (conversion_epoch_tz_to_string(col->write_buf, COLBUFSIZ, (lng*) 
col->buffer_ptr, *((lng*)col->null_value), col->digits, col->timezone) < 0) {
return NULL;
}
return (char*) col->write_buf;
diff --git a/common/utils/conversion.c b/common/utils/conversion.c
--- a/common/utils/conversion.c
+++ b/common/utils/conversion.c
@@ -323,6 +323,7 @@ conversion_time_optional_tz_to_string(ch
if ((res = snprintf(dst + (9 + digits), len - (9 + digits), 
"%s%02d:%02d", original_diff >= 0 ? "+" : "", diff_hour, diff_min)) < 0) {
return res;
}
+   return 15 + digits;
}
return 9 + digits;
 }
@@ -360,17 +361,28 @@ conversion_timestamp_get_data(lng time, 
conversion_date_get_data(days, year, month, day);
 }
 static int
-conversion_epoch_optional_tz_to_string(char *dst, int len, const lng *src, lng 
null_value, int include_timezone, int timezone_diff) {
+conversion_epoch_optional_tz_to_string(char *dst, int len, const lng *src, lng 
null_value, int digits, int include_timezone, int timezone_diff) {
short year;
unsigned short month, day, hour, min, sec;
unsigned int nanosecond;
lng time = *src;
+   int res = 0;
if (*src == null_value) {
strcpy(dst, NULL_STRING);
return 3;
}
 
conversion_timestamp_get_data(*src, timezone_diff, &year, &month, &day, 
&hour, &min, &sec, &nanosecond);
+
+   if ((res = snprintf(dst, len, "%d-%02d-%02d %02d:%02d:%02d.%06d", year, 
month, day,  hour, min, sec, nanosecond)) < 0) {
+   return res;
+   }
+   digits--;
+   if (digits == 0) digits = -1;
+   res += digits - 6;
+   // adjust displayed precision based on the digits
+   dst[res] = '\0';
+
if (include_timezone) {
int diff_hour, diff_min;
int original_diff = timezone_diff;
@@ -378,19 +390,22 @@ conversion_epoch_optional_tz_to_string(c
diff_hour = timezone_diff / 360;
timezone_diff -= diff_hour * 360;
diff_min = timezone_diff / 6;
-   return snprintf(dst, len, "%d-%02d-%02d 
%02d:%02d:%02d.%06d%s%02d:%02d", year, month, day, hour, min, sec, nanosecond, 
original_diff >= 0 ? "+" : "", diff_hour, diff_min);
+   if ((res = snprintf(dst + res, len - res, "%s%02d:%02d", 
original_diff >= 0 ? "+" : "", diff_hour, diff_min)) < 0) {
+   return res;
+   }
+   return res;
}
-   return snprintf(dst, len, "%d-%02d-%02d %02d:%02d:%02d.%06d", year, 
month, day,  hour, min, sec, nanosecond);
+   return res;
 }
 
 int
-conversion_epoch_to_string(char *dst, int len, const lng *src, lng null_value) 
{
-   return conversion_epoch_optional_tz_to_string(dst, len, src, 
null_value, 0, 0);
+conversion_epoch_to_string(char *dst, int len, const lng *src, lng null_value, 
int digits) {
+   return conversion_epoch_optional_tz_to_string(dst, len, src, 
null_value, digits, 0, 0);
 }
 
 int 
-conversion_epoch_tz_to_string(char *dst, int len, const lng *src, lng 
null_value, int timezone_diff) {
-   return conversion_epoch_optional_tz_to_string(dst, len, src, 
null_value, 1, timezone_diff);
+conversion_epoch_tz_to_string(char *dst, int len, const lng *src, lng 
null_value, int digits, int timezone_diff) {
+   return conversion_epoch_optional_tz_to_string(dst, len, src, 
null_value, digits, 1, timezone_diff);
 }
 
 static char hexit[] = "0123456789ABCDEF";
diff

MonetDB: protocol - Fix bug with NULL blobs.

2016-10-14 Thread Mark Raasveldt

Changeset: 300ed9c0c27a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=300ed9c0c27a
Modified Files:
sql/backends/monet5/sql_result.c
Branch: protocol
Log Message:

Fix bug with NULL blobs.


diffs (12 lines):

diff --git a/sql/backends/monet5/sql_result.c b/sql/backends/monet5/sql_result.c
--- a/sql/backends/monet5/sql_result.c
+++ b/sql/backends/monet5/sql_result.c
@@ -2059,7 +2059,7 @@ int mvc_export_resultset_prot10(mvc *m, 
if (convert_to_string || 
ATOMvarsized(mtype)) {
if (c->type.type->eclass == 
EC_BLOB) {
blob *b = (blob*) 
BUNtail(iterators[i], row);
-   rowsize += sizeof(lng) 
+ b->nitems == ~(size_t) 0 ? 0 : b->nitems;
+   rowsize += sizeof(lng) 
+ (b->nitems == ~(size_t) 0) ? 0 : b->nitems;
} else {
size_t slen = 
strlen((const char*) BUNtail(iterators[i], row));
rowsize += slen + 1;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: protocol - Add support for TIMETZ type.

2016-10-14 Thread Mark Raasveldt

Changeset: e4ef92ec4acf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e4ef92ec4acf
Modified Files:
clients/mapilib/mapi.c
common/utils/conversion.c
common/utils/conversion.h
Branch: protocol
Log Message:

Add support for TIMETZ type.


diffs (98 lines):

diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -4119,7 +4119,15 @@ static char* mapi_convert_decimal(struct
 
 static char* mapi_convert_time(struct MapiColumn *col) {
if (*((int*) col->buffer_ptr) == *((int*)col->null_value)) return NULL;
-   if (conversion_time_to_string(col->write_buf, COLBUFSIZ, (int*) 
col->buffer_ptr, *((int*)col->null_value), col->digits, 0) < 0) {
+   if (conversion_time_to_string(col->write_buf, COLBUFSIZ, (int*) 
col->buffer_ptr, *((int*)col->null_value), col->digits) < 0) {
+   return NULL;
+   }
+   return (char*) col->write_buf;
+}
+
+static char* mapi_convert_timetz(struct MapiColumn *col) {
+   if (*((int*) col->buffer_ptr) == *((int*)col->null_value)) return NULL;
+   if (conversion_timetz_to_string(col->write_buf, COLBUFSIZ, (int*) 
col->buffer_ptr, *((int*)col->null_value), col->digits, col->timezone) < 0) {
return NULL;
}
return (char*) col->write_buf;
@@ -4345,6 +4353,10 @@ read_into_cache(MapiHdl hdl, int lookahe
} else if (strcasecmp(type_sql_name, "time") == 
0) {
result->fields[i].sql_type = 
SQL_BINARY_TIME;
result->fields[i].converter = 
(mapi_converter) mapi_convert_time;
+   } else if (strcasecmp(type_sql_name, "timetz") 
== 0) {
+   result->fields[i].sql_type = 
SQL_BINARY_TIMETZ;
+   result->fields[i].timezone = timezone;
+   result->fields[i].converter = 
(mapi_converter) mapi_convert_timetz;
} else if (strcasecmp(type_sql_name, 
"timestamp") == 0) {
result->fields[i].sql_type = 
SQL_BINARY_TIMESTAMP;
result->fields[i].converter = 
(mapi_converter) mapi_convert_timestamp;
diff --git a/common/utils/conversion.c b/common/utils/conversion.c
--- a/common/utils/conversion.c
+++ b/common/utils/conversion.c
@@ -292,8 +292,8 @@ conversion_time_get_data(int time, int t
 }
 
 
-int 
-conversion_time_to_string(char *dst, int len, const int *src, int null_value, 
int digits, int timezone_diff) {
+static int 
+conversion_time_optional_tz_to_string(char *dst, int len, const int *src, int 
null_value, int digits, int include_timezone, int timezone_diff) {
unsigned short hour, min, sec;
unsigned int nanosecond;
int res = 0;
@@ -305,16 +305,36 @@ conversion_time_to_string(char *dst, int
 
conversion_time_get_data(*src, timezone_diff, &hour, &min, &sec, 
&nanosecond);
 
-   if ((res = sprintf(dst, "%02d:%02d:%02d.%06d", hour, min, sec, 
nanosecond)) < 0) {
+   if ((res = snprintf(dst, len, "%02d:%02d:%02d.%06d", hour, min, sec, 
nanosecond)) < 0) {
return res;
}
digits--;
if (digits == 0) digits = -1;
// adjust displayed precision based on the digits
dst[9 + digits] = '\0';
+
+   if (include_timezone) {
+   int diff_hour, diff_min;
+   int original_diff = timezone_diff;
+   
+   diff_hour = timezone_diff / 360;
+   timezone_diff -= diff_hour * 360;
+   diff_min = timezone_diff / 6;
+   if ((res = snprintf(dst + (9 + digits), len - (9 + digits), 
"%s%02d:%02d", original_diff >= 0 ? "+" : "", diff_hour, diff_min)) < 0) {
+   return res;
+   }
+   }
return 9 + digits;
 }
 
+int conversion_time_to_string(char *dst, int len, const int *src, int 
null_value, int digits) {
+   return conversion_time_optional_tz_to_string(dst, len, src, null_value, 
digits, 0, 0);
+}
+
+int conversion_timetz_to_string(char *dst, int len, const int *src, int 
null_value, int digits, int timezone_diff) {
+   return conversion_time_optional_tz_to_string(dst, len, src, null_value, 
digits, 1, timezone_diff);
+}
+
 static int days_between_zero_and_epoch = 719528;
 
 void 
diff --git a/common/utils/conversion.h b/common/utils/conversion.h
--- a/common/utils/conversion.h
+++ b/common/utils/conversion.h
@@ -63,7 +63,10 @@ int conversion_date_to_string(char *dst,
 void conversion_date_get_data(int date, short *year, unsigned short *month, 
unsigned short *day);
 
 // time conversion, *src is ms since 00:00:00
-int conversion_time_to_string(char *dst, int len, const int *src, int 
null_value, int digits, int timezone_diff);
+int conversion_time_to_string(char *dst, int

MonetDB: protocol - Deal with NULL blobs correctly.

2016-10-14 Thread Mark Raasveldt

Changeset: 209f5381b23e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=209f5381b23e
Modified Files:
sql/backends/monet5/sql_result.c
Branch: protocol
Log Message:

Deal with NULL blobs correctly.


diffs (32 lines):

diff --git a/sql/backends/monet5/sql_result.c b/sql/backends/monet5/sql_result.c
--- a/sql/backends/monet5/sql_result.c
+++ b/sql/backends/monet5/sql_result.c
@@ -2059,7 +2059,7 @@ int mvc_export_resultset_prot10(mvc *m, 
if (convert_to_string || 
ATOMvarsized(mtype)) {
if (c->type.type->eclass == 
EC_BLOB) {
blob *b = (blob*) 
BUNtail(iterators[i], row);
-   rowsize += sizeof(lng) 
+ b->nitems;
+   rowsize += sizeof(lng) 
+ b->nitems == ~(size_t) 0 ? 0 : b->nitems;
} else {
size_t slen = 
strlen((const char*) BUNtail(iterators[i], row));
rowsize += slen + 1;
@@ -2143,10 +2143,15 @@ int mvc_export_resultset_prot10(mvc *m, 
buf += sizeof(lng);
for (crow = srow; crow < row; crow++) {
blob *b = (blob*) 
BUNtail(iterators[i], crow);
-   (*(lng*)buf) = b->nitems == 
~(size_t) 0 ? -1 : (lng) b->nitems;
-   buf += sizeof(lng);
-   memcpy(buf, b->data, b->nitems);
-   buf += b->nitems;
+   if (b->nitems == ~(size_t) 0) {
+   (*(lng*)buf) = -1;
+   buf += sizeof(lng);
+   } else {
+   (*(lng*)buf) = (lng) 
b->nitems;
+   buf += sizeof(lng);
+   memcpy(buf, b->data, 
b->nitems);
+   buf += b->nitems;
+   }
}
// after the loop we know the size of 
the column, so write it
*((lng*)startbuf) = buf - (startbuf + 
sizeof(lng));
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: HTM - remove garbage files and correct stable.{err,out}

2016-10-14 Thread Jennie Zhang

Changeset: 4a9fd46f3f01 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4a9fd46f3f01
Removed Files:

sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.err--

sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.out--

sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-2.stable.err--

sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-2.stable.out--

sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-1.stable.err--

sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-1.stable.out--

sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-2.stable.err--

sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-2.stable.out--
sql/test/2-phase-commit/Tests/MixTransactionPrecommit-1.stable.err--
sql/test/2-phase-commit/Tests/MixTransactionPrecommit-1.stable.out--
sql/test/2-phase-commit/Tests/MixTransactionPrecommit-2.stable.err--
sql/test/2-phase-commit/Tests/MixTransactionPrecommit-2.stable.out--

sql/test/2-phase-commit/Tests/MixTransactionPrecommit-cleanup.stable.err--

sql/test/2-phase-commit/Tests/MixTransactionPrecommit-cleanup.stable.out--
sql/test/2-phase-commit/Tests/MultipleConnections-cleanup.stable.err--
sql/test/2-phase-commit/Tests/MultipleConnections-cleanup.stable.out--

sql/test/2-phase-commit/Tests/MultipleConnectionsAllWithAutocommit.stable.err--

sql/test/2-phase-commit/Tests/MultipleConnectionsAllWithAutocommit.stable.out--
sql/test/2-phase-commit/Tests/NonUpdatePrecommitReturns0.stable.err--
sql/test/2-phase-commit/Tests/NonUpdatePrecommitReturns0.stable.out--
sql/test/2-phase-commit/Tests/PersistBeforePrecommit-1.stable.err--
sql/test/2-phase-commit/Tests/PersistBeforePrecommit-1.stable.out--
sql/test/2-phase-commit/Tests/PersistBeforePrecommit-2.stable.err--
sql/test/2-phase-commit/Tests/PersistBeforePrecommit-2.stable.out--

sql/test/2-phase-commit/Tests/PersistBeforePrecommitWithRollback-1.stable.err--

sql/test/2-phase-commit/Tests/PersistBeforePrecommitWithRollback-1.stable.out--

sql/test/2-phase-commit/Tests/PersistBeforePrecommitWithRollback-2.stable.err--

sql/test/2-phase-commit/Tests/PersistBeforePrecommitWithRollback-2.stable.out--
sql/test/2-phase-commit/Tests/PrecommitWithoutPersists-1.stable.err--
sql/test/2-phase-commit/Tests/PrecommitWithoutPersists-1.stable.out--
sql/test/2-phase-commit/Tests/PrecommitWithoutPersists-2.stable.err--
sql/test/2-phase-commit/Tests/PrecommitWithoutPersists-2.stable.out--
sql/test/2-phase-commit/Tests/ReadsItsOwnWrites-cleanup.stable.err--
sql/test/2-phase-commit/Tests/ReadsItsOwnWrites-cleanup.stable.out--
sql/test/2-phase-commit/Tests/ReadsItsOwnWrites.stable.err--
sql/test/2-phase-commit/Tests/ReadsItsOwnWrites.stable.out--

sql/test/2-phase-commit/Tests/RollbackAfterPersistcommitHasNoEffect-1.stable.err--

sql/test/2-phase-commit/Tests/RollbackAfterPersistcommitHasNoEffect-1.stable.out--

sql/test/2-phase-commit/Tests/RollbackAfterPersistcommitHasNoEffect-2.stable.err--

sql/test/2-phase-commit/Tests/RollbackAfterPersistcommitHasNoEffect-2.stable.out--
sql/test/2-phase-commit/Tests/RollbackAfterPrecommit-1.stable.err--
sql/test/2-phase-commit/Tests/RollbackAfterPrecommit-1.stable.out--
sql/test/2-phase-commit/Tests/RollbackAfterPrecommit-2.stable.err--
sql/test/2-phase-commit/Tests/RollbackAfterPrecommit-2.stable.out--
sql/test/2-phase-commit/Tests/RollbackBeforePrecommit-1.stable.err--
sql/test/2-phase-commit/Tests/RollbackBeforePrecommit-1.stable.out--
sql/test/2-phase-commit/Tests/RollbackBeforePrecommit-2.stable.err--
sql/test/2-phase-commit/Tests/RollbackBeforePrecommit-2.stable.out--
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-1.stable.err--
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-1.stable.out--
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-2.stable.err--
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-2.stable.out--
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-3.stable.err--
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-3.stable.out--
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-4.stable.err--
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-4.stable.out--
sql/test/2-phase-commit/Tests/TwoInsetsIn1Transaction.stable.err--
sql/test/2-phase-commit/Tests/TwoInsetsIn1Transaction.stable.out--
sql/test/2-phase-commit/Tests/setup.stable.err--
sql/test/2-phase-commit/Tests/setup.stable.out--
Modified Files:
sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.err
sql/test/2-phase-commit/

MonetDB: 2PC - Remove garbage files

2016-10-14 Thread Jennie Zhang

Changeset: ab30dbc72c9c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ab30dbc72c9c
Removed Files:

sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.err--

sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.out--

sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-2.stable.err--

sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-2.stable.out--

sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-1.stable.err--

sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-1.stable.out--

sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-2.stable.err--

sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-2.stable.out--
sql/test/2-phase-commit/Tests/MixTransactionPrecommit-1.stable.err--
sql/test/2-phase-commit/Tests/MixTransactionPrecommit-1.stable.out--
sql/test/2-phase-commit/Tests/MixTransactionPrecommit-2.stable.err--
sql/test/2-phase-commit/Tests/MixTransactionPrecommit-2.stable.out--

sql/test/2-phase-commit/Tests/MixTransactionPrecommit-cleanup.stable.err--

sql/test/2-phase-commit/Tests/MixTransactionPrecommit-cleanup.stable.out--
sql/test/2-phase-commit/Tests/MultipleConnections-cleanup.stable.err--
sql/test/2-phase-commit/Tests/MultipleConnections-cleanup.stable.out--

sql/test/2-phase-commit/Tests/MultipleConnectionsAllWithAutocommit.stable.err--

sql/test/2-phase-commit/Tests/MultipleConnectionsAllWithAutocommit.stable.out--
sql/test/2-phase-commit/Tests/NonUpdatePrecommitReturns0.stable.err--
sql/test/2-phase-commit/Tests/NonUpdatePrecommitReturns0.stable.out--
sql/test/2-phase-commit/Tests/PersistBeforePrecommit-1.stable.err--
sql/test/2-phase-commit/Tests/PersistBeforePrecommit-1.stable.out--
sql/test/2-phase-commit/Tests/PersistBeforePrecommit-2.stable.err--
sql/test/2-phase-commit/Tests/PersistBeforePrecommit-2.stable.out--

sql/test/2-phase-commit/Tests/PersistBeforePrecommitWithRollback-1.stable.err--

sql/test/2-phase-commit/Tests/PersistBeforePrecommitWithRollback-1.stable.out--

sql/test/2-phase-commit/Tests/PersistBeforePrecommitWithRollback-2.stable.err--

sql/test/2-phase-commit/Tests/PersistBeforePrecommitWithRollback-2.stable.out--
sql/test/2-phase-commit/Tests/PrecommitWithoutPersists-1.stable.err--
sql/test/2-phase-commit/Tests/PrecommitWithoutPersists-1.stable.out--
sql/test/2-phase-commit/Tests/PrecommitWithoutPersists-2.stable.err--
sql/test/2-phase-commit/Tests/PrecommitWithoutPersists-2.stable.out--
sql/test/2-phase-commit/Tests/ReadsItsOwnWrites-cleanup.stable.err--
sql/test/2-phase-commit/Tests/ReadsItsOwnWrites-cleanup.stable.out--
sql/test/2-phase-commit/Tests/ReadsItsOwnWrites.stable.err--
sql/test/2-phase-commit/Tests/ReadsItsOwnWrites.stable.out--

sql/test/2-phase-commit/Tests/RollbackAfterPersistcommitHasNoEffect-1.stable.err--

sql/test/2-phase-commit/Tests/RollbackAfterPersistcommitHasNoEffect-1.stable.out--

sql/test/2-phase-commit/Tests/RollbackAfterPersistcommitHasNoEffect-2.stable.err--

sql/test/2-phase-commit/Tests/RollbackAfterPersistcommitHasNoEffect-2.stable.out--
sql/test/2-phase-commit/Tests/RollbackAfterPrecommit-1.stable.err--
sql/test/2-phase-commit/Tests/RollbackAfterPrecommit-1.stable.out--
sql/test/2-phase-commit/Tests/RollbackAfterPrecommit-2.stable.err--
sql/test/2-phase-commit/Tests/RollbackAfterPrecommit-2.stable.out--
sql/test/2-phase-commit/Tests/RollbackBeforePrecommit-1.stable.err--
sql/test/2-phase-commit/Tests/RollbackBeforePrecommit-1.stable.out--
sql/test/2-phase-commit/Tests/RollbackBeforePrecommit-2.stable.err--
sql/test/2-phase-commit/Tests/RollbackBeforePrecommit-2.stable.out--
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-1.stable.err--
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-1.stable.out--
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-2.stable.err--
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-2.stable.out--
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-3.stable.err--
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-3.stable.out--
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-4.stable.err--
sql/test/2-phase-commit/Tests/TestAutocommitUpdates-4.stable.out--
sql/test/2-phase-commit/Tests/TwoInsetsIn1Transaction.stable.err--
sql/test/2-phase-commit/Tests/TwoInsetsIn1Transaction.stable.out--
sql/test/2-phase-commit/Tests/setup.stable.err--
sql/test/2-phase-commit/Tests/setup.stable.out--
Branch: 2PC
Log Message:

Remove garbage files


diffs (truncated from 2985 to 300 lines):

diff --git 
a/sql/test/2-phase-commit

MonetDB: protocol - Don't use -fraw in tests because it makes no...

2016-10-14 Thread Mark Raasveldt

Changeset: de3ee2290202 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=de3ee2290202
Modified Files:
sql/test/mapi/Tests/utf8test.SQL.py
sql/test/mapi/Tests/utf8test.stable.out
Branch: protocol
Log Message:

Don't use -fraw in tests because it makes no sense with the new protocol, now 
use -fcsv.


diffs (79 lines):

diff --git a/sql/test/mapi/Tests/utf8test.SQL.py 
b/sql/test/mapi/Tests/utf8test.SQL.py
--- a/sql/test/mapi/Tests/utf8test.SQL.py
+++ b/sql/test/mapi/Tests/utf8test.SQL.py
@@ -23,13 +23,13 @@ sys.stderr.write(err)
 out, err = client(['-s', "insert into utf8test values ('funny characters: 
%s')" % funny])
 sys.stdout.write(out)
 sys.stderr.write(err)
-out, err = client(['-fraw', '-s', 'select * from utf8test'])
+out, err = client(['-fcsv', '-s', 'select * from utf8test'])
 sys.stdout.write(out)
 sys.stderr.write(err)
 out, err = client(['-fsql', '-s', 'select * from utf8test'])
 sys.stdout.write(out)
 sys.stderr.write(err)
-out, err = client(['-fraw', '-Eiso-8859-1', '-s', 'select * from utf8test'],
+out, err = client(['-fcsv', '-Eiso-8859-1', '-s', 'select * from utf8test'],
   universal_newlines = False)
 out = out.decode('iso-8859-1')
 err = err.decode('iso-8859-1')
@@ -47,7 +47,7 @@ if sys.version_info[0] == 2:
 err = err.encode('utf-8')
 sys.stdout.write(out)
 sys.stderr.write(err)
-out, err = client(['-fraw', '-Eus-ascii', '-s', 'select * from utf8test'],
+out, err = client(['-fcsv', '-Eus-ascii', '-s', 'select * from utf8test'],
   universal_newlines = False)
 out = out.decode('us-ascii')
 err = err.decode('us-ascii')
diff --git a/sql/test/mapi/Tests/utf8test.stable.out 
b/sql/test/mapi/Tests/utf8test.stable.out
--- a/sql/test/mapi/Tests/utf8test.stable.out
+++ b/sql/test/mapi/Tests/utf8test.stable.out
@@ -44,17 +44,8 @@ Ready.
 # 10:26:28 >  
 
 [ 1]
-
-# 10:26:28 >  
-# 10:26:28 >  Mtimeout -timeout 60 mclient -lsql -umonetdb -Pmonetdb 
--host=ottar --port=32641  -fraw -s 'select * from utf8test'
-# 10:26:28 >  
-
-% sys.utf8test # table_name
-% s # name
-% varchar # type
-% 32 # length
-[ "value without special characters"   ]
-[ "funny characters: Ã Ã¡Ã¢Ã£Ã¤Ã¥" ]
+value without special characters
+funny characters: Ã Ã¡Ã¢Ã£Ã¤Ã¥
 select * from utf8test
 +--+
 | s|
@@ -63,12 +54,8 @@ select * from utf8test
 | funny characters: Ã Ã¡Ã¢Ã£Ã¤Ã¥ |
 +--+
 2 tuples
-% sys.utf8test # table_name
-% s # name
-% varchar # type
-% 32 # length
-[ "value without special characters"   ]
-[ "funny characters: Ã Ã¡Ã¢Ã£Ã¤Ã¥" ]
+value without special characters
+funny characters: Ã Ã¡Ã¢Ã£Ã¤Ã¥
 select * from utf8test
 +--+
 | s|
@@ -77,11 +64,7 @@ select * from utf8test
 | funny characters: Ã Ã¡Ã¢Ã£Ã¤Ã¥ |
 +--+
 2 tuples
-% sys.utf8test # table_name
-% s # name
-% varchar # type
-% 32 # length
-[ "value without special characters"   ]
+value without special characters
 select * from utf8test
 +--+
 | s|
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: protocol - Implement mapi_fetch_all_rows.

2016-10-14 Thread Mark Raasveldt

Changeset: b372bf9457d3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b372bf9457d3
Modified Files:
clients/mapilib/mapi.c
Branch: protocol
Log Message:

Implement mapi_fetch_all_rows.


diffs (13 lines):

diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -5814,6 +5814,9 @@ mapi_fetch_all_rows(MapiHdl hdl)
mnstr_flush(mid->to))
check_stream(mid, mid->to, 
mnstr_error(mid->to), "mapi_fetch_line", 0);
}
+   if (result->prot10_resultset) {
+   return result->row_count;
+   }
if (mid->active)
read_into_cache(mid->active, 0);
else
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: protocol - Add mapi_fetch_field_[type] family of functi...

2016-10-14 Thread Mark Raasveldt

Changeset: 8a3d8e27b790 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8a3d8e27b790
Modified Files:
clients/mapilib/mapi.c
clients/mapilib/mapi.h
common/utils/conversion.c
common/utils/conversion.h
Branch: protocol
Log Message:

Add mapi_fetch_field_[type] family of functions to avoid unnecessary string 
conversion function, and implement mapi_store_bind functions.


diffs (truncated from 895 to 300 lines):

diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -840,6 +840,7 @@ struct MapiColumn {
size_t dynamic_write_bufsiz;
char write_buf[COLBUFSIZ];
mapi_converter converter;
+   binary_sql_type sql_type;
 };
 
 /* information about bound columns */
@@ -4289,12 +4290,15 @@ read_into_cache(MapiHdl hdl, int lookahe
result->fields[i].dynamic_write_buf = NULL;
result->fields[i].dynamic_write_bufsiz = 0;
result->fields[i].converter = NULL;
+   result->fields[i].sql_type = SQL_BINARY_UNKNOWN;
 
if (strcasecmp(type_sql_name, "blob") == 0) {
+   result->fields[i].sql_type = 
SQL_BINARY_BLOB;
result->fields[i].converter = 
(mapi_converter) mapi_convert_blob;
} else if (result->fields[i].null_value == 
NULL) {
result->fields[i].converter = 
(mapi_converter) mapi_convert_null;
} else if (strcasecmp(type_sql_name, "varchar") 
== 0 || strcasecmp(type_sql_name, "char") == 0) {
+   result->fields[i].sql_type = 
SQL_BINARY_VARCHAR;
if (typelen > 0) {
result->fields[i].converter = 
(mapi_converter) mapi_convert_varchar;

result->fields[i].dynamic_write_bufsiz = result->fields[i].typelen * 
sizeof(char);
@@ -4303,38 +4307,53 @@ read_into_cache(MapiHdl hdl, int lookahe
result->fields[i].converter = 
(mapi_converter) mapi_convert_clob;
}
} else if (strcasecmp(type_sql_name, "clob") == 
0) {
+   result->fields[i].sql_type = 
SQL_BINARY_CLOB;
// var length strings
result->fields[i].converter = 
(mapi_converter) mapi_convert_clob;
} else if (strcasecmp(type_sql_name, "int") == 
0 || strcasecmp(type_sql_name, "month_interval") == 0) {
+   result->fields[i].sql_type = 
SQL_BINARY_INT;
result->fields[i].converter = 
(mapi_converter) mapi_convert_int;
} else if (strcasecmp(type_sql_name, 
"smallint") == 0) {
+   result->fields[i].sql_type = 
SQL_BINARY_SMALLINT;
result->fields[i].converter = 
(mapi_converter) mapi_convert_smallint;
} else if (strcasecmp(type_sql_name, "tinyint") 
== 0) {
+   result->fields[i].sql_type = 
SQL_BINARY_TINYINT;
result->fields[i].converter = 
(mapi_converter) mapi_convert_tinyint;
} else if (strcasecmp(type_sql_name, "boolean") 
== 0) {
+   result->fields[i].sql_type = 
SQL_BINARY_BOOLEAN;
result->fields[i].converter = 
(mapi_converter) mapi_convert_boolean;
} else if (strcasecmp(type_sql_name, "decimal") 
== 0 || strcasecmp(type_sql_name, "sec_interval") == 0) {
+   result->fields[i].sql_type = 
SQL_BINARY_DECIMAL;
result->fields[i].converter = 
(mapi_converter) mapi_convert_decimal;
} else if (strcasecmp(type_sql_name, "double") 
== 0) {
+   result->fields[i].sql_type = 
SQL_BINARY_DOUBLE;
result->fields[i].converter = 
(mapi_converter) mapi_convert_double;
} else if (strcasecmp(type_sql_name, "date") == 
0) {
+   result->fields[i].sql_type = 
SQL_BINARY_DATE;
result->fields[i].converter = 
(mapi_converter) mapi_convert_date;
} else if (strcasecmp(type_sql_name, "bigint") 
== 0) {
+   result->fields[i].sql_type =

MonetDB: protocol - Handle TYPE_void.

2016-10-14 Thread Mark Raasveldt

Changeset: 5525372adcd6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5525372adcd6
Modified Files:
sql/backends/monet5/sql_result.c
Branch: protocol
Log Message:

Handle TYPE_void.


diffs (12 lines):

diff --git a/sql/backends/monet5/sql_result.c b/sql/backends/monet5/sql_result.c
--- a/sql/backends/monet5/sql_result.c
+++ b/sql/backends/monet5/sql_result.c
@@ -1454,6 +1454,8 @@ get_print_width(int mtype, int eclass, i
} else if (mtype == TYPE_hge) {
count = bat_max_hgelength(b);
 #endif
+   } else if (mtype == TYPE_void) {
+   count = 4;
} else {
assert(0);
}
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: protocol - Merge with default.

2016-10-14 Thread Mark Raasveldt

Changeset: 19f650d7c7d1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=19f650d7c7d1
Added Files:
sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/13-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit
sql/jdbc/tests/Tests/BugExecuteUpdate_Bug_3350.SQL.bat
sql/jdbc/tests/Tests/BugExecuteUpdate_Bug_3350.SQL.sh
sql/jdbc/tests/Tests/BugExecuteUpdate_Bug_3350.stable.err
sql/jdbc/tests/Tests/BugExecuteUpdate_Bug_3350.stable.out
sql/jdbc/tests/Tests/Test_Wrapper.SQL.bat
sql/jdbc/tests/Tests/Test_Wrapper.SQL.sh
sql/jdbc/tests/Tests/Test_Wrapper.stable.err
sql/jdbc/tests/Tests/Test_Wrapper.stable.out

sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
sql/test/BugTracker-2016/Tests/cast_and_floor.Bug-6071.sql
sql/test/BugTracker-2016/Tests/cast_and_floor.Bug-6071.stable.err
sql/test/BugTracker-2016/Tests/cast_and_floor.Bug-6071.stable.out
sql/test/BugTracker-2016/Tests/storagemodel.stable.out.int128
sql/test/BugTracker-2016/Tests/union.Bug-6069.sql
sql/test/BugTracker-2016/Tests/union.Bug-6069.stable.err
sql/test/BugTracker-2016/Tests/union.Bug-6069.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out.int128
sql/test/pg_regress/Tests/oid.stable.out.oid32
sql/test/pg_regress/Tests/without_oid.stable.out.oid32
Modified Files:
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
geom/sql/conformance/Tests/T10.stable.out
geom/sql/conformance/Tests/T11.stable.out
geom/sql/conformance/Tests/T12.stable.out
geom/sql/conformance/Tests/T13.stable.out
geom/sql/conformance/Tests/T14.stable.out
geom/sql/conformance/Tests/T15.stable.out
geom/sql/conformance/Tests/T16.stable.out
geom/sql/conformance/Tests/T17.stable.out
geom/sql/conformance/Tests/T18.stable.out
geom/sql/conformance/Tests/T21.stable.out
geom/sql/conformance/Tests/T22.stable.out
geom/sql/conformance/Tests/T23.stable.out
geom/sql/conformance/Tests/T24.stable.out
geom/sql/conformance/Tests/T25.stable.out
geom/sql/conformance/Tests/T26.stable.out
geom/sql/conformance/Tests/T27.stable.out
geom/sql/conformance/Tests/T28.stable.out
geom/sql/conformance/Tests/T29.stable.out
geom/sql/conformance/Tests/T30.stable.out
geom/sql/conformance/Tests/T31.stable.out
geom/sql/conformance/Tests/T32.stable.out
geom/sql/conformance/Tests/T33.stable.out
geom/sql/conformance/Tests/T34.stable.out
geom/sql/conformance/Tests/T35.stable.out
geom/sql/conformance/Tests/T36.stable.out
geom/sql/conformance/Tests/T37.stable.out
geom/sql/conformance/Tests/T38.stable.out
geom/sql/conformance/Tests/T39.stable.out
geom/sql/conformance/Tests/T40.stable.out
geom/sql/conformance/Tests/T41.stable.out
geom/sql/conformance/Tests/T42.stable.out
geom/sql/conformance/Tests/T43.stable.out
geom/sql/conformance/Tests/T44.stable.out
geom/sql/conformance/Tests/T45.stable.out
geom/sql/conformance/Tests/T46.stable.out
geom/sql/conformance/Tests/T47.stable.out
geom/sql/conformance/Tests/T48.stable.out
geom/sql/conformance/Tests/T49.stable.out
geom/sql/conformance/Tests/T50.stable.out
geom/sql/conformance/Tests/T51.stable.out
geom/sql/conformance/Tests/T52.stable.out
geom/sql/conformance/Tests/T6.stable.out
geom/sql/conformance/Tests/T7.stable.out
geom/sql/conformance/Tests/T8.stable.out
geom/sql/functions/Tests/ST_AsEWKT.stable.out
geom/sql/functions/Tests/ST_AsText.stable.out
geom/sql/functions/Tests/ST_Boundary.stable.out
geom/sql/functions/Tests/ST_Contains.stable.out
geom/sql/functions/Tests/ST_CoordDim.stable.out
geom/sql/functions/Tests/ST_Dimension.stable.out
geom/sql/functions/Tests/ST_GeomFromText.stable.out
geom/sql/functions/Tests/ST_GeometryN.stable.out
geom/sql/functions/Tests/ST_GeometryType.stable.out
geom/sql/functions/Tests/ST_IsClosed.stable.out
geom/sql/functions/Tests/ST_IsEmpty.stable.out
geom/sql/functions/Tests/ST_IsRing.stable.out
geom/sql/functions/Tests/ST_IsSimple.stable.out
geom/sql/functions/Tests/ST_IsValid.stable.out
geom/sql/functions/Tests/ST_LineFromText.stable.out
geom/sql/functions/Tests/ST_MLineFromText.stable.out
geom/sql/functions/Tests/ST_MPointFromText.stable.out
geom/sql/functions/Tests/ST_MPolygonFromText.stable.out
geom/sql/funct

MonetDB: Dec2016 - Merge with Jun2016 branch.

2016-10-14 Thread Sjoerd Mullender

Changeset: f7301d22c7d9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f7301d22c7d9
Added Files:
sql/test/emptydb-upgrade-chain/Tests/check.stable.out.32bit
sql/test/emptydb-upgrade/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.32bit
Modified Files:
sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/check.stable.out
sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade/Tests/check.stable.out
sql/test/emptydb-upgrade/Tests/check.stable.out.int128
sql/test/emptydb/Tests/All
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.int128
Branch: Dec2016
Log Message:

Merge with Jun2016 branch.


diffs (truncated from 14182 to 300 lines):

diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 
b/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
@@ -39,10 +39,16 @@ Ready.
 \dSv
 \dSs
 \dSf
+\dn bam
 \dn json
 \dn profiler
 \dn sys
 \dn tmp
+\dSt bam.export
+\dSt bam.files
+\dSt bam.pg
+\dSt bam.rg
+\dSt bam.sq
 \dSt sys._columns
 \dSt sys._tables
 \dSt sys.args
@@ -55,6 +61,11 @@ Ready.
 \dSt sys.idxs
 \dSt sys.keys
 \dSt sys.keywords
+\dSt sys.netcdf_attrs
+\dSt sys.netcdf_dims
+\dSt sys.netcdf_files
+\dSt sys.netcdf_vardim
+\dSt sys.netcdf_vars
 \dSt sys.objects
 \dSt sys.privileges
 \dSt sys.schemas
@@ -94,6 +105,7 @@ Ready.
 \dSf sys."analyze"
 \dSf sys."bbp"
 \dSf sys."broadcast"
+\dSf sys."chi2prob"
 \dSf sys."clearrejects"
 \dSf sys."columnsize"
 \dSf sys."contains"
@@ -125,6 +137,8 @@ Ready.
 \dSf sys."environment"
 \dSf sys."epoch"
 \dSf sys."evalalgebra"
+\dSf sys."fitsattach"
+\dSf sys."fitsload"
 \dSf sys."flush_log"
 \dSf sys."fuse"
 \dSf sys."generate_series"
@@ -157,7 +171,12 @@ Ready.
 \dSf sys."isauuid"
 \dSf sys."left_shift"
 \dSf sys."left_shift_assign"
+\dSf sys."lidarattach"
+\dSf sys."lidarexport"
+\dSf sys."lidarload"
 \dSf sys."like"
+\dSf sys."listdir"
+\dSf sys."listdirpat"
 \dSf sys."malfunctions"
 \dSf sys."masklen"
 \dSf sys."mbr"
@@ -167,6 +186,8 @@ Ready.
 \dSf sys."ms_str"
 \dSf sys."ms_stuff"
 \dSf sys."ms_trunc"
+\dSf sys."netcdf_attach"
+\dSf sys."netcdf_importvar"
 \dSf sys."netmask"
 \dSf sys."network"
 \dSf sys."newurl"
@@ -194,6 +215,8 @@ Ready.
 \dSf sys."setmasklen"
 \dSf sys."setsession"
 \dSf sys."settimeout"
+\dSf sys."shpattach"
+\dSf sys."shpload"
 \dSf sys."shrink"
 \dSf sys."shutdown"
 \dSf sys."st_area"
@@ -308,6 +331,7 @@ Ready.
 \dSf sys."var"
 \dSf sys."var_pop"
 \dSf sys."var_samp"
+SYSTEM SCHEMA  bam
 SYSTEM SCHEMA  json
 SYSTEM SCHEMA profiler
 SYSTEM SCHEMA  sys
@@ -324,6 +348,11 @@ SYSTEM TABLE  sys.functions
 SYSTEM TABLE  sys.idxs
 SYSTEM TABLE  sys.keys
 SYSTEM TABLE  sys.keywords
+SYSTEM TABLE  sys.netcdf_attrs
+SYSTEM TABLE  sys.netcdf_dims
+SYSTEM TABLE  sys.netcdf_files
+SYSTEM TABLE  sys.netcdf_vardim
+SYSTEM TABLE  sys.netcdf_vars
 SYSTEM TABLE  sys.objects
 SYSTEM TABLE  sys.privileges
 SYSTEM TABLE  sys.schemas
@@ -380,6 +409,7 @@ SYSTEM FUNCTION sys.ceiling
 SYSTEM FUNCTION sys.char_length
 SYSTEM FUNCTION sys.character_length
 SYSTEM FUNCTION sys.charindex
+SYSTEM FUNCTION  sys.chi2prob
 SYSTEM FUNCTION  sys.clearrejects
 SYSTEM FUNCTION sys.code
 SYSTEM FUNCTION  sys.columnsize
@@ -435,6 +465,8 @@ SYSTEM FUNCTION  sys.epoch
 SYSTEM FUNCTION  sys.evalalgebra
 SYSTEM FUNCTION sys.exist
 SYSTEM FUNCTION sys.exp
+SYSTEM FUNCTION  sys.fitsattach
+SYSTEM FUNCTION  sys.fitsload
 SYSTEM FUNCTION sys.floor
 SYSTEM FUNCTION sys.flush_log
 SYSTEM FUNCTION  sys.fuse
@@ -481,7 +513,12 @@ SYSTEM FUNCTION  sys.left_shift
 SYSTEM FUNCTION  sys.left_shift_assign
 SYSTEM FUNCTION  sys.length
 SYSTEM FUNCTION sys.levenshtein
+SYSTEM FUNCTION  sys.lidarattach
+SYSTEM FUNCTION  sys.lidarexport
+SYSTEM FUNCTION  sys.lidarload
 SYSTEM FUNCTION  sys.like
+SYSTEM FUNCTION  sys.listdir
+SYSTEM FUNCTION  sys.listdirpat
 SYSTEM FUNCTION sys.local_timezone
 SYSTEM FUNCTION sys.localtime
 SYSTEM FUNCTION sys.localtimestamp
@@ -518,6 +555,8 @@ SYSTEM FUNCTION  sys.ms_round
 SYSTEM FUNCTION  sys.ms_str
 SYSTEM FUNCTION  sys.ms_stuff
 SYSTEM FUNCTION  sys.ms_trunc
+SYSTEM FUNCTION  sys.netcdf_attach
+SYSTEM FUNCTION  sys.netcdf_importvar
 SYSTEM FUNCTION  sys.netmask
 SYSTEM FUNCTION  sys.network
 SYSTEM FUNCTION  sys.newurl
@@ -574,6 +613,8 @@ SYSTEM FUNCTION  sys.sessions
 SYSTEM FUNCTION  sys.setmasklen
 SYSTEM FUNCTION  sys.setsession
 SYSTEM FUNCTION  sys.settimeout
+SYSTEM FUNCTION  sys.shpattach
+SYSTEM FUNCTION  sys.shpload
 SYSTEM FUNCTION  sys.shrink
 SYSTEM FUNCTION  sys.shutdown
 SYSTEM FUNCTION sys.sign
@@ -718,10 +759,16 @@ SYSTEM FUNCTION sys.weekofyear
 SYSTEM FUNCTION sys.xor
 S

MonetDB: default - Merge with Dec2016 branch.

2016-10-14 Thread Sjoerd Mullender

Changeset: 25027e4c22ae for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=25027e4c22ae
Added Files:
sql/test/emptydb-upgrade-chain/Tests/check.stable.out.32bit
sql/test/emptydb-upgrade/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.32bit
Modified Files:
sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/check.stable.out
sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade/Tests/check.stable.out
sql/test/emptydb-upgrade/Tests/check.stable.out.int128
sql/test/emptydb/Tests/All
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.int128
Branch: default
Log Message:

Merge with Dec2016 branch.


diffs (truncated from 14182 to 300 lines):

diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 
b/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
@@ -39,10 +39,16 @@ Ready.
 \dSv
 \dSs
 \dSf
+\dn bam
 \dn json
 \dn profiler
 \dn sys
 \dn tmp
+\dSt bam.export
+\dSt bam.files
+\dSt bam.pg
+\dSt bam.rg
+\dSt bam.sq
 \dSt sys._columns
 \dSt sys._tables
 \dSt sys.args
@@ -55,6 +61,11 @@ Ready.
 \dSt sys.idxs
 \dSt sys.keys
 \dSt sys.keywords
+\dSt sys.netcdf_attrs
+\dSt sys.netcdf_dims
+\dSt sys.netcdf_files
+\dSt sys.netcdf_vardim
+\dSt sys.netcdf_vars
 \dSt sys.objects
 \dSt sys.privileges
 \dSt sys.schemas
@@ -94,6 +105,7 @@ Ready.
 \dSf sys."analyze"
 \dSf sys."bbp"
 \dSf sys."broadcast"
+\dSf sys."chi2prob"
 \dSf sys."clearrejects"
 \dSf sys."columnsize"
 \dSf sys."contains"
@@ -125,6 +137,8 @@ Ready.
 \dSf sys."environment"
 \dSf sys."epoch"
 \dSf sys."evalalgebra"
+\dSf sys."fitsattach"
+\dSf sys."fitsload"
 \dSf sys."flush_log"
 \dSf sys."fuse"
 \dSf sys."generate_series"
@@ -157,7 +171,12 @@ Ready.
 \dSf sys."isauuid"
 \dSf sys."left_shift"
 \dSf sys."left_shift_assign"
+\dSf sys."lidarattach"
+\dSf sys."lidarexport"
+\dSf sys."lidarload"
 \dSf sys."like"
+\dSf sys."listdir"
+\dSf sys."listdirpat"
 \dSf sys."malfunctions"
 \dSf sys."masklen"
 \dSf sys."mbr"
@@ -167,6 +186,8 @@ Ready.
 \dSf sys."ms_str"
 \dSf sys."ms_stuff"
 \dSf sys."ms_trunc"
+\dSf sys."netcdf_attach"
+\dSf sys."netcdf_importvar"
 \dSf sys."netmask"
 \dSf sys."network"
 \dSf sys."newurl"
@@ -194,6 +215,8 @@ Ready.
 \dSf sys."setmasklen"
 \dSf sys."setsession"
 \dSf sys."settimeout"
+\dSf sys."shpattach"
+\dSf sys."shpload"
 \dSf sys."shrink"
 \dSf sys."shutdown"
 \dSf sys."st_area"
@@ -308,6 +331,7 @@ Ready.
 \dSf sys."var"
 \dSf sys."var_pop"
 \dSf sys."var_samp"
+SYSTEM SCHEMA  bam
 SYSTEM SCHEMA  json
 SYSTEM SCHEMA profiler
 SYSTEM SCHEMA  sys
@@ -324,6 +348,11 @@ SYSTEM TABLE  sys.functions
 SYSTEM TABLE  sys.idxs
 SYSTEM TABLE  sys.keys
 SYSTEM TABLE  sys.keywords
+SYSTEM TABLE  sys.netcdf_attrs
+SYSTEM TABLE  sys.netcdf_dims
+SYSTEM TABLE  sys.netcdf_files
+SYSTEM TABLE  sys.netcdf_vardim
+SYSTEM TABLE  sys.netcdf_vars
 SYSTEM TABLE  sys.objects
 SYSTEM TABLE  sys.privileges
 SYSTEM TABLE  sys.schemas
@@ -380,6 +409,7 @@ SYSTEM FUNCTION sys.ceiling
 SYSTEM FUNCTION sys.char_length
 SYSTEM FUNCTION sys.character_length
 SYSTEM FUNCTION sys.charindex
+SYSTEM FUNCTION  sys.chi2prob
 SYSTEM FUNCTION  sys.clearrejects
 SYSTEM FUNCTION sys.code
 SYSTEM FUNCTION  sys.columnsize
@@ -435,6 +465,8 @@ SYSTEM FUNCTION  sys.epoch
 SYSTEM FUNCTION  sys.evalalgebra
 SYSTEM FUNCTION sys.exist
 SYSTEM FUNCTION sys.exp
+SYSTEM FUNCTION  sys.fitsattach
+SYSTEM FUNCTION  sys.fitsload
 SYSTEM FUNCTION sys.floor
 SYSTEM FUNCTION sys.flush_log
 SYSTEM FUNCTION  sys.fuse
@@ -481,7 +513,12 @@ SYSTEM FUNCTION  sys.left_shift
 SYSTEM FUNCTION  sys.left_shift_assign
 SYSTEM FUNCTION  sys.length
 SYSTEM FUNCTION sys.levenshtein
+SYSTEM FUNCTION  sys.lidarattach
+SYSTEM FUNCTION  sys.lidarexport
+SYSTEM FUNCTION  sys.lidarload
 SYSTEM FUNCTION  sys.like
+SYSTEM FUNCTION  sys.listdir
+SYSTEM FUNCTION  sys.listdirpat
 SYSTEM FUNCTION sys.local_timezone
 SYSTEM FUNCTION sys.localtime
 SYSTEM FUNCTION sys.localtimestamp
@@ -518,6 +555,8 @@ SYSTEM FUNCTION  sys.ms_round
 SYSTEM FUNCTION  sys.ms_str
 SYSTEM FUNCTION  sys.ms_stuff
 SYSTEM FUNCTION  sys.ms_trunc
+SYSTEM FUNCTION  sys.netcdf_attach
+SYSTEM FUNCTION  sys.netcdf_importvar
 SYSTEM FUNCTION  sys.netmask
 SYSTEM FUNCTION  sys.network
 SYSTEM FUNCTION  sys.newurl
@@ -574,6 +613,8 @@ SYSTEM FUNCTION  sys.sessions
 SYSTEM FUNCTION  sys.setmasklen
 SYSTEM FUNCTION  sys.setsession
 SYSTEM FUNCTION  sys.settimeout
+SYSTEM FUNCTION  sys.shpattach
+SYSTEM FUNCTION  sys.shpload
 SYSTEM FUNCTION  sys.shrink
 SYSTEM FUNCTION  sys.shutdown
 SYSTEM FUNCTION sys.sign
@@ -718,10 +759,16 @@ SYSTEM FUNCTION sys.weekofyear
 SYSTEM FUNCTION sys.xor
 S

MonetDB: Jun2016 - Move stable.out to stable.out.32bit, approve ...

2016-10-14 Thread Sjoerd Mullender

Changeset: 6843f6bd5843 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6843f6bd5843
Added Files:
sql/test/emptydb-upgrade-chain/Tests/check.stable.out.32bit
sql/test/emptydb-upgrade/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.32bit
Modified Files:
sql/test/emptydb-upgrade-chain/Tests/check.stable.out
sql/test/emptydb-upgrade/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out
Branch: Jun2016
Log Message:

Move stable.out to stable.out.32bit, approve 64 bit to stable.out.


diffs (truncated from 5064 to 300 lines):

diff --git a/sql/test/emptydb-upgrade-chain/Tests/check.stable.out 
b/sql/test/emptydb-upgrade-chain/Tests/check.stable.out
--- a/sql/test/emptydb-upgrade-chain/Tests/check.stable.out
+++ b/sql/test/emptydb-upgrade-chain/Tests/check.stable.out
@@ -1,33 +1,29 @@
 stdout of test 'check` in directory 'sql/test/emptydb-upgrade-chain` itself:
 
 
-# 12:41:42 >  
-# 12:41:42 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=38686" "--set" 
"mapi_usock=/var/tmp/mtest-29963/.s.monetdb.38686" "--set" "monet_prompt=" 
"--forcemito" "--set" "mal_listing=2" 
"--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_emptydb-upgrade-chain"
 "--set" "mal_listing=0" "--set" "embedded_r=yes"
-# 12:41:42 >  
+# 15:32:57 >  
+# 15:32:57 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=39456" "--set" 
"mapi_usock=/var/tmp/mtest-19169/.s.monetdb.39456" "--set" "monet_prompt=" 
"--forcemito" 
"--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_emptydb-upgrade-chain"
 "--set" "embedded_r=yes"
+# 15:32:57 >  
 
-# MonetDB 5 server v11.21.16 (hg id: 3d106269871b+)
+# MonetDB 5 server v11.23.14
 # This is an unreleased version
 # Serving database 'mTests_sql_test_emptydb-upgrade-chain', using 8 threads
 # Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically 
linked
 # Found 15.589 GiB available main-memory.
 # Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Copyright (c) August 2008-2016 MonetDB B.V., all rights reserved
 # Visit http://www.monetdb.org/ for further information
-# Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:38686/
-# Listening for UNIX domain connection requests on 
mapi:monetdb:///var/tmp/mtest-29963/.s.monetdb.38686
+# Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:39456/
+# Listening for UNIX domain connection requests on 
mapi:monetdb:///var/tmp/mtest-19169/.s.monetdb.39456
 # MonetDB/GIS module loaded
-# Start processing logs sql/sql_logs version 52200
-# Start reading the write-ahead log 'sql_logs/sql/log.4'
-# Finished reading the write-ahead log 'sql_logs/sql/log.4'
-# Finished processing logs sql/sql_logs
 # MonetDB/SQL module loaded
 # MonetDB/R   module loaded
 
 Ready.
 
-# 12:41:42 >  
-# 12:41:42 >  "/usr/bin/python2" "check.SQL.py" "check"
-# 12:41:42 >  
+# 15:32:58 >  
+# 15:32:58 >  "/usr/bin/python2" "check.SQL.py" "check"
+# 15:32:58 >  
 
 \dn
 \dt
@@ -334,7 +330,7 @@ Ready.
 \dSf sys."zorder_encode"
 SYSTEM SCHEMA  bam
 SYSTEM SCHEMA  json
-SYSTEM SCHEMA profiler
+SYSTEM SCHEMA  profiler
 SYSTEM SCHEMA  sys
 SYSTEM SCHEMA  tmp
 SYSTEM TABLE  sys._columns
@@ -358,7 +354,7 @@ SYSTEM TABLE  sys.objects
 SYSTEM TABLE  sys.privileges
 SYSTEM TABLE  sys.schemas
 SYSTEM TABLE  sys.sequences
-SYSTEM TABLE sys.spatial_ref_sys
+SYSTEM TABLE  sys.spatial_ref_sys
 SYSTEM TABLE  sys.statistics
 SYSTEM TABLE  sys.storagemodelinput
 SYSTEM TABLE  sys.systemfunctions
@@ -368,7 +364,7 @@ SYSTEM TABLE  sys.types
 SYSTEM TABLE  sys.user_role
 SYSTEM VIEW  sys.columns
 SYSTEM VIEW  sys.environment
-SYSTEM VIEW sys.geometry_columns
+SYSTEM VIEW  sys.geometry_columns
 SYSTEM VIEW  sys.optimizers
 SYSTEM VIEW  sys.querylog_calls
 SYSTEM VIEW  sys.querylog_catalog
@@ -382,60 +378,60 @@ SYSTEM VIEW  sys.tables
 SYSTEM VIEW  sys.tablestoragemodel
 SYSTEM VIEW  sys.tracelog
 SYSTEM VIEW  sys.users
-SYSTEM FUNCTION sys.<
-SYSTEM FUNCTION sys.<=
-SYSTEM FUNCTION sys.<>
-SYSTEM FUNCTION sys.=
-SYSTEM FUNCTION sys.>
-SYSTEM FUNCTION sys.>=
+SYSTEM FUNCTION  sys.<
+SYSTEM FUNCTION  sys.<=
+SYSTEM FUNCTION  sys.<>
+SYSTEM FUNCTION  sys.=
+SYSTEM FUNCTION  sys.>
+SYSTEM FUNCTION  sys.>=
 SYSTEM FUNCTION  sys.abbrev
-SYSTEM FUNCTION sys.abs
-SYSTEM FUNCTION sys.acos
+SYSTEM FUNCTION  sys.abs
+SYSTEM FUNCTION  sys.acos
 SYSTEM FUNCTION  sys.alpha
 SYSTEM FUNCTION  sys.analyze
-SYSTEM FUNCTION sys.and
-SYSTEM FUNCTION sys.ascii
-SYSTEM FUNCTION sys.asin
-SYSTEM FUNCTION sys.atan
-SYSTEM FUNCTION sys.avg
+SYSTEM FUNCTION  sys.and
+SYSTEM FUNCTION  sys.ascii
+SYSTEM FUNCTION  sys.asin
+SYSTEM FUNCTION  sys.atan
+SYSTEM FUNCTION  sys.avg
 SYSTEM FUNCTION  sys.bbp
-SYSTEM FUNCTION sys.bit_and
-SYSTEM FUNCTION sys.bit_not
-SYSTEM FUNCTION sys.bit_or
-SYSTEM FUNCTION sys.bit_xor
+SYSTEM

MonetDB: Jun2016 - Tests emptydb using a "normally" configured s...

2016-10-14 Thread Sjoerd Mullender

Changeset: e2d8c9244083 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e2d8c9244083
Modified Files:
sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/check.stable.out
sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade/Tests/check.stable.out
sql/test/emptydb-upgrade/Tests/check.stable.out.int128
sql/test/emptydb/Tests/All
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.int128
Branch: Jun2016
Log Message:

Tests emptydb using a "normally" configured server.
Note that the saved databases on the test system have been updated as
well.


diffs (truncated from 8815 to 300 lines):

diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 
b/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
@@ -39,10 +39,16 @@ Ready.
 \dSv
 \dSs
 \dSf
+\dn bam
 \dn json
 \dn profiler
 \dn sys
 \dn tmp
+\dSt bam.export
+\dSt bam.files
+\dSt bam.pg
+\dSt bam.rg
+\dSt bam.sq
 \dSt sys._columns
 \dSt sys._tables
 \dSt sys.args
@@ -55,6 +61,11 @@ Ready.
 \dSt sys.idxs
 \dSt sys.keys
 \dSt sys.keywords
+\dSt sys.netcdf_attrs
+\dSt sys.netcdf_dims
+\dSt sys.netcdf_files
+\dSt sys.netcdf_vardim
+\dSt sys.netcdf_vars
 \dSt sys.objects
 \dSt sys.privileges
 \dSt sys.schemas
@@ -94,6 +105,7 @@ Ready.
 \dSf sys."analyze"
 \dSf sys."bbp"
 \dSf sys."broadcast"
+\dSf sys."chi2prob"
 \dSf sys."clearrejects"
 \dSf sys."columnsize"
 \dSf sys."contains"
@@ -123,6 +135,8 @@ Ready.
 \dSf sys."environment"
 \dSf sys."epoch"
 \dSf sys."evalalgebra"
+\dSf sys."fitsattach"
+\dSf sys."fitsload"
 \dSf sys."flush_log"
 \dSf sys."fuse"
 \dSf sys."generate_series"
@@ -155,7 +169,12 @@ Ready.
 \dSf sys."isauuid"
 \dSf sys."left_shift"
 \dSf sys."left_shift_assign"
+\dSf sys."lidarattach"
+\dSf sys."lidarexport"
+\dSf sys."lidarload"
 \dSf sys."like"
+\dSf sys."listdir"
+\dSf sys."listdirpat"
 \dSf sys."malfunctions"
 \dSf sys."masklen"
 \dSf sys."mbr"
@@ -165,6 +184,8 @@ Ready.
 \dSf sys."ms_str"
 \dSf sys."ms_stuff"
 \dSf sys."ms_trunc"
+\dSf sys."netcdf_attach"
+\dSf sys."netcdf_importvar"
 \dSf sys."netmask"
 \dSf sys."network"
 \dSf sys."newurl"
@@ -192,6 +213,8 @@ Ready.
 \dSf sys."setmasklen"
 \dSf sys."setsession"
 \dSf sys."settimeout"
+\dSf sys."shpattach"
+\dSf sys."shpload"
 \dSf sys."shrink"
 \dSf sys."shutdown"
 \dSf sys."st_area"
@@ -309,6 +332,7 @@ Ready.
 \dSf sys."zorder_decode_x"
 \dSf sys."zorder_decode_y"
 \dSf sys."zorder_encode"
+SYSTEM SCHEMA  bam
 SYSTEM SCHEMA  json
 SYSTEM SCHEMA profiler
 SYSTEM SCHEMA  sys
@@ -325,6 +349,11 @@ SYSTEM TABLE  sys.functions
 SYSTEM TABLE  sys.idxs
 SYSTEM TABLE  sys.keys
 SYSTEM TABLE  sys.keywords
+SYSTEM TABLE  sys.netcdf_attrs
+SYSTEM TABLE  sys.netcdf_dims
+SYSTEM TABLE  sys.netcdf_files
+SYSTEM TABLE  sys.netcdf_vardim
+SYSTEM TABLE  sys.netcdf_vars
 SYSTEM TABLE  sys.objects
 SYSTEM TABLE  sys.privileges
 SYSTEM TABLE  sys.schemas
@@ -380,6 +409,7 @@ SYSTEM FUNCTION sys.ceiling
 SYSTEM FUNCTION sys.char_length
 SYSTEM FUNCTION sys.character_length
 SYSTEM FUNCTION sys.charindex
+SYSTEM FUNCTION  sys.chi2prob
 SYSTEM FUNCTION  sys.clearrejects
 SYSTEM FUNCTION sys.code
 SYSTEM FUNCTION  sys.columnsize
@@ -433,6 +463,8 @@ SYSTEM FUNCTION  sys.epoch
 SYSTEM FUNCTION  sys.evalalgebra
 SYSTEM FUNCTION sys.exist
 SYSTEM FUNCTION sys.exp
+SYSTEM FUNCTION  sys.fitsattach
+SYSTEM FUNCTION  sys.fitsload
 SYSTEM FUNCTION sys.floor
 SYSTEM FUNCTION sys.flush_log
 SYSTEM FUNCTION  sys.fuse
@@ -479,7 +511,12 @@ SYSTEM FUNCTION  sys.left_shift
 SYSTEM FUNCTION  sys.left_shift_assign
 SYSTEM FUNCTION  sys.length
 SYSTEM FUNCTION sys.levenshtein
+SYSTEM FUNCTION  sys.lidarattach
+SYSTEM FUNCTION  sys.lidarexport
+SYSTEM FUNCTION  sys.lidarload
 SYSTEM FUNCTION  sys.like
+SYSTEM FUNCTION  sys.listdir
+SYSTEM FUNCTION  sys.listdirpat
 SYSTEM FUNCTION sys.local_timezone
 SYSTEM FUNCTION sys.localtime
 SYSTEM FUNCTION sys.localtimestamp
@@ -516,6 +553,8 @@ SYSTEM FUNCTION  sys.ms_round
 SYSTEM FUNCTION  sys.ms_str
 SYSTEM FUNCTION  sys.ms_stuff
 SYSTEM FUNCTION  sys.ms_trunc
+SYSTEM FUNCTION  sys.netcdf_attach
+SYSTEM FUNCTION  sys.netcdf_importvar
 SYSTEM FUNCTION  sys.netmask
 SYSTEM FUNCTION  sys.network
 SYSTEM FUNCTION  sys.newurl
@@ -572,6 +611,8 @@ SYSTEM FUNCTION  sys.sessions
 SYSTEM FUNCTION  sys.setmasklen
 SYSTEM FUNCTION  sys.setsession
 SYSTEM FUNCTION  sys.settimeout
+SYSTEM FUNCTION  sys.shpattach
+SYSTEM FUNCTION  sys.shpload
 SYSTEM FUNCTION  sys.shrink
 SYSTEM FUNCTION  sys.shutdown
 SYSTEM FUNCTION sys.sign
@@ -719,10 +760,16 @@ SYSTEM FUNCTION sys.zero_or_one
 SYSTEM FUNCTION  sys.zorder_decode_x
 SYSTEM FUNCTION  sys.zorder_decode_y
 SYSTEM FUNCTION  sys.

MonetDB: default - Step two towards a new stable branch "Dec2016".

2016-10-14 Thread Sjoerd Mullender

Changeset: d330627d491a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d330627d491a
Added Files:
ChangeLog.Dec2016
buildtools/ChangeLog.Dec2016
clients/ChangeLog.Dec2016
clients/mapilib/ChangeLog.Dec2016
common/stream/ChangeLog.Dec2016
gdk/ChangeLog.Dec2016
geom/ChangeLog.Dec2016
monetdb5/ChangeLog.Dec2016
sql/ChangeLog.Dec2016
testing/ChangeLog.Dec2016
tools/merovingian/ChangeLog.Dec2016
Modified Files:
ChangeLog
MonetDB.spec
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
NT/rules.msc
buildtools/ChangeLog
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
gdk/ChangeLog
gdk/libbat.rc
monetdb5/ChangeLog
monetdb5/tools/libmonetdb5.rc
sql/ChangeLog
vertoo.data
Branch: default
Log Message:

Step two towards a new stable branch "Dec2016".

Increment version numbers.

>From now on, *all* bug fixes, and *only* bug fixes, *must* go to the
stable branch with the name "Dec2016".


diffs (truncated from 468 to 300 lines):

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,3 @@
 # ChangeLog file for devel
 # This file is updated with Maddlog
 
-* Thu Sep 22 2016 Sjoerd Mullender 
-- The Perl, PHP, and Python clients, and the JDBC driver each now have
-  their own repositories and release cycles.  The Python client is
-  maintained by Gijs Molenaar on Github
-  (https://github.com/gijzelaerr/pymonetdb), the other clients are
-  maintained by CWI/MonetDB on our own server
-  (https://dev.monetdb.org/hg/monetdb-java,
-  https://dev.monetdb.org/hg/monetdb-perl,
-  https://dev.monetdb.org/hg/monetdb-php).
-
diff --git a/ChangeLog b/ChangeLog.Dec2016
copy from ChangeLog
copy to ChangeLog.Dec2016
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
 %define name MonetDB
-%define version 11.24.0
+%define version 11.26.0
 %{!?buildno: %global buildno %(date +%Y%m%d)}
 
 # groups of related archs
diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj 
b/NT/installer32/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer32/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj
@@ -574,7 +574,7 @@
 "RemovePreviousVersions" = "11:TRUE"
 "DetectNewerInstalledVersion" = "11:TRUE"
 "InstallAllUsers" = "11:TRUE"
-"ProductVersion" = "8:11.24.0"
+"ProductVersion" = "8:11.26.0"
 "Manufacturer" = "8:MonetDB"
 "ARPHELPTELEPHONE" = "8:"
 "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj 
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -439,7 +439,7 @@
 "RemovePreviousVersions" = "11:TRUE"
 "DetectNewerInstalledVersion" = "11:TRUE"
 "InstallAllUsers" = "11:TRUE"
-"ProductVersion" = "8:11.24.0"
+"ProductVersion" = "8:11.26.0"
 "Manufacturer" = "8:MonetDB"
 "ARPHELPTELEPHONE" = "8:"
 "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj 
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -4348,7 +4348,7 @@
 "RemovePreviousVersions" = "11:TRUE"
 "DetectNewerInstalledVersion" = "11:TRUE"
 "InstallAllUsers" = "11:TRUE"
-"ProductVersion" = "8:11.24.0"
+"ProductVersion" = "8:11.26.0"
 "Manufacturer" = "8:MonetDB"
 "ARPHELPTELEPHONE" = "8:"
 "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer64/MonetDB-ODBC-Installer.vdproj 
b/NT/installer64/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer64/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer64/MonetDB-ODBC-Installer.vdproj
@@ -574,7 +574,7 @@
 "RemovePreviousVersions" = "11:TRUE"
 "DetectNewerInstalledVersion" = "11:TRUE"
 "InstallAllUsers" = "11:TRUE"
-"ProductVersion" = "8:11.24.0"
+"ProductVersion" = "8:11.26.0"
 "Manufacturer" = "8:MonetDB"
 "ARPHELPTELEPHONE" = "8:"
 "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer64/MonetDB5-Geom-Module.vdproj 
b/NT/installer64/MonetDB5-Geom-Module.vdproj
--- a/NT/installer64/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer64/MonetDB5-Geom-Module.vdproj
@@ -439,7 +439,7 @@
 "RemovePreviousVersions" = "11:TRUE"
 "

MonetDB: Dec2016 - Step one towards a new stable branch "Dec2016".

2016-10-14 Thread Sjoerd Mullender

Changeset: 878cf065ea12 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=878cf065ea12
Added Files:
ChangeLog.Dec2016
buildtools/ChangeLog.Dec2016
clients/ChangeLog.Dec2016
clients/mapilib/ChangeLog.Dec2016
common/stream/ChangeLog.Dec2016
gdk/ChangeLog.Dec2016
geom/ChangeLog.Dec2016
monetdb5/ChangeLog.Dec2016
sql/ChangeLog.Dec2016
testing/ChangeLog.Dec2016
tools/merovingian/ChangeLog.Dec2016
Removed Files:
ChangeLog
buildtools/ChangeLog
clients/ChangeLog
clients/mapilib/ChangeLog
common/stream/ChangeLog
gdk/ChangeLog
geom/ChangeLog
monetdb5/ChangeLog
sql/ChangeLog
testing/ChangeLog
tools/merovingian/ChangeLog
Modified Files:
MonetDB.spec
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
vertoo.data
Branch: Dec2016
Log Message:

Step one towards a new stable branch "Dec2016".

Incremented version numbers.
Moved ChangeLog file to ChangeLog.Dec2016.
The root of the stable branch is "Dec2016_root".


diffs (truncated from 323 to 300 lines):

diff --git a/ChangeLog b/ChangeLog.Dec2016
rename from ChangeLog
rename to ChangeLog.Dec2016
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
 %define name MonetDB
-%define version 11.24.0
+%define version 11.25.0
 %{!?buildno: %global buildno %(date +%Y%m%d)}
 
 # groups of related archs
diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj 
b/NT/installer32/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer32/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj
@@ -574,7 +574,7 @@
 "RemovePreviousVersions" = "11:TRUE"
 "DetectNewerInstalledVersion" = "11:TRUE"
 "InstallAllUsers" = "11:TRUE"
-"ProductVersion" = "8:11.24.0"
+"ProductVersion" = "8:11.25.0"
 "Manufacturer" = "8:MonetDB"
 "ARPHELPTELEPHONE" = "8:"
 "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj 
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -439,7 +439,7 @@
 "RemovePreviousVersions" = "11:TRUE"
 "DetectNewerInstalledVersion" = "11:TRUE"
 "InstallAllUsers" = "11:TRUE"
-"ProductVersion" = "8:11.24.0"
+"ProductVersion" = "8:11.25.0"
 "Manufacturer" = "8:MonetDB"
 "ARPHELPTELEPHONE" = "8:"
 "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj 
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -4348,7 +4348,7 @@
 "RemovePreviousVersions" = "11:TRUE"
 "DetectNewerInstalledVersion" = "11:TRUE"
 "InstallAllUsers" = "11:TRUE"
-"ProductVersion" = "8:11.24.0"
+"ProductVersion" = "8:11.25.0"
 "Manufacturer" = "8:MonetDB"
 "ARPHELPTELEPHONE" = "8:"
 "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer64/MonetDB-ODBC-Installer.vdproj 
b/NT/installer64/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer64/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer64/MonetDB-ODBC-Installer.vdproj
@@ -574,7 +574,7 @@
 "RemovePreviousVersions" = "11:TRUE"
 "DetectNewerInstalledVersion" = "11:TRUE"
 "InstallAllUsers" = "11:TRUE"
-"ProductVersion" = "8:11.24.0"
+"ProductVersion" = "8:11.25.0"
 "Manufacturer" = "8:MonetDB"
 "ARPHELPTELEPHONE" = "8:"
 "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer64/MonetDB5-Geom-Module.vdproj 
b/NT/installer64/MonetDB5-Geom-Module.vdproj
--- a/NT/installer64/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer64/MonetDB5-Geom-Module.vdproj
@@ -439,7 +439,7 @@
 "RemovePreviousVersions" = "11:TRUE"
 "DetectNewerInstalledVersion" = "11:TRUE"
 "InstallAllUsers" = "11:TRUE"
-"ProductVersion" = "8:11.24.0"
+"ProductVersion" = "8:11.25.0"
 "Manufacturer" = "8:MonetDB"
 "ARPHELPTELEPHONE" = "8:"
 "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj 
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vd

MonetDB: default - Added tag Dec2016_root for changeset 0027cb04...

2016-10-14 Thread Sjoerd Mullender

Changeset: f0b8d4b0e589 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f0b8d4b0e589
Modified Files:
.hgtags
Branch: default
Log Message:

Added tag Dec2016_root for changeset 0027cb04877b


diffs (8 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -640,3 +640,4 @@ f16cdfed96bdc0f3324f8ced85a8b74c67f4dc9b
 293b452cd1e5964d820f7d6c538e06507e575d88 Jun2016_13
 f16cdfed96bdc0f3324f8ced85a8b74c67f4dc9b Jun2016_SP2_release
 293b452cd1e5964d820f7d6c538e06507e575d88 Jun2016_SP2_release
+0027cb04877b7687f45277a81a25253a63e9f21f Dec2016_root
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - The Python client is no longer part of the repo.

2016-10-14 Thread Sjoerd Mullender

Changeset: 0027cb04877b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0027cb04877b
Modified Files:
vertoo.config
Branch: default
Log Message:

The Python client is no longer part of the repo.


diffs (16 lines):

diff --git a/vertoo.config b/vertoo.config
--- a/vertoo.config
+++ b/vertoo.config
@@ -35,12 +35,6 @@ main.addAnchors("clients/mapilib/mapi.rc
 'VALUE "ProductVersion", "%v\\0"',
 arguments(pattern = 'FILEVERSION %v', format = '@winrc'),
 arguments(pattern = 'PRODUCTVERSION %v', format = '@winrc'))
-main.addAnchors("clients/python2/setup.py",
-"version=%q,",
-"python2-monetdb-%v.tar")
-main.addAnchors("clients/python3/setup.py",
-"version=%q,",
-"python3-monetdb-%v.tar")
 main.addAnchors("monetdb5/tools/libmonetdb5.rc",
 'VALUE "FileVersion", "%v\\0"',
 'VALUE "ProductVersion", "%v\\0"',
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Approvals.

2016-10-14 Thread Sjoerd Mullender

Changeset: db01d8e05444 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=db01d8e05444
Modified Files:
sql/benchmarks/ssbm/Tests/01-explain.stable.out
sql/benchmarks/ssbm/Tests/02-explain.stable.out
sql/benchmarks/ssbm/Tests/03-explain.stable.out
sql/benchmarks/ssbm/Tests/04-explain.stable.out
sql/benchmarks/ssbm/Tests/05-explain.stable.out
sql/benchmarks/ssbm/Tests/06-explain.stable.out
sql/benchmarks/ssbm/Tests/07-explain.stable.out
sql/benchmarks/ssbm/Tests/08-explain.stable.out
sql/benchmarks/ssbm/Tests/09-explain.stable.out
sql/benchmarks/ssbm/Tests/10-explain.stable.out
sql/benchmarks/ssbm/Tests/11-explain.stable.out
sql/benchmarks/ssbm/Tests/12-explain.stable.out
sql/benchmarks/ssbm/Tests/13-explain.stable.out
sql/benchmarks/tpch/Tests/01-explain.stable.out
sql/benchmarks/tpch/Tests/01-plan.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/03-plan.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out
sql/benchmarks/tpch/Tests/05-plan.stable.out
sql/benchmarks/tpch/Tests/06-explain.stable.out
sql/benchmarks/tpch/Tests/06-plan.stable.out
sql/benchmarks/tpch/Tests/07-explain.stable.out
sql/benchmarks/tpch/Tests/07-plan.stable.out
sql/benchmarks/tpch/Tests/08-explain.stable.out
sql/benchmarks/tpch/Tests/08-plan.stable.out
sql/benchmarks/tpch/Tests/09-explain.stable.out
sql/benchmarks/tpch/Tests/09-plan.stable.out
sql/benchmarks/tpch/Tests/10-explain.stable.out
sql/benchmarks/tpch/Tests/10-plan.stable.out
sql/benchmarks/tpch/Tests/11-explain.stable.out
sql/benchmarks/tpch/Tests/11-plan.stable.out
sql/benchmarks/tpch/Tests/14-explain.stable.out
sql/benchmarks/tpch/Tests/14-plan.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out
sql/benchmarks/tpch/Tests/17-plan.stable.out
sql/benchmarks/tpch/Tests/19-explain.stable.out
sql/benchmarks/tpch/Tests/19-plan.stable.out

sql/test/BugTracker-2009/Tests/arithmetic-small-values-null.SF-2921310.stable.out
sql/test/BugTracker-2009/Tests/avg-bug.SF-2132666.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
sql/test/BugTracker-2012/Tests/power_priority.Bug-2291.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/select1.test.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/select2.test.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/select3.test.stable.out
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/drop3.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: default
Log Message:

Approvals.


diffs (truncated from 41129 to 300 lines):

diff --git a/sql/benchmarks/ssbm/Tests/01-explain.stable.out 
b/sql/benchmarks/ssbm/Tests/01-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/01-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/01-explain.stable.out
@@ -37,48 +37,29 @@ Ready.
 % mal # name
 % clob # type
 % 254 # length
-function user.s2_1(A0:int,A1:int,A2:int,A3:int):void;
-X_63:void := querylog.define("explain\nselect 
sum(lo_extendedprice*lo_discount) as revenue\n from lineorder, dwdate\n where 
lo_orderdate = d_datekey\n and d_year = 1993\n and lo_discount between 1 and 
3\n and lo_quantity < 25;","sequential_pipe",43);
-X_5 := sql.mvc();
-X_9:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_quantity",0);
-X_17:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_discount",0);
-C_6:bat[:oid] := sql.tid(X_5,"sys","lineorder");
-C_79 := algebra.subselect(X_17,C_6,A1,A2,true,true,false);
-(C_19,r1_22) := sql.bind(X_5,"sys","lineorder","lo_discount",2);
-C_80 := algebra.subselect(r1_22,nil:bat[:oid],A1,A2,true,true,f

MonetDB: graph1 - Semantic: support for CHEAPEST SUM(e: expr)

2016-10-14 Thread Dean De Leo

Changeset: e03fa66a96b5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e03fa66a96b5
Modified Files:
sql/server/rel_graph.c
sql/server/sql_scan.c
Branch: graph1
Log Message:

Semantic: support for CHEAPEST SUM(e: expr)

Explicitly bind the edge table from the argument of CHEAPEST SUM,
identified by the string preceding the colon (:).


diffs (192 lines):

diff --git a/sql/server/rel_graph.c b/sql/server/rel_graph.c
--- a/sql/server/rel_graph.c
+++ b/sql/server/rel_graph.c
@@ -109,7 +109,6 @@ sql_rel* rel_graph_reaches(mvc *sql, sql
 
 static bool error_reported(mvc* sql){ return (sql->session->status < 0); }
 
-
 static sql_exp* bindg_ret(mvc *sql, sql_exp* bind1, sql_exp* bind2){
if (error_reported(sql)){ // an error already occurred
return NULL;
@@ -122,60 +121,71 @@ static sql_exp* bindg_ret(mvc *sql, sql_
}
 }
 
-static sql_exp* bindg_exp(mvc *sql, sql_exp *exp, dlist *parse_tree){
-   graph_join *g =NULL;
-   sql_exp* e =NULL;
-   exp_kind exp_kind_value = {type_value, card_column, TRUE};
+static sql_exp* bindg_filter_graph(mvc *sql, sql_exp *exp, dlist *parse_tree){
const char* table_ref = NULL; // the table referred (optional)
symbol* expr_weight = NULL; // the expression inside CHEAPEST SUM ( ... 
);
+   graph_join* g = NULL;
+   sql_exp* e = NULL;
+   exp_kind exp_kind_value = {type_value, card_column, TRUE};
 
assert(exp && "Expected an expression");
+   assert(exp->type == e_cmp && get_cmp(exp) == cmp_filter_graph && 
"Expected a graph filter exp~");
assert(parse_tree && "The input argument parse_tree is NULL");
assert(parse_tree->cnt == 2 && "Expected two nodes in the root of the 
parse tree");
 
-   if(exp->type != e_cmp || get_cmp(exp) != cmp_filter_graph){
-   // this is not a graph join, move along
-   return NULL;
-   }
-
-   (void) sql;
-   (void) g;
-   (void) e;
-   (void) exp_kind_value;
-   (void) table_ref;
-   (void) expr_weight;
+   g = exp->f;
 
table_ref = parse_tree->h->data.sval;
expr_weight = parse_tree->h->next->data.sym;
 
+   if (table_ref){ // use the table name to refer to the edge table
+   const char* tname = rel_name(g->edges);
 
-   return NULL;
+   // TODO shall we consider the schema as well?
+   assert(tname != NULL);
+   if(strcmp(tname, table_ref) == 0){
+   // force the binding against this relation
+   e = rel_value_exp(sql, &(g->edges), expr_weight, 
sql_sel, exp_kind_value);
+   if(!e){ return sql_error(sql, 02, "Cannot bind the 
cheapest sum expression in the subquery `%s'", tname); }
+   }
+   } else { // table name not given
+   // try to bind the expression a la `best effort'
+   e = rel_value_exp(sql, &(g->edges), expr_weight, sql_sel, 
exp_kind_value);
+   }
 
-// g = exp->f;
-//
-// // try to bind the expression
-// e = rel_value_exp(sql, &(g->edges), sym, sql_sel, exp_kind_value);
-// if(!e){ return NULL; }
-//
-// // an expression has already been bound
-// if(g->cost){
-// return sql_error(sql, 02, "TODO: At the moment you cannot bind 
multiple CHEAPEST SUM expression against the same join");
-// }
-//
-// // found it!
-// g->cost = exp_label(sql->sa, e, ++sql->label);
-// return g->cost;
+   // did we bind our parse tree?
+   if(e){
+   if(g->cost){ // existing limitation, an expression has already 
been bound
+   return sql_error(sql, 02, "TODO: At the moment you 
cannot bind multiple CHEAPEST SUM expression against the same join");
+   }
+
+   // found it!
+   g->cost = exp_label(sql->sa, e, ++sql->label);
+   return g->cost;
+
+   } else { // no, we didn't bind it
+   return NULL;
+   }
 }
 
+static sql_exp* bindg_exp(mvc *sql, sql_exp *exp, dlist *parse_tree){
+   if(exp->type == e_cmp && get_cmp(exp) == cmp_filter_graph){
+   // ok this is a graph join
+   return bindg_filter_graph(sql, exp, parse_tree);
+   } else {
+   // this is not a graph join, move along
+   return NULL;
+   }
+}
 
-static sql_exp* bindg_exps(mvc *sql, list *exps, dlist *sym){
+static sql_exp* bindg_exps(mvc *sql, list *exps, dlist *parse_tree){
sql_exp *result = NULL;
 
// edge case
if(!exps || error_reported(sql)) return NULL;
 
for(node* n = exps->h; n; n = n->next){
-   sql_exp *bound = bindg_exp(sql, n->data, sym);
+   sql_exp *bound = bindg_exp(sql, n->data, parse_tree);
result = bindg_ret(sql, result, bound);
if(error_reported(sql)) return NULL; // ERROR! => stop 
processing
}
@@ -183,7

MonetDB: protocol - Compilation fixes.

2016-10-14 Thread Mark Raasveldt

Changeset: 9290ec648fa5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9290ec648fa5
Modified Files:
clients/mapilib/mapi.c
common/utils/conversion.c
monetdb5/modules/atoms/blob.c
Branch: protocol
Log Message:

Compilation fixes.


diffs (78 lines):

diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -4145,7 +4145,7 @@ static char* mapi_convert_blob(struct Ma
if (length < 0) {
return NULL;
}
-   if (24 + 3 * length > col->dynamic_write_bufsiz) {
+   if (24 + 3 * length > (lng) col->dynamic_write_bufsiz) {
col->dynamic_write_bufsiz = (size_t) 24 + 3 * length;
if (col->dynamic_write_buf) free(col->dynamic_write_buf);
col->dynamic_write_buf = malloc(col->dynamic_write_bufsiz);
@@ -4153,7 +4153,7 @@ static char* mapi_convert_blob(struct Ma
return NULL;
}
}
-   if (conversion_blob_to_string(col->dynamic_write_buf, 
col->dynamic_write_bufsiz, col->buffer_ptr + sizeof(lng), length) < 0) {
+   if (conversion_blob_to_string(col->dynamic_write_buf, (int) 
col->dynamic_write_bufsiz, col->buffer_ptr + sizeof(lng), length) < 0) {
return NULL;
}
return (char*) col->dynamic_write_buf;
@@ -4258,7 +4258,7 @@ read_into_cache(MapiHdl hdl, int lookahe
!mnstr_readInt(mid->from, 
&result->fields[i].scale)) {
return mapi_setError(mid, "read error 
from stream while reading result set", "read_into_cache", MERROR);
}
-   
+
if (!mnstr_readInt(mid->from, &null_len)) {
return mapi_setError(mid, "read error 
from stream while reading result set", "read_into_cache", MERROR);
}
diff --git a/common/utils/conversion.c b/common/utils/conversion.c
--- a/common/utils/conversion.c
+++ b/common/utils/conversion.c
@@ -357,7 +357,7 @@ conversion_blob_to_string(char *dst, int
 {
char *s;
size_t i;
-   size_t expectedlen;
+   int expectedlen;
 
if (nitems == ~(size_t) 0)
expectedlen = 4;
diff --git a/monetdb5/modules/atoms/blob.c b/monetdb5/modules/atoms/blob.c
--- a/monetdb5/modules/atoms/blob.c
+++ b/monetdb5/modules/atoms/blob.c
@@ -31,6 +31,7 @@
  */
 #include "monetdb_config.h"
 #include "blob.h"
+#include 
 
 int TYPE_blob;
 int TYPE_sqlblob;
@@ -228,24 +229,6 @@ sqlblob_tostr(str *tostr, int *l, const 
}
 
return conversion_blob_to_string(*tostr, expectedlen, p->data, 
p->nitems);
-
-   // if (p->nitems == ~(size_t) 0) {
-   //  strcpy(*tostr, "nil");
-   //  return 3;
-   // }
-
-   // strcpy(*tostr, "\0");
-   // s = *tostr;
-
-   // for (i = 0; i < p->nitems; i++) {
-   //  int val = (p->data[i] >> 4) & 15;
-
-   //  *s++ = hexit[val];
-   //  val = p->data[i] & 15;
-   //  *s++ = hexit[val];
-   // }
-   // *s = '\0';
-   // return (int) (s - *tostr); /* 64bit: check for overflow */
 }
 
 static int
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: protocol - Remove print statements and minor consistenc...

2016-10-14 Thread Mark Raasveldt

Changeset: ecadceeb8b8f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ecadceeb8b8f
Modified Files:
clients/mapiclient/mclient.c
clients/mapilib/mapi.c
sql/backends/monet5/sql_result.c
Branch: protocol
Log Message:

Remove print statements and minor consistency changes.


diffs (39 lines):

diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -1047,7 +1047,7 @@ mapi_escape_name(char *name) {
char *startbuffer = malloc(strlen(name) * 2 + 2);
char *buffer = startbuffer;
if (!startbuffer) return NULL;
-   if (strchr(name, ',') || strchr(name, ' ') || strchr(name, '\t') || 
strchr(name, '#')) {
+   if (strchr(name, ',') || strchr(name, '\t') || strchr(name, '#')) {
*buffer++ = '"';
char *p;
for (p = name; *p; p++) {
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -4258,11 +4258,7 @@ read_into_cache(MapiHdl hdl, int lookahe
!mnstr_readInt(mid->from, 
&result->fields[i].scale)) {
return mapi_setError(mid, "read error 
from stream while reading result set", "read_into_cache", MERROR);
}
-
-   if (strcasecmp(type_sql_name, "sec_interval") 
== 0) {
-   result->fields[i].scale = 3;
-   }
-
+   
if (!mnstr_readInt(mid->from, &null_len)) {
return mapi_setError(mid, "read error 
from stream while reading result set", "read_into_cache", MERROR);
}
diff --git a/sql/backends/monet5/sql_result.c b/sql/backends/monet5/sql_result.c
--- a/sql/backends/monet5/sql_result.c
+++ b/sql/backends/monet5/sql_result.c
@@ -2019,7 +2019,6 @@ int mvc_export_resultset_prot10(mvc *m, 
}
}
if (mnstr_flush(s) < 0) {
-   fprintf(stderr, "Failed to flush.\n");
fres = -1;
goto cleanup;
}
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: protocol - Escape name in fake mapi headers for consist...

2016-10-14 Thread Mark Raasveldt

Changeset: a0ce86ce65b1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a0ce86ce65b1
Modified Files:
clients/mapiclient/mclient.c
Branch: protocol
Log Message:

Escape name in fake mapi headers for consistency with old protocol.


diffs (44 lines):

diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -1041,6 +1041,29 @@ classify(const char *s, size_t l)
}
 }
 
+
+static char* 
+mapi_escape_name(char *name) {
+   char *startbuffer = malloc(strlen(name) * 2 + 2);
+   char *buffer = startbuffer;
+   if (!startbuffer) return NULL;
+   if (strchr(name, ',') || strchr(name, ' ') || strchr(name, '\t') || 
strchr(name, '#')) {
+   *buffer++ = '"';
+   char *p;
+   for (p = name; *p; p++) {
+   if (*p == '"') {
+   *buffer++ = '\\';
+   }
+   *buffer++ = *p;
+   }
+   *buffer++ = '"';
+   *buffer = '\0';
+   } else {
+   strcpy(buffer, name);
+   }
+   return startbuffer;
+}
+
 static void
 TESTrenderer(MapiHdl hdl)
 {
@@ -1067,7 +1090,9 @@ TESTrenderer(MapiHdl hdl)
// column names
mnstr_printf(toConsole, "%% ");
for(i = 0; i < fields; i++) {
-   mnstr_printf(toConsole, "%s%s", mapi_get_name(hdl, i), 
i < fields - 1 ? ",\t" : " ");
+   char *name = mapi_escape_name(mapi_get_name(hdl, i));
+   mnstr_printf(toConsole, "%s%s", name, i < fields - 1 ? 
",\t" : " ");
+   if (name) free(name);
}
mnstr_printf(toConsole, "# name\n");
// column type names
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: protocol - Compilation fixes.

MonetDB: protocol - Approve exports.

MonetDB: protocol - Binary transfer of OIDs.

MonetDB: protocol - Always print leading zero for timezone display.

MonetDB: protocol - Use digits to determine timestamp printing p...

MonetDB: protocol - Fix bug with NULL blobs.

MonetDB: protocol - Add support for TIMETZ type.

MonetDB: protocol - Deal with NULL blobs correctly.

MonetDB: HTM - remove garbage files and correct stable.{err,out}

MonetDB: 2PC - Remove garbage files

MonetDB: protocol - Don't use -fraw in tests because it makes no...

MonetDB: protocol - Implement mapi_fetch_all_rows.

MonetDB: protocol - Add mapi_fetch_field_[type] family of functi...

MonetDB: protocol - Handle TYPE_void.

MonetDB: protocol - Merge with default.

MonetDB: Dec2016 - Merge with Jun2016 branch.

MonetDB: default - Merge with Dec2016 branch.

MonetDB: Jun2016 - Move stable.out to stable.out.32bit, approve ...

MonetDB: Jun2016 - Tests emptydb using a "normally" configured s...

MonetDB: default - Step two towards a new stable branch "Dec2016".

MonetDB: Dec2016 - Step one towards a new stable branch "Dec2016".

MonetDB: default - Added tag Dec2016_root for changeset 0027cb04...

MonetDB: default - The Python client is no longer part of the repo.

MonetDB: default - Approvals.

MonetDB: graph1 - Semantic: support for CHEAPEST SUM(e: expr)

MonetDB: protocol - Compilation fixes.

MonetDB: protocol - Remove print statements and minor consistenc...

MonetDB: protocol - Escape name in fake mapi headers for consist...

28 matches

Site Navigation

Mail list logo

Footer information