Changeset: 83dd10f6ba56 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=83dd10f6ba56 Modified Files: clients/Tests/exports.stable.out java/example/XQueryLoad.java monetdb5/modules/mal/Tests/inspect05.stable.out monetdb5/modules/mal/Tests/inspect05.stable.out.Windows sql/backends/monet5/sql.mx sql/backends/monet5/sql_user.c sql/include/sql_catalog.h sql/include/sql_relation.h sql/jdbc/tests/Tests/Test_Dobjects.stable.out sql/jdbc/tests/Tests/Test_PSlargeamount.SQL.bat sql/jdbc/tests/Tests/Test_PSlargeamount.SQL.sh sql/jdbc/tests/Tests/Test_PSlargeamount.stable.err sql/jdbc/tests/Tests/Test_PSlargeamount.stable.out sql/jdbc/tests/Tests/Test_PSlargeamount.timeout sql/rel.txt sql/server/rel_dump.c sql/server/rel_exp.c sql/server/rel_exp.h sql/server/rel_schema.c sql/server/rel_select.c sql/server/rel_semantic.c sql/server/rel_subquery.c sql/server/rel_subquery.h sql/server/rel_updates.c sql/server/sql_mvc.c sql/server/sql_parser.y sql/server/sql_psm.c sql/server/sql_psm.h sql/server/sql_scan.c sql/server/sql_schema.c sql/server/sql_schema.h sql/server/sql_statement.c sql/server/sql_statement.h sql/storage/sql_storage.h sql/storage/store.c sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err.Solaris.src sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.FreeBSD sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out.FreeBSD sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err sql/test/Views/Tests/Views.stable.err sql/test/leaks/Tests/check0.stable.out sql/test/leaks/Tests/check1.stable.out sql/test/leaks/Tests/check2.stable.out sql/test/leaks/Tests/check3.stable.out sql/test/leaks/Tests/check4.stable.out sql/test/leaks/Tests/check5.stable.out sql/test/mapi/Tests/php_monetdb.stable.out Branch: sciql Log Message:
Merge with default branch. diffs (truncated from 21303 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -469,3 +469,5 @@ 6dbadba38a4635b6319f2ba966f5dde6efab037d 2373eb4ee98b690aa72b86bebf4b2b47c87aa77c Dec2011_5 6dbadba38a4635b6319f2ba966f5dde6efab037d Dec2011_release 32665cf67d03011ff1fcc2c8e118370c47e5fae6 Dec2011_release +d159bb1ba293002773b896353854b14aeb4e5cd1 Dec2011_7 +f47248f30989933b245a4d6f2e31a9e443f1078b Dec2011_SP1_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -27,7 +27,7 @@ Vendor: MonetDB BV <[email protected]> Group: Applications/Databases License: MPL - http://www.monetdb.org/Legal/MonetDBLicense URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Dec2011/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Dec2011-SP1/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -626,6 +626,52 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet rm -fr $RPM_BUILD_ROOT %changelog +* Fri Feb 24 2012 Fabian Groffen <[email protected]> - 11.7.7-20120224 +- Rebuilt. + +* Wed Feb 22 2012 Sjoerd Mullender <[email protected]> - 11.7.7-20120224 +- buildtools: Fixed some of the package names for Debian/Ubuntu. Packages for + libraries should contain the major number of the library version number. + This was not always the case. + +* Mon Feb 20 2012 Fabian Groffen <[email protected]> - 11.7.7-20120224 +- java: Fixed bug in DatabaseMetaData.getSchemas() method that caused an SQL + error when called with catalog and schema argument. + +* Fri Feb 17 2012 Fabian Groffen <[email protected]> - 11.7.7-20120224 +- merovingian: Fixed a bug in the multiplex-funnel where certain clients would abort + on responses for update queries. + +* Fri Feb 17 2012 Sjoerd Mullender <[email protected]> - 11.7.7-20120224 +- sql: Fixed a crash that happened at the end of a database upgrade to the + Dec2011 database scheme. The crash happened during cleanup after the + database was upgraded, so it was merely inconvenient. + +* Wed Feb 15 2012 Sjoerd Mullender <[email protected]> - 11.7.7-20120224 +- sql: Stripped off implementation-specific parts from error messages before + they get presented to the user. + +* Tue Feb 14 2012 Fabian Groffen <[email protected]> - 11.7.7-20120224 +- java: Resolved a bug where JDBC and Control connections could terminate + abruptly with 'Connection closed' messages + +* Thu Feb 9 2012 Sjoerd Mullender <[email protected]> - 11.7.7-20120224 +- monetdb5: Fixed potential crash by dealing better with non-standard types. + +* Tue Feb 7 2012 Sjoerd Mullender <[email protected]> - 11.7.7-20120224 +- buildtools: On Debian and Ubuntu, install Python modules in dist-packages instead + of site-packages. This fixed bug 2997. + +* Mon Jan 30 2012 Fabian Groffen <[email protected]> - 11.7.7-20120224 +- merovingian: Fixed problem where version and mserver properties for monetdbd were + not always successfully retrieved. Bug #2982. +- merovingian: Fixed problem where shutdown of monetdbd would lead to shutting down + database 'control' which does not exist. Bug #2983. +- merovingian: Fixed issue causing (harmless) 'error reading from control channel' + messages. Bug #2984. +- merovingian: Resolved problem where remote start/stop/etc. commands with monetdb + would report error 'OK'. Bug #2984. + * Fri Jan 20 2012 Sjoerd Mullender <[email protected]> - 11.7.5-20120120 - Rebuilt. diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in --- a/NT/monetdb_config.h.in +++ b/NT/monetdb_config.h.in @@ -590,9 +590,6 @@ /* Define to 1 if you have the <time.h> header file. */ #define HAVE_TIME_H 1 -/* Define to 1 if you have the timezone and daylight variables. */ -#define HAVE_TIMEZONE 1 - /* Define to 1 if you have the `trunc' function. */ /* #undef HAVE_TRUNC */ @@ -703,9 +700,6 @@ /* Define if you don't want to expand the bte type */ /* #undef NOEXPAND_BTE */ -/* Define if you don't want to expand the chr type */ -/* #undef NOEXPAND_CHR */ - /* Define if you don't want to expand the dbl type */ /* #undef NOEXPAND_DBL */ diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive --- a/buildtools/ChangeLog-Archive +++ b/buildtools/ChangeLog-Archive @@ -1,6 +1,15 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Wed Feb 22 2012 Sjoerd Mullender <[email protected]> - 11.7.7-20120224 +- Fixed some of the package names for Debian/Ubuntu. Packages for + libraries should contain the major number of the library version number. + This was not always the case. + +* Tue Feb 7 2012 Sjoerd Mullender <[email protected]> - 11.7.7-20120224 +- On Debian and Ubuntu, install Python modules in dist-packages instead + of site-packages. This fixed bug 2997. + * Sat Aug 6 2011 Sjoerd Mullender <[email protected]> - 11.5.1-20110907 - Fixed Fedora 15 (and presumably later) configuration that uses a tmpfs file system for /var/run. This fixes bug 2850. diff --git a/buildtools/ChangeLog.Dec2011 b/buildtools/ChangeLog.Dec2011 --- a/buildtools/ChangeLog.Dec2011 +++ b/buildtools/ChangeLog.Dec2011 @@ -1,7 +1,3 @@ # ChangeLog file for buildtools # This file is updated with Maddlog -* Tue Feb 7 2012 Sjoerd Mullender <[email protected]> -- On Debian and Ubuntu, install Python modules in dist-packages instead - of site-packages. This fixed bug 2997. - 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 @@ -5328,6 +5328,7 @@ str ZORDsql_slice_int(int *r, int *xb, i str ZORDsql_slice_int(int *r, int *xb, int *yb, int *xt, int *yt){ int slice_ret; void _initTrace(void); str activateCounter(str name); +str addOptimizerPipe(Client cntxt, MalBlkPtr mb, str name); str addPipeDefinition(str name, str pipe); str addRegWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pc); DCYcatalog *addRegist(str sch, str tab, str col, int acc, int part, int f_bun, int l_bun); @@ -5413,17 +5414,17 @@ int canBeJoinselectProp; str catalogRef; str catchKernelException(Client cntxt, str ret); str centipedeRef; -void chkDeclarations(MalBlkPtr mb); -void chkFlow(MalBlkPtr mb); -void chkInstruction(Module s, MalBlkPtr mb, InstrPtr p); -void chkProgram(Module s, MalBlkPtr mb); -void chkTypes(Module s, MalBlkPtr mb, int silent); +void chkDeclarations(stream *out, MalBlkPtr mb); +void chkFlow(stream *out, MalBlkPtr mb); +void chkInstruction(stream *out, Module s, MalBlkPtr mb, InstrPtr p); +void chkProgram(stream *out, Module s, MalBlkPtr mb); +void chkTypes(stream *out, Module s, MalBlkPtr mb, int silent); str cleanupProfiler(void); void clearStack(MalStkPtr s); void clearTrace(void); void clearVariable(MalBlkPtr mb, int varid); str clear_tableRef; -Symbol cloneFunction(Module scope, Symbol proc, MalBlkPtr mb, InstrPtr p); +Symbol cloneFunction(stream *out, Module scope, Symbol proc, MalBlkPtr mb, InstrPtr p); int cloneVariable(MalBlkPtr dst, MalBlkPtr src, int varid); int closeBox(str name, int flag); str closeProfilerStream(void); @@ -5509,7 +5510,6 @@ void dumpManualOverview(stream *f, Modul void dumpManualSection(stream *f, Module v); void dumpNamespaceStatistics(stream *f, int details); void dumpSearchTable(stream *f, str text); -InstrPtr dynamicTypeChecker(Module scope, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); void echoInput(Client cntxt); str escape_str(str *retval, str s); str evalFile(Client c, str fname, int listing); @@ -5522,7 +5522,7 @@ void expandMalBlk(MalBlkPtr mb, int line str expandRef; str exportOperationRef; int factoryHasFreeSpace(void); -int fcnBinder(Module scope, MalBlkPtr mb, InstrPtr p); +int fcnBinder(stream *out, Module scope, MalBlkPtr mb, InstrPtr p); str fcnDefinition(MalBlkPtr mb, InstrPtr p, str s, int flg, str base, size_t len); int fileProp; Box findBox(str name); @@ -5557,7 +5557,7 @@ str fstrcmp_impl(dbl *ret, str *string1, str function2str(MalBlkPtr mb, int flg); void garbageCollector(Client cntxt, MalBlkPtr mb, MalStkPtr stk, int flag); void garbageElement(Client cntxt, ValPtr v); -MALfcn getAddress(str filename, str modnme, str fcnname, int silent); +MALfcn getAddress(stream *out, str filename, str modnme, str fcnname, int silent); str getArgDefault(MalBlkPtr mb, InstrPtr p, int idx); ptr getArgReference(MalStkPtr stk, InstrPtr pci, int k); int getBarrierEnvelop(MalBlkPtr mb); @@ -5581,7 +5581,7 @@ MalBlkPtr getMalBlkHistory(MalBlkPtr mb, MalBlkPtr getMalBlkMarker(MalBlkPtr mb, str marker); str getName(str nme, size_t len); int getPC(MalBlkPtr mb, InstrPtr p); -str getPipeCatalog(int *nme, int *def); +str getPipeCatalog(int *nme, int *def, int *stat); str getPipeDefinition(str name); stream *getProfilerStream(void); str getRef; @@ -5659,6 +5659,7 @@ int isMapOp(InstrPtr q); int isMatJoinOp(InstrPtr q); int isModuleDefined(Module scope, str name); int isOptimizerEnabled(MalBlkPtr mb, str opt); +int isOptimizerPipe(str name); int isOrderby(InstrPtr q); int isPreloaded(str nme); int isProcedure(MalBlkPtr mb, InstrPtr p); @@ -5718,9 +5719,10 @@ int logger_exit_wrap(logger *L); int logger_find_bat_wrap(int *bid, logger *L, str nme); int logger_restart_wrap(logger *L); str lookupRef; +str mal2str(MalBlkPtr mb, int flg, int first, int last); malType malAnyBatType(malType t1, malType t2); int malAtomArray(int tpe, int idx); -void malAtomDefinition(str name, int tpe); +void malAtomDefinition(stream *out, str name, int tpe); int malAtomFixed(int size, int align, char *name); int malAtomProperty(MalBlkPtr mb, InstrPtr pci); int malAtomSize(int size, int align, char *name); @@ -5770,6 +5772,7 @@ aggrFun minAggr; str minRef; str min_no_nilRef; str mirrorRef; +str mitosisRef; str mkeyRef; str mmathRef; int mnstr_close_stream(Stream *S); @@ -6022,17 +6025,17 @@ void showAllScenarios(stream *f); void showAtoms(stream *fd); void showCurrentScenario(void); void showErrors(Client cntxt); -void showException(enum malexception, const char *, _In_z_ _Printf_format_string_ const char *, ...) __attribute__((__format__(__printf__, 3, 4))); +void showException(stream *out, enum malexception, const char *, _In_z_ _Printf_format_string_ const char *, ...) __attribute__((__format__(__printf__, 4, 5))); void showFlowGraph(MalBlkPtr mb, MalStkPtr stk, str fname); void showHelp(Module m, str txt, stream *fs); -void showMalBlkHistory(MalBlkPtr mb); +void showMalBlkHistory(stream *out, MalBlkPtr mb); void showModuleStatistics(stream *f, Module s); void showModules(stream *f, Module v); void showOptimizerHistory(void); void showOptimizerStep(str fnme, int i, int flg); void showScenario(stream *f, Scenario s); void showScenarioByName(stream *f, str s); -void showScriptException(MalBlkPtr, int, enum malexception, _In_z_ _Printf_format_string_ const char *, ...) __attribute__((__format__(__printf__, 4, 5))); +void showScriptException(stream *out, MalBlkPtr, int, enum malexception, _In_z_ _Printf_format_string_ const char *, ...) __attribute__((__format__(__printf__, 5, 6))); str shtFromintImpl(sht *res, int *val); str shtFromlngImpl(sht *res, lng *val); str shutdownFactory(Client cntxt, MalBlkPtr mb); @@ -6110,7 +6113,7 @@ void trimMalVariables(MalBlkPtr mb); void trimMalVariables_(MalBlkPtr mb, bit *used, MalStkPtr glb); int tubProp; str tuniqueRef; -void typeChecker(Module scope, MalBlkPtr mb, InstrPtr p, int silent); +void typeChecker(stream *out, Module scope, MalBlkPtr mb, InstrPtr p, int silent); int tzone_fromstr(str buf, int *len, tzone **d); int tzone_fromstr(str buf, int *len, tzone **d); tzone tzone_local; diff --git a/clients/mapiclient/mclient.1 b/clients/mapiclient/mclient.1 --- a/clients/mapiclient/mclient.1 +++ b/clients/mapiclient/mclient.1 @@ -368,5 +368,27 @@ Enable auto commit mode. .TP \fB\ea\fP Disable auto commit mode. +.SH EXAMPLES +Efficiently import data from a CSV (comma-separated values) file into +a table. The file must be readable by the server. $file is the +absolute path name of the file, $table is the name of the table, $db +is the name of the database. +.PP +mclient -d $db -s "COPY INTO $table FROM '$file' USING DELIMITERS ',','\e\en','\e"'" +.PP +Efficiently import data from a CSV file into a table when the file is +to be read by mclient (e.g. the server has no access to the file). +$file is the (absolute or relative) path name of the file, $table is +the name of the table, $db is the name of the database. +.PP +mclient -d $db -s "COPY INTO $table FROM STDIN USING DELIMITERS ',','\e\en','\e"'" - < $file +.PP +Note that in this latter case, if a count of records is supplied, it +should be at least as large as the number of records actually present +in the CSV file. This, because otherwise the remainder of the file +will be interpreted as SQL queries. +.PP +See http://www.monetdb.org/Documentation/Manuals/SQLreference/CopyInto +for more information about the COPY INTO query. .SH SEE ALSO .IR msqldump (1) diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c --- a/clients/mapiclient/mclient.c +++ b/clients/mapiclient/mclient.c @@ -1014,6 +1014,8 @@ SQLdebugRendering(MapiHdl hdl) mnstr_printf(toConsole, "%s\n", reply); if (strncmp(reply, "mdb>#EOD", 8) == 0) { cnt = 0; + while ((reply = fetch_line(hdl))) + mnstr_printf(toConsole, "%s\n", reply); break; } } @@ -1763,6 +1765,7 @@ doFile(Mapi mid, const char *file, int u enum hmyesno hassysfuncs = UNKNOWN; _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
