Changeset: 91be0ba1d902 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=91be0ba1d902
Modified Files:
        buildtools/conf/monetdbd.conf.in
        clients/Tests/exports.stable.out
        clients/examples/C/CMakeLists.txt
        clients/odbc/driver/ODBC.def
        clients/odbc/winsetup/setup.def
        common/stream/stream.c
        common/stream/stream.h
        common/stream/stream_internal.h
        common/utils/CMakeLists.txt
        documentation/conf.py
        monetdb5/optimizer/CMakeLists.txt
        monetdb5/optimizer/opt_pipes.c
        monetdb5/optimizer/opt_prelude.c
        monetdb5/optimizer/opt_prelude.h
        sql/backends/monet5/CMakeLists.txt
        sql/backends/monet5/sql.c
        sql/backends/monet5/sql.h
        sql/storage/bat/bat_storage.c
        sql/storage/sql_storage.h
        sql/storage/store.c
Branch: copybinary
Log Message:

Merge branch 'default' into 'copybinary'


diffs (truncated from 226200 to 300 lines):

diff --git a/.editorconfig b/.editorconfig
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,9 +1,11 @@
+root = true
+
 # Unix-style newlines with a newline ending every file
 [*]
 end_of_line = lf
 insert_final_newline = true
 
-[*.{c,h}]
+[*.{c,h}{,.in}]
 indent_style = tab
 tab_width = 4
 indent_size = tab
@@ -11,12 +13,13 @@ trim_trailing_whitespace = true
 charset = utf-8
 max_line_length = 120
 
-[*.py]
+[*.py{,.in}]
 indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
 charset = utf-8
 
-[gdk/*.{c,h}]
-tab_width = 8
-max_line_length = 72
+[{CMakeLists.txt,*.cmake}{,.in}]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md 
b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,34 @@
+---
+name: Bug report
+about: Create a report to help us improve the sytem 
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Create a setting with minimal input for an external user to demonstrate him 
the buggy behavior.
+This includes the relevant part of the database  schema description.
+Performance trace of the roque query (using the TRACE command)
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Software versions**
+ - MonetDB version number [a milestone label]
+ - OS and version: [e.g. Ubuntu 18.04]
+ - Installed from release package or self-installed and compiled
+
+
+**Issue labeling **
+Make liberal use of the labels to characterise the issue topics. e.g. identify 
severity, version, etc..
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md 
b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always 
frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features 
you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -781,3 +781,11 @@ bb157905ecb86908dcfb112d102a8c6152557b5d
 1e3bd8cd485a0880a7557aa5307e986a210a1e00 Jun2020_SP1_release
 bb157905ecb86908dcfb112d102a8c6152557b5d Jun2020_SP1_release
 94231c85384d893701beeeb69996f57c70fade4d Oct2020_root
+017e44827765fb819d31faefcdf9066dfe593f04 Oct2020_1
+017e44827765fb819d31faefcdf9066dfe593f04 Oct2020_release
+cb4b3f021774b60ffd84c3004d341ec04de736f3 Oct2020_3
+017e44827765fb819d31faefcdf9066dfe593f04 Oct2020_release
+cb4b3f021774b60ffd84c3004d341ec04de736f3 Oct2020_release
+bd91504a03736565fb2dff13cd4c94c738e81aa0 Oct2020_5
+cb4b3f021774b60ffd84c3004d341ec04de736f3 Oct2020_release
+bd91504a03736565fb2dff13cd4c94c738e81aa0 Oct2020_release
diff --git a/.readthedocs.yml b/.readthedocs.yml
new file mode 100644
--- /dev/null
+++ b/.readthedocs.yml
@@ -0,0 +1,14 @@
+# .readthedocs.yml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  configuration: documentation/conf.py
+
+# Optionally build your docs in additional formats such as PDF
+formats:
+  - pdf
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, 
body
+size, disability, ethnicity, sex characteristics, gender identity and 
expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an 
appointed
+representative at an online or offline event. Representation of a project may 
be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at i...@monetdb.org. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an 
incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], 
version 1.4,
+available at 
https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,19 +1,3 @@
 # ChangeLog file for devel
 # This file is updated with Maddlog
 
-* Mon Aug 10 2020 Ying Zhang <y.zh...@cwi.nl>
-- Finished a first version of the new monitoring function
-  user_statistics(), which is only intended for the DBAs.
-  For each database user who has logged in during the current mserver5
-  session, it returns
-  "username": login name of the database user,
-  "querycount": the number of queries this user has executed since his/her
-      first login,
-  "totalticks": the total execution time (in microsecond) of the queries ran
-      by this user,
-  "maxquery": the query with the longest execution time (if two queries have
-      the same execution time, the newer overwrites the older),
-  "maxticks": the execution time of the 'maxquery' (in microsecond),
-  "started": the start timestamp of the 'maxquery',
-  "finished": the finish timestamp of the 'maxquery'.
-
diff --git a/ChangeLog-Archive b/ChangeLog-Archive
--- a/ChangeLog-Archive
+++ b/ChangeLog-Archive
@@ -1,6 +1,30 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Mon Aug 10 2020 Ying Zhang <y.zh...@cwi.nl> - 11.39.1-20201006
+- Finished a first version of the new monitoring function
+  user_statistics(), which is only intended for the DBAs.
+  For each database user who has logged in during the current mserver5
+  session, it returns
+  "username": login name of the database user,
+  "querycount": the number of queries this user has executed since his/her
+      first login,
+  "totalticks": the total execution time (in microsecond) of the queries ran
+      by this user,
+  "maxquery": the query with the longest execution time (if two queries have
+      the same execution time, the newer overwrites the older),
+  "maxticks": the execution time of the 'maxquery' (in microsecond),
+  "started": the start timestamp of the 'maxquery',
+  "finished": the finish timestamp of the 'maxquery'.
+
+* Wed Jun 10 2020 Sjoerd Mullender <sjo...@acm.org> - 11.39.1-20201006
+- Removed support for LiDAR data, that is the SQL procedures
+  sys.lidarattach, sys.lidarload, and sys.lidarexport.
+
+* Thu Apr  2 2020 Martin Kersten <m...@cwi.nl> - 11.39.1-20201006
+- The sys.queue() has been turned into a circular buffer to allow for
+  inspection of both active, paused and recently executed queries.
+
 * Mon Apr 20 2020 Sjoerd Mullender <sjo...@acm.org> - 11.37.1-20200511
 - 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
diff --git a/ChangeLog.Jun2020 b/ChangeLog.Jun2020
deleted file mode 100644
--- a/ChangeLog.Jun2020
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for devel
-# This file is updated with Maddlog
-
diff --git a/ChangeLog.Oct2020 b/ChangeLog.Oct2020
--- a/ChangeLog.Oct2020
+++ b/ChangeLog.Oct2020
@@ -1,11 +1,3 @@
 # ChangeLog file for devel
 # This file is updated with Maddlog
 
-* Wed Jun 10 2020 Sjoerd Mullender <sjo...@acm.org>
-- Removed support for LiDAR data, that is the SQL procedures
-  sys.lidarattach, sys.lidarload, and sys.lidarexport.
-
-* Thu Apr  2 2020 Martin Kersten <m...@cwi.nl>
-- The sys.queue() has been turned into a circular buffer to allow for
-  inspection of both active, paused and recently executed queries.
-
diff --git a/Config.cmake.in b/Config.cmake.in
--- a/Config.cmake.in
+++ b/Config.cmake.in
@@ -12,6 +12,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/monet
 include("${CMAKE_CURRENT_LIST_DIR}/streamTargets.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/mapiTargets.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/matomicTargets.cmake")
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to