From 5bb474d048bc6bfff2dc23dc46ed90bfb2245adf Mon Sep 17 00:00:00 2001 From: Chris Turner Date: Fri, 22 Jan 2021 10:44:52 -0600 Subject: [PATCH 1/3] add docs-parts/computation/06-distributed-computing_kill_order_by.rst (#804) --- .../06-distributed-computing_jobs_by_key.rst | 21 +++++++++++++++++++ ...06-distributed-computing_kill_order_by.rst | 2 +- .../06-distributed-computing_lang2.rst | 2 +- .../06-distributed-computing_lang3.rst | 2 +- .../06-distributed-computing_lang4.rst | 2 +- .../06-distributed-computing_lang5.rst | 2 +- 6 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 docs-parts/computation/06-distributed-computing_jobs_by_key.rst diff --git a/docs-parts/computation/06-distributed-computing_jobs_by_key.rst b/docs-parts/computation/06-distributed-computing_jobs_by_key.rst new file mode 100644 index 000000000..50599ed89 --- /dev/null +++ b/docs-parts/computation/06-distributed-computing_jobs_by_key.rst @@ -0,0 +1,21 @@ + +This can be done by using `dj.hash.key_hash` to convert the key as follows: + +.. code-block:: python + + In [4]: schema.jobs & {'key_hash' : dj.hash.key_hash({'id': 2})} + Out[4]: + *table_name *key_hash status key error_message error_stac user host pid connection_id timestamp + +------------+ +------------+ +--------+ +--------+ +------------+ +--------+ +------------+ +-------+ +--------+ +------------+ +------------+ + __job_results c81e728d9d4c2f error =BLOB= KeyboardInterr =BLOB= datajoint@localhost localhost 15571 59 2017-09-04 14: + (Total: 1) + + In [5]: (schema.jobs & {'key_hash' : dj.hash.key_hash({'id': 2})}).delete() + + In [6]: schema.jobs & {'key_hash' : dj.hash.key_hash({'id': 2})} + Out[6]: + *table_name *key_hash status key error_message error_stac user host pid connection_id timestamp + +------------+ +----------+ +--------+ +--------+ +------------+ +--------+ +------+ +------+ +-----+ +------------+ +-----------+ + + (Total: 0) + diff --git a/docs-parts/computation/06-distributed-computing_kill_order_by.rst b/docs-parts/computation/06-distributed-computing_kill_order_by.rst index 9830b70ed..585f309fc 100644 --- a/docs-parts/computation/06-distributed-computing_kill_order_by.rst +++ b/docs-parts/computation/06-distributed-computing_kill_order_by.rst @@ -1,7 +1,7 @@ For example, to sort the output by hostname in descending order: -.. code-block:: text +.. code-block:: python In [3]: dj.kill(None, None, 'host desc') Out[3]: diff --git a/docs-parts/computation/06-distributed-computing_lang2.rst b/docs-parts/computation/06-distributed-computing_lang2.rst index d3a3338e1..2df361bf8 100644 --- a/docs-parts/computation/06-distributed-computing_lang2.rst +++ b/docs-parts/computation/06-distributed-computing_lang2.rst @@ -1,5 +1,5 @@ -.. code-block:: text +.. code-block:: python In [1]: schema.jobs Out[1]: diff --git a/docs-parts/computation/06-distributed-computing_lang3.rst b/docs-parts/computation/06-distributed-computing_lang3.rst index f4b840866..2a26bc51c 100644 --- a/docs-parts/computation/06-distributed-computing_lang3.rst +++ b/docs-parts/computation/06-distributed-computing_lang3.rst @@ -1,7 +1,7 @@ For example, if a Python process is interrupted via the keyboard, a KeyboardError will be logged to the database as follows: -.. code-block:: text +.. code-block:: python In [2]: schema.jobs Out[2]: diff --git a/docs-parts/computation/06-distributed-computing_lang4.rst b/docs-parts/computation/06-distributed-computing_lang4.rst index e8a98ae77..106fa51f1 100644 --- a/docs-parts/computation/06-distributed-computing_lang4.rst +++ b/docs-parts/computation/06-distributed-computing_lang4.rst @@ -1,7 +1,7 @@ For example, given the above table, errors can be inspected as follows: -.. code-block:: text +.. code-block:: python In [3]: (schema.jobs & 'status="error"' ).fetch(as_dict=True) Out[3]: diff --git a/docs-parts/computation/06-distributed-computing_lang5.rst b/docs-parts/computation/06-distributed-computing_lang5.rst index 3f27bda08..31ffaf493 100644 --- a/docs-parts/computation/06-distributed-computing_lang5.rst +++ b/docs-parts/computation/06-distributed-computing_lang5.rst @@ -1,6 +1,6 @@ For example: -.. code-block:: text +.. code-block:: python In [4]: (schema.jobs & 'status="error"' ).delete() From 3945725866d4b0a601c6f367ca62e78e4e0a8293 Mon Sep 17 00:00:00 2001 From: Chris Turner Date: Fri, 22 Jan 2021 13:17:23 -0600 Subject: [PATCH 2/3] add dj.key_hash reference to dj.hash.key_hash, treat as 'public api' --- CHANGELOG.md | 4 ++++ datajoint/__init__.py | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 797a2211c..9aca9e5f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## Release notes +### Current +* add dj.key_hash reference to dj.hash.key_hash, treat as 'public api' + + ### 0.12.8 -- Jan 12, 2021 * table.children, .parents, .descendents, and ancestors can return queryable objects. PR #833 * Load dependencies before querying dependencies. (#179) PR #833 diff --git a/datajoint/__init__.py b/datajoint/__init__.py index 6d5031fde..c26fc8435 100644 --- a/datajoint/__init__.py +++ b/datajoint/__init__.py @@ -24,7 +24,7 @@ 'Not', 'AndList', 'U', 'Diagram', 'Di', 'ERD', 'set_password', 'kill', 'MatCell', 'MatStruct', 'AttributeAdapter', - 'errors', 'DataJointError', 'key'] + 'errors', 'DataJointError', 'key', 'key_hash'] from .version import __version__ from .settings import config @@ -38,6 +38,7 @@ from .admin import set_password, kill from .blob import MatCell, MatStruct from .fetch import key +from .hash import key_hash from .attribute_adapter import AttributeAdapter from . import errors from .errors import DataJointError From 25ae98fd870a21dbc122e056510b13764a0009f8 Mon Sep 17 00:00:00 2001 From: Chris Turner Date: Fri, 5 Feb 2021 12:11:18 -0600 Subject: [PATCH 3/3] 06-distributed-computing_jobs_by_key.rst: dj.hash.key_hash -> dj.key_hash --- .../computation/06-distributed-computing_jobs_by_key.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs-parts/computation/06-distributed-computing_jobs_by_key.rst b/docs-parts/computation/06-distributed-computing_jobs_by_key.rst index 50599ed89..fbec4df41 100644 --- a/docs-parts/computation/06-distributed-computing_jobs_by_key.rst +++ b/docs-parts/computation/06-distributed-computing_jobs_by_key.rst @@ -1,18 +1,18 @@ -This can be done by using `dj.hash.key_hash` to convert the key as follows: +This can be done by using `dj.key_hash` to convert the key as follows: .. code-block:: python - In [4]: schema.jobs & {'key_hash' : dj.hash.key_hash({'id': 2})} + In [4]: schema.jobs & {'key_hash' : dj.key_hash({'id': 2})} Out[4]: *table_name *key_hash status key error_message error_stac user host pid connection_id timestamp +------------+ +------------+ +--------+ +--------+ +------------+ +--------+ +------------+ +-------+ +--------+ +------------+ +------------+ __job_results c81e728d9d4c2f error =BLOB= KeyboardInterr =BLOB= datajoint@localhost localhost 15571 59 2017-09-04 14: (Total: 1) - In [5]: (schema.jobs & {'key_hash' : dj.hash.key_hash({'id': 2})}).delete() + In [5]: (schema.jobs & {'key_hash' : dj.key_hash({'id': 2})}).delete() - In [6]: schema.jobs & {'key_hash' : dj.hash.key_hash({'id': 2})} + In [6]: schema.jobs & {'key_hash' : dj.key_hash({'id': 2})} Out[6]: *table_name *key_hash status key error_message error_stac user host pid connection_id timestamp +------------+ +----------+ +--------+ +--------+ +------------+ +--------+ +------+ +------+ +-----+ +------------+ +-----------+