MonetDB: Mar2018 - Upgrade netcdf and bam: add grants and fix so...
Changeset: acb735858eab for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=acb735858eab
Modified Files:
sql/backends/monet5/sql_upgrades.c
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
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.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: Mar2018
Log Message:
Upgrade netcdf and bam: add grants and fix some procedures.
diffs (truncated from 809 to 300 lines):
diff --git a/sql/backends/monet5/sql_upgrades.c
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -973,6 +973,8 @@ sql_update_mar2018(Client c, mvc *sql)
buf = GDKmalloc(bufsize);
if (buf== NULL)
throw(SQL, "sql_update_mar2018", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
+ s = mvc_bind_schema(sql, "sys");
+
pos += snprintf(buf + pos, bufsize - pos, "set schema \"sys\";\n");
/* 21_dependency_views.sql */
@@ -1253,7 +1255,6 @@ sql_update_mar2018(Client c, mvc *sql)
);
/* 25_debug.sql */
- s = mvc_bind_schema(sql, "sys");
t = mvc_bind_table(sql, s, "environment");
t->system = 0;
pos += snprintf(buf + pos, bufsize - pos,
@@ -1296,7 +1297,6 @@ sql_update_mar2018(Client c, mvc *sql)
"insert into sys.systemfunctions (select id from
sys.functions where name = 'corr' and schema_id = (select id from sys.schemas
where name = 'sys') and id not in (select function_id from
sys.systemfunctions));\n");
/* 51_sys_schema_extensions.sql */
- s = mvc_bind_schema(sql, "sys");
t = mvc_bind_table(sql, s, "privilege_codes");
t->system = 0;
pos += snprintf(buf + pos, bufsize - pos,
@@ -1524,6 +1524,121 @@ sql_update_mar2018(Client c, mvc *sql)
return err; /* usually MAL_SUCCEED */
}
+#ifdef HAVE_NETCDF
+static str
+sql_update_mar2018_netcdf(Client c, mvc *sql)
+{
+ size_t bufsize = 1000, pos = 0;
+ char *buf, *err;
+ char *schema;
+
+ schema = stack_get_string(sql, "current_schema");
+ buf = GDKmalloc(bufsize);
+ if (buf== NULL)
+ throw(SQL, "sql_update_mar2018_netcdf", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
+
+ pos += snprintf(buf + pos, bufsize - pos, "set schema sys;\n");
+
+ /* 74_netcdf.sql */
+ pos += snprintf(buf + pos, bufsize - pos,
+ "grant select on sys.netcdf_files to public;\n"
+ "grant select on sys.netcdf_dims to public;\n"
+ "grant select on sys.netcdf_vars to public;\n"
+ "grant select on sys.netcdf_vardim to public;\n"
+ "grant select on sys.netcdf_attrs to public;\n"
+ "grant execute on procedure
sys.netcdf_attach(varchar(256)) to public;\n"
+ "grant execute on procedure
sys.netcdf_importvar(integer, varchar(256)) to public;\n");
+
+ if (schema)
+ pos += snprintf(buf + pos, bufsize - pos, "set schema
\"%s\";\n", schema);
+
+ assert(pos < bufsize);
+ printf("Running database upgrade commands:\n%s\n", buf);
+ err = SQLstatementIntern(c, &buf, "update", 1, 0, NULL);
+ GDKfree(buf);
+ return err; /* usually MAL_SUCCEED */
+}
+#endif /* HAVE_NETCDF */
+
+#ifdef HAVE_SAMTOOLS
+static str
+sql_update_mar2018_samtools(Client c, mvc *sql)
+{
+ size_t bufsize = 2000, pos = 0;
+ char *buf, *err;
+ char *schema;
+ sql_schema *s = mvc_bind_schema(sql, "bam");
+
+ if (s == NULL)
+ return MAL_SUCCEED;
+
+ schema = stack_get_string(sql, "current_schema");
+ buf = GDKmalloc(bufsize);
+ if (buf== NULL)
+ throw(SQL, "sql_update_mar2018_samtools", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
+
+ pos += snprintf(buf + pos, bufsize - pos, "set schema sys;\n");
+
+ /* 85_bam.sql */
+ list *l = sa_list(sql->sa);
+ sql_subtype tpi, tps;
+ sql_find_subtype(&tpi, "int", 0, 0);
+ sql_find_subtype(&tps, "clob", 0, 0);
+ list_append(l, &tpi);
+ list_append(l, &tps);
+ list_ap
MonetDB: Mar2018 - Approve output.
Changeset: 3e086f043f28 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3e086f043f28 Modified Files: sql/test/emptydb/Tests/check.stable.out Branch: Mar2018 Log Message: Approve output. diffs (28 lines): diff --git a/sql/test/emptydb/Tests/check.stable.out b/sql/test/emptydb/Tests/check.stable.out --- a/sql/test/emptydb/Tests/check.stable.out +++ b/sql/test/emptydb/Tests/check.stable.out @@ -489,7 +489,6 @@ SYSTEM FUNCTION sys.charindex SYSTEM PROCEDUREsys.clearrejects SYSTEM FUNCTION sys.code SYSTEM FUNCTION sys.columnsize -SYSTEM PROCEDUREsys.comment_on SYSTEM FUNCTION sys.concat SYSTEM FUNCTION sys.contains SYSTEM FUNCTION sys.copyfrom @@ -642,6 +641,7 @@ SYSTEM FUNCTION sys.netmask SYSTEM FUNCTION sys.network SYSTEM FUNCTION sys.newurl SYSTEM FUNCTION sys.next_value_for +SYSTEM PROCEDUREsys.no_op SYSTEM FUNCTION sys.not SYSTEM AGGREGATEsys.not_exist SYSTEM FUNCTION sys.not_ilike @@ -2098,7 +2098,7 @@ drop function pcre_replace(string, strin % .s, .f, .L4,.f, .fl,.ft,.f, .f, .f, .L14, .L16, .L20, .L22, .L24, .L26, .L30, .L32, .L34, .L36, .L40, .L42, .L44, .L46, .L50, .L52, .L54, .L56, .L60, .L62, .L64, .L66, .L70, .L72, .L74, .L76, .L100, .L102, .L104, .L106, .L110, .L112, .L114, .L116, .L120, .L122, .L124, .L126, .L130, .L132, .L134, .L136, .L140, .L142, .L144, .L146, .L150, .L152, .L154, .L156, .L160, .L162, .L164, .L166, .L170, .L172, .L174, .L176, .L200, .L202, .L204, .L206, .L210, .L212, .L214, .L216, .L220, .L222, .L224, .L226, .L230, .L232, .L234, .L236, .L240, .L242, .L244, .L246, .L250, .L252 # table_name % name,name, query, mod,language_name, function_type_name, side_effect,varres, vararg, name0, type0, type_digits0, type_scale0, inout0, name1, type1, type_digits1, type_scale1,inout1, name2, type2, type_digits2, type_scale2,inout2, name3, type3, type_digits3, type_scale3,inout3, name4, type4, type_digits4, type_scale4,inout4, name5, type5, type_digits5, type_scale5,inout5, name6, type6, type_digits6, type_scale6,inout6, name7, type7, type_digits7, type_scale7,inout7, name8, type8, type_digits8, type_scale8,inout8, name9, type9, type_digits9, type_scale9,inout9, name10, type10, type_digits10, type_scale10, inout10,name11, type11, type_digits11, type_scale11, inout11,name12, type12, type_digits12, type_scale12, inout12,name13, type13, type_digits13, type_scale13, inout13, name14, type14, type_digits14, type_scale14, inout14,name15, type15, type_digits15, type_scale15, inout15 # name % varchar, varchar,varchar,varchar,varchar, varchar,boolean,boolean,boolean,varchar, varchar,int,int,char, varchar,varchar,int, int,char, varchar,varchar,int,int,char, varchar,varchar,int,int,char, varchar, varchar,int,int,char, varchar,varchar,int, int,char, varchar,varchar,int,int,char, varchar,varchar,int,int,char, varchar, varchar,int,int,char, varchar,varchar,int, int,char, varchar,varchar,int,int,char, varchar,varchar,int,int,char, varchar, varchar,int,int,char, varchar,varchar,int, int,char, varchar,varchar,int,int,char, varchar,varchar,int,int,char # type -% 8, 35, 831,9, 10, 26, 5, 5, 5, 11, 14, 4, 1, 3, 16, 14, 5, 1, 3, 16, 14, 2, 1, 3, 27, 12, 2, 1, 3, 12, 7, 2, 1, 3, 10, 7, 2, 1, 3, 8, 7, 2, 1, 3, 9, 6, 2, 1, 3, 10, 6, 2, 1, 3, 8, 7, 2, 1, 3, 9, 7, 2, 1, 3, 6, 7, 2, 1, 3, 8, 6, 2, 1, 3, 6, 7, 1, 1, 3, 9, 7, 1, 1, 3, 6, 7, 1, 1, 3 # length +% 8, 35, 831,9, 10, 26, 5, 5, 5, 11, 14, 4, 1, 3, 16, 14, 4, 1, 3, 16, 14, 2, 1, 3, 27, 12, 2, 1, 3, 12, 7, 2, 1, 3, 10, 7, 2, 1, 3, 8, 7, 2, 1, 3, 9,
MonetDB: Mar2018 - Approve output.
Changeset: df64b0ee287d for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=df64b0ee287d Modified Files: sql/test/emptydb/Tests/check.stable.out.32bit Branch: Mar2018 Log Message: Approve output. diffs (36 lines): diff --git a/sql/test/emptydb/Tests/check.stable.out.32bit b/sql/test/emptydb/Tests/check.stable.out.32bit --- a/sql/test/emptydb/Tests/check.stable.out.32bit +++ b/sql/test/emptydb/Tests/check.stable.out.32bit @@ -493,7 +493,6 @@ SYSTEM FUNCTION sys.charindex SYSTEM PROCEDUREsys.clearrejects SYSTEM FUNCTION sys.code SYSTEM FUNCTION sys.columnsize -SYSTEM PROCEDUREsys.comment_on SYSTEM FUNCTION sys.concat SYSTEM FUNCTION sys.contains SYSTEM FUNCTION sys.copyfrom @@ -646,6 +645,7 @@ SYSTEM FUNCTION sys.netmask SYSTEM FUNCTION sys.network SYSTEM FUNCTION sys.newurl SYSTEM FUNCTION sys.next_value_for +SYSTEM PROCEDUREsys.no_op SYSTEM FUNCTION sys.not SYSTEM AGGREGATEsys.not_exist SYSTEM FUNCTION sys.not_ilike @@ -2102,7 +2102,7 @@ drop function pcre_replace(string, strin % .s, .f, .L4,.f, .fl,.ft,.f, .f, .f, .L14, .L16, .L20, .L22, .L24, .L26, .L30, .L32, .L34, .L36, .L40, .L42, .L44, .L46, .L50, .L52, .L54, .L56, .L60, .L62, .L64, .L66, .L70, .L72, .L74, .L76, .L100, .L102, .L104, .L106, .L110, .L112, .L114, .L116, .L120, .L122, .L124, .L126, .L130, .L132, .L134, .L136, .L140, .L142, .L144, .L146, .L150, .L152, .L154, .L156, .L160, .L162, .L164, .L166, .L170, .L172, .L174, .L176, .L200, .L202, .L204, .L206, .L210, .L212, .L214, .L216, .L220, .L222, .L224, .L226, .L230, .L232, .L234, .L236, .L240, .L242, .L244, .L246, .L250, .L252 # table_name % name,name, query, mod,language_name, function_type_name, side_effect,varres, vararg, name0, type0, type_digits0, type_scale0, inout0, name1, type1, type_digits1, type_scale1,inout1, name2, type2, type_digits2, type_scale2,inout2, name3, type3, type_digits3, type_scale3,inout3, name4, type4, type_digits4, type_scale4,inout4, name5, type5, type_digits5, type_scale5,inout5, name6, type6, type_digits6, type_scale6,inout6, name7, type7, type_digits7, type_scale7,inout7, name8, type8, type_digits8, type_scale8,inout8, name9, type9, type_digits9, type_scale9,inout9, name10, type10, type_digits10, type_scale10, inout10,name11, type11, type_digits11, type_scale11, inout11,name12, type12, type_digits12, type_scale12, inout12,name13, type13, type_digits13, type_scale13, inout13, name14, type14, type_digits14, type_scale14, inout14,name15, type15, type_digits15, type_scale15, inout15 # name % varchar, varchar,varchar,varchar,varchar, varchar,boolean,boolean,boolean,varchar, varchar,int,int,char, varchar,varchar,int, int,char, varchar,varchar,int,int,char, varchar,varchar,int,int,char, varchar, varchar,int,int,char, varchar,varchar,int, int,char, varchar,varchar,int,int,char, varchar,varchar,int,int,char, varchar, varchar,int,int,char, varchar,varchar,int, int,char, varchar,varchar,int,int,char, varchar,varchar,int,int,char, varchar, varchar,int,int,char, varchar,varchar,int, int,char, varchar,varchar,int,int,char, varchar,varchar,int,int,char # type -% 8, 35, 831,9, 10, 26, 5, 5, 5, 11, 14, 4, 1, 3, 16, 14, 5, 1, 3, 16, 14, 2, 1, 3, 27, 12, 2, 1, 3, 12, 7, 2, 1, 3, 10, 7, 2, 1, 3, 8, 7, 2, 1, 3, 9, 6, 2, 1, 3, 10, 6, 2, 1, 3, 8, 7, 2, 1, 3, 9, 7, 2, 1, 3, 6, 7, 2, 1, 3, 8, 6, 2, 1, 3, 6, 7, 1, 1, 3, 9, 7, 1, 1, 3, 6, 7, 1, 1, 3 # length +% 8, 35, 831,9, 10, 26, 5, 5, 5, 11, 14, 4, 1, 3, 16, 14, 4, 1, 3, 16, 14, 2, 1, 3, 27, 12, 2, 1, 3, 12, 7, 2, 1, 3, 10, 7, 2, 1, 3, 8, 7,
MonetDB: merge-partitions - Sort partition values BAT
Changeset: cad4b0882496 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cad4b0882496
Modified Files:
sql/backends/monet5/sql_cat.c
sql/storage/store.c
Branch: merge-partitions
Log Message:
Sort partition values BAT
diffs (75 lines):
diff --git a/sql/backends/monet5/sql_cat.c b/sql/backends/monet5/sql_cat.c
--- a/sql/backends/monet5/sql_cat.c
+++ b/sql/backends/monet5/sql_cat.c
@@ -227,7 +227,7 @@ alter_table_add_value_partition(mvc *sql
sql_column *col = NULL;
sql_part *err = NULL;
int tp1 = 0, errcode = 0, i = 0, ninserts = 0;
- BAT *b = NULL;
+ BAT *b = NULL, *sorted = NULL/*, *cbind = NULL, *diff = NULL*/;
gdk_return ret = GDK_SUCCEED;
if((msg = validate_alter_table_add_table(sql,
"sql.alter_table_add_value_partition", msname, mtname, psname, ptname, &mt,
&pt)))
@@ -270,7 +270,12 @@ alter_table_add_value_partition(mvc *sql
}
}
- errcode = sql_trans_add_value_partition(sql->session->tr, mt, pt, tp1,
b, &err);
+ if (BATsort(&sorted, NULL, NULL, b, NULL, NULL, 0, 0) != GDK_SUCCEED) {
+ msg =
createException(SQL,"sql.alter_table_add_value_partition",SQLSTATE(HY001)
MAL_MALLOC_FAIL);
+ goto finish;
+ }
+
+ errcode = sql_trans_add_value_partition(sql->session->tr, mt, pt, tp1,
sorted, &err);
switch(errcode) {
case 0:
break;
@@ -280,15 +285,23 @@ alter_table_add_value_partition(mvc *sql
err->t->s->base.name, err->t->base.name);
break;
default:
- msg =
createException(SQL,"sql.alter_table_add_value_partition",SQLSTATE(42000) \
+ msg =
createException(SQL,"sql.alter_table_add_value_partition",SQLSTATE(42000)
"ALTER
TABLE: value at position %d length is higher than %d",
(errcode * -1) - 1, STORAGE_MAX_VALUE_LENGTH);
break;
}
finish:
- if(msg && b)
- BBPreclaim(b);
+ if(b)
+ BBPunfix(b->batCacheid);
+ /*if(cbind)
+ BBPunfix(diff->batCacheid);
+ if(diff)
+ BBPunfix(diff->batCacheid);*/
+ if(sorted && msg)
+ BBPunfix(sorted->batCacheid);
+ else if(sorted)
+ BBPretain(sorted->batCacheid);
return msg;
}
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -4733,8 +4733,7 @@ sql_trans_add_value_partition(sql_trans
i++;
}
_DELETE(v);
- BATsetcount(b, i);
- BATsettrivprop(b);
+
p->part.values = b->batCacheid;
/* add list partition values */
@@ -4742,8 +4741,6 @@ sql_trans_add_value_partition(sql_trans
if(*err)
return -1;
- BBPretain(b->batCacheid);
-
/* add merge table dependency */
sql_trans_create_dependency(tr, pt->base.id, mt->base.id,
TABLE_DEPENDENCY);
table_funcs.table_insert(tr, sysobj, &mt->base.id, p->base.name,
&p->base.id);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: merge-partitions - When adding a table partition, valid...
Changeset: e4026dc87123 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e4026dc87123
Added Files:
sql/test/merge-partitions/Tests/mergepart03.stable.err
sql/test/merge-partitions/Tests/mergepart03.stable.out
sql/test/merge-partitions/Tests/mergepart04.sql
sql/test/merge-partitions/Tests/mergepart04.stable.err
sql/test/merge-partitions/Tests/mergepart04.stable.out
Modified Files:
sql/backends/monet5/sql_cat.c
sql/test/merge-partitions/Tests/All
sql/test/merge-partitions/Tests/mergepart03.sql
Branch: merge-partitions
Log Message:
When adding a table partition, validate if the column's inout is according to
the range or list of values of the partition
diffs (truncated from 526 to 300 lines):
diff --git a/sql/backends/monet5/sql_cat.c b/sql/backends/monet5/sql_cat.c
--- a/sql/backends/monet5/sql_cat.c
+++ b/sql/backends/monet5/sql_cat.c
@@ -148,11 +148,13 @@ alter_table_add_range_partition(mvc *sql
sql_table *mt = NULL, *pt = NULL;
sql_part *err = NULL;
str msg = MAL_SUCCEED, err_min = NULL, err_max = NULL;
- sql_column *col = NULL;
- int tp1 = 0, errcode = 0;
+ sql_column *col = NULL, *bcol = NULL;
+ BAT *diff1 = NULL, *diff2 = NULL, *cbind = NULL;
+ int tp1 = 0, errcode = 0, i = 0;
ptr pmin = NULL, pmax = NULL;
size_t smin = 0, smax = 0, serr_min = 0, serr_max = 0;
ssize_t (*atomtostr)(str *, size_t *, const void *);
+ int accesses[3] = {RDONLY, RD_INS, RD_UPD_VAL};
if((msg = validate_alter_table_add_table(sql,
"sql.alter_table_add_range_partition", msname, mtname, psname, ptname, &mt,
&pt)))
return msg;
@@ -178,6 +180,45 @@ alter_table_add_range_partition(mvc *sql
goto finish;
}
+ bcol = mvc_bind_column(sql, pt, col->base.name);
+
+ for(i = 0 ; i < 3 ; i++) {
+ if(cbind) {
+ BBPunfix(cbind->batCacheid);
+ cbind = NULL;
+ }
+ if(diff1) {
+ BBPunfix(diff1->batCacheid);
+ diff1 = NULL;
+ }
+ if(diff2) {
+ BBPunfix(diff2->batCacheid);
+ diff2 = NULL;
+ }
+ if((cbind = store_funcs.bind_col(sql->session->tr, bcol,
accesses[i])) == NULL) {
+ msg =
createException(SQL,"sql.alter_table_add_range_partition",SQLSTATE(HY001)
MAL_MALLOC_FAIL);
+ goto finish;
+ }
+ if((diff1 = BATthetaselect(cbind, NULL, pmin, "<")) == NULL) {
+ msg =
createException(SQL,"sql.alter_table_add_range_partition",SQLSTATE(HY001)
MAL_MALLOC_FAIL);
+ goto finish;
+ }
+ if(BATcount(diff1) > 0) {
+ msg =
createException(SQL,"sql.alter_table_add_range_partition",SQLSTATE(42000)
+ "ALTER
TABLE: there are values in the column %s with values lesser than the partition
minimum", col->base.name);
+ goto finish;
+ }
+ if((diff2 = BATthetaselect(cbind, NULL, pmax, ">")) == NULL) {
+ msg =
createException(SQL,"sql.alter_table_add_range_partition",SQLSTATE(HY001)
MAL_MALLOC_FAIL);
+ goto finish;
+ }
+ if(BATcount(diff2) > 0) {
+ msg =
createException(SQL,"sql.alter_table_add_range_partition",SQLSTATE(42000)
+ "ALTER
TABLE: there are values in the column %s with values higher than the partition
maximum", col->base.name);
+ goto finish;
+ }
+ }
+
errcode = sql_trans_add_range_partition(sql->session->tr, mt, pt, tp1,
pmin, smin, pmax, smax, &err);
switch(errcode) {
case -1:
@@ -210,6 +251,12 @@ alter_table_add_range_partition(mvc *sql
}
finish:
+ if(cbind)
+ BBPunfix(cbind->batCacheid);
+ if(diff1)
+ BBPunfix(diff1->batCacheid);
+ if(diff2)
+ BBPunfix(diff2->batCacheid);
if(msg) {
if(pmin)
GDKfree(pmin);
@@ -224,11 +271,12 @@ alter_table_add_value_partition(mvc *sql
{
sql_table *mt = NULL, *pt = NULL;
str msg = MAL_SUCCEED;
- sql_column *col = NULL;
+ sql_column *col = NULL, *bcol = NULL;
sql_part *err = NULL;
int tp1 = 0, errcode = 0, i = 0, ninserts = 0;
- BAT *b = NULL, *sorted = NULL/*, *cbind = NULL, *diff = NULL*/;
+ BAT *b = NULL, *sorted = NULL, *cbind = NULL, *diff = NULL;
gdk_return ret = GDK_SUCCEED;
+ int accesses[3] = {RDONLY, RD_INS, RD_UPD_VAL};
if((msg = val
MonetDB: data-vaults - Merge with default
Changeset: 026af75c1929 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=026af75c1929 Added Files: sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.stable.err sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.stable.out sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.stable.out.int128 sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.sql sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.stable.err sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.stable.out sql/test/BugTracker-2018/Tests/ilike.Bug-6547.sql sql/test/BugTracker-2018/Tests/ilike.Bug-6547.stable.err sql/test/BugTracker-2018/Tests/ilike.Bug-6547.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-in-cast-null.Bug-6529.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-in-cast-null.Bug-6529.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-in-query.Bug-6545.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-in-with-division.Bug-6546.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-not-in-wrong-results.Bug-6530.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-not-in-wrong-results.Bug-6530.stable.out sql/test/BugTracker-2018/Tests/truncate_add_user.sql sql/test/BugTracker-2018/Tests/truncate_add_user.stable.err sql/test/BugTracker-2018/Tests/truncate_add_user.stable.out sql/test/BugTracker-2018/Tests/truncate_bam_tables.Bug-6543.reqtests sql/test/BugTracker-2018/Tests/truncate_bam_tables.Bug-6543.sql sql/test/BugTracker-2018/Tests/truncate_bam_tables.Bug-6543.stable.err sql/test/BugTracker-2018/Tests/truncate_bam_tables.Bug-6543.stable.out sql/test/BugTracker-2018/Tests/truncate_empty_table.Bug-6544.sql sql/test/BugTracker-2018/Tests/truncate_empty_table.Bug-6544.stable.err sql/test/BugTracker-2018/Tests/truncate_empty_table.Bug-6544.stable.out sql/test/BugTracker-2018/Tests/truncate_remove_user.sql sql/test/BugTracker-2018/Tests/truncate_remove_user.stable.err sql/test/BugTracker-2018/Tests/truncate_remove_user.stable.out sql/test/BugTracker-2018/Tests/truncate_sys_netcdf_tables.Bug-6543.reqtests sql/test/BugTracker-2018/Tests/truncate_sys_netcdf_tables.Bug-6543.sql sql/test/BugTracker-2018/Tests/truncate_sys_netcdf_tables.Bug-6543.stable.err sql/test/BugTracker-2018/Tests/truncate_sys_netcdf_tables.Bug-6543.stable.out sql/test/BugTracker-2018/Tests/truncate_sys_tables.Bug-6543.reqtests sql/test/BugTracker-2018/Tests/truncate_sys_tables.Bug-6543.sql sql/test/BugTracker-2018/Tests/truncate_sys_tables.Bug-6543.stable.err sql/test/BugTracker-2018/Tests/truncate_sys_tables.Bug-6543.stable.out sql/test/BugTracker/Tests/mapi_connect_errors_vanish.SF-1432134.sql Removed Files: sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Darwin sql/test/BugTracker-2016/Tests/storagemodel.stable.out.FreeBSD sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Windows sql/test/BugTracker/Tests/mapi_connect_errors_vanish.SF-1432134.SQL.py Modified Files: clients/Tests/exports.stable.out clients/mapiclient/mclient.c clients/mapiclient/mhelp.c clients/odbc/setup/drvcfg.h gdk/ChangeLog.Mar2018 gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_atomic.h gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_join.c gdk/gdk_storage.c monetdb5/mal/mal_readline.c monetdb5/modules/kernel/bat5.c monetdb5/modules/mal/bbp.c monetdb5/modules/mal/clients.c monetdb5/modules/mal/inspect.c monetdb5/modules/mal/mal_io.c monetdb5/modules/mal/mdb.c monetdb5/modules/mal/mkey.c monetdb5/modules/mal/pcre.c monetdb5/optimizer/opt_candidates.c sql/ChangeLog.Mar2018 sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql_fround_impl.h sql/backends/monet5/sql_optimizer.h sql/backends/monet5/sql_round_impl.h sql/backends/monet5/sql_upgrades.c sql/backends/monet5/vaults/bam/85_bam.sql sql/backends/monet5/vaults/netcdf/74_netcdf.sql sql/scripts/97_comments.sql sql/server/rel_optimizer.c sql/server/rel_schema.c sql/server/rel_select.c sql/storage/bat/bat_storage.c sql/storage/bat/bat_table.c sql/storage/bat/bat_utils.c sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out sql/test/BugTracker-2016/Tes
MonetDB: configurable_working_set - Add .vscode directory to bra...
Changeset: e707ae94cc8e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e707ae94cc8e
Added Files:
.vscode/c_cpp_properties.json
.vscode/settings.json
.vscode/tasks.json
Branch: configurable_working_set
Log Message:
Add .vscode directory to branch for convenience.
diffs (235 lines):
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
new file mode 100644
--- /dev/null
+++ b/.vscode/c_cpp_properties.json
@@ -0,0 +1,81 @@
+{
+"configurations": [
+{
+"name": "Mac",
+"includePath": [
+"/usr/include",
+"/usr/local/include",
+"${workspaceRoot}"
+],
+"defines": [],
+"intelliSenseMode": "clang-x64",
+"browse": {
+"path": [
+"/usr/include",
+"/usr/local/include",
+"${workspaceRoot}"
+],
+"limitSymbolsToIncludedHeaders": true,
+"databaseFilename": ""
+},
+"macFrameworkPath": [
+"/System/Library/Frameworks",
+"/Library/Frameworks"
+]
+},
+{
+"name": "Linux",
+"includePath": [
+"/usr/include/c++/5",
+"/usr/include/x86_64-linux-gnu/c++/5",
+"/usr/include/c++/5/backward",
+"/usr/lib/gcc/x86_64-linux-gnu/5/include",
+"/usr/local/include",
+"/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed",
+"/usr/include/x86_64-linux-gnu",
+"/usr/include",
+"${workspaceRoot}",
+"${workspaceRoot}/build"
+],
+"defines": [],
+"intelliSenseMode": "clang-x64",
+"browse": {
+"path": [
+"/usr/include/c++/5",
+"/usr/include/x86_64-linux-gnu/c++/5",
+"/usr/include/c++/5/backward",
+"/usr/lib/gcc/x86_64-linux-gnu/5/include",
+"/usr/local/include",
+"/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed",
+"/usr/include/x86_64-linux-gnu",
+"/usr/include",
+"${workspaceRoot}"
+],
+"limitSymbolsToIncludedHeaders": true,
+"databaseFilename": ""
+}
+},
+{
+"name": "Win32",
+"includePath": [
+"C:/Program Files (x86)/Microsoft Visual Studio
14.0/VC/include",
+"${workspaceRoot}"
+],
+"defines": [
+"_DEBUG",
+"UNICODE",
+"_UNICODE"
+],
+"intelliSenseMode": "msvc-x64",
+"browse": {
+"path": [
+"C:/Program Files (x86)/Microsoft Visual Studio
14.0/VC/include/*",
+"${workspaceRoot}"
+],
+"limitSymbolsToIncludedHeaders": true,
+"databaseFilename": ""
+}
+}
+],
+"version": 3
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,74 @@
+{
+"files.exclude": {
+"**/.git": true,
+"**/.svn": true,
+"**/.hg": true,
+"**/CVS": true,
+"**/.DS_Store": true,
+ "Makefile.am": true,
+ "Makefile.in": true,
+ "Makefile.msc": true,
+ "aclocal.m4": true,
+ "acout.in": true,
+ "autom4te.cache": true,
+ "buildtools/conf/compile": true,
+ "buildtools/conf/config.guess": true,
+ "buildtools/conf/config.sub": true,
+ "buildtools/conf/install-sh": true,
+ "buildtools/conf/libtool.m4": true,
+ "buildtools/conf/ltmain.sh": true,
+ "buildtools/conf/ltoptions.m4": true,
+ "buildtools/conf/ltsugar.m4": true,
+ "buildtools/conf/ltversion.m4": true,
+ "buildtools/conf/lt~obsolete.m4": true,
+ "buildtools/conf/missing": true,
+ "buildtools/conf/ylwrap": true,
+ "configure": true,
+ "configure.ac": true,
+ "doc.lst": true,
+ "install.lst": true,
+ "monetdb_config.h.in": true,
+ "*.pyc": true,
+ "sql/backends/monet5/UDF/capi/cheader.text.h": true,
+ "*.swp": true,
+ "*~": true,
+ "\\#*": true,
+ ".#*": true,
+ "lex.yy.c": true,
+ "*.tab.c": true,
+ "*.tab.h": true,
+ ".libs": true,
+ "*.exe": true,
+ "*.exe.m
MonetDB: configurable_working_set - Add autotools and make file ...
Changeset: 4a1a6f103d29 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4a1a6f103d29
Modified Files:
.vscode/settings.json
Branch: configurable_working_set
Log Message:
Add autotools and make file associations.
diffs (150 lines):
diff --git a/.vscode/settings.json b/.vscode/settings.json
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,74 +1,80 @@
{
+"files.associations": {
+"extraMakefile": "makefile",
+"configure.ag": "m4",
+"Makefile.ag": "automake"
+},
"files.exclude": {
"**/.git": true,
"**/.svn": true,
"**/.hg": true,
"**/CVS": true,
"**/.DS_Store": true,
- "Makefile.am": true,
- "Makefile.in": true,
- "Makefile.msc": true,
- "aclocal.m4": true,
- "acout.in": true,
- "autom4te.cache": true,
- "buildtools/conf/compile": true,
- "buildtools/conf/config.guess": true,
- "buildtools/conf/config.sub": true,
- "buildtools/conf/install-sh": true,
- "buildtools/conf/libtool.m4": true,
- "buildtools/conf/ltmain.sh": true,
- "buildtools/conf/ltoptions.m4": true,
- "buildtools/conf/ltsugar.m4": true,
- "buildtools/conf/ltversion.m4": true,
- "buildtools/conf/lt~obsolete.m4": true,
- "buildtools/conf/missing": true,
- "buildtools/conf/ylwrap": true,
- "configure": true,
- "configure.ac": true,
- "doc.lst": true,
- "install.lst": true,
- "monetdb_config.h.in": true,
- "*.pyc": true,
- "sql/backends/monet5/UDF/capi/cheader.text.h": true,
- "*.swp": true,
- "*~": true,
- "\\#*": true,
- ".#*": true,
- "lex.yy.c": true,
- "*.tab.c": true,
- "*.tab.h": true,
- ".libs": true,
- "*.exe": true,
- "*.exe.manifest": true,
- "*.la": true,
- "*.lo": true,
- "*.o": true,
- "*.obj": true,
- "*.lib": true,
- "*.dll": true,
- "GTAGS": true,
- "gtags.files": true,
- "GPATH": true,
- "GRTAGS": true,
- "TAGS": true,
- "tags": true,
- "*.pyo": true,
- "*.rej": true,
- "*.orig": true,
- "NT/.monetdb": true,
- "NT/buildtools": true,
- "NT/clients": true,
- "NT/common": true,
- "NT/gdk": true,
- "NT/geom": true,
- "NT/java": true,
- "NT/monetdb5": true,
- "NT/monetdb_config.h": true,
- "NT/sql": true,
- "NT/testing": true,
- "NT/tools": true,
- "NT/unistd.h": true,
- "MacOSX/build": true,
- "MacOSX/usr": true,
- }
+"Makefile.am": true,
+"Makefile.in": true,
+"Makefile.msc": true,
+"aclocal.m4": true,
+"acout.in": true,
+"autom4te.cache": true,
+"buildtools/conf/compile": true,
+"buildtools/conf/config.guess": true,
+"buildtools/conf/config.sub": true,
+"buildtools/conf/install-sh": true,
+"buildtools/conf/libtool.m4": true,
+"buildtools/conf/ltmain.sh": true,
+"buildtools/conf/ltoptions.m4": true,
+"buildtools/conf/ltsugar.m4": true,
+"buildtools/conf/ltversion.m4": true,
+"buildtools/conf/lt~obsolete.m4": true,
+"buildtools/conf/missing": true,
+"buildtools/conf/ylwrap": true,
+"configure": true,
+"configure.ac": true,
+"doc.lst": true,
+"install.lst": true,
+"monetdb_config.h.in": true,
+"*.pyc": true,
+"sql/backends/monet5/UDF/capi/cheader.text.h": true,
+"*.swp": true,
+"*~": true,
+"\\#*": true,
+".#*": true,
+"lex.yy.c": true,
+"*.tab.c": true,
+"*.tab.h": true,
+".libs": true,
+"*.exe": true,
+"*.exe.manifest": true,
+"*.la": true,
+"*.lo": true,
+"*.o": true,
+"*.obj": true,
+"*.lib": true,
+"*.dll": true,
+"GTAGS": true,
+"gtags.files": true,
+"GPATH": true,
+"GRTAGS": true,
+"TAGS": true,
+"tags": true,
+"*.pyo": true,
+"*.rej": true,
+"*.orig": true,
+"NT/.monetdb": true,
+"NT/buildtools": true,
+"NT/clients": true,
+"NT/common": true,
+"NT/gdk": true,
+"NT/geom": true,
+"NT/java": true,
+"NT/monetdb5": true,
+"NT/monetdb_config.h": tru
MonetDB: configurable_working_set - "Add Windows specific develo...
Changeset: d67f575acbe7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d67f575acbe7
Added Files:
.vscode/monetdb-environment.bat
.vscode/run_build.bat
.vscode/run_install.bat
.vscode/run_tests.bat
Modified Files:
.vscode/tasks.json
Branch: configurable_working_set
Log Message:
"Add Windows specific development scripts and associated VS Code tasks."
diffs (167 lines):
diff --git a/.vscode/monetdb-environment.bat b/.vscode/monetdb-environment.bat
new file mode 100644
--- /dev/null
+++ b/.vscode/monetdb-environment.bat
@@ -0,0 +1,65 @@
+rem Set build variables for monetdb
+set SOURCE=%USERPROFILE%\Sources\monetdb
+set BUILD=%SOURCE%\build
+set PREFIX=%USERPROFILE%\monetdb-installation
+set Path=%PREFIX%\bin;%PREFIX%\lib;%Path%
+
+rem additional libraries and additional tools
+
+rem Look in Cygwin's bin as a default location for programs, e.g. Bison.
+rem When appropriate, Windows specific packages like the Python distributions
are given priority over the possible Cygwin alternatives.
+set CYGWIN=C:\cygwin64
+set Path=%CYGWIN%\bin;%Path%
+
+rem PCRE
+set LIBPCRE=%ProgramFiles%\PCRE
+set Path=%LIBPCRE%\bin;%Path%
+set Path=%LIBPCRE%\lib;%Path%
+
+rem OpenSSL
+set OPENSSLDIR=C:\openssl
+set Path=%OPENSSLDIR%\bin;%Path%
+set Path=%OPENSSLDIR%\lib;%Path%
+
+rem libXML
+set LIBXML2=C:\libxml2-2.9.3-win32-x86_64
+set Path=%LIBXML2%\bin;%Path%
+set Path=%LIBXML2%\lib;%Path%
+
+rem zlib
+set LIBZLIB=C:\zlib-1.2.11-win64-x86_64
+set Path=%LIBZLIB%\bin;%Path%
+set Path=%LIBZLIB%\lib;%Path%
+
+rem bzip2
+set LIBBZ2=C:\bzip2-1.0.6
+set Path=%LIBBZ2%\bin;%Path%
+set Path=%LIBBZ2%\lib;%Path%
+
+rem iconv
+set LIBICONV=C:\iconv-1.14-win32-x86_64
+set Path=%LIBICONV%\bin;%Path%
+set Path=%LIBICONV%\lib;%Path%
+
+rem perl
+set PERLDIR=C:\Perl64
+set Path=%PERLDIR%\bin;%Path%
+set Path=%PERLDIR%\lib;%Path%
+
+rem geos
+set GEOSDIR=C:\geos-3.4.2
+set Path=%GEOSDIR%\bin;%Path%
+set Path=%GEOSDIR%\lib;%Path%
+
+rem python3
+set PYTHON3=C:\Python36
+set Path=%PYTHON3%;%Path%
+set PYTHON3_LIBDIR=%PYTHON3%\lib
+
+rem python2
+set PYTHON2=C:\Python27
+set Path=%PYTHON2%;%Path%
+set PYTHON2_LIBDIR=%PYTHON2%\lib
+
+rem Python module search path
+set PYTHONPATH=%PREFIX%\lib\site-packages;%PYTHONPATH%
diff --git a/.vscode/run_build.bat b/.vscode/run_build.bat
new file mode 100644
--- /dev/null
+++ b/.vscode/run_build.bat
@@ -0,0 +1,9 @@
+rem call environment variables for Monetdb compilation and runtime
+call %~dp0/monetdb-environment.bat
+
+rem Set the environment variables for Visual Studio 2017 native x64.
+call "C:\Program Files (x86)\Microsoft Visual
Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
+
+cd %BUILD%
+
+nmake -nologo -f ..\NT\Makefile HAVE_LIBBZ2=1 HAVE_MONETDB5=1 HAVE_SQL=1
HAVE_PCRE=1 HAVE_GDK=1 HAVE_OPENSSL=1 HAVE_MAPI=1 HAVE_GEOM=1 HAVE_TESTING=1
"MAKE_INCLUDEFILE=%SOURCE%\.vscode\extraMakefile"
diff --git a/.vscode/run_install.bat b/.vscode/run_install.bat
new file mode 100644
--- /dev/null
+++ b/.vscode/run_install.bat
@@ -0,0 +1,9 @@
+rem call environment variables for Monetdb compilation and runtime
+call %~dp0/monetdb-environment.bat
+
+rem Set the environment variables for Visual Studio 2017 native x64.
+call "C:\Program Files (x86)\Microsoft Visual
Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
+
+cd %BUILD%
+
+nmake -nologo -f ..\NT\Makefile "prefix=%PREFIX%" HAVE_LIBBZ2=1
HAVE_MONETDB5=1 HAVE_SQL=1 HAVE_PCRE=1 HAVE_GDK=1 HAVE_OPENSSL=1 HAVE_MAPI=1
HAVE_GEOM=1 HAVE_PYTHON=1 HAVE_TESTING=1
"MAKE_INCLUDEFILE=%SOURCE%\.vscode\extraMakefile" install
diff --git a/.vscode/run_tests.bat b/.vscode/run_tests.bat
new file mode 100644
--- /dev/null
+++ b/.vscode/run_tests.bat
@@ -0,0 +1,6 @@
+rem call environment variables for Monetdb compilation and runtime
+call %~dp0/monetdb-environment.bat
+
+echo %PATH%
+
+Mtest.py -r
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -8,19 +8,20 @@
"type": "shell",
"command": "cd ${workspaceFolder} && ./bootstrap && (test -d build
|| mkdir build) && cd build && ../configure
--prefix=/home/aris/Installations/default-env --enable-debug --enable-strict
--disable-optimize",
"group": "build",
-"problemMatcher": [],
-"windows": {
-"command": ".\\run_bootstrap_and_configure.bat"
-}
+"problemMatcher": []
},
{
-"label": "run make",
+"label": "run build",
"type": "shell",
"command": "cd ${workspaceFolder}/build && make -j2",
"group": {
"kind": "build",
"isDefault": true
},
+"presentation": {
+"panel": "new"
+
+},
"problemMatcher": {
"base": "$gcc",
"fileLocation": [
@@ -37,8 +38,8 @@
}
},
MonetDB: configurable_working_set - Merge with default branch.
Changeset: ebc84c29cf3d for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ebc84c29cf3d Added Files: sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.stable.err sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-in-cast-null.Bug-6529.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-in-cast-null.Bug-6529.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-in-query.Bug-6545.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-in-with-division.Bug-6546.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-not-in-wrong-results.Bug-6530.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-not-in-wrong-results.Bug-6530.stable.out Modified Files: gdk/gdk_atomic.h monetdb5/modules/mal/mkey.c sql/backends/monet5/rel_bin.c sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_optimizer.h sql/backends/monet5/sql_upgrades.c sql/scripts/97_comments.sql sql/server/rel_optimizer.c sql/server/rel_select.c sql/test/BugTracker-2018/Tests/All sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.stable.out sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64 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.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: configurable_working_set Log Message: Merge with default branch. diffs (truncated from 1207 to 300 lines): diff --git a/gdk/gdk_atomic.h b/gdk/gdk_atomic.h --- a/gdk/gdk_atomic.h +++ b/gdk/gdk_atomic.h @@ -24,7 +24,7 @@ * ATOMIC_INC -- increment a variable's value, return new value; * ATOMIC_DEC -- decrement a variable's value, return new value; * These interfaces work on variables of type ATOMIC_TYPE - * (int or lng depending on architecture). + * (int or int64_t depending on architecture). * * In addition, the following operations are defined: * ATOMIC_TAS -- test-and-set: set variable to "true" and return old value @@ -67,9 +67,9 @@ #include -#if SIZEOF_SSIZE_T == SIZEOF_LNG +#if SIZEOF_SSIZE_T == 8 -#define ATOMIC_TYPElng +#define ATOMIC_TYPEint64_t #define ATOMIC_GET(var, lck) var #define ATOMIC_SET(var, val, lck) _InterlockedExchange64(&var, (val)) @@ -110,10 +110,10 @@ #define ATOMIC_TAS(var, lck) _InterlockedCompareExchange(&var, 1, 0) #pragma intrinsic(_InterlockedCompareExchange) -#elif (defined(__GNUC__) || defined(__INTEL_COMPILER)) && !(defined(__sun__) && SIZEOF_SIZE_T == SIZEOF_LNG) && !defined(_MSC_VER) && !defined(NO_ATOMIC_INSTRUCTIONS) +#elif (defined(__GNUC__) || defined(__INTEL_COMPILER)) && !(defined(__sun__) && SIZEOF_SIZE_T == 8) && !defined(_MSC_VER) && !defined(NO_ATOMIC_INSTRUCTIONS) -#if SIZEOF_SSIZE_T == SIZEOF_LNG -#define ATOMIC_TYPElng +#if SIZEOF_SSIZE_T == 8 +#define ATOMIC_TYPEint64_t #else #define ATOMIC_TYPEint #endif @@ -154,8 +154,8 @@ #else -#if SIZEOF_SSIZE_T == SIZEOF_LNG -#define ATOMIC_TYPElng +#if SIZEOF_SSIZE_T == 8 +#define ATOMIC_TYPEint64_t #else #define ATOMIC_TYPEint #endif diff --git a/monetdb5/modules/mal/mkey.c b/monetdb5/modules/mal/mkey.c --- a/monetdb5/modules/mal/mkey.c +++ b/monetdb5/modules/mal/mkey.c @@ -357,7 +357,7 @@ MKEYbulk_rotate_xor_hash(bat *res, const BATkey(bn, 0); bn->tsorted = bn->trevsorted = 0; } - bn->tnonil = 1; + bn->tnonil = 0; bn->tnil = 0; BBPkeepref(*res = bn->batCacheid); @@ -439,7 +439,7 @@ MKEYbulkconst_rotate_xor_hash(Client cnt BATkey(bn, 0); bn->tsorted = bn->trevsorted = 0; } - bn->tnonil = 1; + bn->tno
MonetDB: configurable_working_set - Small modifications. Doesn't...
Changeset: b91eea35a5c9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b91eea35a5c9
Modified Files:
.vscode/monetdb-environment.bat
.vscode/run_build.bat
.vscode/run_install.bat
.vscode/settings.json
Branch: configurable_working_set
Log Message:
Small modifications. Doesn't fix the failing tests.
diffs (50 lines):
diff --git a/.vscode/monetdb-environment.bat b/.vscode/monetdb-environment.bat
--- a/.vscode/monetdb-environment.bat
+++ b/.vscode/monetdb-environment.bat
@@ -22,7 +22,7 @@ set Path=%OPENSSLDIR%\bin;%Path%
set Path=%OPENSSLDIR%\lib;%Path%
rem libXML
-set LIBXML2=C:\libxml2-2.9.3-win32-x86_64
+set LIBXML2=C:\libxml2
set Path=%LIBXML2%\bin;%Path%
set Path=%LIBXML2%\lib;%Path%
@@ -37,7 +37,7 @@ set Path=%LIBBZ2%\bin;%Path%
set Path=%LIBBZ2%\lib;%Path%
rem iconv
-set LIBICONV=C:\iconv-1.14-win32-x86_64
+set LIBICONV=C:\iconv
set Path=%LIBICONV%\bin;%Path%
set Path=%LIBICONV%\lib;%Path%
diff --git a/.vscode/run_build.bat b/.vscode/run_build.bat
--- a/.vscode/run_build.bat
+++ b/.vscode/run_build.bat
@@ -6,4 +6,4 @@ call "C:\Program Files (x86)\Microsoft V
cd %BUILD%
-nmake -nologo -f ..\NT\Makefile HAVE_LIBBZ2=1 HAVE_MONETDB5=1 HAVE_SQL=1
HAVE_PCRE=1 HAVE_GDK=1 HAVE_OPENSSL=1 HAVE_MAPI=1 HAVE_GEOM=1 HAVE_TESTING=1
"MAKE_INCLUDEFILE=%SOURCE%\.vscode\extraMakefile"
+nmake -nologo -f ..\NT\Makefile
"MAKE_INCLUDEFILE=%SOURCE%\.vscode\extraMakefile"
diff --git a/.vscode/run_install.bat b/.vscode/run_install.bat
--- a/.vscode/run_install.bat
+++ b/.vscode/run_install.bat
@@ -6,4 +6,4 @@ call "C:\Program Files (x86)\Microsoft V
cd %BUILD%
-nmake -nologo -f ..\NT\Makefile "prefix=%PREFIX%" HAVE_LIBBZ2=1
HAVE_MONETDB5=1 HAVE_SQL=1 HAVE_PCRE=1 HAVE_GDK=1 HAVE_OPENSSL=1 HAVE_MAPI=1
HAVE_GEOM=1 HAVE_PYTHON=1 HAVE_TESTING=1
"MAKE_INCLUDEFILE=%SOURCE%\.vscode\extraMakefile" install
+nmake -nologo -f ..\NT\Makefile HAVE_LIBXML=1 HAVE_LIBZ=1 HAVE_LIBBZ2=1
HAVE_MONETDB5=1 HAVE_SQL=1 HAVE_PCRE=1 HAVE_GDK=1 HAVE_OPENSSL=1 HAVE_MAPI=1
HAVE_GEOM=1 HAVE_PYTHON=1 HAVE_TESTING=1
"MAKE_INCLUDEFILE=%SOURCE%\.vscode\extraMakefile" install
diff --git a/.vscode/settings.json b/.vscode/settings.json
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,6 +1,7 @@
{
"files.associations": {
"extraMakefile": "makefile",
+"rules.msc": "makefile",
"configure.ag": "m4",
"Makefile.ag": "automake"
},
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: configurable_working_set - Extend the PATH variable acc...
Changeset: 9803a9ee3e8c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9803a9ee3e8c Modified Files: .vscode/monetdb-environment.bat Branch: configurable_working_set Log Message: Extend the PATH variable according to the "How to build on Windows" recommendations. diffs (12 lines): diff --git a/.vscode/monetdb-environment.bat b/.vscode/monetdb-environment.bat --- a/.vscode/monetdb-environment.bat +++ b/.vscode/monetdb-environment.bat @@ -2,7 +2,7 @@ rem Set build variables for monetdb set SOURCE=%USERPROFILE%\Sources\monetdb set BUILD=%SOURCE%\build set PREFIX=%USERPROFILE%\monetdb-installation -set Path=%PREFIX%\bin;%PREFIX%\lib;%Path% +set Path=%PREFIX%\bin;%PREFIX%\lib\monetdb;%PREFIX%\lib;%Path% rem additional libraries and additional tools ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: configurable_working_set - Add extraMakefile to version...
Changeset: f216875bbf2a for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f216875bbf2a Added Files: .vscode/extraMakefile Modified Files: .vscode/run_install.bat Branch: configurable_working_set Log Message: Add extraMakefile to version control and simplify install command. diffs (44 lines): diff --git a/.vscode/extraMakefile b/.vscode/extraMakefile new file mode 100644 --- /dev/null +++ b/.vscode/extraMakefile @@ -0,0 +1,30 @@ +HAVE_STRICT=1 +HAVE_DEBUG=1 +HAVE_MONETDB5=1 +HAVE_LIBXML=1 +HAVE_LIBZ=1 +HAVE_LIBBZ2=1 +HAVE_SQL=1 +HAVE_PCRE=1 +HAVE_GDK=1 +HAVE_OPENSSL=1 +HAVE_MAPI=1 +HAVE_GEOM=1 +HAVE_PYTHON=1 +HAVE_TESTING=1 +HAVE_ICONV=1 + +bits=64 + +LIBICONV=C:\iconv +LIBZLIB=C:\zlib-1.2.11-win64-x86_64 +LIBZLIBFILE=zlib +LIBXML2=C:\libxml2 +LIBBZIP2=C:\bzip2-1.0.6 +LIBOPENSSL=C:\openssl +LIBPCRE=C:\Program Files\PCRE +LIBGEOS=C:\geos-3.4.2 +PYTHON2=C:\Python27 +PYTHON2_LIBDIR=C:\Python27\libs + +prefix = $(PREFIX) diff --git a/.vscode/run_install.bat b/.vscode/run_install.bat --- a/.vscode/run_install.bat +++ b/.vscode/run_install.bat @@ -6,4 +6,4 @@ call "C:\Program Files (x86)\Microsoft V cd %BUILD% -nmake -nologo -f ..\NT\Makefile HAVE_LIBXML=1 HAVE_LIBZ=1 HAVE_LIBBZ2=1 HAVE_MONETDB5=1 HAVE_SQL=1 HAVE_PCRE=1 HAVE_GDK=1 HAVE_OPENSSL=1 HAVE_MAPI=1 HAVE_GEOM=1 HAVE_PYTHON=1 HAVE_TESTING=1 "MAKE_INCLUDEFILE=%SOURCE%\.vscode\extraMakefile" install +nmake -nologo -f ..\NT\Makefile "MAKE_INCLUDEFILE=%SOURCE%\.vscode\extraMakefile" install ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: configurable_working_set - Moving more definitions from...
Changeset: f257c4958546 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f257c4958546 Modified Files: .vscode/extraMakefile .vscode/monetdb-environment.bat Branch: configurable_working_set Log Message: Moving more definitions from extraMakefile to monetdb-environment.bat. diffs (63 lines): diff --git a/.vscode/extraMakefile b/.vscode/extraMakefile --- a/.vscode/extraMakefile +++ b/.vscode/extraMakefile @@ -1,20 +1,5 @@ -HAVE_STRICT=1 -HAVE_DEBUG=1 -HAVE_MONETDB5=1 -HAVE_LIBXML=1 -HAVE_LIBZ=1 -HAVE_LIBBZ2=1 -HAVE_SQL=1 -HAVE_PCRE=1 -HAVE_GDK=1 -HAVE_OPENSSL=1 -HAVE_MAPI=1 -HAVE_GEOM=1 -HAVE_PYTHON=1 -HAVE_TESTING=1 -HAVE_ICONV=1 - -bits=64 +bits= $(BITS) +prefix = $(PREFIX) LIBICONV=C:\iconv LIBZLIB=C:\zlib-1.2.11-win64-x86_64 @@ -27,4 +12,4 @@ LIBGEOS=C:\geos-3.4.2 PYTHON2=C:\Python27 PYTHON2_LIBDIR=C:\Python27\libs -prefix = $(PREFIX) + diff --git a/.vscode/monetdb-environment.bat b/.vscode/monetdb-environment.bat --- a/.vscode/monetdb-environment.bat +++ b/.vscode/monetdb-environment.bat @@ -4,8 +4,27 @@ set BUILD=%SOURCE%\build set PREFIX=%USERPROFILE%\monetdb-installation set Path=%PREFIX%\bin;%PREFIX%\lib\monetdb;%PREFIX%\lib;%Path% +rem Set Windows type. +set BITS=64 + rem additional libraries and additional tools +set HAVE_STRICT=1 +set HAVE_DEBUG=1 +set HAVE_MONETDB5=1 +set HAVE_LIBXML=1 +set HAVE_LIBZ=1 +set HAVE_LIBBZ2=1 +set HAVE_SQL=1 +set HAVE_PCRE=1 +set HAVE_GDK=1 +set HAVE_OPENSSL=1 +set HAVE_MAPI=1 +set HAVE_GEOM=1 +set HAVE_PYTHON=1 +set HAVE_TESTING=1 +set HAVE_ICONV=1 + rem Look in Cygwin's bin as a default location for programs, e.g. Bison. rem When appropriate, Windows specific packages like the Python distributions are given priority over the possible Cygwin alternatives. set CYGWIN=C:\cygwin64 ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: configurable_working_set - Migrate last definitions fro...
Changeset: f92a101a32fe for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f92a101a32fe Removed Files: .vscode/extraMakefile Modified Files: .vscode/monetdb-environment.bat .vscode/run_build.bat .vscode/run_install.bat .vscode/run_tests.bat Branch: configurable_working_set Log Message: Migrate last definitions from extraMakefile to environment script and remove it. diffs (102 lines): diff --git a/.vscode/extraMakefile b/.vscode/extraMakefile deleted file mode 100644 --- a/.vscode/extraMakefile +++ /dev/null @@ -1,15 +0,0 @@ -bits= $(BITS) -prefix = $(PREFIX) - -LIBICONV=C:\iconv -LIBZLIB=C:\zlib-1.2.11-win64-x86_64 -LIBZLIBFILE=zlib -LIBXML2=C:\libxml2 -LIBBZIP2=C:\bzip2-1.0.6 -LIBOPENSSL=C:\openssl -LIBPCRE=C:\Program Files\PCRE -LIBGEOS=C:\geos-3.4.2 -PYTHON2=C:\Python27 -PYTHON2_LIBDIR=C:\Python27\libs - - diff --git a/.vscode/monetdb-environment.bat b/.vscode/monetdb-environment.bat --- a/.vscode/monetdb-environment.bat +++ b/.vscode/monetdb-environment.bat @@ -36,9 +36,9 @@ set Path=%LIBPCRE%\bin;%Path% set Path=%LIBPCRE%\lib;%Path% rem OpenSSL -set OPENSSLDIR=C:\openssl -set Path=%OPENSSLDIR%\bin;%Path% -set Path=%OPENSSLDIR%\lib;%Path% +set LIBOPENSSL=C:\openssl +set Path=%LIBOPENSSL%\bin;%Path% +set Path=%LIBOPENSSL%\lib;%Path% rem libXML set LIBXML2=C:\libxml2 @@ -49,11 +49,12 @@ rem zlib set LIBZLIB=C:\zlib-1.2.11-win64-x86_64 set Path=%LIBZLIB%\bin;%Path% set Path=%LIBZLIB%\lib;%Path% +set LIBZLIBFILE=zlib rem bzip2 -set LIBBZ2=C:\bzip2-1.0.6 -set Path=%LIBBZ2%\bin;%Path% -set Path=%LIBBZ2%\lib;%Path% +set LIBBZIP2=C:\bzip2-1.0.6 +set Path=%LIBBZIP2%\bin;%Path% +set Path=%LIBBZIP2%\lib;%Path% rem iconv set LIBICONV=C:\iconv @@ -66,9 +67,9 @@ set Path=%PERLDIR%\bin;%Path% set Path=%PERLDIR%\lib;%Path% rem geos -set GEOSDIR=C:\geos-3.4.2 -set Path=%GEOSDIR%\bin;%Path% -set Path=%GEOSDIR%\lib;%Path% +set LIBGEOS=C:\geos-3.4.2 +set Path=%LIBGEOS%\bin;%Path% +set Path=%LIBGEOS%\lib;%Path% rem python3 set PYTHON3=C:\Python36 @@ -78,7 +79,7 @@ set PYTHON3_LIBDIR=%PYTHON3%\lib rem python2 set PYTHON2=C:\Python27 set Path=%PYTHON2%;%Path% -set PYTHON2_LIBDIR=%PYTHON2%\lib +set PYTHON2_LIBDIR=%PYTHON2%\libs rem Python module search path set PYTHONPATH=%PREFIX%\lib\site-packages;%PYTHONPATH% diff --git a/.vscode/run_build.bat b/.vscode/run_build.bat --- a/.vscode/run_build.bat +++ b/.vscode/run_build.bat @@ -6,4 +6,4 @@ call "C:\Program Files (x86)\Microsoft V cd %BUILD% -nmake -nologo -f ..\NT\Makefile "MAKE_INCLUDEFILE=%SOURCE%\.vscode\extraMakefile" +nmake -nologo -f ..\NT\Makefile bits=%BITS% diff --git a/.vscode/run_install.bat b/.vscode/run_install.bat --- a/.vscode/run_install.bat +++ b/.vscode/run_install.bat @@ -6,4 +6,4 @@ call "C:\Program Files (x86)\Microsoft V cd %BUILD% -nmake -nologo -f ..\NT\Makefile "MAKE_INCLUDEFILE=%SOURCE%\.vscode\extraMakefile" install +nmake -nologo -f ..\NT\Makefile bits=%BITS% prefix=%PREFIX% install diff --git a/.vscode/run_tests.bat b/.vscode/run_tests.bat --- a/.vscode/run_tests.bat +++ b/.vscode/run_tests.bat @@ -1,6 +1,4 @@ rem call environment variables for Monetdb compilation and runtime call %~dp0/monetdb-environment.bat -echo %PATH% - Mtest.py -r ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: configurable_working_set - The build, install and (near...
Changeset: 07d1a0092a02 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=07d1a0092a02 Added Files: .vscode/extraMakefile Modified Files: .vscode/monetdb-environment.bat .vscode/run_build.bat .vscode/run_install.bat Branch: configurable_working_set Log Message: The build, install and (nearly 100% of the) test tasks are working in Visual Studio Code. diffs (57 lines): diff --git a/.vscode/extraMakefile b/.vscode/extraMakefile new file mode 100644 --- /dev/null +++ b/.vscode/extraMakefile @@ -0,0 +1,9 @@ +bits=$(BITS) +LIBICONV=$(LIBICONV) +LIBBZIP2=$(LIBBZIP2) +LIBOPENSSL=$(LIBOPENSSL) +LIBXML2=$(LIBXML2) +LIBPCRE=$(LIBPCRE) +LIBOPENSSL=$(LIBOPENSSL) +LIBZLIB=$(LIBZLIB) +LIBGEOS=$(LIBGEOS) diff --git a/.vscode/monetdb-environment.bat b/.vscode/monetdb-environment.bat --- a/.vscode/monetdb-environment.bat +++ b/.vscode/monetdb-environment.bat @@ -2,7 +2,7 @@ rem Set build variables for monetdb set SOURCE=%USERPROFILE%\Sources\monetdb set BUILD=%SOURCE%\build set PREFIX=%USERPROFILE%\monetdb-installation -set Path=%PREFIX%\bin;%PREFIX%\lib\monetdb;%PREFIX%\lib;%Path% +set Path=%PREFIX%\bin;%PREFIX%\lib;%PREFIX%\lib\monetdb5;%Path% rem Set Windows type. set BITS=64 @@ -74,12 +74,10 @@ set Path=%LIBGEOS%\lib;%Path% rem python3 set PYTHON3=C:\Python36 set Path=%PYTHON3%;%Path% -set PYTHON3_LIBDIR=%PYTHON3%\lib rem python2 set PYTHON2=C:\Python27 set Path=%PYTHON2%;%Path% -set PYTHON2_LIBDIR=%PYTHON2%\libs rem Python module search path set PYTHONPATH=%PREFIX%\lib\site-packages;%PYTHONPATH% diff --git a/.vscode/run_build.bat b/.vscode/run_build.bat --- a/.vscode/run_build.bat +++ b/.vscode/run_build.bat @@ -6,4 +6,4 @@ call "C:\Program Files (x86)\Microsoft V cd %BUILD% -nmake -nologo -f ..\NT\Makefile bits=%BITS% +nmake -nologo -f ..\NT\Makefile prefix=%PREFIX% "MAKE_INCLUDEFILE=%SOURCE%\.vscode\extraMakefile" diff --git a/.vscode/run_install.bat b/.vscode/run_install.bat --- a/.vscode/run_install.bat +++ b/.vscode/run_install.bat @@ -6,4 +6,4 @@ call "C:\Program Files (x86)\Microsoft V cd %BUILD% -nmake -nologo -f ..\NT\Makefile bits=%BITS% prefix=%PREFIX% install +nmake -nologo -f ..\NT\Makefile prefix=%PREFIX% "MAKE_INCLUDEFILE=%SOURCE%\.vscode\extraMakefile" install ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: configurable_working_set - Merge with default branch.
Changeset: e5190ed74614 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e5190ed74614
Added Files:
sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.stable.out.int128
sql/test/BugTracker-2018/Tests/ilike.Bug-6547.sql
sql/test/BugTracker-2018/Tests/ilike.Bug-6547.stable.err
sql/test/BugTracker-2018/Tests/ilike.Bug-6547.stable.out
sql/test/BugTracker-2018/Tests/truncate_add_user.sql
sql/test/BugTracker-2018/Tests/truncate_add_user.stable.err
sql/test/BugTracker-2018/Tests/truncate_add_user.stable.out
sql/test/BugTracker-2018/Tests/truncate_bam_tables.Bug-6543.reqtests
sql/test/BugTracker-2018/Tests/truncate_remove_user.sql
sql/test/BugTracker-2018/Tests/truncate_remove_user.stable.err
sql/test/BugTracker-2018/Tests/truncate_remove_user.stable.out
sql/test/BugTracker-2018/Tests/truncate_sys_netcdf_tables.Bug-6543.reqtests
sql/test/BugTracker-2018/Tests/truncate_sys_tables.Bug-6543.reqtests
sql/test/BugTracker/Tests/mapi_connect_errors_vanish.SF-1432134.sql
Removed Files:
sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Darwin
sql/test/BugTracker-2016/Tests/storagemodel.stable.out.FreeBSD
sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Windows
sql/test/BugTracker/Tests/mapi_connect_errors_vanish.SF-1432134.SQL.py
Modified Files:
clients/mapiclient/mclient.c
clients/odbc/setup/drvcfg.h
gdk/gdk.h
gdk/gdk_bat.c
gdk/gdk_batop.c
monetdb5/mal/mal_readline.c
monetdb5/modules/mal/pcre.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/vaults/bam/85_bam.sql
sql/backends/monet5/vaults/netcdf/74_netcdf.sql
sql/scripts/97_comments.sql
sql/server/rel_schema.c
sql/server/rel_updates.c
sql/test/BugTracker-2016/Tests/storagemodel.sql
sql/test/BugTracker-2016/Tests/storagemodel.stable.out
sql/test/BugTracker-2018/Tests/All
sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.stable.out
sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.sql
sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.stable.out
sql/test/BugTracker/Tests/All
sql/test/Tests/comment-auth.stable.err
sql/test/Tests/comment-auth.stable.out
sql/test/Tests/comment-on.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
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.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
testing/Mtest.py.in
Branch: configurable_working_set
Log Message:
Merge with default branch.
diffs (truncated from 4022 to 300 lines):
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -71,11 +71,11 @@ static stream *fromConsole = NULL;
static char *language = NULL;
static char *logfile = NULL;
static char promptbuf[16];
-static int echoquery = 0;
+static bool echoquery = false;
#ifdef HAVE_ICONV
static char *encoding;
#endif
-static int errseen = 0;
+static bool errseen = false;
#define setPrompt() sprintf(promptbuf, "%.*s>", (int) sizeof(promptbuf) - 2,
language)
#define debugMode() (strncmp(promptbuf, "mdb", 3) == 0)
@@ -94,7 +94,7 @@ enum formatters {
};
static enum formatters formatter = NOformatter;
char *separator = NULL;/* column separator for CSV/TAB format
*/
-int csvheader = 0; /* include header line in CSV format */
+
MonetDB: configurable_working_set - Add Windows specific working...
Changeset: 30efba37da23 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=30efba37da23
Modified Files:
gdk/gdk_utils.c
Branch: configurable_working_set
Log Message:
Add Windows specific working set configuration.
diffs (36 lines):
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -47,6 +47,12 @@ static char THRprintbuf[BUFSIZ];
#define chdir _chdir
#endif
+#ifdef WIN32
+# include
+#endif
+
+#define MIN_WORKING_SET 1 << 26 // Minimum memory working/resident set size
+
static volatile ATOMIC_FLAG GDKstopped = ATOMIC_FLAG_INIT;
static void GDKunlockHome(int farmid);
@@ -548,7 +554,18 @@ GDKinit(opt *set, int setlen)
for (i = 0; i < nlen; i++) {
if (strcmp("gdk_mem_maxsize", n[i].name) == 0) {
GDK_mem_maxsize = (size_t) strtoll(n[i].value, NULL,
10);
- GDK_mem_maxsize = MAX(1 << 26, GDK_mem_maxsize);
+ GDK_mem_maxsize = MAX(MIN_WORKING_SET, GDK_mem_maxsize);
+#ifdef WIN32 // On windows we can use a system call to limit the maximum
working set size.
+ const HANDLE process = GetCurrentProcess();
+
+ printf("MonetDb says Hello, world!\"\n\n");
+
+ if (!SetProcessWorkingSetSizeEx(process,
MIN_WORKING_SET, GDK_mem_maxsize, QUOTA_LIMITS_HARDWS_MAX_ENABLE))
+ {
+ printf("Something went wrong while setting the
limits on the working set: %d\n", GetLastError());
+ return 1;
+ }
+#endif
} else if (strcmp("gdk_vm_maxsize", n[i].name) == 0) {
GDK_vm_maxsize = (size_t) strtoll(n[i].value, NULL, 10);
GDK_vm_maxsize = MAX(1 << 30, GDK_vm_maxsize);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Mar2018 branch.
Changeset: 8d0d2eb50794 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8d0d2eb50794
Added Files:
sql/test/Users/Tests/grantAndRevokeUserLoggedIN.Bug-3476.SQL.py
sql/test/Users/Tests/grantAndRevokeUserLoggedIN.Bug-3476.stable.err
sql/test/Users/Tests/grantAndRevokeUserLoggedIN.Bug-3476.stable.out
Removed Files:
sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.SQL.py
sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.stable.err
sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.stable.out
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk.h
gdk/gdk_batop.c
gdk/gdk_private.h
gdk/gdk_project.c
gdk/gdk_qsort.c
gdk/gdk_select.c
gdk/gdk_ssort_impl.h
sql/backends/monet5/sql_upgrades.c
sql/server/rel_schema.c
sql/storage/store.c
sql/test/Users/Tests/All
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
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.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: default
Log Message:
Merge with Mar2018 branch.
diffs (truncated from 1289 to 300 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
@@ -253,8 +253,8 @@ gdk_return GDKmmapfile(str buffer, size_
int GDKms(void);
int GDKnr_threads;
void GDKprepareExit(void);
-void GDKqsort(void *h, void *t, const void *base, size_t n, int hs, int ts,
int tpe);
-void GDKqsort_rev(void *h, void *t, const void *base, size_t n, int hs, int
ts, int tpe);
+void GDKqsort(void *restrict h, void *restrict t, const void *restrict base,
size_t n, int hs, int ts, int tpe);
+void GDKqsort_rev(void *restrict h, void *restrict t, const void *restrict
base, size_t n, int hs, int ts, int tpe);
void *GDKrealloc(void *pold, size_t size)
__attribute__((__warn_unused_result__));
void GDKregister(MT_Id pid);
gdk_return GDKreleasemmap(void *ptr, size_t size, size_t id, str *msg);
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1467,8 +1467,8 @@ gdk_export gdk_return BATsort(BAT **sort
__attribute__ ((__warn_unused_result__));
-gdk_export void GDKqsort(void *h, void *t, const void *base, size_t n, int hs,
int ts, int tpe);
-gdk_export void GDKqsort_rev(void *h, void *t, const void *base, size_t n, int
hs, int ts, int tpe);
+gdk_export void GDKqsort(void *restrict h, void *restrict t, const void
*restrict base, size_t n, int hs, int ts, int tpe);
+gdk_export void GDKqsort_rev(void *restrict h, void *restrict t, const void
*restrict base, size_t n, int hs, int ts, int tpe);
#define BATtordered(b) ((b)->ttype == TYPE_void || (b)->tsorted)
#define BATtrevordered(b) (((b)->ttype == TYPE_void &&
is_oid_nil((b)->tseqbase)) || (b)->trevsorted)
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -1278,7 +1278,7 @@ BATordered_rev(BAT *b)
* stable sort can produce an error (not enough memory available),
* "quick" sort does not produce errors */
static gdk_return
-do_sort(void *h, void *t, const void *base, size_t n, int hs, int ts, int tpe,
+do_sort(void *restrict h, void *restrict t, const void *restrict base, size_t
n, int hs, int ts, int tpe,
int reverse, int stable)
{
if (n <= 1) /* trivially sorted */
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -141,10 +141,10 @@ void BBPdump(void); /* never called: fo
__hidden gdk_return GDKsave(int farmid, const char *nme, const char *ext, void
*buf, size_t size, storage_t mode, int dosync)
__attribute__((__warn_unused_result__))
__attribute__((__visibilit
MonetDB: merge-partitions - Testing partition ranges with non-nu...
Changeset: ad378d127873 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ad378d127873
Added Files:
sql/test/merge-partitions/Tests/mergepart05.sql
sql/test/merge-partitions/Tests/mergepart05.stable.err
sql/test/merge-partitions/Tests/mergepart05.stable.out
Modified Files:
sql/backends/monet5/sql_statement.c
sql/server/rel_dump.c
sql/server/rel_schema.c
sql/server/sql_atom.c
sql/server/sql_atom.h
sql/test/merge-partitions/Tests/All
Branch: merge-partitions
Log Message:
Testing partition ranges with non-numeric values
diffs (truncated from 492 to 300 lines):
diff --git a/sql/backends/monet5/sql_statement.c
b/sql/backends/monet5/sql_statement.c
--- a/sql/backends/monet5/sql_statement.c
+++ b/sql/backends/monet5/sql_statement.c
@@ -3315,7 +3315,7 @@ const char *
return st->op4.cval->base.name;
case st_atom:
if (st->op4.aval->data.vtype == TYPE_str)
- return atom2string(sa, st->op4.aval);
+ return atom2string(sa, st->op4.aval, 0);
/* fall through */
case st_var:
case st_temp:
diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c
--- a/sql/server/rel_dump.c
+++ b/sql/server/rel_dump.c
@@ -118,7 +118,7 @@ exp_print(mvc *sql, stream *fout, sql_ex
t->base.name);
} else {
char *t = sql_subtype_string(atom_type(a));
- char *s = atom2string(sql->sa, a);
+ char *s = atom2string(sql->sa, a, 0);
mnstr_printf(fout, "%s \"%s\"", t, s);
_DELETE(t);
}
diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c
--- a/sql/server/rel_schema.c
+++ b/sql/server/rel_schema.c
@@ -89,7 +89,7 @@ rel_alter_table_add_partition_range(sql_
{
sql_rel *rel = rel_create(sa);
list *exps = new_exp_list(sa);
- char *pmin = atom2string(sa, min), *pmax = atom2string(sa, max);
+ char *pmin = atom2string(sa, min, 1), *pmax = atom2string(sa, max, 1);
if(!rel || !exps || !pmin || !pmax)
return NULL;
@@ -130,7 +130,7 @@ rel_alter_table_add_partition_list(sql_a
}
for (n = ll->h; n ; n = n->next) {
symbol* next = n->data.sym;
- char *nvalue = atom2string(sa, ((AtomNode *) next)->a);
+ char *nvalue = atom2string(sa, ((AtomNode *) next)->a, 1);
append(exps, exp_atom_clob(sa, nvalue));
}
rel->l = NULL;
@@ -523,7 +523,7 @@ column_option(
if (a->data.vtype == TYPE_str) {
mvc_default(sql, cs, a->data.val.sval);
} else {
- char *r = atom2string(sql->sa, a);
+ char *r = atom2string(sql->sa, a, 0);
mvc_default(sql, cs, r);
}
@@ -1455,7 +1455,7 @@ sql_alter_table(mvc *sql, dlist *qname,
sql_column *col = t->pcol;
dlist* ll = extra->data.lval;
symbol* min = ll->h->data.sym, *max =
ll->h->next->data.sym;
- atom *amin, *amax;
+ atom *amin = NULL, *amax = NULL;
if(t->type != tt_range_partition) {
return sql_error(sql,
02,SQLSTATE(42000) "ALTER TABLE: cannot add a range partition into a %s table",
@@ -1464,6 +1464,12 @@ sql_alter_table(mvc *sql, dlist *qname,
if(min->token == SQL_MINVALUE) {
amin =
atom_absolute_min(sql->sa, &(col->type));
+ if(!amin) {
+ char *err =
sql_subtype_string(&(col->type));
+ if(!err)
+ return
sql_error(sql, 02, SQLSTATE(HY001) MAL_MALLOC_FAIL);
+ return sql_error(sql,
02, SQLSTATE(HY001) "ALTER TABLE: absolute minimum value not available for %s
type", err);
+ }
} else {
amin = ((AtomNode *) min)->a;
}
@@ -1471,6 +1477,12 @@ sql_alter_table(mvc *sql, dlist *qname,
amax =
atom_absolute_max(sql->sa, &(col->type));
} else {
