[Maps][File upload] Remove geojson deep clone logic, handle on maps side#41835
Merged
kindsun merged 6 commits intoelastic:masterfrom Jul 30, 2019
Merged
Conversation
kindsun
added
Team:Geo
x-pack/legacy/plugins/maps/public/layers/sources/client_file_source/geojson_file_source.js
Outdated
Show resolved
Hide resolved
x-pack/legacy/plugins/maps/public/layers/sources/client_file_source/geojson_file_source.js
Outdated
Show resolved
Hide resolved
x-pack/legacy/plugins/maps/public/layers/sources/client_file_source/geojson_file_source.js
Outdated
Show resolved
Hide resolved
Contributor
💚 Build Succeeded |
x-pack/legacy/plugins/maps/public/layers/sources/client_file_source/geojson_file_source.js
Outdated
Show resolved
Hide resolved
Contributor
💚 Build Succeeded |
thomasneirynck
added
bug
Contributor
|
Should not skip release note, but add one to the effect of "Geojson upload is now more stable to upload large geometries", or something along those lines. E.g. the army bases file (small feature count, but huge geometries) now uploads fairly fast, while without this upload often hanged or the browser tab crashed. |
Contributor
💚 Build Succeeded |
thomasneirynck
approved these changes
Jul 29, 2019
Contributor
thomasneirynck
left a comment
thomasneirynck
left a comment
There was a problem hiding this comment.
This is killer improvement for large files with low number of features. Try uploading army base before and after and notice the difference.
| expect(previewFunction.mock.calls.length).toEqual(1); | ||
| }); | ||
|
|
||
| it('should use object clone for preview function', () => { |
Contributor
There was a problem hiding this comment.
I would just preserve the test but flip the expectation. We're not expecting a clone, rather an identical reference.
Contributor
Author
There was a problem hiding this comment.
I'm not sure it helps us anymore. The preview function is really now just a normal function call with normal args. If I were a developer looking at this code later and I saw a test checking to make sure one arg isn't a clone but rather the same object, I'd wonder "well, why would it be a clone?"
Contributor
There was a problem hiding this comment.
Might prevent them from introducing deepclone for some unrelated reason, without checking why this LOC was changed (?) anyway, your call!
kindsun
pushed a commit
to kindsun/kibana
that referenced
this pull request
Jul 30, 2019
…ide (elastic#41835) * Remove deep clone, just use type & geometry for features on maps end * Remove file parser clone test * Review feedback * Set properties default to empty object since there's downstream modification * Review feedback
kindsun
pushed a commit
to kindsun/kibana
that referenced
this pull request
Jul 30, 2019
…ide (elastic#41835) * Remove deep clone, just use type & geometry for features on maps end * Remove file parser clone test * Review feedback * Set properties default to empty object since there's downstream modification * Review feedback
jloleysens
added a commit
to jloleysens/kibana
that referenced
this pull request
Jul 31, 2019
…-or-edit-existing-rollup-job * 'master' of github.com:elastic/kibana: (114 commits) [ML] Fixing empty index pattern list (elastic#42299) [Markdown] Shim new platform - cleanup plugin (elastic#41760) [Code] Enable hierarchicalDocumentSymbolSupport for java language server (elastic#42233) Add New Platform mocks for data plugin (elastic#42261) Http server route handler implementation (elastic#41894) [SR] Allow custom index pattern to be used instead of selectable list when choosing indices to restore (elastic#41534) [Code] distributed Code abstraction (elastic#41374) [SIEM] Sets page titles to the current page you are on (elastic#42157) Saved Objects export API stable type order (elastic#42310) cancellation of interpreter execution (elastic#40238) [SIEM] Fixes a crash when Machine Learning influencers is an undefined value (elastic#42198) Changed the job to work with a dedicated index (elastic#42297) FTR: fix testSubjects.missingOrFail (elastic#42290) Increase retry timeout to prevent flaky tests (elastic#42291) Spaces - make space a hidden saved object type (elastic#41688) Allow applications to register feature privileges which are excluded from the base privileges (elastic#41300) Disable flaky log column reorder test (elastic#42285) Fixing add element in element reducer (elastic#42276) Fix infinite loop (elastic#42228) [Maps][File upload] Remove geojson deep clone logic, handle on maps side (elastic#41835) ...
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Previously we were cloning the entire geojson object on the File Upload side to prevent downstream modification of features prior to indexing. This PR removes the cloning logic and instead copies just the parts we need on the maps side (i.e.- type & geometry per feature).