-
Notifications
You must be signed in to change notification settings - Fork 18
feat: Add Schema and Field withMetadata methods for metadata replacement #334
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
kentkwu
wants to merge
2
commits into
apache:main
Choose a base branch
from
kentkwu:feat/add-schema-and-field-with-metadata-helpers
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| import '../jest-extensions.js'; | ||
| import { Field, Int32, Schema } from 'apache-arrow'; | ||
|
|
||
| describe('Field.withMetadata', () => { | ||
| test('replaces metadata from plain objects', () => { | ||
| const field = new Field('col', new Int32(), true, new Map([['foo', 'bar']])); | ||
| const input = { baz: 'qux' }; | ||
| const updated = field.withMetadata(input); | ||
| expect(updated).not.toBe(field); | ||
| expect(updated.metadata.get('foo')).toBeUndefined(); | ||
| expect(updated.metadata.get('baz')).toBe('qux'); | ||
| expect(field.metadata.get('foo')).toBe('bar'); | ||
| expect(field.metadata.get('baz')).toBeUndefined(); | ||
| // Mutating the input after the call should not affect the result | ||
| input.baz = 'changed'; | ||
| (input as any).newKey = 'newValue'; | ||
| expect(updated.metadata.get('baz')).toBe('qux'); | ||
| expect(updated.metadata.get('newKey')).toBeUndefined(); | ||
| }); | ||
|
|
||
| test('replaces metadata from Maps', () => { | ||
| const field = new Field('col', new Int32(), true, new Map([['foo', 'bar']])); | ||
| const input = new Map([['foo', 'baz']]); | ||
| const updated = field.withMetadata(input); | ||
| expect(updated.metadata.get('foo')).toBe('baz'); | ||
| expect(updated.metadata.size).toBe(1); | ||
| expect(field.metadata.get('foo')).toBe('bar'); | ||
| expect(field.metadata.size).toBe(1); | ||
| // Mutating the input after the call should not affect the result | ||
| input.set('foo', 'qux'); | ||
| input.set('newKey', 'newValue'); | ||
| expect(updated.metadata.get('foo')).toBe('baz'); | ||
| expect(updated.metadata.get('newKey')).toBeUndefined(); | ||
| expect(updated.metadata.size).toBe(1); | ||
| }); | ||
|
|
||
| test('clears metadata when null is passed', () => { | ||
| const field = new Field('col', new Int32(), true, new Map([['foo', 'bar']])); | ||
| const updated = field.withMetadata(null); | ||
| expect(updated.metadata.size).toBe(0); | ||
| expect(field.metadata.get('foo')).toBe('bar'); | ||
| expect(field.metadata.size).toBe(1); | ||
| }); | ||
| }); | ||
|
|
||
| describe('Schema.withMetadata', () => { | ||
| test('replaces metadata from plain objects', () => { | ||
| const schema = new Schema([new Field('col', new Int32())], new Map([['foo', 'bar']])); | ||
| const input = { baz: 'qux' }; | ||
| const updated = schema.withMetadata(input); | ||
| expect(updated).not.toBe(schema); | ||
| expect(schema.metadata.get('baz')).toBeUndefined(); | ||
| expect(schema.metadata.get('foo')).toBe('bar'); | ||
| expect(updated.metadata.get('foo')).toBeUndefined(); | ||
| expect(updated.metadata.get('baz')).toBe('qux'); | ||
| // Mutating the input after the call should not affect the result | ||
| input.baz = 'changed'; | ||
| (input as any).newKey = 'newValue'; | ||
| expect(updated.metadata.get('baz')).toBe('qux'); | ||
| expect(updated.metadata.get('newKey')).toBeUndefined(); | ||
| }); | ||
|
|
||
| test('replaces metadata from Maps', () => { | ||
| const schema = new Schema([new Field('col', new Int32())], new Map([['foo', 'bar']])); | ||
| const input = new Map([['foo', 'baz']]); | ||
| const updated = schema.withMetadata(input); | ||
| expect(updated.metadata.get('foo')).toBe('baz'); | ||
| expect(updated.metadata.size).toBe(1); | ||
| expect(schema.metadata.get('foo')).toBe('bar'); | ||
| expect(schema.metadata.size).toBe(1); | ||
| // Mutating the input after the call should not affect the result | ||
| input.set('foo', 'qux'); | ||
| input.set('newKey', 'newValue'); | ||
| expect(updated.metadata.get('foo')).toBe('baz'); | ||
| expect(updated.metadata.get('newKey')).toBeUndefined(); | ||
| expect(updated.metadata.size).toBe(1); | ||
| }); | ||
|
|
||
| test('clears metadata when null is passed', () => { | ||
| const schema = new Schema([new Field('col', new Int32())], new Map([['foo', 'bar']])); | ||
| const updated = schema.withMetadata(null); | ||
| expect(updated.metadata.size).toBe(0); | ||
| expect(schema.metadata.get('foo')).toBe('bar'); | ||
| expect(schema.metadata.size).toBe(1); | ||
| }); | ||
| }); |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not familiar with JavaScript/TypeScript but it seems that we don't have
withXXXstyle API.It seems that the below
assign()merges something to the current schema. Isschema.assign(metadata)a natural API?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the feedback @kou. You're correct that withXXX isn't currently really present in this library.
The naming was chosen to align with other Arrow implementations — PyArrow uses .with_metadata(), Rust Arrow uses .with_metadata(). In absence of another pre-existing convention here I’m proposing just adopting the same from the other bindings.
The existing
assign()method does merge metadata from another Schema, but it doesn't cover the replace-metadata case without constructing a throwaway Schema:And even that merges rather than replaces. The only clean way to replace metadata today is to construct a Schema directly, which requires using the full constructor.
I'd also like to add more small convenience methods over time to improve the usability of the library, and this is a first step in that direction.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should give you a schema or field with the metadata replaced:
And if you want to mutate instead of clone, you can do
schema.metadata.clear().