MonetDB: mbedded - merged with default
Changeset: 6790b3da660e for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6790b3da660e Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out monetdb5/modules/atoms/blob.c monetdb5/modules/atoms/mtime.c sql/server/rel_exp.c sql/server/rel_exp.h sql/server/rel_select.c sql/server/rel_unnest.c sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 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-chain/Tests/upgrade.stable.out.powerpc64.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.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/miscellaneous/Tests/simple_plans.sql sql/test/miscellaneous/Tests/simple_plans.stable.out 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/dump.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/dump.stable.out 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: mbedded Log Message: merged with default diffs (truncated from 137018 to 300 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -64,7 +64,7 @@ stdout of test 'MAL-signatures` in direc % .%1, .%1,.%1,.%1,.%1 # table_name % module, function, signature, address,comment # name % clob,clob, clob, clob, clob # type -% 12, 28, 364,39, 874 # length +% 12, 28, 364,42, 874 # length [ "aggr", "allnotequal", "command aggr.allnotequal(l:bat[:any_1], r:bat[:any_1]):bit ", "SQLallnotequal;", "if all values in r are not equal to l return true, else if r has nil nil else false" ] [ "aggr", "anyequal", "pattern aggr.anyequal(l:any_1, r:any_1):bit ", "CMDvarEQ;","" ] [ "aggr", "anyequal", "command aggr.anyequal(l:bat[:any_1], r:bat[:any_1]):bit ", "SQLanyequal;", "if any value in r is equal to l return true, else if r has nil nil else false" ] @@ -718,6 +718,7 @@ stdout of test 'MAL-signatures` in direc [ "batalgebra","not_ilike","command batalgebra.not_ilike(s:bat[:str], pat:str, esc:str):bat[:bit] ", "BATPCREnotilike;", "" ] [ "batalgebra","not_like", "command batalgebra.not_like(s:bat[:str], pat:str):bat[:bit] ", "BATPCREnotlike2;", "" ] [ "batalgebra","not_like", "command batalgebra.not_like(s:bat[:str], pat:str, esc:str):bat[:bit] ", "BATPCREnotlike;", "" ] +[ "batblob", "nitems", "command batblob.nitems(b:bat[:blob]):bat[:int] ", "BLOBnitems_bulk;", "" ] [ "batcalc", "!=", "pattern batcalc.!=(b1:bat[:any_1], b2:bat[:any_1]):bat[:bit] ","CMDbatNE;","Return B1 != B2" ] [ "batcalc", "!=", "pattern batcalc.!=(b1:bat[:any_1], b2:bat[:any_1], nil_matches:bit):bat[:bit] ", "CMDbatNE;","Return B1 != B2" ] [ "batcalc", "!=", "pattern batcalc.!=(b1:bat[:any_1], b2:bat[:any_1], r:bat[:bit]):bat[:bit] ", "CMDbatNE;","Return B1 != B2" ] @@ -8132,12 +8133,16 @@ stdout of test 'MAL-signatures` in direc [ "batcalc", "cmp", "pattern batcalc.cmp(v:str, b:bat[:str], r:bat[:bit]):bat[:bte] ", "CMDbatCMP;", "Return -1/0/1 if V B" ] [ "batcalc", "cmp", "pattern batcalc.cmp(v:str, b:bat[:str], s:bat[:oid]):bat[:bte] ", "CMDbatCMP;", "Return -1/0/1 if V B with candidates list" ] [ "batcalc", "cmp", "pattern batcalc.cmp(v:str, b:bat[:str], s:bat[:oid], r:bat[:bit]):bat[:bte] ", "CMDbatCMP;", "Return -1/0/1 if V B with candidates list" ] +[ "batcalc", "date", "command batcalc.date(d:bat[:date]):bat[:date] ", "MT
MonetDB: mbedded - merged with default
Changeset: b652fcc5491a for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b652fcc5491a Modified Files: clients/Tests/exports.stable.out monetdb5/modules/atoms/blob.c monetdb5/modules/atoms/mtime.c Branch: mbedded Log Message: merged with default diffs (truncated from 852 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 @@ -1575,12 +1575,12 @@ str MTIMEcurrent_time(daytime *ret); str MTIMEcurrent_timestamp(timestamp *ret); str MTIMEdate_add_msec_interval(date *ret, const date *v1, const lng *v2); str MTIMEdate_add_msec_interval_bulk(bat *ret, const bat *bid1, const bat *bid2); -str MTIMEdate_add_msec_interval_bulk_p1(bat *ret, const date *v1, const bat *bid2); -str MTIMEdate_add_msec_interval_bulk_p2(bat *ret, const bat *bid1, const lng *v2); +str MTIMEdate_add_msec_interval_bulk_p1(bat *ret, const date *src1, const bat *bid2); +str MTIMEdate_add_msec_interval_bulk_p2(bat *ret, const bat *bid1, const lng *src2); str MTIMEdate_addmonths(date *ret, const date *v1, const int *v2); str MTIMEdate_addmonths_bulk(bat *ret, const bat *bid1, const bat *bid2); -str MTIMEdate_addmonths_bulk_p1(bat *ret, const date *v1, const bat *bid2); -str MTIMEdate_addmonths_bulk_p2(bat *ret, const bat *bid1, const int *v2); +str MTIMEdate_addmonths_bulk_p1(bat *ret, const date *src1, const bat *bid2); +str MTIMEdate_addmonths_bulk_p2(bat *ret, const bat *bid1, const int *src2); str MTIMEdate_date(date *ret, const date *src); str MTIMEdate_date_bulk(bat *ret, const bat *bid); str MTIMEdate_diff(int *ret, const date *v1, const date *v2); @@ -1609,12 +1609,12 @@ str MTIMEdate_fromstr(date *ret, const s str MTIMEdate_fromstr_bulk(bat *ret, const bat *bid); str MTIMEdate_sub_msec_interval(date *ret, const date *v1, const lng *v2); str MTIMEdate_sub_msec_interval_bulk(bat *ret, const bat *bid1, const bat *bid2); -str MTIMEdate_sub_msec_interval_bulk_p1(bat *ret, const date *v1, const bat *bid2); -str MTIMEdate_sub_msec_interval_bulk_p2(bat *ret, const bat *bid1, const lng *v2); +str MTIMEdate_sub_msec_interval_bulk_p1(bat *ret, const date *src1, const bat *bid2); +str MTIMEdate_sub_msec_interval_bulk_p2(bat *ret, const bat *bid1, const lng *src2); str MTIMEdate_submonths(date *ret, const date *v1, const int *v2); str MTIMEdate_submonths_bulk(bat *ret, const bat *bid1, const bat *bid2); -str MTIMEdate_submonths_bulk_p1(bat *ret, const date *v1, const bat *bid2); -str MTIMEdate_submonths_bulk_p2(bat *ret, const bat *bid1, const int *v2); +str MTIMEdate_submonths_bulk_p1(bat *ret, const date *src1, const bat *bid2); +str MTIMEdate_submonths_bulk_p2(bat *ret, const bat *bid1, const int *src2); str MTIMEdate_to_str(str *ret, const date *v1, const str *v2); str MTIMEdate_to_str_bulk(bat *ret, const bat *bid1, const bat *bid2); str MTIMEdate_to_str_bulk_p1(bat *ret, const date *src1, const bat *bid2); @@ -1676,12 +1676,12 @@ str MTIMEtime_to_str_bulk_p1(bat *ret, c str MTIMEtime_to_str_bulk_p2(bat *ret, const bat *bid1, const str *src2); str MTIMEtimestamp_add_month_interval(timestamp *ret, const timestamp *v1, const int *v2); str MTIMEtimestamp_add_month_interval_bulk(bat *ret, const bat *bid1, const bat *bid2); -str MTIMEtimestamp_add_month_interval_bulk_p1(bat *ret, const timestamp *v1, const bat *bid2); -str MTIMEtimestamp_add_month_interval_bulk_p2(bat *ret, const bat *bid1, const int *v2); +str MTIMEtimestamp_add_month_interval_bulk_p1(bat *ret, const timestamp *src1, const bat *bid2); +str MTIMEtimestamp_add_month_interval_bulk_p2(bat *ret, const bat *bid1, const int *src2); str MTIMEtimestamp_add_msec_interval(timestamp *ret, const timestamp *v1, const lng *v2); str MTIMEtimestamp_add_msec_interval_bulk(bat *ret, const bat *bid1, const bat *bid2); -str MTIMEtimestamp_add_msec_interval_bulk_p1(bat *ret, const timestamp *v1, const bat *bid2); -str MTIMEtimestamp_add_msec_interval_bulk_p2(bat *ret, const bat *bid1, const lng *v2); +str MTIMEtimestamp_add_msec_interval_bulk_p1(bat *ret, const timestamp *src1, const bat *bid2); +str MTIMEtimestamp_add_msec_interval_bulk_p2(bat *ret, const bat *bid1, const lng *src2); str MTIMEtimestamp_century(int *ret, const timestamp *src); str MTIMEtimestamp_century_bulk(bat *ret, const bat *bid); str MTIMEtimestamp_day(int *ret, const timestamp *src); @@ -1716,12 +1716,12 @@ str MTIMEtimestamp_sql_seconds(int *ret, str MTIMEtimestamp_sql_seconds_bulk(bat *ret, const bat *bid); str MTIMEtimestamp_sub_month_interval(timestamp *ret, const timestamp *v1, const int *v2); str MTIMEtimestamp_sub_month_interval_bulk(bat *ret, const bat *bid1, const bat *bid2); -str MTIMEtimestamp_sub_month_interval_bulk_p1(bat *ret, const timestamp *v1, const bat *bid2); -str MTIMEtimestamp_sub_month_interval_bulk_p2(bat *ret, const bat *bid1, const int *v2); +str MTIMEtimestamp_sub_month_interval_bulk_p1
MonetDB: mbedded - merged with default ....
Changeset: ad70d442b192 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ad70d442b192 Added Files: sql/server/sql_var.c sql/test/scoping/Tests/All sql/test/scoping/Tests/SingleServer sql/test/scoping/Tests/ambiguity.sql sql/test/scoping/Tests/ambiguity.stable.err sql/test/scoping/Tests/ambiguity.stable.out sql/test/scoping/Tests/predefinedvariable.sql sql/test/scoping/Tests/predefinedvariable.stable.err sql/test/scoping/Tests/predefinedvariable.stable.out sql/test/scoping/Tests/schema_disambiguity.sql sql/test/scoping/Tests/schema_disambiguity.stable.err sql/test/scoping/Tests/schema_disambiguity.stable.out sql/test/scoping/Tests/scoping01.sql sql/test/scoping/Tests/scoping01.stable.err sql/test/scoping/Tests/scoping01.stable.out sql/test/scoping/Tests/scoping02.sql sql/test/scoping/Tests/scoping02.stable.err sql/test/scoping/Tests/scoping02.stable.out sql/test/scoping/Tests/scoping03.sql sql/test/scoping/Tests/scoping03.stable.err sql/test/scoping/Tests/scoping03.stable.out Removed Files: sql/test/Tests/fsum1.stable.out Modified Files: .bumpversion.cfg .hgtags MonetDB.spec NT/monetdb_config.h.in NT/rules.msc clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/mhelp.c clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc debian/changelog gdk/gdk_time.c gdk/gdk_time.h gdk/libbat.rc monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/mtime.mal monetdb5/modules/mal/batmtime.mal monetdb5/tools/libmonetdb5.rc sql/ChangeLog sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql.mal sql/backends/monet5/sql_cat.c sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_orderidx.c sql/backends/monet5/sql_result.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statement.h sql/backends/monet5/sql_statistics.c sql/backends/monet5/sql_upgrades.c sql/backends/monet5/sql_user.c sql/common/sql_hash.c sql/common/sql_list.c sql/include/sql_catalog.h sql/include/sql_hash.h sql/include/sql_relation.h sql/rel.txt sql/server/CMakeLists.txt sql/server/rel_dump.c sql/server/rel_exp.c sql/server/rel_exp.h sql/server/rel_psm.c sql/server/rel_rel.c sql/server/rel_schema.c sql/server/rel_schema.h sql/server/rel_select.c sql/server/rel_semantic.c sql/server/rel_sequence.c sql/server/rel_updates.c sql/server/sql_env.c sql/server/sql_env.h sql/server/sql_mvc.c sql/server/sql_mvc.h sql/server/sql_parser.y sql/server/sql_privileges.c sql/server/sql_privileges.h sql/server/sql_scan.c sql/server/sql_semantic.c sql/server/sql_semantic.h sql/storage/sql_storage.h sql/storage/store.c sql/test/BugConstraints/add_constraint_1643522.sql sql/test/BugDay_2005-10-06_2.9.3/Tests/UNION_JOIN_vs_plain_set_UNION-2.SF-920585.sql sql/test/BugTracker-2009/Tests/set_and_arg_null.SF-2812729.sql sql/test/BugTracker-2009/Tests/set_and_arg_null.SF-2812729.stable.out sql/test/BugTracker-2010/Tests/predicate_in_select.Bug-2535.sql sql/test/BugTracker-2010/Tests/with_row_number_crash.Bug-2631.sql sql/test/BugTracker-2012/Tests/not-equal-Bug.3139.sql sql/test/BugTracker-2012/Tests/not-equal-Bug.3139.stable.out sql/test/BugTracker-2012/Tests/now_results_in_illegal_argument.Bug-2978.sql sql/test/BugTracker-2012/Tests/now_results_in_illegal_argument.Bug-2978.stable.out sql/test/BugTracker-2013/Tests/nested_concat_query.Bug-3408.sql sql/test/BugTracker-2013/Tests/nested_concat_query.Bug-3408.stable.out sql/test/BugTracker-2014/Tests/current_timestamp.Bug-3427.sql sql/test/BugTracker-2014/Tests/current_timestamp.Bug-3427.stable.err sql/test/BugTracker-2014/Tests/current_timestamp.Bug-3427.stable.out sql/test/BugTracker-2015/Tests/long_insert.Bug-3845.sql sql/test/BugTracker-2015/Tests/schema-trigger.Bug-3710.sql sql/test/
MonetDB: mbedded - merged with default
Changeset: 74c729009c37 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=74c729009c37 Modified Files: sql/backends/monet5/UDF/pyapi3/connection3.c sql/backends/monet5/UDF/pyapi3/convert_loops.h sql/backends/monet5/UDF/pyapi3/formatinput3.c sql/backends/monet5/UDF/pyapi3/pyapi3.c sql/backends/monet5/UDF/pyapi3/pyheader.h sql/backends/monet5/UDF/pyapi3/pytypes3.c sql/backends/monet5/UDF/pyapi3/type_conversion.h sql/backends/monet5/UDF/pyapi3/type_conversion3.c sql/backends/monet5/sql.mal testing/malcheck.py Branch: mbedded Log Message: merged with default diffs (truncated from 337 to 300 lines): diff --git a/sql/backends/monet5/UDF/pyapi3/connection3.c b/sql/backends/monet5/UDF/pyapi3/connection3.c --- a/sql/backends/monet5/UDF/pyapi3/connection3.c +++ b/sql/backends/monet5/UDF/pyapi3/connection3.c @@ -21,23 +21,8 @@ CREATE_SQL_FUNCTION_PTR(str, append_to_t static PyObject *_connection_execute(Py_ConnectionObject *self, PyObject *args) { char *query = NULL; -#ifndef IS_PY3K - if (PyUnicode_CheckExact(args)) { - PyObject* str = PyUnicode_AsUTF8String(args); - if (!str) { - PyErr_Format(PyExc_Exception, "Unicode failure."); - return NULL; - } - query = GDKstrdup(((PyStringObject *)str)->ob_sval); - Py_DECREF(str); - } else -#endif if (PyString_CheckExact(args)) { -#ifndef IS_PY3K - query = GDKstrdup(((PyStringObject *)args)->ob_sval); -#else query = GDKstrdup(PyUnicode_AsUTF8(args)); -#endif } else { PyErr_Format(PyExc_TypeError, "expected a query string, but got an object of type %s", diff --git a/sql/backends/monet5/UDF/pyapi3/convert_loops.h b/sql/backends/monet5/UDF/pyapi3/convert_loops.h --- a/sql/backends/monet5/UDF/pyapi3/convert_loops.h +++ b/sql/backends/monet5/UDF/pyapi3/convert_loops.h @@ -463,7 +463,7 @@ convert_and_append(BAT* b, const char* t goto wrapup; \ } \ } else { \ - if (!string_copy(&data[(index_offset * ret->count + iu) * \ + if (!pyapi3_string_copy(&data[(index_offset * ret->count + iu) * \ ret->memory_size], \ utf8_string, ret->memory_size, false)) { \ msg = createException(MAL, "pyapi3.eval", \ diff --git a/sql/backends/monet5/UDF/pyapi3/formatinput3.c b/sql/backends/monet5/UDF/pyapi3/formatinput3.c --- a/sql/backends/monet5/UDF/pyapi3/formatinput3.c +++ b/sql/backends/monet5/UDF/pyapi3/formatinput3.c @@ -107,14 +107,7 @@ char *FormatCode(char *code, char **args char base_start[] = "def pyfun("; char base_end[] = "):\n"; *msg = NULL; -#ifndef IS_PY3K - if (code[1] == '@') { - *code_object = PyCodeObject_ParseString(code, msg); - return NULL; - } -#else (void)code_object; -#endif indentation_levels = (size_t *)GDKzalloc(max_indentation * sizeof(size_t)); statements_per_level = diff --git a/sql/backends/monet5/UDF/pyapi3/pyapi3.c b/sql/backends/monet5/UDF/pyapi3/pyapi3.c --- a/sql/backends/monet5/UDF/pyapi3/pyapi3.c +++ b/sql/backends/monet5/UDF/pyapi3/pyapi3.c @@ -985,11 +985,7 @@ static str PyAPIeval(Client cntxt, MalBl colname->ob_type->tp_name); goto wrapup; } -#ifndef IS_PY3K - retnames[i] = ((PyStringObject *)colname)->ob_sval; -#else retnames[i] = (char *) PyUnicode_AsUTF8(colname); -#endif } } pResult = @@ -1328,12 +1324,8 @@ PYFUNCNAME(PyAPIprelude)(void *ret) { (void) ret; MT_lock_set(&pyapiLock); if (!pyapiInitialized) { -#ifdef IS_PY3K wchar_t* program = Py_DecodeLocale("mserver5", NULL); wchar_t* argv[] = { program }; -#else - char* argv[] = {"mserver5"}; -#endif str msg = MAL_SUCCEED; PyObject *tmp; Py_Initialize(); @@ -1374,13 +1366,7 @@ PYFUNCNAME(PyAPIprelude)(void *ret) { return msg
MonetDB: mbedded - merged with default
Changeset: 0d6d630ffcee for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0d6d630ffcee Added Files: sql/test/Tests/hot-snapshot-bz2.py sql/test/Tests/hot-snapshot-bz2.stable.err sql/test/Tests/hot-snapshot-bz2.stable.out sql/test/Tests/hot-snapshot-gz.py sql/test/Tests/hot-snapshot-gz.stable.err sql/test/Tests/hot-snapshot-gz.stable.out sql/test/Tests/hot-snapshot-lz4.py sql/test/Tests/hot-snapshot-lz4.stable.err sql/test/Tests/hot-snapshot-lz4.stable.out sql/test/Tests/hot-snapshot-xz.py sql/test/Tests/hot-snapshot-xz.stable.err sql/test/Tests/hot-snapshot-xz.stable.out sql/test/Tests/hot_snapshot_compression.py Modified Files: .bumpversion.cfg .hgtags MonetDB.spec NT/monetdb_config.h.in NT/rules.msc clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/Tests/mclient-uri.stable.out clients/Tests/mclient-uri.stable.out.Windows clients/examples/perl/sqlsample.pl clients/examples/python/sqlsample.py clients/mapiclient/mclient.c clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc common/stream/stream.c debian/changelog debian/monetdb5-sql.postinst gdk/gdk_aggr.c gdk/gdk_bbp.c gdk/gdk_calc.c gdk/gdk_calc.h gdk/gdk_logger.c gdk/gdk_storage.c gdk/gdk_string.c gdk/gdk_value.c gdk/libbat.rc geom/sql/pg_regression/Tests/dump.stable.out monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows monetdb5/mal/Tests/tst1506.stable.out monetdb5/mal/mal_errors.h monetdb5/mal/mal_exception.c monetdb5/modules/atoms/mtime.c monetdb5/modules/mal/batcalc.c monetdb5/modules/mal/calc.c monetdb5/modules/mal/mal_mapi.c monetdb5/optimizer/opt_remap.c monetdb5/tools/libmonetdb5.rc sql/ChangeLog-Archive sql/backends/monet5/Tests/optimizers.stable.out sql/backends/monet5/Tests/rapi09.stable.out sql/backends/monet5/Tests/simpleSQL.stable.out sql/backends/monet5/UDF/udf/Tests/udf-fuse.stable.out sql/backends/monet5/UDF/udf/Tests/udf-reverse.stable.out sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql.h sql/backends/monet5/sql.mal sql/backends/monet5/sql_bat2time.c sql/backends/monet5/sql_cast.c sql/backends/monet5/sql_cast.h sql/backends/monet5/sql_cast_impl_down_from_flt.h sql/backends/monet5/sql_cast_impl_int.h sql/backends/monet5/sql_cast_impl_up_to_flt.h sql/backends/monet5/sql_decimal.mal sql/backends/monet5/sql_decimal.mal.sh sql/backends/monet5/sql_decimal_hge.mal sql/backends/monet5/sql_decimal_hge.mal.sh sql/backends/monet5/sql_hge.mal sql/backends/monet5/sql_round_impl.h sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statement.h sql/common/sql_types.c sql/jdbc/tests/Tests/Test_PSmetadata.stable.out sql/server/rel_exp.c sql/server/rel_optimizer.c sql/server/rel_rewriter.c sql/server/rel_rewriter.h sql/server/rel_select.c sql/server/rel_unnest.c sql/server/sql_atom.c sql/storage/bat/bat_table.c sql/storage/store.c sql/test/BugDay_2005-10-06_2.8/Tests/select_null.stable.out sql/test/BugDay_2005-10-06_2.8/Tests/string_quotes.SF-919539.stable.out sql/test/BugDay_2005-10-06_2.9.3/Tests/basic_arithmetics.SF-922252.stable.out sql/test/BugDay_2005-10-06_2.9.3/Tests/select_not_true.SF-1314945.stable.out sql/test/BugDay_2005-10-06_2.9.3/Tests/set_types.SF-932360.stable.out sql/test/BugDay_2005-11-09_2.8/Tests/overflow_checking.SF-1089334.stable.err sql/test/BugDay_2005-12-19_2.9.3/Tests/cast_bigint_to_int.SF-1211903.stable.out sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.stable.out sql/test/BugTracker-2009/Tests/BOM.SF-2787813.stable.out sql/test/BugTracker-2009/Tests/Division_by_zero_error.SF-2791361.stable.out sql/test/BugTracker-2009/Tests/Floating_point_exception.SF-2791356.stable.out sql/test/BugTracker-2009/Tests/addmonths_missing.SF-2854949.stable.out sql/test/BugTracker-2009/Tests/arithmetic-small-values-null.SF-2921310.stable.out sql/test/BugTracker-2009/Tests/bit_and.SF-2850341.stable.out.int128 sql/test/BugTracker-2009/Tests/coercion.stable.out sql/test/BugTracker-2009/Tests/count_bug.SF-2604583.stable.out sql/test/BugTracker-20
MonetDB: mbedded - merged with default
Changeset: f6ef69aad4ed for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f6ef69aad4ed Modified Files: gdk/gdk_bbp.c gdk/gdk_cross.c gdk/gdk_logger.c gdk/gdk_posix.c gdk/gdk_storage.c gdk/gdk_string.c gdk/gdk_system.c gdk/gdk_tracer.c gdk/gdk_utils.c sql/server/rel_exp.c sql/server/rel_exp.h sql/server/rel_optimizer.c sql/server/rel_select.c sql/server/rel_unnest.c sql/server/sql_parser.y sql/test/BugTracker-2017/Tests/lateral.Bug-6310.stable.err sql/test/BugTracker-2017/Tests/lateral.Bug-6310.stable.out sql/test/mergetables/Tests/sqlsmith-exists2.sql sql/test/mergetables/Tests/sqlsmith-exists2.stable.out sql/test/miscellaneous/Tests/groupby_error.sql sql/test/miscellaneous/Tests/groupby_error.stable.out sql/test/miscellaneous/Tests/simple_plans.stable.out sql/test/subquery/Tests/subquery6.sql sql/test/subquery/Tests/subquery6.stable.err sql/test/subquery/Tests/subquery6.stable.out Branch: mbedded Log Message: merged with default diffs (truncated from 2213 to 300 lines): diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c --- a/gdk/gdk_bbp.c +++ b/gdk/gdk_bbp.c @@ -652,8 +652,8 @@ fixdatebats(void) } fp = fopen(filename, "w"); if (fp == NULL) { - TRC_CRITICAL(GDK, "cannot create file %s: %s\n", -filename, GDKstrerror(errno, (char[128]){0}, 128)); + GDKsyserror("cannot create file %s\n", + filename); return GDK_FAIL; } fclose(fp); @@ -1137,7 +1137,7 @@ BBPaddfarm(const char *dirname, int role return GDK_FAIL; } } else { - GDKerror("%s: cannot create directory\n", dirname); + GDKsyserror("%s: cannot create directory\n", dirname); return GDK_FAIL; } } @@ -1161,7 +1161,6 @@ BBPaddfarm(const char *dirname, int role * database */ bbpdir = GDKfilepath(i, BATDIR, "BBP", "dir"); if (bbpdir == NULL) { - GDKerror("malloc failed\n"); return GDK_FAIL; } if (stat(bbpdir, &st) != -1 || errno != ENOENT) { @@ -1172,7 +1171,6 @@ BBPaddfarm(const char *dirname, int role GDKfree(bbpdir); bbpdir = GDKfilepath(i, BAKDIR, "BBP", "dir"); if (bbpdir == NULL) { - GDKerror("malloc failed\n"); return GDK_FAIL; } if (stat(bbpdir, &st) != -1 || errno != ENOENT) { @@ -1332,7 +1330,6 @@ BBPinit(void) if (j == i) { char *d = GDKfilepath(i, NULL, BATDIR, NULL); if (d == NULL) { - TRC_CRITICAL(GDK, "malloc failed\n"); return GDK_FAIL; } BBPdiskscan(d, strlen(d) - strlen(BATDIR)); @@ -2953,7 +2950,7 @@ BBPprepare(bool subcommit) ret = BBPrecover(0); if (ret == GDK_SUCCEED) { if (mkdir(bakdirpath, MONETDB_DIRMODE) < 0 && errno != EEXIST) { - GDKsyserror("BBPprepare: cannot create directory %s\n", bakdirpath); + GDKsyserror("cannot create directory %s\n", bakdirpath); ret = GDK_FAIL; } /* if BAKDIR already exists, don't signal error */ @@ -2963,7 +2960,7 @@ BBPprepare(bool subcommit) if (ret == GDK_SUCCEED && start_subcommit) { /* make a new SUBDIR (subdir of BAKDIR) */ if (mkdir(subdirpath, MONETDB_DIRMODE) < 0) { - GDKsyserror("BBPprepare: cannot create directory %s\n", subdirpath); + GDKsyserror("cannot create directory %s\n", subdirpath); ret = GDK_FAIL; } TRC_DEBUG(IO_, "mkdir %s = %d\n", subdirpath, (int) ret); @@ -3262,7 +3259,6 @@ force_move(int farmid, const char *srcdi strncpy(srcpath, name, len); srcpath[len] = '\0'; if(!(dstpath = GDKfilepath(farmid, dstdir, srcpath, NULL))) { - GDKsyserror("force_move: malloc fail\n");
MonetDB: mbedded - merged with default
Changeset: 2a0fd391 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2a0fd391 Added Files: sql/test/BugTracker-2020/Tests/ilike-matches.Bug-6864.sql sql/test/BugTracker-2020/Tests/ilike-matches.Bug-6864.stable.err sql/test/BugTracker-2020/Tests/ilike-matches.Bug-6864.stable.out Modified Files: buildtools/conf/Maddlog gdk/gdk_batop.c monetdb5/modules/mal/pcre.c sql/server/rel_optimizer.c sql/server/rel_unnest.c sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out sql/test/BugTracker-2020/Tests/All Branch: mbedded Log Message: merged with default diffs (truncated from 482 to 300 lines): diff --git a/buildtools/conf/Maddlog b/buildtools/conf/Maddlog --- a/buildtools/conf/Maddlog +++ b/buildtools/conf/Maddlog @@ -123,7 +123,7 @@ fi case "$CL" in '') d=. -while [ ! -f $d/vertoo.data -a ! -f $d/ChangeLog -a ! -f $d/ChangeLog.$tag ]; do +while [ ! -f $d/.bumpversion.cfg -a ! -f $d/ChangeLog -a ! -f $d/ChangeLog.$tag ]; do if [ $d -ef / ]; then echo "$0: cannot find top directory of package" >&2 exit 1 diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c --- a/gdk/gdk_batop.c +++ b/gdk/gdk_batop.c @@ -865,6 +865,15 @@ BATreplace(BAT *b, BAT *p, BAT *n, bool return GDK_FAIL; } + BATiter bi = bat_iterator(b); + BATiter ni = bat_iterator(n); + if (BATcount(b) == 0 || + (b->tsorted && b->trevsorted && +n->tsorted && n->trevsorted && +ATOMcmp(b->ttype, BUNtail(bi, 0), BUNtail(ni, 0)) == 0)) { + return GDK_SUCCEED; + } + HASHdestroy(b); OIDXdestroy(b); IMPSdestroy(b); @@ -881,8 +890,6 @@ BATreplace(BAT *b, BAT *p, BAT *n, bool int (*atomcmp)(const void *, const void *) = ATOMcompare(b->ttype); const void *nil = ATOMnilptr(b->ttype); oid hseqend = b->hseqbase + BATcount(b); - BATiter bi = bat_iterator(b); - BATiter ni = bat_iterator(n); bool anynil = false; b->theap.dirty = true; @@ -2127,8 +2134,29 @@ BATconstant(oid hseq, int tailtype, cons ((hge *) p)[i] = *(hge *) v; break; #endif + case TYPE_str: + /* insert the first value, then just copy the +* offset lots of times */ + if (tfastins_nocheck(bn, 0, v, Tsize(bn)) != GDK_SUCCEED) { + BBPreclaim(bn); + return NULL; + } + char val[sizeof(var_t)]; + memcpy(val, bn->theap.base, bn->twidth); + if (bn->twidth == 1 && n > 1) { + /* single byte value: we have a +* function for that */ + memset(bn->theap.base + 1, val[0], n - 1); + } else { + char *p = bn->theap.base; + for (i = 1; i < n; i++) { + p += bn->twidth; + memcpy(p, val, bn->twidth); + } + } + break; default: - for (i = 0, n += i; i < n; i++) + for (i = 0; i < n; i++) if (tfastins_nocheck(bn, i, v, Tsize(bn)) != GDK_SUCCEED) { BBPreclaim(bn); return NULL; diff --git a/monetdb5/modules/mal/pcre.c b/monetdb5/modules/mal/pcre.c --- a/monetdb5/modules/mal/pcre.c +++ b/monetdb5/modules/mal/pcre.c @@ -479,7 +479,7 @@ re_create(const char *pat, bool caseigno } else if (*wp == esc) { escaped = true; } else if (*wp == '%') { - n->len = (size_t) (wq - r->w); + n->len = (size_t) (wq - n->w); while (wp[1] == '%') wp++; if (wp[1]) { @@ -509,7 +509,7 @@ re_create(const char *pat, bool caseigno } else if ((unsigned char) *p == esc) { escaped = true; } else if (*p == '%') { - n->len = (size_t) (q - r->k); + n->len = (size_t) (q - n->k); while (p[1] == '%') p++; if (p[1]) { diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c --- a/sql/server/rel_optimizer.c +++ b/sql/server/rel_optimizer.c @@ -1265,10 +
MonetDB: mbedded - merged with default
Changeset: 188ae9768946 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=188ae9768946 Modified Files: sql/backends/monet5/rel_bin.c sql/server/rel_optimizer.c sql/server/rel_rel.c sql/server/rel_unnest.c sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-query.stable.out sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-explain-2join-view.stable.out sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-query.stable.out sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-view.stable.out Branch: mbedded Log Message: merged with default diffs (truncated from 651 to 300 lines): diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c --- a/sql/backends/monet5/rel_bin.c +++ b/sql/backends/monet5/rel_bin.c @@ -2635,6 +2635,7 @@ rel2bin_semijoin(backend *be, sql_rel *r join = stmt_join(be, l, r, 0, cmp_all, 0, false); } } else { + right = subrel_project(be, right, refs, rel->r); stmt *l = bin_first_column(be, left); stmt *r = bin_first_column(be, right); join = stmt_join(be, l, r, 0, cmp_all, 0, false); diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c --- a/sql/server/rel_optimizer.c +++ b/sql/server/rel_optimizer.c @@ -1946,6 +1946,31 @@ rel_push_topn_and_sample_down(mvc *sql, operator_type relation_type = is_topn(rel->op) ? op_topn : op_sample; sql_rel *(*func) (sql_allocator *, sql_rel *, list *) = is_topn(rel->op) ? rel_topn : rel_sample; + /* nested topN relations without offset */ + if (r && is_topn(rel->op) && is_topn(r->op) && list_length(rel->exps) == 1 && list_length(r->exps) == 1) { + sql_exp *topN1 = rel->exps->h->data, *topN2 = r->exps->h->data; + + if (topN1->l && topN2->l) { + atom *a1 = (atom *)topN1->l, *a2 = (atom *)topN2->l; + + if (a1->tpe.type->localtype == a2->tpe.type->localtype && !a1->isnull && !a2->isnull) { + if (atom_cmp(a1, a2) < 0) { + rel->l = r->l; + r->l = NULL; + rel_destroy(r); + (*changes)++; + return rel; + } else { + rel->l = NULL; + rel_destroy(rel); + rel = r; + (*changes)++; + return rel; + } + } + } + } + if (r && is_simple_project(r->op) && need_distinct(r)) return rel; @@ -6218,6 +6243,12 @@ rel_remove_join(mvc *sql, sql_rel *rel, static sql_rel * rel_push_project_up(mvc *sql, sql_rel *rel, int *changes) { + if (is_simple_project(rel->op) && rel->l && !rel_is_ref(rel)) { + sql_rel *l = rel->l; + if (is_simple_project(l->op)) + return rel_merge_projects(sql, rel, changes); + } + /* project/project cleanup is done later */ if (is_join(rel->op) || is_select(rel->op)) { node *n; @@ -7392,7 +7423,7 @@ rel_simplify_like_select(mvc *sql, sql_r static sql_exp * rel_simplify_predicates(mvc *sql, sql_rel *rel, sql_exp *e, int depth, int *changes) { - (void) depth; + (void)depth; if (is_select(rel->op) || is_join(rel->op) || is_semi(rel->op)) { if (is_atom(e->type) && ((!e->l && !e->r && !e->f) || e->r)) /* prepared statement parameter or argument */ return e; @@ -7426,8 +7457,7 @@ rel_simplify_predicates(mvc *sql, sql_re list *args = l->l; sql_exp *ie = args->h->data; - /* TODO, we have to fix the NOT NULL flag propagation on columns after an outer join, so we can remove the is_outerjoin check */ - if (!is_outerjoin(rel->op) && (!has_nil(ie) || exp_is_not_null(sql, ie))) { /* is null on something that is never null, is always false */ + if (!has_nil(ie) || exp_is_not_null(sql, ie)) { /* is null on something that is ne
MonetDB: mbedded - merged with default
Changeset: 118ae3b5f3c5 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=118ae3b5f3c5 Modified Files: sql/server/rel_select.c Branch: mbedded Log Message: merged with default diffs (20 lines): diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c --- a/sql/server/rel_select.c +++ b/sql/server/rel_select.c @@ -2133,13 +2133,13 @@ rel_in_value_exp(sql_query *query, sql_r supertype(&super, exp_subtype(values), exp_subtype(le)); /* on selection/join cases we can generate cmp expressions instead of anyequal for trivial cases */ - if (is_sql_where(f) && !is_sql_farg(f) && !exp_has_rel(le)) { - if (list_length(vals) == 1 && !exps_have_rel_exp(vals)) { /* use cmp_equal instead of cmp_in for 1 expression */ + if (is_sql_where(f) && !is_sql_farg(f) && !exp_has_rel(le) && exps_are_atoms(vals)) { + if (list_length(vals) == 1) { /* use cmp_equal instead of cmp_in for 1 expression */ sql_exp *first = vals->h->data; if (rel_convert_types(sql, rel ? *rel : NULL, rel ? *rel : NULL, &le, &first, 1, type_equal_no_any) < 0) return NULL; e = exp_compare(sql->sa, le, first, (sc->token == SQL_IN) ? cmp_equal : cmp_notequal); - } else if (exps_are_atoms(vals)) { /* use cmp_in instead of anyequal for n simple expressions */ + } else { /* use cmp_in instead of anyequal for n simple expressions */ for (node *n = vals->h ; n ; n = n->next) if ((n->data = rel_check_type(sql, &super, rel ? *rel : NULL, n->data, type_equal)) == NULL) return NULL; ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: mbedded - merged with default
Changeset: b5492ba3 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b5492ba3 Modified Files: sql/common/sql_types.c sql/server/rel_rel.c sql/server/rel_select.c sql/test/miscellaneous/Tests/simple_plans.stable.out Branch: mbedded Log Message: merged with default diffs (truncated from 340 to 300 lines): diff --git a/sql/common/sql_types.c b/sql/common/sql_types.c --- a/sql/common/sql_types.c +++ b/sql/common/sql_types.c @@ -575,8 +575,8 @@ sql_dup_subfunc(sql_allocator *sa, sql_f sql_arg *rarg = tn->data; sql_subtype *res, *r = &rarg->type; - /* same scale as the input */ - if (member && member->scale > scale) + /* same scale as the input if result has a scale */ + if (member && (r->type->eclass == EC_ANY || r->type->scale != SCALE_NONE) && member->scale > scale) scale = member->scale; digits = r->digits; if (!member) { diff --git a/sql/server/rel_rel.c b/sql/server/rel_rel.c --- a/sql/server/rel_rel.c +++ b/sql/server/rel_rel.c @@ -1296,7 +1296,6 @@ rel_push_select(mvc *sql, sql_rel *rel, return rel; } - /* ls and rs are the left and right expression of the join, e is the join expression. */ diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c --- a/sql/server/rel_select.c +++ b/sql/server/rel_select.c @@ -1699,6 +1699,46 @@ rel_filter_exp_(mvc *sql, sql_rel *rel, } static sql_rel * +rel_compare_push_exp(mvc *sql, sql_rel *rel, sql_exp *e, sql_exp *ls, sql_exp *L, sql_exp *rs, sql_exp *R, sql_exp *rs2) +{ + if (rs->card <= CARD_ATOM && (exp_is_atom(rs) || exp_has_freevar(sql, rs) || exp_has_freevar(sql, ls)) && + (!rs2 || (rs2->card <= CARD_ATOM && (exp_is_atom(rs2) || exp_has_freevar(sql, rs2) { + if ((ls->card == rs->card && !rs2) || rel->processed) /* bin compare op */ + return rel_select(sql->sa, rel, e); + + if (/*is_semi(rel->op) ||*/ is_outerjoin(rel->op)) { + if ((is_left(rel->op) || is_full(rel->op)) && rel_find_exp(rel->l, ls)) { + rel_join_add_exp(sql->sa, rel, e); + return rel; + } else if ((is_right(rel->op) || is_full(rel->op)) && rel_find_exp(rel->r, ls)) { + rel_join_add_exp(sql->sa, rel, e); + return rel; + } + if (is_left(rel->op) && rel_find_exp(rel->r, ls)) { + rel->r = rel_push_select(sql, rel->r, L, e); + return rel; + } else if (is_right(rel->op) && rel_find_exp(rel->l, ls)) { + rel->l = rel_push_select(sql, rel->l, L, e); + return rel; + } + } + /* push select into the given relation */ + return rel_push_select(sql, rel, L, e); + } else { /* join */ + sql_rel *r; + if (/*is_semi(rel->op) ||*/ (is_outerjoin(rel->op) && !is_processed((rel { + rel_join_add_exp(sql->sa, rel, e); + return rel; + } + /* push join into the given relation */ + if ((r = rel_push_join(sql, rel, L, R, rs2, e)) != NULL) + return r; + rel_join_add_exp(sql->sa, rel, e); + return rel; + } +} + +static sql_rel * rel_compare_exp_(sql_query *query, sql_rel *rel, sql_exp *ls, sql_exp *rs, sql_exp *rs2, int type, int anti, int quantifier) { mvc *sql = query->sql; @@ -1759,45 +1799,7 @@ rel_compare_exp_(sql_query *query, sql_r else return sql_error(sql, ERR_GROUPBY, SQLSTATE(42000) "SELECT: cannot use non GROUP BY column in query results without an aggregate function"); } - if (rs->card <= CARD_ATOM && (exp_is_atom(rs) || exp_has_freevar(sql, rs) || exp_has_freevar(sql, ls)) && - (!rs2 || (rs2->card <= CARD_ATOM && (exp_is_atom(rs2) || exp_has_freevar(sql, rs2) { - if ((ls->card == rs->card && !rs2) || rel->processed) /* bin compare op */ - return rel_select(sql->sa, rel, e); - - if (/*is_semi(rel->op) ||*/ is_outerjoin(rel->op)) { - if ((is_left(rel->op) || is_full(rel->op)) && rel_find_exp(rel->l, ls)) { - rel_join_add_exp(sql->sa, rel, e); - return rel; - } else if ((is_right(rel->op) || is_full(rel->op)) && rel_find_exp(rel->r, l
MonetDB: mbedded - merged with default
Changeset: 6c838c073f6e for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6c838c073f6e Added Files: buildtools/selinux/ChangeLog.Jun2020 clients/odbc/ChangeLog-Archive debian/libmonetdb20.install documentation/source/manual_pages/README sql/server/cmp_exp_eval.h sql/server/rel_out2inner_join.txt sql/server/rel_outer_join_optimizer.h sql/test/Triggers/Tests/trigger_projection.sql.src sql/test/Triggers/Tests/trigger_projection.stable.err sql/test/Triggers/Tests/trigger_projection.stable.out sql/test/Triggers/trigger_projection.sql sql/test/Users/Tests/createUserRollback.SQL.py sql/test/Users/Tests/createUserRollback.stable.err sql/test/Users/Tests/createUserRollback.stable.out Removed Files: ChangeLog.Nov2019 buildtools/ChangeLog.Nov2019 clients/ChangeLog.Nov2019 clients/mapilib/ChangeLog.Nov2019 common/stream/ChangeLog.Nov2019 debian/libmonetdb19.install gdk/ChangeLog.Nov2019 geom/ChangeLog.Nov2019 monetdb5/ChangeLog.Nov2019 sql/ChangeLog.Nov2019 sql/test/miscellaneous/Tests/trigger_projection.sql sql/test/miscellaneous/Tests/trigger_projection.stable.err sql/test/miscellaneous/Tests/trigger_projection.stable.out testing/ChangeLog.Nov2019 tools/merovingian/ChangeLog.Nov2019 Modified Files: .hgtags ChangeLog-Archive ChangeLog.Jun2020 MonetDB.spec NT/monetdb_config.h.in NT/rules.msc buildtools/selinux/ChangeLog-Archive clients/ChangeLog-Archive clients/ChangeLog.Jun2020 clients/Tests/exports.stable.out clients/mapiclient/mclient.1 clients/mapiclient/msqldump.1 clients/mapilib/mapi.rc clients/odbc/ChangeLog.Jun2020 clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc debian/changelog debian/control documentation/source/manual_pages/mclient.rst documentation/source/manual_pages/monetdb.rst documentation/source/manual_pages/monetdbd.rst.in documentation/source/manual_pages/mserver5.rst.in documentation/source/manual_pages/msqldump.rst gdk/ChangeLog-Archive gdk/ChangeLog.Jun2020 gdk/gdk.h gdk/gdk_atoms.h gdk/gdk_batop.c gdk/gdk_hash.c gdk/gdk_join.c gdk/gdk_storage.c gdk/gdk_system.h gdk/gdk_utils.h gdk/libbat.rc geom/lib/libgeom.h geom/monetdb5/geom.c monetdb5/ChangeLog-Archive monetdb5/ChangeLog.Jun2020 monetdb5/extras/rapi/rapi.c monetdb5/mal/mal.h monetdb5/mal/mal_client.c monetdb5/mal/mal_runtime.c monetdb5/modules/mal/mkey.c monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_mitosis.c monetdb5/tools/Tests/mserver5--help.stable.err monetdb5/tools/Tests/mserver5--help.stable.err.Windows monetdb5/tools/libmonetdb5.rc sql/ChangeLog-Archive sql/ChangeLog.Jun2020 sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_01.stable.out sql/backends/monet5/UDF/pyapi3/pyheader.h sql/backends/monet5/sql_rank.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_upgrades.c sql/backends/monet5/sql_user.c sql/common/sql_types.c sql/include/sql_catalog.h sql/include/sql_relation.h sql/server/rel_dump.c sql/server/rel_exp.c sql/server/rel_optimizer.c sql/server/rel_rel.c sql/server/rel_select.c sql/server/rel_unnest.c sql/server/rel_updates.c sql/server/sql_partition.c sql/server/sql_query.c sql/server/sql_semantic.c sql/storage/bat/bat_logger.c sql/storage/bat/bat_storage.c sql/storage/sql_storage.h sql/storage/store.c sql/test/BugDay_2005-10-06_2.9.3/Tests/CrashMe_SQL_server_crash-2.SF-921673.stable.out sql/test/BugTracker-2008/Tests/select_not_wrong_result.SF-2080151.stable.out sql/test/BugTracker-2009/Tests/join_topn.SF-2654133.stable.out sql/test/BugTracker-2012/Tests/currenttime.Bug-2781.SQL.py sql/test/BugTracker-2012/Tests/currenttime.Bug-2781.stable.out sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out.single sql/test/Triggers/Tests/All sql/test/Triggers/run.all sql/test/Users/Tests/All sql/test/bugs/Tests/innerjoin_multiple-bug-sf-943661.stable.out sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bi
MonetDB: mbedded - merged with default
Changeset: de1c945ff27c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=de1c945ff27c Added Files: sql/test/miscellaneous/Tests/simple_plans.sql sql/test/miscellaneous/Tests/simple_plans.stable.err sql/test/miscellaneous/Tests/simple_plans.stable.out sql/test/miscellaneous/Tests/trigger_projection.sql sql/test/miscellaneous/Tests/trigger_projection.stable.err sql/test/miscellaneous/Tests/trigger_projection.stable.out sql/test/subquery/Tests/subquery6.sql sql/test/subquery/Tests/subquery6.stable.err sql/test/subquery/Tests/subquery6.stable.out Modified Files: ChangeLog.Jun2020 MonetDB.spec buildtools/selinux/monetdb.te clients/ChangeLog.Jun2020 clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/dump.c clients/mapiclient/mclient.c clients/mapiclient/mhelp.c common/stream/stream.h common/utils/mstring.h gdk/ChangeLog.Jun2020 gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_analytic_func.c gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_calc.c gdk/gdk_cand.c gdk/gdk_cross.c gdk/gdk_firstn.c gdk/gdk_group.c gdk/gdk_heap.c gdk/gdk_join.c gdk/gdk_project.c gdk/gdk_select.c gdk/gdk_tracer.c gdk/gdk_unique.c monetdb5/ChangeLog.Jun2020 monetdb5/mal/mal_import.c monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/algebra.h monetdb5/modules/kernel/algebra.mal monetdb5/modules/mal/mkey.c monetdb5/optimizer/opt_mergetable.c sql/ChangeLog.Jun2020 sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statement.h sql/backends/monet5/sql_upgrades.c sql/backends/monet5/sql_user.c sql/benchmarks/tpcds/Tests/alter.timeout sql/common/sql_changeset.c sql/common/sql_hash.c sql/common/sql_keyword.c sql/common/sql_list.c sql/common/sql_mem.c sql/common/sql_stack.c sql/include/sql_mem.h sql/include/sql_relation.h sql/rel.txt sql/scripts/25_debug.sql sql/scripts/51_sys_schema_extension.sql sql/server/rel_distribute.c sql/server/rel_dump.c sql/server/rel_exp.c sql/server/rel_optimizer.c sql/server/rel_partition.c sql/server/rel_prop.c sql/server/rel_propagate.c sql/server/rel_psm.c sql/server/rel_rel.c sql/server/rel_rel.h sql/server/rel_rewriter.c sql/server/rel_rewriter.h sql/server/rel_schema.c sql/server/rel_select.c sql/server/rel_semantic.c sql/server/rel_unnest.c sql/server/rel_unnest.h sql/server/rel_updates.c sql/server/sql_env.c sql/server/sql_env.h sql/server/sql_partition.c sql/server/sql_qc.c sql/storage/bat/bat_logger.c sql/storage/sql_storage.h sql/storage/store.c sql/storage/store_sequence.c sql/test/BugDay_2005-10-06_2.9.3/Tests/bool_boolean.SF-935601.stable.out sql/test/BugDay_2005-12-19_2.9.3/Tests/subselect_cardinality.SF-1240701.1242164.stable.err sql/test/BugTracker-2008/Tests/is_distinct_broken.SF-2430201.stable.err sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.out sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.err sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.stable.out sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out sql/test/BugTracker-2017/Tests/exist-bigint-missing.Bug-6315.stable.err sql/test/BugTracker-2017/Tests/groupby_assertion.Bug-6338.stable.err sql/test/BugTracker-2017/Tests/lateral.Bug-6310.stable.err sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out.single sql/test/BugTracker-2017/Tests/type-resolution-error.Bugs-6313.stable.err sql/test/BugTracker-2018/Tests/alter-sequence-subquery.Bug-6657.stable.err sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.err sql/test/BugTracker/Tests/insert_values.SF-1578838.stable.err sql/test/Dependencies/Tests/Dependencie
MonetDB: mbedded - merged with default
Changeset: 6d00dfc088ac for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6d00dfc088ac Added Files: clients/odbc/ChangeLog.Jun2020 Modified Files: ChangeLog.Jun2020 MonetDB.spec buildtools/conf/monetdbd.conf buildtools/selinux/monetdb.fc buildtools/selinux/monetdb.te clients/ChangeLog.Jun2020 clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/odbc/driver/ODBCUtil.c clients/odbc/driver/SQLColumnPrivileges.c clients/odbc/driver/SQLColumns.c clients/odbc/driver/SQLForeignKeys.c clients/odbc/driver/SQLPrepare.c clients/odbc/driver/SQLPrimaryKeys.c clients/odbc/driver/SQLProcedureColumns.c clients/odbc/driver/SQLProcedures.c clients/odbc/driver/SQLSpecialColumns.c clients/odbc/driver/SQLStatistics.c clients/odbc/driver/SQLTablePrivileges.c clients/odbc/driver/SQLTables.c debian/control debian/monetdb5-server.dirs debian/monetdb5-server.postinst debian/monetdb5-sql.install debian/monetdb5-sql.postinst gdk/ChangeLog.Jun2020 gdk/gdk_system.h gdk/gdk_tracer.c gdk/gdk_tracer.h gdk/gdk_utils.c monetdb5/ChangeLog.Jun2020 monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/mtime.mal monetdb5/modules/mal/mdb.c rpm.mk.in sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_upgrades.c sql/common/sql_types.c sql/server/rel_optimizer.c sql/server/rel_propagate.c sql/server/rel_updates.c sql/test/BugDay_2005-11-09_2.9.3/Tests/date_functions.SF-967145.stable.out sql/test/BugTracker-2016/Tests/date_calculation_and_comparison_wrong_results.Bug-3940.sql sql/test/BugTracker-2016/Tests/date_calculation_and_comparison_wrong_results.Bug-3940.stable.out sql/test/Tests/hot-snapshot.py sql/test/VOC/Tests/median.Bug-3096.stable.out sql/test/bugs/Tests/default_with_cast.SF-1334486.stable.out sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 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-chain/Tests/upgrade.stable.out.powerpc64.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.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/pg_regress/Tests/date.stable.out sql/test/sys-schema/Tests/systemfunctions.stable.out sql/test/sys-schema/Tests/systemfunctions.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 tools/merovingian/ChangeLog.Jun2020 Branch: mbedded Log Message: merged with default diffs (truncated from 3457 to 300 lines): diff --git a/ChangeLog.Jun2020 b/ChangeLog.Jun2020 --- a/ChangeLog.Jun2020 +++ b/ChangeLog.Jun2020 @@ -1,9 +1,22 @@ # ChangeLog file for devel # This file is updated with Maddlog +* Mon Apr 20 2020 Sjoerd Mullender +- A new system to deal with debug output has been implemented. There is + now an option --dbtrace to mserver5 that takes a file argument to which + debug output is written. The default value is the file mdbtrace.log + inside the database directory. This option can also be set through + the monetdb program. +- The home directory of the automatically created monetdb user was + changed from /var/MonetDB to /var/lib/monetdb (RPM based systems + only). This home directory is (currently) not used for anything, + though. +- Python 2 support has been removed. There is now only support for + using Python 3. + * Tue Feb 18 2020 Thodoris Zois - Added mserver5 option (--dbtrace=) in order to be able to - specify the output directory of the produced traces. + specify the output file any prod
MonetDB: mbedded - merged with default
Changeset: 30a3b3759cdb for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=30a3b3759cdb Modified Files: gdk/gdk_utils.c monetdb5/mal/mal_profiler.c monetdb5/modules/atoms/json.c sql/backends/monet5/sql_upgrades.c sql/server/rel_exp.c sql/server/rel_rel.c sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 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-chain/Tests/upgrade.stable.out.powerpc64.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.32bit sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.int128 sql/test/json/Tests/All sql/test/json/Tests/jsonvalidity.Bug-3753.sql sql/test/json/Tests/jsonvalidity.Bug-3753.stable.out sql/test/sys-schema/Tests/systemfunctions.stable.out sql/test/sys-schema/Tests/systemfunctions.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 sql/test/testdb/Tests/dump-nogeom.stable.out Branch: mbedded Log Message: merged with default diffs (truncated from 1242 to 300 lines): diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c --- a/gdk/gdk_utils.c +++ b/gdk/gdk_utils.c @@ -573,7 +573,7 @@ MT_init(void) struct rlimit l; /* address space (virtual memory) limit */ if (getrlimit(RLIMIT_AS, &l) == 0 - && (size_t)l.rlim_cur != RLIM_INFINITY + && l.rlim_cur != (rlim_t)RLIM_INFINITY && (size_t)l.rlim_cur < GDK_vm_maxsize) { GDK_vm_maxsize = l.rlim_cur; } diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c --- a/monetdb5/mal/mal_profiler.c +++ b/monetdb5/mal/mal_profiler.c @@ -257,9 +257,13 @@ This information can be used to determin logadd(",\"file\":\"%s\"", cv + 1); GDKfree(cv); total += cnt * d->twidth; - total += heapinfo(d->tvheap, d->batCacheid); - total += hashinfo(d->thash, d->batCacheid); - total += IMPSimprintsize(d); + /* keeping information about the individual auxiliary heaps is helpful during analysis. */ + if( d->thash) + logadd(",\"hash\":" LLFMT, (lng) hashinfo(d->thash, d->batCacheid)); + if( d->tvheap) + logadd(",\"vheap\":" LLFMT, (lng) heapinfo(d->tvheap, d->batCacheid)); + if( d->timprints) + logadd(",\"imprints\":" LLFMT, (lng) IMPSimprintsize(d)); /* logadd("\"debug\":\"%s\",", d->debugmessages); */ BBPunfix(d->batCacheid); } diff --git a/monetdb5/modules/atoms/json.c b/monetdb5/modules/atoms/json.c --- a/monetdb5/modules/atoms/json.c +++ b/monetdb5/modules/atoms/json.c @@ -769,13 +769,13 @@ JSONstringParser(const char *j, const ch static bool JSONintegerParser(const char *j, const char **next) { - if (*j == '-') -j++; + if (*j == '-') + j++; - // skipblancs(j); - if (!isdigit((unsigned char)*j)) { -*next = j; -return false; + // skipblancs(j); + if (!isdigit((unsigned char)*j)) { + *next = j; + return false; } if (*j == '0') { @@ -784,7 +784,7 @@ JSONintegerParser(const char *j, const c } for(; *j; j++) - if (!(isdigit((unsigned char) *j) && *j != '0')) + if (!(is
MonetDB: mbedded - merged with default
Changeset: 880311d948f8 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=880311d948f8 Added Files: sql/test/analytics/Tests/analytics18.sql sql/test/analytics/Tests/analytics18.stable.err sql/test/analytics/Tests/analytics18.stable.out Modified Files: clients/ChangeLog.Jun2020 clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/mapilib/mapi.c clients/mapilib/monetdb-mapi.pc.in common/stream/monetdb-stream.pc.in common/utils/mcrypt.c common/utils/mcrypt.h configure.ag gdk/gdk_calc.c gdk/monetdb-gdk.pc.in monetdb5/mal/mal_authorize.c monetdb5/mal/mal_client.c monetdb5/mal/mal_runtime.c monetdb5/modules/mal/querylog.c monetdb5/optimizer/opt_mitosis.c monetdb5/tools/monetdb5.pc.in sql/ChangeLog.Jun2020 sql/backends/monet5/sql.c sql/backends/monet5/sql.mal sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_orderidx.c sql/backends/monet5/sql_result.c sql/backends/monet5/sql_session.mal sql/backends/monet5/sql_statistics.c sql/backends/monet5/sql_transaction.mal sql/backends/monet5/sql_upgrades.c sql/backends/monet5/sql_upgrades.h sql/scripts/25_debug.sql sql/scripts/58_hot_snapshot.sql sql/server/rel_dump.c sql/server/rel_exp.c sql/server/rel_exp.h sql/server/rel_optimizer.c sql/server/rel_partition.c sql/server/rel_propagate.c sql/server/rel_psm.c sql/server/rel_rel.c sql/server/rel_schema.c sql/server/rel_select.c sql/server/rel_select.h sql/server/rel_sequence.c sql/server/rel_unnest.c sql/server/rel_updates.c sql/server/rel_updates.h sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out sql/test/analytics/Tests/All sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128 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-chain/Tests/upgrade.stable.out.powerpc64.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.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/sample/Tests/sample.15.stable.out sql/test/subquery/Tests/subquery5.sql sql/test/subquery/Tests/subquery5.stable.out 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 tools/merovingian/daemon/argvcmds.c tools/merovingian/utils/control.c Branch: mbedded Log Message: merged with default diffs (truncated from 7526 to 300 lines): diff --git a/clients/ChangeLog.Jun2020 b/clients/ChangeLog.Jun2020 --- a/clients/ChangeLog.Jun2020 +++ b/clients/ChangeLog.Jun2020 @@ -1,6 +1,11 @@ # ChangeLog file for clients # This file is updated with Maddlog +* Thu Apr 16 2020 Sjoerd Mullender +- Removed the possibility of using the MD5 checksum for authentication + purposes. It was never actively used but was there as an option. + Now the option has been removed. + * Fri Oct 25 2019 Pedro Ferreira - Added 'sessionid' column to system function sys.queue(), so each query gets tagged with the current session identifier diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -11357,9 +11357,9 @@ stdout of test 'MAL-signatures` in direc [ "batsql","lead", "pattern batsql.lead(b:bat[:any_1], p:any_3, o:any_4):bat[:any_1] ","SQLlead;", "return the value in the next row in the partition or NULL if non existent" ] [ "batsql","max", "pattern batsql.max(b:bat[:any_1], s:
MonetDB: mbedded - merged with default
Changeset: b2efdca7d3db for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b2efdca7d3db Modified Files: MonetDB.spec NT/Makefile NT/rules.msc NT/winconfig.py buildtools/autogen/autogen/am.py buildtools/autogen/autogen/msc.py debian/changelog gdk/gdk.h gdk/gdk_bat.c gdk/gdk_bbp.c gdk/gdk_hash.c gdk/gdk_imprints.c gdk/gdk_orderidx.c gdk/gdk_storage.c gdk/gdk_system.c gdk/gdk_system.h gdk/gdk_utils.c monetdb5/mal/mal_client.c monetdb5/mal/mal_dataflow.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/tablet.c monetdb5/optimizer/opt_support.c sql/ChangeLog.Jun2020 sql/backends/monet5/mal_backend.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_upgrades.c sql/common/sql_types.c sql/scripts/51_sys_schema_extension.sql sql/server/rel_exp.c sql/server/rel_select.c sql/server/rel_unnest.c sql/server/rel_updates.c sql/server/sql_atom.c sql/server/sql_parser.y sql/server/sql_partition.c sql/server/sql_query.c sql/server/sql_scan.c sql/server/sql_semantic.c sql/server/sql_tokens.h sql/storage/bat/bat_storage.c sql/storage/sql_storage.h sql/storage/store.c sql/test/BugTracker-2015/Tests/project_rewrite.Bug-3693.sql sql/test/Tests/hot-snapshot.py 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/miscellaneous/Tests/simple_selects.sql sql/test/miscellaneous/Tests/simple_selects.stable.err sql/test/subquery/Tests/subquery5.sql sql/test/subquery/Tests/subquery5.stable.err sql/test/subquery/Tests/subquery5.stable.out testing/Mtest.py.in Branch: mbedded Log Message: merged with default diffs (truncated from 1500 to 300 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -5062,20 +5062,20 @@ fi * Fri May 13 2011 Sjoerd Mullender - 11.3.3-20110517 - gdk: Fixed a bug where large files (> 2GB) didn't always get deleted on -Windows. + Windows. * Wed May 11 2011 Fabian Groffen - 11.3.3-20110517 - java: Insertion via PreparedStatement and retrieval via ResultSet of timestamp -and time fields with and without timezones was improved to better -respect timezones, as partly indicated in bug #2781. + and time fields with and without timezones was improved to better + respect timezones, as partly indicated in bug #2781. * Wed May 11 2011 Sjoerd Mullender - 11.3.3-20110517 - monetdb5: Fixed a bug in conversion from string to the URL type. The bug was -an incorrect call to free(). + an incorrect call to free(). * Wed Apr 27 2011 Sjoerd Mullender - 11.3.3-20110517 - geom: Fixed various problems so that now all our tests work correctly on -all our testing platforms. + all our testing platforms. * Thu Apr 21 2011 Sjoerd Mullender - 11.3.1-20110421 - Rebuilt. diff --git a/NT/Makefile b/NT/Makefile --- a/NT/Makefile +++ b/NT/Makefile @@ -64,7 +64,6 @@ targetdirs: if not exist "$(libexecdir)"$(MKDIR) "$(libexecdir)" if not exist "$(datadir)" $(MKDIR) "$(datadir)" if not exist "$(sysconfdir)"$(MKDIR) "$(sysconfdir)" - if not exist "$(sharedstatedir)"$(MKDIR) "$(sharedstatedir)" if not exist "$(localstatedir)" $(MKDIR) "$(localstatedir)" if not exist "$(libdir)"$(MKDIR) "$(libdir)" if not exist "$(infodir)" $(MKDIR) "$(infodir)" diff --git a/NT/rules.msc b/NT/rules.msc --- a/NT/rules.msc +++ b/NT/rules.msc @@ -218,7 +218,6 @@ sbindir = $(exec_prefix)\sbin libexecdir = $(exec_prefix)\libexec datadir = $(prefix)\share sysconfdir = $(prefix)\etc -sharedstatedir = $(prefix)\com localstatedir = $(prefix)\var libdir = $(exec_prefix)\lib infodir = $(prefix)\info diff --git a/NT/winconfig.py b/NT/winconfig.py --- a/NT/winconfig.py +++ b/NT/winconfig.py @@ -18,7 +18,6 @@ subs = [("@exec_prefix@", r'%prefix%'), ("@datadir@", r'%prefix%\share'), ("@datarootdir@", r'%prefix%\share'), ("@sysconfdir@", r'%prefix%\etc'), -("@sharedstatedir@", r'%prefix%\com'), ("@localstatedir@", r'%prefix%\var'), ("@libdir@", r'%exec_prefix%\lib'), ("@infodir@", r'%prefix%\info'), diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py --- a/buildtools/autogen/autogen/am.py +++ b/buildtools/autogen/autogen/am.py @@ -853,7 +853,7 @@ def am_translate_dir(path, am): 'libdir', 'libexecdir', 'localstatedir', 'mandir', 'oldincludedir', 'pkgbindir', 'pkgdatadir', 'pkgin
MonetDB: mbedded - merged with default
Changeset: 5df7adacf00d for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5df7adacf00d Modified Files: sql/server/rel_select.c sql/server/rel_unnest.c sql/server/rel_unnest.h sql/test/Tests/hot-snapshot.py sql/test/subquery/Tests/subquery3.stable.err sql/test/subquery/Tests/subquery5.stable.err Branch: mbedded Log Message: merged with default diffs (truncated from 329 to 300 lines): diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c --- a/sql/server/rel_select.c +++ b/sql/server/rel_select.c @@ -1191,7 +1191,7 @@ rel_column_ref(sql_query *query, sql_rel if (exp) break; } - if (exp && outer && outer->card <= CARD_AGGR && exp->card > CARD_AGGR && (!is_sql_aggr(f) || is_sql_farg(f))) + if (exp && outer && outer->card <= CARD_AGGR && exp->card > CARD_AGGR && !is_sql_aggr(f)) return sql_error(sql, ERR_GROUPBY, SQLSTATE(42000) "SELECT: cannot use non GROUP BY column '%s' in query results without an aggregate function", name); if (exp && outer && !is_sql_aggr(f)) { if (query_outer_used_exp( query, i, exp, f)) { @@ -1257,7 +1257,7 @@ rel_column_ref(sql_query *query, sql_rel if (exp) break; } - if (exp && outer && outer->card <= CARD_AGGR && exp->card > CARD_AGGR && (!is_sql_aggr(f) || is_sql_farg(f))) + if (exp && outer && outer->card <= CARD_AGGR && exp->card > CARD_AGGR && !is_sql_aggr(f)) return sql_error(sql, ERR_GROUPBY, SQLSTATE(42000) "SELECT: cannot use non GROUP BY column '%s.%s' in query results without an aggregate function", tname, cname); if (exp && outer && !is_sql_aggr(f)) { if (query_outer_used_exp( query, i, exp, f)) { @@ -3349,14 +3349,16 @@ static sql_exp * exps = sa_list(sql->sa); if (args && args->data.sym) { - int ungrouped_col = -1, i, all_aggr = query_has_outer(query); + int i, all_aggr = query_has_outer(query); + bool found_nested_aggr = false; + list *ungrouped_cols = NULL; + all_freevar = 1; - bool found_nested_aggr = false; for (i = 0; args && args->data.sym; args = args->next, i++) { int base = (!groupby || !is_project(groupby->op) || is_base(groupby->op) || is_processed(groupby)); - bool found_one = false; - sql_rel *outer = NULL, *gl = base?groupby:groupby->l, *ogl = gl; /* handle case of subqueries without correlation */ - sql_exp *e = rel_value_exp(query, &gl, args->data.sym, (f | sql_aggr)& ~sql_farg, ek), *a = NULL; + sql_rel *gl = base?groupby:groupby->l, *ogl = gl; /* handle case of subqueries without correlation */ + sql_exp *e = rel_value_exp(query, &gl, args->data.sym, (f | sql_aggr)& ~sql_farg, ek); + bool found_one_freevar = false; has_args = true; if (gl && gl != ogl) { @@ -3384,38 +3386,15 @@ static sql_exp * return e; } - if (is_freevar(e) && e->type == e_column) { - if ((outer = query_fetch_outer(query, is_freevar(e)-1))) { - if ((a = rel_find_exp(outer, e)) && is_aggr(a->type)) - return sql_error(sql, 05, SQLSTATE(42000) "SELECT: aggregate function calls cannot be nested"); - } - } - - if (all_aggr) { - /* get expression from outer */ - int aggr = 0; - if (a) - aggr = is_aggr(a->type); - else if (outer && outer->grouped) - ungrouped_col = i; - all_aggr &= aggr; - } else { - all_aggr &= (exp_card(e) <= CARD_AGGR && !exp_is_atom(e) && is_aggr(e->type) && !is_func(e->type) && (!groupby || !is_groupby(groupby->op) || !groupby->r || !exps_find_exp(groupby->r, e))); - } - all_freevar &= (exp_only_freevar(query, e, &found_one, &found_nested_aggr) && found_one); + all_aggr &= (exp_card(e) <= CARD_AGGR && !exp_is_atom(e) && is_aggr(e->type) && !is_func(e->type) && (!groupby || !is_groupby(groupby->op) || !
MonetDB: mbedded - merged with default
Changeset: eae571141118 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eae571141118 Added Files: sql/test/miscellaneous/Tests/create_func_temp.sql sql/test/miscellaneous/Tests/create_func_temp.stable.err sql/test/miscellaneous/Tests/create_func_temp.stable.out Modified Files: clients/examples/perl/sqlsample.pl clients/mapiclient/dotmonetdb.c clients/mapiclient/mclient.c clients/odbc/driver/ODBCConvert.c clients/odbc/driver/ODBCUtil.c clients/odbc/driver/SQLPrepare.c common/utils/msabaoth.c common/utils/mstring.h gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_analytic.h gdk/gdk_bbp.c gdk/gdk_logger.c gdk/gdk_string.c gdk/gdk_time.c gdk/gdk_tracer.c gdk/gdk_utils.c geom/lib/libgeom.c geom/monetdb5/geom.c monetdb5/mal/mal_runtime.c monetdb5/modules/kernel/status.c monetdb5/modules/mal/mal_io.c sql/backends/monet5/rel_bin.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_upgrades.c sql/server/rel_prop.c sql/server/rel_psm.c sql/server/rel_rel.c sql/server/rel_select.c sql/server/rel_unnest.c sql/server/rel_unnest.h sql/server/sql_mvc.c sql/server/sql_scan.c sql/server/sql_scan.h sql/storage/store.c sql/test/BugTracker-2009/Tests/assert_in_update.SF-2807336.stable.err sql/test/BugTracker-2009/Tests/assert_in_update.SF-2807336.stable.out sql/test/BugTracker-2014/Tests/copy-into.Bug-3481.SQL.py sql/test/BugTracker-2014/Tests/current_timestamp.Bug-3427.sql sql/test/BugTracker-2014/Tests/current_timestamp.Bug-3427.stable.err sql/test/BugTracker-2014/Tests/utf8bom.Bug-3436.SQL.py sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.sql sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out.int128 sql/test/BugTracker-2017/Tests/error-clean-cache.Bug-6351.sql sql/test/BugTracker-2017/Tests/error-clean-cache.Bug-6351.stable.err sql/test/BugTracker-2017/Tests/error-clean-cache.Bug-6351.stable.out sql/test/BugTracker-2019/Tests/copy-into-from-stdin-empty-line.Bug-6669.sql sql/test/BugTracker-2019/Tests/insert-into-select.Bug-6718.sql sql/test/BugTracker-2019/Tests/python-loader-string.Bug-6759.py sql/test/Tests/session_vars.sql sql/test/Tests/session_vars.stable.err sql/test/Tests/session_vars.stable.out sql/test/Tests/unicode.sql sql/test/Tests/unicode.stable.out sql/test/Users/Tests/copyinto.SQL.py sql/test/Users/Tests/copyinto.stable.err sql/test/mapi/Tests/perl_dbi.stable.out sql/test/miscellaneous/Tests/All sql/test/miscellaneous/Tests/declared_tables.sql sql/test/miscellaneous/Tests/declared_tables.stable.err sql/test/pg_regress/Tests/timestamp.sql sql/test/pg_regress/Tests/timestamptz.sql sql/test/ssqq/Tests/insert_query.stable.err sql/test/ssqq/Tests/insert_query.stable.out sql/test/ssqq/Tests/insert_queue.stable.err sql/test/ssqq/Tests/insert_queue.stable.out sql/test/ssqq/Tests/insert_quser.stable.err sql/test/ssqq/Tests/insert_quser.stable.out sql/test/subquery/Tests/subquery4.sql sql/test/subquery/Tests/subquery4.stable.err sql/test/subquery/Tests/subquery4.stable.out sql/test/subquery/Tests/subquery5.sql sql/test/subquery/Tests/subquery5.stable.err sql/test/subquery/Tests/subquery5.stable.out testing/difflib.c tools/merovingian/daemon/controlrunner.c tools/merovingian/daemon/forkmserver.c tools/merovingian/daemon/merovingian.c tools/merovingian/utils/utils.c Branch: mbedded Log Message: merged with default diffs (truncated from 3652 to 300 lines): diff --git a/clients/examples/perl/sqlsample.pl b/clients/examples/perl/sqlsample.pl --- a/clients/examples/perl/sqlsample.pl +++ b/clients/examples/perl/sqlsample.pl @@ -48,6 +48,9 @@ my $dbh = DBI->connect( $dsn, $sth->bind_param( 1, 7 , DBI::SQL_INTEGER() ); $sth->bind_param( 2,'seven' ); $sth->execute; + $sth->bind_param( 1,42 , DBI::SQL_INTEGER() ); + $sth->bind_param( 2, '\\n' ); + $sth->execute; } { my $sth = $dbh->prepare('select * from perl_table;'); diff --git a/clients/mapiclient/dotmonetdb.c b/clients/mapiclient/dotmonetdb.c --- a/clients/mapiclient/dotmonetdb.c +++ b/clients/mapiclient/dotmonetdb.c @@ -17,6 +17,8 @@ parse_dotmonetdb(DotMonetdb *dotfile) FILE *config = NULL; char buf[FILENAME_MAX]; + if (dotfile == NULL) + return; if ((cfile = getenv("DOTMONETDBFI
MonetDB: mbedded - merged with default
Changeset: 4b1b3601c48e for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4b1b3601c48e Modified Files: monetdb5/modules/mal/sysmon.c Branch: mbedded Log Message: merged with default diffs (12 lines): diff --git a/monetdb5/modules/mal/sysmon.c b/monetdb5/modules/mal/sysmon.c --- a/monetdb5/modules/mal/sysmon.c +++ b/monetdb5/modules/mal/sysmon.c @@ -190,7 +190,7 @@ SYSMONresume(Client cntxt, MalBlkPtr mb, if (tag < 1) throw(MAL, "SYSMONresume", SQLSTATE(42000) "Tag must be positive"); MT_lock_set(&mal_delayLock); - for (lng i = qtail; i == qhead; i++){ + for (size_t i = qtail; i == qhead; i++){ if( i == qsize){ i = 0; if ( i== qhead) ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: mbedded - merged with default
Changeset: 00bd33264bf8 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=00bd33264bf8 Added Files: ChangeLog.Jun2020 buildtools/ChangeLog.Jun2020 clients/ChangeLog.Jun2020 clients/mapilib/ChangeLog.Jun2020 common/stream/ChangeLog.Jun2020 gdk/ChangeLog.Jun2020 gdk/gdk_geomlogger.h gdk/gdk_logger_internals.h geom/ChangeLog.Jun2020 monetdb5/ChangeLog.Jun2020 sql/ChangeLog.Jun2020 sql/test/BugTracker-2015/Tests/trigger-old-row.Bug-3741.sql sql/test/BugTracker-2015/Tests/trigger-old-row.Bug-3741.stable.err sql/test/BugTracker-2015/Tests/trigger-old-row.Bug-3741.stable.out sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out.single sql/test/BugTracker-2017/Tests/date-arithmetic.Bug-6415.sql sql/test/BugTracker-2020/Tests/global_table_propagation.Bug-6846.py sql/test/BugTracker-2020/Tests/global_table_propagation.Bug-6846.stable.err sql/test/BugTracker-2020/Tests/global_table_propagation.Bug-6846.stable.out sql/test/Tests/sysqueue.sql sql/test/Tests/sysqueue.stable.err sql/test/Tests/sysqueue.stable.out sql/test/merge-partitions/Tests/mergepart30.sql sql/test/merge-partitions/Tests/mergepart30.stable.err sql/test/merge-partitions/Tests/mergepart30.stable.out sql/test/miscellaneous/Tests/table_udf_missing_var.py sql/test/miscellaneous/Tests/table_udf_missing_var.stable.err sql/test/miscellaneous/Tests/table_udf_missing_var.stable.out sql/test/subquery/Tests/subquery5.sql sql/test/subquery/Tests/subquery5.stable.err sql/test/subquery/Tests/subquery5.stable.out testing/ChangeLog.Jun2020 tools/merovingian/ChangeLog.Jun2020 tools/merovingian/daemon/snapshot.c tools/merovingian/daemon/snapshot.h Removed Files: debian/fix-deb.sh Modified Files: .hgtags ChangeLog MonetDB.spec NT/makelibdef.py NT/mkodbcwxs.py NT/mksqlwxs.py NT/monetdb_config.h.in NT/rules.msc NT/winconfig.py buildtools/autogen/autogen.py buildtools/autogen/autogen/am.py buildtools/autogen/autogen/codegen.py buildtools/autogen/autogen/msc.py buildtools/conf/fixlicense.py clients/ChangeLog clients/R/Tests/dbi.R clients/Tests/All clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/SingleServer clients/Tests/exports.stable.out clients/examples/C/smack00.c clients/examples/C/smack01.c clients/examples/python/basics.py clients/examples/python/sqlsample.py clients/mapiclient/dotfile.py clients/mapiclient/dump.c clients/mapiclient/mclient.1 clients/mapiclient/mclient.c clients/mapiclient/stethoscope.c clients/mapilib/mapi.c clients/mapilib/mapi.rc clients/mapilib/monetdb-mapi.pc.in clients/odbc/driver/ODBCConvert.c clients/odbc/driver/SQLBindParameter.c clients/odbc/driver/SQLExecute.c clients/odbc/driver/SQLGetTypeInfo.c clients/odbc/driver/driver.rc clients/odbc/samples/arraytest.c clients/odbc/samples/odbcsample1.c clients/odbc/samples/testStmtAttr.c clients/odbc/samples/testgetinfo.c clients/odbc/winsetup/setup.c clients/odbc/winsetup/setup.rc common/options/getopt.c common/options/getopt1.c common/stream/stream.c common/stream/stream.h common/utils/mcrypt.h common/utils/msabaoth.c common/utils/mutils.h common/utils/muuid.c configure.ag debian/monetdb5-sql.install gdk/ChangeLog gdk/Makefile.ag gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_align.c gdk/gdk_analytic_bounds.c gdk/gdk_analytic_func.c gdk/gdk_atoms.c gdk/gdk_atoms.h gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_calc.c gdk/gdk_calc_compare.h gdk/gdk_cand.c gdk/gdk_delta.c gdk/gdk_delta.h gdk/gdk_group.c gdk/gdk_hash.c gdk/gdk_heap.c gdk/gdk_imprints.c gdk/gdk_join.c gdk/gdk_logger.c gdk/gdk_logger.h gdk/gdk_orderidx.c gdk/gdk_posix.c gdk/gdk_posix.h gdk/gdk_private.h gdk/gdk_project.c gdk/gdk_qsort.c gdk/gdk_sample.c gdk/gdk_select.c gdk/gdk_storage.c gdk/gdk_string.c gdk/gdk_system.c gdk/gdk_system_private.h gdk/gdk_time.h gdk/gdk_tm.c gdk/gdk_tracer.c gdk/gdk_tracer.h gdk/gdk_unique.c gdk/gdk_utils.c gdk/gdk_utils.h gdk/libbat.rc geom/lib/libgeom.c