Changeset: c2242d708092 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/c2242d708092 Modified Files: cmake/monetdb-defines.cmake cmake/monetdb-findpackages.cmake cmake/monetdb-functions.cmake cmake/monetdb-options.cmake common/stream/CMakeLists.txt common/stream/socket_stream.c monetdb_config.h.in Branch: smapi Log Message:
Merge with default diffs (truncated from 11955 to 300 lines): diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,6 @@ #[[ +# SPDX-License-Identifier: MPL-2.0 +# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/Config.cmake.in b/Config.cmake.in --- a/Config.cmake.in +++ b/Config.cmake.in @@ -1,4 +1,6 @@ #[[ +# SPDX-License-Identifier: MPL-2.0 +# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: MPL-2.0 +# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -84,7 +86,7 @@ Summary: MonetDB - Monet Database Manage Vendor: MonetDB BV <i...@monetdb.org> Group: Applications/Databases -License: MPLv2.0 +License: MPL-2.0 URL: https://www.monetdb.org/ BugURL: https://bugs.monetdb.org/ Source: https://www.monetdb.org/downloads/sources/Sep2022-SP1/%{name}-%{version}.tar.bz2 diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py --- a/NT/mkodbcwxs.py +++ b/NT/mkodbcwxs.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: MPL-2.0 +# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py --- a/NT/mksqlwxs.py +++ b/NT/mksqlwxs.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: MPL-2.0 +# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/README.rst b/README.rst --- a/README.rst +++ b/README.rst @@ -141,6 +141,8 @@ Please note that we do not accept github Copyright Notice ================ +SPDX-License-Identifier: MPL-2.0 + This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/buildtools/CMakeLists.txt b/buildtools/CMakeLists.txt --- a/buildtools/CMakeLists.txt +++ b/buildtools/CMakeLists.txt @@ -1,4 +1,6 @@ #[[ +# SPDX-License-Identifier: MPL-2.0 +# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/buildtools/conf/CMakeLists.txt b/buildtools/conf/CMakeLists.txt --- a/buildtools/conf/CMakeLists.txt +++ b/buildtools/conf/CMakeLists.txt @@ -1,4 +1,6 @@ #[[ +# SPDX-License-Identifier: MPL-2.0 +# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/buildtools/conf/Maddlog b/buildtools/conf/Maddlog --- a/buildtools/conf/Maddlog +++ b/buildtools/conf/Maddlog @@ -1,6 +1,8 @@ #!/usr/bin/env bash # -*-shell-script-*- +# SPDX-License-Identifier: MPL-2.0 +# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/buildtools/conf/website.html b/buildtools/conf/website.html --- a/buildtools/conf/website.html +++ b/buildtools/conf/website.html @@ -1,4 +1,6 @@ <!-- +SPDX-License-Identifier: MPL-2.0 + This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/buildtools/coverity_model.c b/buildtools/coverity_model.c --- a/buildtools/coverity_model.c +++ b/buildtools/coverity_model.c @@ -1,4 +1,6 @@ /* + * SPDX-License-Identifier: MPL-2.0 + * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt --- a/clients/CMakeLists.txt +++ b/clients/CMakeLists.txt @@ -1,4 +1,6 @@ #[[ +# SPDX-License-Identifier: MPL-2.0 +# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/clients/NT/CMakeLists.txt b/clients/NT/CMakeLists.txt --- a/clients/NT/CMakeLists.txt +++ b/clients/NT/CMakeLists.txt @@ -1,4 +1,6 @@ #[[ +# SPDX-License-Identifier: MPL-2.0 +# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/clients/NT/mclient.bat b/clients/NT/mclient.bat --- a/clients/NT/mclient.bat +++ b/clients/NT/mclient.bat @@ -1,3 +1,5 @@ +@REM SPDX-License-Identifier: MPL-2.0 +@REM @REM This Source Code Form is subject to the terms of the Mozilla Public @REM License, v. 2.0. If a copy of the MPL was not distributed with this @REM file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/clients/NT/msqldump.bat b/clients/NT/msqldump.bat --- a/clients/NT/msqldump.bat +++ b/clients/NT/msqldump.bat @@ -1,3 +1,5 @@ +@REM SPDX-License-Identifier: MPL-2.0 +@REM @REM This Source Code Form is subject to the terms of the Mozilla Public @REM License, v. 2.0. If a copy of the MPL was not distributed with this @REM file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/clients/Tests/MAL-signatures-hge.test b/clients/Tests/MAL-signatures-hge.test --- a/clients/Tests/MAL-signatures-hge.test +++ b/clients/Tests/MAL-signatures-hge.test @@ -44832,7 +44832,7 @@ geom Length command geom.Length(X_0:wkb):dbl wkbLength; -Returns the cartesian 2D length of the geometry if it is a linestrin or multilinestring +Returns the cartesian 2D length of the geometry if it is a linestring or multilinestring geom LineFromText command geom.LineFromText(X_0:str):wkb diff --git a/clients/Tests/MAL-signatures.test b/clients/Tests/MAL-signatures.test --- a/clients/Tests/MAL-signatures.test +++ b/clients/Tests/MAL-signatures.test @@ -33282,7 +33282,7 @@ geom Length command geom.Length(X_0:wkb):dbl wkbLength; -Returns the cartesian 2D length of the geometry if it is a linestrin or multilinestring +Returns the cartesian 2D length of the geometry if it is a linestring or multilinestring geom LineFromText command geom.LineFromText(X_0:str):wkb 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 @@ -736,7 +736,6 @@ str AUTHinitTables(void); str AUTHrequireAdmin(Client c); str AUTHunlockVault(const char *password); str AUTHverifyPassword(const char *passwd); -str BATinfo(BAT **key, BAT **val, const bat bid); str BKCmirror(bat *ret, const bat *bid); str BKCnewBAT(bat *res, const int *tt, const BUN *cap, role_t role); str BKCreuseBAT(bat *ret, const bat *bid, const bat *did); @@ -750,8 +749,6 @@ str COPYrejects_clear(Client cntxt, MalB str GRPgroup1(bat *ngid, bat *next, bat *nhis, const bat *bid); str GRPsubgroup5(bat *ngid, bat *next, bat *nhis, const bat *bid, const bat *sid, const bat *gid, const bat *eid, const bat *hid); int MAL_MAXCLIENTS; -int MALadmission_claim(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, lng argclaim); -void MALadmission_release(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, lng argclaim); str MALcallback(Client c, str msg); int MALcommentsOnly(MalBlkPtr mb); lng MALdebug; @@ -773,7 +770,6 @@ int MCpushClientInput(Client c, bstream void MCstopClients(Client c); str MCsuspendClient(int id); int MCvalid(Client c); -void MPresetProfiler(stream *fdout); char *MSP_locate_sqlscript(const char *mod_name, bit recurse); str MSinitClientPrg(Client cntxt, const char *mod, const char *nme); void MSresetInstructions(MalBlkPtr mb, int start); @@ -789,7 +785,6 @@ str QLOGempty(void *ret); str QLOGenable(void *ret); str QLOGenableThreshold(void *ret, int *threshold); int QLOGisset(void); -QueryQueue QRYqueue; str RMTdisconnect(void *ret, str *conn); BUN SQLload_file(Client cntxt, Tablet *as, bstream *b, stream *out, const char *csep, const char *rsep, char quote, lng skip, lng maxrow, int best, bool from_stdin, const char *tabnam, bool escape); str TABLETcollect(BAT **bats, Tablet *as); @@ -799,7 +794,6 @@ void TABLETdestroy_format(Tablet *as); int TABLEToutput_file(Tablet *as, BAT *order, stream *s); int TRACEtable(Client cntxt, BAT **r); int TYPE_xml; -UserStats USRstats; InstrPtr addArgument(MalBlkPtr mb, InstrPtr p, int varid); void addMalException(MalBlkPtr mb, str msg); str addOptimizerPipe(Client cntxt, MalBlkPtr mb, const char *name); @@ -853,12 +847,10 @@ int chkInstruction(Module s, MalBlkPtr m str chkProgram(Module s, MalBlkPtr mb); str chkTypes(Module s, MalBlkPtr mb, int silent); const char *claimRef; -str cleanupTraces(Client cntxt); void clearTrace(Client cntxt); void clearVariable(MalBlkPtr mb, int varid); const char *clear_tableRef; int cloneVariable(MalBlkPtr dst, MalBlkPtr src, int varid); -str closeProfilerStream(Client cntxt); void clrDeclarations(MalBlkPtr mb); void clrFunction(InstrPtr p); void clrInstruction(InstrPtr p); @@ -892,7 +884,6 @@ const char *crossRef; const char *cume_distRef; const char *dataflowRef; const char *dblRef; -str deblockdataflow(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); void debugFunction(stream *fd, MalBlkPtr mb, MalStkPtr stk, int flg, int first, int size); const char *decompressRef; int defConstant(MalBlkPtr mb, int type, ValPtr cst); @@ -962,16 +953,12 @@ MALfcn getAddress(const char *modname, c str getArgDefault(MalBlkPtr mb, InstrPtr p, int idx); ptr getArgReference(MalStkPtr stk, InstrPtr pci, int k); int getAtomIndex(const char *nme, size_t len, int deftpe); -lng getBatSpace(BAT *b); int getBitConstant(MalBlkPtr mb, bit val); int getBlockBegin(MalBlkPtr mb, int pc); int getBlockExit(MalBlkPtr mb, int pc); int getBteConstant(MalBlkPtr mb, bte val); Client getClientContext(void); int getDblConstant(MalBlkPtr mb, dbl val); -lng getDiskReads(void); -lng getDiskSpace(void); -lng getDiskWrites(void); str getExceptionMessage(const char *); str getExceptionMessageAndState(const char *); str getExceptionPlace(const char *); @@ -984,7 +971,6 @@ int getIntConstant(MalBlkPtr mb, int val int getLngConstant(MalBlkPtr mb, lng val); MalBlkPtr getMalBlkHistory(MalBlkPtr mb, int idx); MalBlkPtr getMalBlkOptimized(MalBlkPtr mb, const char *name); -lng getMemoryClaim(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, int i, int flag); Module getModule(const char *nme); void getModuleList(Module **out, int *length); BAT *getModules(void); @@ -994,20 +980,14 @@ int getOidConstant(MalBlkPtr mb, oid val int getPC(MalBlkPtr mb, InstrPtr p); str getPipeCatalog(bat *nme, bat *def, bat *stat); const char *getRef; -str getScenarioLanguage(Client c); int getShtConstant(MalBlkPtr mb, sht val); int getStrConstant(MalBlkPtr mb, str val); -lng getSystemTime(void); -BAT *getTrace(Client cntxt, const char *nme); const char *getTraceRef; malType getType(MalBlkPtr mb, const char *nme); str getTypeIdentifier(malType tpe); str getTypeName(malType tpe); -lng getUserTime(void); char *getVarName(MalBlkPtr mb, int idx); const char *getVariableRef; -lng getVolume(MalStkPtr stk, InstrPtr pci, int rd); -int getprofilerlimit(void); Module globalModule(const char *nme); const char *grantRef; const char *grant_functionRef; @@ -1021,10 +1001,7 @@ const char *hgeRef; const char *identityRef; const char *ifthenelseRef; const char *importColumnRef; -void initHeartbeat(void); void initNamespace(void); -void initParser(void); _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
