Update Array to respect FSStore's key_separator - #718

Merged
joshmoore merged 5 commits into
zarr-developers:masterfrom
grlee77:fix-chunk-key-for-nested-v2
Apr 16, 2021
Merged

Update Array to respect FSStore's key_separator #718
joshmoore merged 5 commits into
zarr-developers:masterfrom
grlee77:fix-chunk-key-for-nested-v2

Conversation

@grlee77

@grlee77grlee77 commented Apr 15, 2021

Copy link
Copy Markdown
Contributor

[Description of PR]

closes#717

I added a couple of FSStore test classes to test_hierarchy.py. The "NestedFSStore" class tests the fix on the specific case raised in #717.

TODO:

  • Add unit tests and/or doctests in docstrings
    * [ ] Add docstrings and API docs for any new/modified user-facing classes and functions
    * [ ] New/modified features documented in docs/tutorial.rst
  • Changes documented in docs/release.rst
  • GitHub Actions have all passed
  • Test coverage is 100% (Codecov passes)

@codecov

codecovBot commented Apr 15, 2021•
edited
Loading

Copy link
Copy Markdown

Codecov Report

Merging #718 (14db70e) into master (17728e8) will increase coverage by 0.00%.
The diff coverage is 100.00%.

@@ Coverage Diff @@## master #718 +/- ##
========================================
Coverage 99.93% 99.94% ========================================
Files 26 28 +2 Lines 9945 10328 +383 ========================================
+ Hits 9939 10322 +383 
Misses 6 6
Impacted FilesCoverage Δ
zarr/core.py100.00% <100.00%> (ø)
zarr/tests/test_hierarchy.py100.00% <100.00%> (ø)
zarr/util.py100.00% <0.00%> (ø)
zarr/__init__.py100.00% <0.00%> (ø)

joshmoore
joshmoore reviewed Apr 15, 2021
View reviewed changes
Comment threadzarr/core.py

def _chunk_key(self, chunk_coords):
return self._key_prefix + '.'.join(map(str, chunk_coords))
if hasattr(self._store, 'key_separator'):

@joshmoorejoshmooreApr 15, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A heads up that #716 deprecates key_separator in favor store._dimension_separator. Looking at this usage, I imagine wrapping stores like LRUCacheStore and ConsolidatedMetadataStore are going to need to set `_dimension_separator as well.

@grlee77grlee77Apr 16, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, thanks for letting me know. Should we hold off on this PR until #716 is in and then revisit?

@joshmoorejoshmooreApr 16, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nah, let's get this out as a point release. Just a warning that this "API" will change. It's all kismet.

@d-v-bd-v-bApr 29, 2021•
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The behavior of _chunk_key should not be changed here. Instead, the behavior of FSStore.getitems should be changed to properly remap the keys. See https://github.com/zarr-developers/zarr-python/pull/709/files#diff-565e487a2f60258b6baa2e4db8ef175cc16b8a949651834bd43d0a9f21e07358R1054

joshmoore
joshmoore approved these changes Apr 16, 2021
View reviewed changes
Comment threadzarr/core.py

def _chunk_key(self, chunk_coords):
return self._key_prefix + '.'.join(map(str, chunk_coords))
if hasattr(self._store, 'key_separator'):

@joshmoorejoshmooreApr 16, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nah, let's get this out as a point release. Just a warning that this "API" will change. It's all kismet.

@joshmoore
joshmoore merged commit 449ed26 into zarr-developers:masterApr 16, 2021
@joshmoorejoshmoore mentioned this pull request Apr 19, 2021
Merged
@d-v-bd-v-b mentioned this pull request Apr 29, 2021
Open
@d-v-b

d-v-b commented Apr 29, 2021

Copy link
Copy Markdown
Contributor

This PR needs to be reverted, since the solution in this PR breaks the abstraction boundary between array and chunk store, and the problem this PR solves is addressed in #709 by changes to FSStore, which is the correct level of abstraction for this fix.

@joshmoore

joshmoore commented Apr 29, 2021

Copy link
Copy Markdown
Member

Thanks, @d-v-b. And sorry for the troubles. If you haven't already, can you capture the test from here in #709?

joshmoore added a commit to joshmoore/zarr-python that referenced this pull request Apr 29, 2021
@joshmoore
Revert "Update Array to respect FSStore's key_separator (zarr-develop…
8076e5b
…ers#718)"
This reverts commit 449ed26.
@joshmoore

joshmoore commented Apr 29, 2021

Copy link
Copy Markdown
Member

see #729

jakirkham pushed a commit that referenced this pull request Apr 29, 2021
@joshmoore
Revert "Update Array to respect FSStore's key_separator (#718)" (#729)
a8561fc
This reverts commit 449ed26.
joshmoore added a commit to d-v-b/zarr-python that referenced this pull request Apr 30, 2021
@joshmoore
Add tests fromzarr-developers#718
c68ed82
joshmoore added a commit to d-v-b/zarr-python that referenced this pull request Apr 30, 2021
@joshmoore
Add tests fromzarr-developers#718
749747c
@joshmoorejoshmoore mentioned this pull request Apr 30, 2021
Merged
6 tasks
joshmoore added a commit that referenced this pull request May 19, 2021
@d-v-b@joshmoore
Expand (and pass) nested FSStore tests (#709)
a756586
* FSStore: aflesh out incomplete test and add another. The first test passes after changes to FSStore. The second test fails.
* pep8 fixes
* TestNestedFSStore: tweak second assertion of test_numbered_groups
* FSStore: change ggetitems to return dict with input keys
* TestArrayWithFSStore: add key_separator kwarg FSStore constructor
* TestArrayWithFSStore: add key_separator arg to store constructor in create_arrray.
* revert changes. the logic I need to test actually lives in test_core, not test_storage.
* kill some whitespace
* add nested tfsstore tests
* FSStore: fsstore.listdir now handles nested keys
* FSStore: re-order conditional evaluation in listdir
* FSStore: use self.fs.find in listdir
* Add tests from #718
* Apply suggestion from @grlee77
* Update PartialRead hexdigest values
* More hexdigest updates
Co-authored-by: jmoore <josh@glencoesoftware.com>
@joshmoorejoshmoore mentioned this pull request Feb 9, 2022
Open
19 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@d-v-bd-v-bd-v-b left review comments
@joshmoorejoshmoorejoshmoore approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Array._chunk_key does not respect FSStore's key_separator attribute

3 participants

@grlee77@d-v-b@joshmoore
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Update Array to respect FSStore's key_separator  - #718
Merged
joshmoore merged 5 commits into
zarr-developers:masterfrom 
grlee77:fix-chunk-key-for-nested-v2
Apr 16, 2021
Merged
Update Array to respect FSStore's key_separator #718
joshmoore merged 5 commits into
zarr-developers:masterfrom 
grlee77:fix-chunk-key-for-nested-v2
Conversation
@grlee77
@grlee77grlee77
commented
Apr 15, 2021

Copy link


Copy Markdown

Contributor
[Description of PR]
closes#717
I added a couple of FSStore test classes to test_hierarchy.py. The "NestedFSStore" class tests the fix on the specific case raised in #717.
TODO:
  •  Add unit tests and/or doctests in docstrings
    * [ ] Add docstrings and API docs for any new/modified user-facing classes and functions
    * [ ] New/modified features documented in docs/tutorial.rst
  •  Changes documented in docs/release.rst
  •  GitHub Actions have all passed
  •  Test coverage is 100% (Codecov passes)
@codecov
codecovBot
commented
Apr 15, 2021•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Merging #718 (14db70e) into master (17728e8) will increase coverage by 0.00%.

The diff coverage is 100.00%.
@@ Coverage Diff @@## master #718 +/- ##
========================================
Coverage 99.93% 99.94% ========================================
Files 26 28 +2 Lines 9945 10328 +383 ========================================
+ Hits 9939 10322 +383 
Misses 6 6 
Impacted FilesCoverage Δ
zarr/core.py100.00% <100.00%> (ø)
zarr/tests/test_hierarchy.py100.00% <100.00%> (ø)
zarr/util.py100.00% <0.00%> (ø)
zarr/__init__.py100.00% <0.00%> (ø)
joshmoore
joshmoore
reviewed
Apr 15, 2021
View reviewed changes
Comment threadzarr/core.py

 def _chunk_key(self, chunk_coords):
 return self._key_prefix + '.'.join(map(str, chunk_coords))
 if hasattr(self._store, 'key_separator'):
@joshmoorejoshmooreApr 15, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A heads up that #716 deprecates key_separator in favor store._dimension_separator. Looking at this usage, I imagine wrapping stores like LRUCacheStore and ConsolidatedMetadataStore are going to need to set `_dimension_separator as well.
@grlee77grlee77Apr 16, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, thanks for letting me know. Should we hold off on this PR until #716 is in and then revisit?
@joshmoorejoshmooreApr 16, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nah, let's get this out as a point release. Just a warning that this "API" will change. It's all kismet.
@d-v-bd-v-bApr 29, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The behavior of _chunk_key should not be changed here. Instead, the behavior of FSStore.getitems should be changed to properly remap the keys. See https://github.com/zarr-developers/zarr-python/pull/709/files#diff-565e487a2f60258b6baa2e4db8ef175cc16b8a949651834bd43d0a9f21e07358R1054
joshmoore
joshmoore
approved these changes
Apr 16, 2021
View reviewed changes
Comment threadzarr/core.py

 def _chunk_key(self, chunk_coords):
 return self._key_prefix + '.'.join(map(str, chunk_coords))
 if hasattr(self._store, 'key_separator'):
@joshmoorejoshmooreApr 16, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nah, let's get this out as a point release. Just a warning that this "API" will change. It's all kismet.
@joshmoore
joshmoore
merged commit 449ed26
into
zarr-developers:masterApr 16, 2021
@joshmoorejoshmoore
mentioned this pull request
Apr 19, 2021
 Merged

@d-v-bd-v-b
mentioned this pull request
Apr 29, 2021

Open

@d-v-b
d-v-b
commented
Apr 29, 2021

Copy link


Copy Markdown

Contributor
This PR needs to be reverted, since the solution in this PR breaks the abstraction boundary between array and chunk store, and the problem this PR solves is addressed in #709 by changes to FSStore, which is the correct level of abstraction for this fix.
@joshmoore
joshmoore
commented
Apr 29, 2021

Copy link


Copy Markdown

Member
Thanks, @d-v-b. And sorry for the troubles. If you haven't already, can you capture the test from here in #709?
joshmoore added a commit
to joshmoore/zarr-python
that referenced
this pull request
Apr 29, 2021
@joshmoore
Revert "Update Array to respect FSStore's key_separator (zarr-develop…
8076e5b
…ers#718)"
This reverts commit 449ed26.
@joshmoore
joshmoore
commented
Apr 29, 2021

Copy link


Copy Markdown

Member
see #729
jakirkham pushed a commit
that referenced
this pull request
Apr 29, 2021
@joshmoore
Revert "Update Array to respect FSStore's key_separator (#718)" (#729)
a8561fc
This reverts commit 449ed26.
joshmoore added a commit
to d-v-b/zarr-python
that referenced
this pull request
Apr 30, 2021
@joshmoore
Add tests fromzarr-developers#718
c68ed82
joshmoore added a commit
to d-v-b/zarr-python
that referenced
this pull request
Apr 30, 2021
@joshmoore
Add tests fromzarr-developers#718
749747c
@joshmoorejoshmoore
mentioned this pull request
Apr 30, 2021
 Merged

6 tasks
joshmoore added a commit
that referenced
this pull request
May 19, 2021
@d-v-b@joshmoore
Expand (and pass) nested FSStore tests (#709)
a756586
* FSStore: aflesh out incomplete test and add another. The first test passes after changes to FSStore. The second test fails.
* pep8 fixes
* TestNestedFSStore: tweak second assertion of test_numbered_groups
* FSStore: change ggetitems to return dict with input keys
* TestArrayWithFSStore: add key_separator kwarg FSStore constructor
* TestArrayWithFSStore: add key_separator arg to store constructor in create_arrray.
* revert changes. the logic I need to test actually lives in test_core, not test_storage.
* kill some whitespace
* add nested tfsstore tests
* FSStore: fsstore.listdir now handles nested keys
* FSStore: re-order conditional evaluation in listdir
* FSStore: use self.fs.find in listdir
* Add tests from #718
* Apply suggestion from @grlee77
* Update PartialRead hexdigest values
* More hexdigest updates
Co-authored-by: jmoore <josh@glencoesoftware.com>
@joshmoorejoshmoore
mentioned this pull request
Feb 9, 2022

Open

19 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@d-v-bd-v-bd-v-b left review comments
@joshmoorejoshmoorejoshmoore approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Array._chunk_key does not respect FSStore's key_separator attribute


3 participants

@grlee77@d-v-b@joshmoore

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Update Array to respect FSStore's key_separator  - #718
Merged
joshmoore merged 5 commits into
zarr-developers:masterfrom 
grlee77:fix-chunk-key-for-nested-v2
Apr 16, 2021
Merged
Update Array to respect FSStore's key_separator #718
joshmoore merged 5 commits into
zarr-developers:masterfrom 
grlee77:fix-chunk-key-for-nested-v2
Conversation
@grlee77
@grlee77grlee77
commented
Apr 15, 2021

Copy link


Copy Markdown

Contributor
[Description of PR]
closes#717
I added a couple of FSStore test classes to test_hierarchy.py. The "NestedFSStore" class tests the fix on the specific case raised in #717.
TODO:
  •  Add unit tests and/or doctests in docstrings
    * [ ] Add docstrings and API docs for any new/modified user-facing classes and functions
    * [ ] New/modified features documented in docs/tutorial.rst
  •  Changes documented in docs/release.rst
  •  GitHub Actions have all passed
  •  Test coverage is 100% (Codecov passes)
@codecov
codecovBot
commented
Apr 15, 2021•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Merging #718 (14db70e) into master (17728e8) will increase coverage by 0.00%.

The diff coverage is 100.00%.
@@ Coverage Diff @@## master #718 +/- ##
========================================
Coverage 99.93% 99.94% ========================================
Files 26 28 +2 Lines 9945 10328 +383 ========================================
+ Hits 9939 10322 +383 
Misses 6 6 
Impacted FilesCoverage Δ
zarr/core.py100.00% <100.00%> (ø)
zarr/tests/test_hierarchy.py100.00% <100.00%> (ø)
zarr/util.py100.00% <0.00%> (ø)
zarr/__init__.py100.00% <0.00%> (ø)
joshmoore
joshmoore
reviewed
Apr 15, 2021
View reviewed changes
Comment threadzarr/core.py

 def _chunk_key(self, chunk_coords):
 return self._key_prefix + '.'.join(map(str, chunk_coords))
 if hasattr(self._store, 'key_separator'):
@joshmoorejoshmooreApr 15, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A heads up that #716 deprecates key_separator in favor store._dimension_separator. Looking at this usage, I imagine wrapping stores like LRUCacheStore and ConsolidatedMetadataStore are going to need to set `_dimension_separator as well.
@grlee77grlee77Apr 16, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, thanks for letting me know. Should we hold off on this PR until #716 is in and then revisit?
@joshmoorejoshmooreApr 16, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nah, let's get this out as a point release. Just a warning that this "API" will change. It's all kismet.
@d-v-bd-v-bApr 29, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The behavior of _chunk_key should not be changed here. Instead, the behavior of FSStore.getitems should be changed to properly remap the keys. See https://github.com/zarr-developers/zarr-python/pull/709/files#diff-565e487a2f60258b6baa2e4db8ef175cc16b8a949651834bd43d0a9f21e07358R1054
joshmoore
joshmoore
approved these changes
Apr 16, 2021
View reviewed changes
Comment threadzarr/core.py

 def _chunk_key(self, chunk_coords):
 return self._key_prefix + '.'.join(map(str, chunk_coords))
 if hasattr(self._store, 'key_separator'):
@joshmoorejoshmooreApr 16, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nah, let's get this out as a point release. Just a warning that this "API" will change. It's all kismet.
@joshmoore
joshmoore
merged commit 449ed26
into
zarr-developers:masterApr 16, 2021
@joshmoorejoshmoore
mentioned this pull request
Apr 19, 2021
 Merged

@d-v-bd-v-b
mentioned this pull request
Apr 29, 2021

Open

@d-v-b
d-v-b
commented
Apr 29, 2021

Copy link


Copy Markdown

Contributor
This PR needs to be reverted, since the solution in this PR breaks the abstraction boundary between array and chunk store, and the problem this PR solves is addressed in #709 by changes to FSStore, which is the correct level of abstraction for this fix.
@joshmoore
joshmoore
commented
Apr 29, 2021

Copy link


Copy Markdown

Member
Thanks, @d-v-b. And sorry for the troubles. If you haven't already, can you capture the test from here in #709?
joshmoore added a commit
to joshmoore/zarr-python
that referenced
this pull request
Apr 29, 2021
@joshmoore
Revert "Update Array to respect FSStore's key_separator (zarr-develop…
8076e5b
…ers#718)"
This reverts commit 449ed26.
@joshmoore
joshmoore
commented
Apr 29, 2021

Copy link


Copy Markdown

Member
see #729
jakirkham pushed a commit
that referenced
this pull request
Apr 29, 2021
@joshmoore
Revert "Update Array to respect FSStore's key_separator (#718)" (#729)
a8561fc
This reverts commit 449ed26.
joshmoore added a commit
to d-v-b/zarr-python
that referenced
this pull request
Apr 30, 2021
@joshmoore
Add tests fromzarr-developers#718
c68ed82
joshmoore added a commit
to d-v-b/zarr-python
that referenced
this pull request
Apr 30, 2021
@joshmoore
Add tests fromzarr-developers#718
749747c
@joshmoorejoshmoore
mentioned this pull request
Apr 30, 2021
 Merged

6 tasks
joshmoore added a commit
that referenced
this pull request
May 19, 2021
@d-v-b@joshmoore
Expand (and pass) nested FSStore tests (#709)
a756586
* FSStore: aflesh out incomplete test and add another. The first test passes after changes to FSStore. The second test fails.
* pep8 fixes
* TestNestedFSStore: tweak second assertion of test_numbered_groups
* FSStore: change ggetitems to return dict with input keys
* TestArrayWithFSStore: add key_separator kwarg FSStore constructor
* TestArrayWithFSStore: add key_separator arg to store constructor in create_arrray.
* revert changes. the logic I need to test actually lives in test_core, not test_storage.
* kill some whitespace
* add nested tfsstore tests
* FSStore: fsstore.listdir now handles nested keys
* FSStore: re-order conditional evaluation in listdir
* FSStore: use self.fs.find in listdir
* Add tests from #718
* Apply suggestion from @grlee77
* Update PartialRead hexdigest values
* More hexdigest updates
Co-authored-by: jmoore <josh@glencoesoftware.com>
@joshmoorejoshmoore
mentioned this pull request
Feb 9, 2022

Open

19 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@d-v-bd-v-bd-v-b left review comments
@joshmoorejoshmoorejoshmoore approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Array._chunk_key does not respect FSStore's key_separator attribute


3 participants

@grlee77@d-v-b@joshmoore

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Update Array to respect FSStore's key_separator  - #718
Merged
joshmoore merged 5 commits into
zarr-developers:masterfrom 
grlee77:fix-chunk-key-for-nested-v2
Apr 16, 2021
Merged
Update Array to respect FSStore's key_separator #718
joshmoore merged 5 commits into
zarr-developers:masterfrom 
grlee77:fix-chunk-key-for-nested-v2
Conversation
@grlee77
@grlee77grlee77
commented
Apr 15, 2021

Copy link


Copy Markdown

Contributor
[Description of PR]
closes#717
I added a couple of FSStore test classes to test_hierarchy.py. The "NestedFSStore" class tests the fix on the specific case raised in #717.
TODO:
  •  Add unit tests and/or doctests in docstrings
    * [ ] Add docstrings and API docs for any new/modified user-facing classes and functions
    * [ ] New/modified features documented in docs/tutorial.rst
  •  Changes documented in docs/release.rst
  •  GitHub Actions have all passed
  •  Test coverage is 100% (Codecov passes)
@codecov
codecovBot
commented
Apr 15, 2021•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Merging #718 (14db70e) into master (17728e8) will increase coverage by 0.00%.

The diff coverage is 100.00%.
@@ Coverage Diff @@## master #718 +/- ##
========================================
Coverage 99.93% 99.94% ========================================
Files 26 28 +2 Lines 9945 10328 +383 ========================================
+ Hits 9939 10322 +383 
Misses 6 6 
Impacted FilesCoverage Δ
zarr/core.py100.00% <100.00%> (ø)
zarr/tests/test_hierarchy.py100.00% <100.00%> (ø)
zarr/util.py100.00% <0.00%> (ø)
zarr/__init__.py100.00% <0.00%> (ø)
joshmoore
joshmoore
reviewed
Apr 15, 2021
View reviewed changes
Comment threadzarr/core.py

 def _chunk_key(self, chunk_coords):
 return self._key_prefix + '.'.join(map(str, chunk_coords))
 if hasattr(self._store, 'key_separator'):
@joshmoorejoshmooreApr 15, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A heads up that #716 deprecates key_separator in favor store._dimension_separator. Looking at this usage, I imagine wrapping stores like LRUCacheStore and ConsolidatedMetadataStore are going to need to set `_dimension_separator as well.
@grlee77grlee77Apr 16, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, thanks for letting me know. Should we hold off on this PR until #716 is in and then revisit?
@joshmoorejoshmooreApr 16, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nah, let's get this out as a point release. Just a warning that this "API" will change. It's all kismet.
@d-v-bd-v-bApr 29, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The behavior of _chunk_key should not be changed here. Instead, the behavior of FSStore.getitems should be changed to properly remap the keys. See https://github.com/zarr-developers/zarr-python/pull/709/files#diff-565e487a2f60258b6baa2e4db8ef175cc16b8a949651834bd43d0a9f21e07358R1054
joshmoore
joshmoore
approved these changes
Apr 16, 2021
View reviewed changes
Comment threadzarr/core.py

 def _chunk_key(self, chunk_coords):
 return self._key_prefix + '.'.join(map(str, chunk_coords))
 if hasattr(self._store, 'key_separator'):
@joshmoorejoshmooreApr 16, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nah, let's get this out as a point release. Just a warning that this "API" will change. It's all kismet.
@joshmoore
joshmoore
merged commit 449ed26
into
zarr-developers:masterApr 16, 2021
@joshmoorejoshmoore
mentioned this pull request
Apr 19, 2021
 Merged

@d-v-bd-v-b
mentioned this pull request
Apr 29, 2021

Open

@d-v-b
d-v-b
commented
Apr 29, 2021

Copy link


Copy Markdown

Contributor
This PR needs to be reverted, since the solution in this PR breaks the abstraction boundary between array and chunk store, and the problem this PR solves is addressed in #709 by changes to FSStore, which is the correct level of abstraction for this fix.
@joshmoore
joshmoore
commented
Apr 29, 2021

Copy link


Copy Markdown

Member
Thanks, @d-v-b. And sorry for the troubles. If you haven't already, can you capture the test from here in #709?
joshmoore added a commit
to joshmoore/zarr-python
that referenced
this pull request
Apr 29, 2021
@joshmoore
Revert "Update Array to respect FSStore's key_separator (zarr-develop…
8076e5b
…ers#718)"
This reverts commit 449ed26.
@joshmoore
joshmoore
commented
Apr 29, 2021

Copy link


Copy Markdown

Member
see #729
jakirkham pushed a commit
that referenced
this pull request
Apr 29, 2021
@joshmoore
Revert "Update Array to respect FSStore's key_separator (#718)" (#729)
a8561fc
This reverts commit 449ed26.
joshmoore added a commit
to d-v-b/zarr-python
that referenced
this pull request
Apr 30, 2021
@joshmoore
Add tests fromzarr-developers#718
c68ed82
joshmoore added a commit
to d-v-b/zarr-python
that referenced
this pull request
Apr 30, 2021
@joshmoore
Add tests fromzarr-developers#718
749747c
@joshmoorejoshmoore
mentioned this pull request
Apr 30, 2021
 Merged

6 tasks
joshmoore added a commit
that referenced
this pull request
May 19, 2021
@d-v-b@joshmoore
Expand (and pass) nested FSStore tests (#709)
a756586
* FSStore: aflesh out incomplete test and add another. The first test passes after changes to FSStore. The second test fails.
* pep8 fixes
* TestNestedFSStore: tweak second assertion of test_numbered_groups
* FSStore: change ggetitems to return dict with input keys
* TestArrayWithFSStore: add key_separator kwarg FSStore constructor
* TestArrayWithFSStore: add key_separator arg to store constructor in create_arrray.
* revert changes. the logic I need to test actually lives in test_core, not test_storage.
* kill some whitespace
* add nested tfsstore tests
* FSStore: fsstore.listdir now handles nested keys
* FSStore: re-order conditional evaluation in listdir
* FSStore: use self.fs.find in listdir
* Add tests from #718
* Apply suggestion from @grlee77
* Update PartialRead hexdigest values
* More hexdigest updates
Co-authored-by: jmoore <josh@glencoesoftware.com>
@joshmoorejoshmoore
mentioned this pull request
Feb 9, 2022

Open

19 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@d-v-bd-v-bd-v-b left review comments
@joshmoorejoshmoorejoshmoore approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Array._chunk_key does not respect FSStore's key_separator attribute


3 participants

@grlee77@d-v-b@joshmoore

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Update Array to respect FSStore's key_separator  - #718
Merged
joshmoore merged 5 commits into
zarr-developers:masterfrom 
grlee77:fix-chunk-key-for-nested-v2
Apr 16, 2021
Merged
Update Array to respect FSStore's key_separator #718
joshmoore merged 5 commits into
zarr-developers:masterfrom 
grlee77:fix-chunk-key-for-nested-v2
Conversation
@grlee77
@grlee77grlee77
commented
Apr 15, 2021

Copy link


Copy Markdown

Contributor
[Description of PR]
closes#717
I added a couple of FSStore test classes to test_hierarchy.py. The "NestedFSStore" class tests the fix on the specific case raised in #717.
TODO:
  •  Add unit tests and/or doctests in docstrings
    * [ ] Add docstrings and API docs for any new/modified user-facing classes and functions
    * [ ] New/modified features documented in docs/tutorial.rst
  •  Changes documented in docs/release.rst
  •  GitHub Actions have all passed
  •  Test coverage is 100% (Codecov passes)
@codecov
codecovBot
commented
Apr 15, 2021•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Merging #718 (14db70e) into master (17728e8) will increase coverage by 0.00%.

The diff coverage is 100.00%.
@@ Coverage Diff @@## master #718 +/- ##
========================================
Coverage 99.93% 99.94% ========================================
Files 26 28 +2 Lines 9945 10328 +383 ========================================
+ Hits 9939 10322 +383 
Misses 6 6 
Impacted FilesCoverage Δ
zarr/core.py100.00% <100.00%> (ø)
zarr/tests/test_hierarchy.py100.00% <100.00%> (ø)
zarr/util.py100.00% <0.00%> (ø)
zarr/__init__.py100.00% <0.00%> (ø)
joshmoore
joshmoore
reviewed
Apr 15, 2021
View reviewed changes
Comment threadzarr/core.py

 def _chunk_key(self, chunk_coords):
 return self._key_prefix + '.'.join(map(str, chunk_coords))
 if hasattr(self._store, 'key_separator'):
@joshmoorejoshmooreApr 15, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A heads up that #716 deprecates key_separator in favor store._dimension_separator. Looking at this usage, I imagine wrapping stores like LRUCacheStore and ConsolidatedMetadataStore are going to need to set `_dimension_separator as well.
@grlee77grlee77Apr 16, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, thanks for letting me know. Should we hold off on this PR until #716 is in and then revisit?
@joshmoorejoshmooreApr 16, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nah, let's get this out as a point release. Just a warning that this "API" will change. It's all kismet.
@d-v-bd-v-bApr 29, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The behavior of _chunk_key should not be changed here. Instead, the behavior of FSStore.getitems should be changed to properly remap the keys. See https://github.com/zarr-developers/zarr-python/pull/709/files#diff-565e487a2f60258b6baa2e4db8ef175cc16b8a949651834bd43d0a9f21e07358R1054
joshmoore
joshmoore
approved these changes
Apr 16, 2021
View reviewed changes
Comment threadzarr/core.py

 def _chunk_key(self, chunk_coords):
 return self._key_prefix + '.'.join(map(str, chunk_coords))
 if hasattr(self._store, 'key_separator'):
@joshmoorejoshmooreApr 16, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nah, let's get this out as a point release. Just a warning that this "API" will change. It's all kismet.
@joshmoore
joshmoore
merged commit 449ed26
into
zarr-developers:masterApr 16, 2021
@joshmoorejoshmoore
mentioned this pull request
Apr 19, 2021
 Merged

@d-v-bd-v-b
mentioned this pull request
Apr 29, 2021

Open

@d-v-b
d-v-b
commented
Apr 29, 2021

Copy link


Copy Markdown

Contributor
This PR needs to be reverted, since the solution in this PR breaks the abstraction boundary between array and chunk store, and the problem this PR solves is addressed in #709 by changes to FSStore, which is the correct level of abstraction for this fix.
@joshmoore
joshmoore
commented
Apr 29, 2021

Copy link


Copy Markdown

Member
Thanks, @d-v-b. And sorry for the troubles. If you haven't already, can you capture the test from here in #709?
joshmoore added a commit
to joshmoore/zarr-python
that referenced
this pull request
Apr 29, 2021
@joshmoore
Revert "Update Array to respect FSStore's key_separator (zarr-develop…
8076e5b
…ers#718)"
This reverts commit 449ed26.
@joshmoore
joshmoore
commented
Apr 29, 2021

Copy link


Copy Markdown

Member
see #729
jakirkham pushed a commit
that referenced
this pull request
Apr 29, 2021
@joshmoore
Revert "Update Array to respect FSStore's key_separator (#718)" (#729)
a8561fc
This reverts commit 449ed26.
joshmoore added a commit
to d-v-b/zarr-python
that referenced
this pull request
Apr 30, 2021
@joshmoore
Add tests fromzarr-developers#718
c68ed82
joshmoore added a commit
to d-v-b/zarr-python
that referenced
this pull request
Apr 30, 2021
@joshmoore
Add tests fromzarr-developers#718
749747c
@joshmoorejoshmoore
mentioned this pull request
Apr 30, 2021
 Merged

6 tasks
joshmoore added a commit
that referenced
this pull request
May 19, 2021
@d-v-b@joshmoore
Expand (and pass) nested FSStore tests (#709)
a756586
* FSStore: aflesh out incomplete test and add another. The first test passes after changes to FSStore. The second test fails.
* pep8 fixes
* TestNestedFSStore: tweak second assertion of test_numbered_groups
* FSStore: change ggetitems to return dict with input keys
* TestArrayWithFSStore: add key_separator kwarg FSStore constructor
* TestArrayWithFSStore: add key_separator arg to store constructor in create_arrray.
* revert changes. the logic I need to test actually lives in test_core, not test_storage.
* kill some whitespace
* add nested tfsstore tests
* FSStore: fsstore.listdir now handles nested keys
* FSStore: re-order conditional evaluation in listdir
* FSStore: use self.fs.find in listdir
* Add tests from #718
* Apply suggestion from @grlee77
* Update PartialRead hexdigest values
* More hexdigest updates
Co-authored-by: jmoore <josh@glencoesoftware.com>
@joshmoorejoshmoore
mentioned this pull request
Feb 9, 2022

Open

19 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@d-v-bd-v-bd-v-b left review comments
@joshmoorejoshmoorejoshmoore approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Array._chunk_key does not respect FSStore's key_separator attribute


3 participants

@grlee77@d-v-b@joshmoore

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Update Array to respect FSStore's key_separator  - #718
Merged
joshmoore merged 5 commits into
zarr-developers:masterfrom 
grlee77:fix-chunk-key-for-nested-v2
Apr 16, 2021
Merged
Update Array to respect FSStore's key_separator #718
joshmoore merged 5 commits into
zarr-developers:masterfrom 
grlee77:fix-chunk-key-for-nested-v2
Conversation
@grlee77
@grlee77grlee77
commented
Apr 15, 2021

Copy link


Copy Markdown

Contributor
[Description of PR]
closes#717
I added a couple of FSStore test classes to test_hierarchy.py. The "NestedFSStore" class tests the fix on the specific case raised in #717.
TODO:
  •  Add unit tests and/or doctests in docstrings
    * [ ] Add docstrings and API docs for any new/modified user-facing classes and functions
    * [ ] New/modified features documented in docs/tutorial.rst
  •  Changes documented in docs/release.rst
  •  GitHub Actions have all passed
  •  Test coverage is 100% (Codecov passes)
@codecov
codecovBot
commented
Apr 15, 2021•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Merging #718 (14db70e) into master (17728e8) will increase coverage by 0.00%.

The diff coverage is 100.00%.
@@ Coverage Diff @@## master #718 +/- ##
========================================
Coverage 99.93% 99.94% ========================================
Files 26 28 +2 Lines 9945 10328 +383 ========================================
+ Hits 9939 10322 +383 
Misses 6 6 
Impacted FilesCoverage Δ
zarr/core.py100.00% <100.00%> (ø)
zarr/tests/test_hierarchy.py100.00% <100.00%> (ø)
zarr/util.py100.00% <0.00%> (ø)
zarr/__init__.py100.00% <0.00%> (ø)
joshmoore
joshmoore
reviewed
Apr 15, 2021
View reviewed changes
Comment threadzarr/core.py

 def _chunk_key(self, chunk_coords):
 return self._key_prefix + '.'.join(map(str, chunk_coords))
 if hasattr(self._store, 'key_separator'):
@joshmoorejoshmooreApr 15, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A heads up that #716 deprecates key_separator in favor store._dimension_separator. Looking at this usage, I imagine wrapping stores like LRUCacheStore and ConsolidatedMetadataStore are going to need to set `_dimension_separator as well.
@grlee77grlee77Apr 16, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, thanks for letting me know. Should we hold off on this PR until #716 is in and then revisit?
@joshmoorejoshmooreApr 16, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nah, let's get this out as a point release. Just a warning that this "API" will change. It's all kismet.
@d-v-bd-v-bApr 29, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The behavior of _chunk_key should not be changed here. Instead, the behavior of FSStore.getitems should be changed to properly remap the keys. See https://github.com/zarr-developers/zarr-python/pull/709/files#diff-565e487a2f60258b6baa2e4db8ef175cc16b8a949651834bd43d0a9f21e07358R1054
joshmoore
joshmoore
approved these changes
Apr 16, 2021
View reviewed changes
Comment threadzarr/core.py

 def _chunk_key(self, chunk_coords):
 return self._key_prefix + '.'.join(map(str, chunk_coords))
 if hasattr(self._store, 'key_separator'):
@joshmoorejoshmooreApr 16, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nah, let's get this out as a point release. Just a warning that this "API" will change. It's all kismet.
@joshmoore
joshmoore
merged commit 449ed26
into
zarr-developers:masterApr 16, 2021
@joshmoorejoshmoore
mentioned this pull request
Apr 19, 2021
 Merged

@d-v-bd-v-b
mentioned this pull request
Apr 29, 2021

Open

@d-v-b
d-v-b
commented
Apr 29, 2021

Copy link


Copy Markdown

Contributor
This PR needs to be reverted, since the solution in this PR breaks the abstraction boundary between array and chunk store, and the problem this PR solves is addressed in #709 by changes to FSStore, which is the correct level of abstraction for this fix.
@joshmoore
joshmoore
commented
Apr 29, 2021

Copy link


Copy Markdown

Member
Thanks, @d-v-b. And sorry for the troubles. If you haven't already, can you capture the test from here in #709?
joshmoore added a commit
to joshmoore/zarr-python
that referenced
this pull request
Apr 29, 2021
@joshmoore
Revert "Update Array to respect FSStore's key_separator (zarr-develop…
8076e5b
…ers#718)"
This reverts commit 449ed26.
@joshmoore
joshmoore
commented
Apr 29, 2021

Copy link


Copy Markdown

Member
see #729
jakirkham pushed a commit
that referenced
this pull request
Apr 29, 2021
@joshmoore
Revert "Update Array to respect FSStore's key_separator (#718)" (#729)
a8561fc
This reverts commit 449ed26.
joshmoore added a commit
to d-v-b/zarr-python
that referenced
this pull request
Apr 30, 2021
@joshmoore
Add tests fromzarr-developers#718
c68ed82
joshmoore added a commit
to d-v-b/zarr-python
that referenced
this pull request
Apr 30, 2021
@joshmoore
Add tests fromzarr-developers#718
749747c
@joshmoorejoshmoore
mentioned this pull request
Apr 30, 2021
 Merged

6 tasks
joshmoore added a commit
that referenced
this pull request
May 19, 2021
@d-v-b@joshmoore
Expand (and pass) nested FSStore tests (#709)
a756586
* FSStore: aflesh out incomplete test and add another. The first test passes after changes to FSStore. The second test fails.
* pep8 fixes
* TestNestedFSStore: tweak second assertion of test_numbered_groups
* FSStore: change ggetitems to return dict with input keys
* TestArrayWithFSStore: add key_separator kwarg FSStore constructor
* TestArrayWithFSStore: add key_separator arg to store constructor in create_arrray.
* revert changes. the logic I need to test actually lives in test_core, not test_storage.
* kill some whitespace
* add nested tfsstore tests
* FSStore: fsstore.listdir now handles nested keys
* FSStore: re-order conditional evaluation in listdir
* FSStore: use self.fs.find in listdir
* Add tests from #718
* Apply suggestion from @grlee77
* Update PartialRead hexdigest values
* More hexdigest updates
Co-authored-by: jmoore <josh@glencoesoftware.com>
@joshmoorejoshmoore
mentioned this pull request
Feb 9, 2022

Open

19 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@d-v-bd-v-bd-v-b left review comments
@joshmoorejoshmoorejoshmoore approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Array._chunk_key does not respect FSStore's key_separator attribute


3 participants

@grlee77@d-v-b@joshmoore

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Update Array to respect FSStore's key_separator  - #718
Merged
joshmoore merged 5 commits into
zarr-developers:masterfrom 
grlee77:fix-chunk-key-for-nested-v2
Apr 16, 2021
Merged
Update Array to respect FSStore's key_separator #718
joshmoore merged 5 commits into
zarr-developers:masterfrom 
grlee77:fix-chunk-key-for-nested-v2
Conversation
@grlee77
@grlee77grlee77
commented
Apr 15, 2021

Copy link


Copy Markdown

Contributor
[Description of PR]
closes#717
I added a couple of FSStore test classes to test_hierarchy.py. The "NestedFSStore" class tests the fix on the specific case raised in #717.
TODO:
  •  Add unit tests and/or doctests in docstrings
    * [ ] Add docstrings and API docs for any new/modified user-facing classes and functions
    * [ ] New/modified features documented in docs/tutorial.rst
  •  Changes documented in docs/release.rst
  •  GitHub Actions have all passed
  •  Test coverage is 100% (Codecov passes)
@codecov
codecovBot
commented
Apr 15, 2021•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Merging #718 (14db70e) into master (17728e8) will increase coverage by 0.00%.

The diff coverage is 100.00%.
@@ Coverage Diff @@## master #718 +/- ##
========================================
Coverage 99.93% 99.94% ========================================
Files 26 28 +2 Lines 9945 10328 +383 ========================================
+ Hits 9939 10322 +383 
Misses 6 6 
Impacted FilesCoverage Δ
zarr/core.py100.00% <100.00%> (ø)
zarr/tests/test_hierarchy.py100.00% <100.00%> (ø)
zarr/util.py100.00% <0.00%> (ø)
zarr/__init__.py100.00% <0.00%> (ø)
joshmoore
joshmoore
reviewed
Apr 15, 2021
View reviewed changes
Comment threadzarr/core.py

 def _chunk_key(self, chunk_coords):
 return self._key_prefix + '.'.join(map(str, chunk_coords))
 if hasattr(self._store, 'key_separator'):
@joshmoorejoshmooreApr 15, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A heads up that #716 deprecates key_separator in favor store._dimension_separator. Looking at this usage, I imagine wrapping stores like LRUCacheStore and ConsolidatedMetadataStore are going to need to set `_dimension_separator as well.
@grlee77grlee77Apr 16, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, thanks for letting me know. Should we hold off on this PR until #716 is in and then revisit?
@joshmoorejoshmooreApr 16, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nah, let's get this out as a point release. Just a warning that this "API" will change. It's all kismet.
@d-v-bd-v-bApr 29, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The behavior of _chunk_key should not be changed here. Instead, the behavior of FSStore.getitems should be changed to properly remap the keys. See https://github.com/zarr-developers/zarr-python/pull/709/files#diff-565e487a2f60258b6baa2e4db8ef175cc16b8a949651834bd43d0a9f21e07358R1054
joshmoore
joshmoore
approved these changes
Apr 16, 2021
View reviewed changes
Comment threadzarr/core.py

 def _chunk_key(self, chunk_coords):
 return self._key_prefix + '.'.join(map(str, chunk_coords))
 if hasattr(self._store, 'key_separator'):
@joshmoorejoshmooreApr 16, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nah, let's get this out as a point release. Just a warning that this "API" will change. It's all kismet.
@joshmoore
joshmoore
merged commit 449ed26
into
zarr-developers:masterApr 16, 2021
@joshmoorejoshmoore
mentioned this pull request
Apr 19, 2021
 Merged

@d-v-bd-v-b
mentioned this pull request
Apr 29, 2021

Open

@d-v-b
d-v-b
commented
Apr 29, 2021

Copy link


Copy Markdown

Contributor
This PR needs to be reverted, since the solution in this PR breaks the abstraction boundary between array and chunk store, and the problem this PR solves is addressed in #709 by changes to FSStore, which is the correct level of abstraction for this fix.
@joshmoore
joshmoore
commented
Apr 29, 2021

Copy link


Copy Markdown

Member
Thanks, @d-v-b. And sorry for the troubles. If you haven't already, can you capture the test from here in #709?
joshmoore added a commit
to joshmoore/zarr-python
that referenced
this pull request
Apr 29, 2021
@joshmoore
Revert "Update Array to respect FSStore's key_separator (zarr-develop…
8076e5b
…ers#718)"
This reverts commit 449ed26.
@joshmoore
joshmoore
commented
Apr 29, 2021

Copy link


Copy Markdown

Member
see #729
jakirkham pushed a commit
that referenced
this pull request
Apr 29, 2021
@joshmoore
Revert "Update Array to respect FSStore's key_separator (#718)" (#729)
a8561fc
This reverts commit 449ed26.
joshmoore added a commit
to d-v-b/zarr-python
that referenced
this pull request
Apr 30, 2021
@joshmoore
Add tests fromzarr-developers#718
c68ed82
joshmoore added a commit
to d-v-b/zarr-python
that referenced
this pull request
Apr 30, 2021
@joshmoore
Add tests fromzarr-developers#718
749747c
@joshmoorejoshmoore
mentioned this pull request
Apr 30, 2021
 Merged

6 tasks
joshmoore added a commit
that referenced
this pull request
May 19, 2021
@d-v-b@joshmoore
Expand (and pass) nested FSStore tests (#709)
a756586
* FSStore: aflesh out incomplete test and add another. The first test passes after changes to FSStore. The second test fails.
* pep8 fixes
* TestNestedFSStore: tweak second assertion of test_numbered_groups
* FSStore: change ggetitems to return dict with input keys
* TestArrayWithFSStore: add key_separator kwarg FSStore constructor
* TestArrayWithFSStore: add key_separator arg to store constructor in create_arrray.
* revert changes. the logic I need to test actually lives in test_core, not test_storage.
* kill some whitespace
* add nested tfsstore tests
* FSStore: fsstore.listdir now handles nested keys
* FSStore: re-order conditional evaluation in listdir
* FSStore: use self.fs.find in listdir
* Add tests from #718
* Apply suggestion from @grlee77
* Update PartialRead hexdigest values
* More hexdigest updates
Co-authored-by: jmoore <josh@glencoesoftware.com>
@joshmoorejoshmoore
mentioned this pull request
Feb 9, 2022

Open

19 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@d-v-bd-v-bd-v-b left review comments
@joshmoorejoshmoorejoshmoore approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Array._chunk_key does not respect FSStore's key_separator attribute


3 participants

@grlee77@d-v-b@joshmoore

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Update Array to respect FSStore's key_separator  - #718
Merged
joshmoore merged 5 commits into
zarr-developers:masterfrom 
grlee77:fix-chunk-key-for-nested-v2
Apr 16, 2021
Merged
Update Array to respect FSStore's key_separator #718
joshmoore merged 5 commits into
zarr-developers:masterfrom 
grlee77:fix-chunk-key-for-nested-v2
Conversation
@grlee77
@grlee77grlee77
commented
Apr 15, 2021

Copy link


Copy Markdown

Contributor
[Description of PR]
closes#717
I added a couple of FSStore test classes to test_hierarchy.py. The "NestedFSStore" class tests the fix on the specific case raised in #717.
TODO:
  •  Add unit tests and/or doctests in docstrings
    * [ ] Add docstrings and API docs for any new/modified user-facing classes and functions
    * [ ] New/modified features documented in docs/tutorial.rst
  •  Changes documented in docs/release.rst
  •  GitHub Actions have all passed
  •  Test coverage is 100% (Codecov passes)
@codecov
codecovBot
commented
Apr 15, 2021•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Merging #718 (14db70e) into master (17728e8) will increase coverage by 0.00%.

The diff coverage is 100.00%.
@@ Coverage Diff @@## master #718 +/- ##
========================================
Coverage 99.93% 99.94% ========================================
Files 26 28 +2 Lines 9945 10328 +383 ========================================
+ Hits 9939 10322 +383 
Misses 6 6 
Impacted FilesCoverage Δ
zarr/core.py100.00% <100.00%> (ø)
zarr/tests/test_hierarchy.py100.00% <100.00%> (ø)
zarr/util.py100.00% <0.00%> (ø)
zarr/__init__.py100.00% <0.00%> (ø)
joshmoore
joshmoore
reviewed
Apr 15, 2021
View reviewed changes
Comment threadzarr/core.py

 def _chunk_key(self, chunk_coords):
 return self._key_prefix + '.'.join(map(str, chunk_coords))
 if hasattr(self._store, 'key_separator'):
@joshmoorejoshmooreApr 15, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A heads up that #716 deprecates key_separator in favor store._dimension_separator. Looking at this usage, I imagine wrapping stores like LRUCacheStore and ConsolidatedMetadataStore are going to need to set `_dimension_separator as well.
@grlee77grlee77Apr 16, 2021

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, thanks for letting me know. Should we hold off on this PR until #716 is in and then revisit?
@joshmoorejoshmooreApr 16, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nah, let's get this out as a point release. Just a warning that this "API" will change. It's all kismet.
@d-v-bd-v-bApr 29, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The behavior of _chunk_key should not be changed here. Instead, the behavior of FSStore.getitems should be changed to properly remap the keys. See https://github.com/zarr-developers/zarr-python/pull/709/files#diff-565e487a2f60258b6baa2e4db8ef175cc16b8a949651834bd43d0a9f21e07358R1054
joshmoore
joshmoore
approved these changes
Apr 16, 2021
View reviewed changes
Comment threadzarr/core.py

 def _chunk_key(self, chunk_coords):
 return self._key_prefix + '.'.join(map(str, chunk_coords))
 if hasattr(self._store, 'key_separator'):
@joshmoorejoshmooreApr 16, 2021

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nah, let's get this out as a point release. Just a warning that this "API" will change. It's all kismet.
@joshmoore
joshmoore
merged commit 449ed26
into
zarr-developers:masterApr 16, 2021
@joshmoorejoshmoore
mentioned this pull request
Apr 19, 2021
 Merged

@d-v-bd-v-b
mentioned this pull request
Apr 29, 2021

Open

@d-v-b
d-v-b
commented
Apr 29, 2021

Copy link


Copy Markdown

Contributor
This PR needs to be reverted, since the solution in this PR breaks the abstraction boundary between array and chunk store, and the problem this PR solves is addressed in #709 by changes to FSStore, which is the correct level of abstraction for this fix.
@joshmoore
joshmoore
commented
Apr 29, 2021

Copy link


Copy Markdown

Member
Thanks, @d-v-b. And sorry for the troubles. If you haven't already, can you capture the test from here in #709?
joshmoore added a commit
to joshmoore/zarr-python
that referenced
this pull request
Apr 29, 2021
@joshmoore
Revert "Update Array to respect FSStore's key_separator (zarr-develop…
8076e5b
…ers#718)"
This reverts commit 449ed26.
@joshmoore
joshmoore
commented
Apr 29, 2021

Copy link


Copy Markdown

Member
see #729
jakirkham pushed a commit
that referenced
this pull request
Apr 29, 2021
@joshmoore
Revert "Update Array to respect FSStore's key_separator (#718)" (#729)
a8561fc
This reverts commit 449ed26.
joshmoore added a commit
to d-v-b/zarr-python
that referenced
this pull request
Apr 30, 2021
@joshmoore
Add tests fromzarr-developers#718
c68ed82
joshmoore added a commit
to d-v-b/zarr-python
that referenced
this pull request
Apr 30, 2021
@joshmoore
Add tests fromzarr-developers#718
749747c
@joshmoorejoshmoore
mentioned this pull request
Apr 30, 2021
 Merged

6 tasks
joshmoore added a commit
that referenced
this pull request
May 19, 2021
@d-v-b@joshmoore
Expand (and pass) nested FSStore tests (#709)
a756586
* FSStore: aflesh out incomplete test and add another. The first test passes after changes to FSStore. The second test fails.
* pep8 fixes
* TestNestedFSStore: tweak second assertion of test_numbered_groups
* FSStore: change ggetitems to return dict with input keys
* TestArrayWithFSStore: add key_separator kwarg FSStore constructor
* TestArrayWithFSStore: add key_separator arg to store constructor in create_arrray.
* revert changes. the logic I need to test actually lives in test_core, not test_storage.
* kill some whitespace
* add nested tfsstore tests
* FSStore: fsstore.listdir now handles nested keys
* FSStore: re-order conditional evaluation in listdir
* FSStore: use self.fs.find in listdir
* Add tests from #718
* Apply suggestion from @grlee77
* Update PartialRead hexdigest values
* More hexdigest updates
Co-authored-by: jmoore <josh@glencoesoftware.com>
@joshmoorejoshmoore
mentioned this pull request
Feb 9, 2022

Open

19 tasks
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@d-v-bd-v-bd-v-b left review comments
@joshmoorejoshmoorejoshmoore approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Array._chunk_key does not respect FSStore's key_separator attribute


3 participants

@grlee77@d-v-b@joshmoore