Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions src/schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,17 @@ export class Schema<T extends TypeMap = any> {
return new Schema<K>(fields, this.metadata);
}

/**
* Create a new Schema with replaced metadata.
*
* @param metadata Replacement metadata entries. Pass `null` to clear.
*/
public withMetadata(metadata?: Map<string, string> | Record<string, string> | null): Schema<T> {
if (metadata === undefined) { return this; }
const next = metadata === null ? new Map<string, string>() : toMetadataMap(metadata);
return new Schema<T>(this.fields, next, this.dictionaries, this.metadataVersion);
}

public assign<R extends TypeMap = any>(schema: Schema<R>): Schema<T & R>;
public assign<R extends TypeMap = any>(...fields: (Field<R[keyof R]> | Field<R[keyof R]>[])[]): Schema<T & R>;
public assign<R extends TypeMap = any>(...args: (Schema<R> | Field<R[keyof R]> | Field<R[keyof R]>[])[]) {
Expand Down Expand Up @@ -143,6 +154,18 @@ export class Field<T extends DataType = any> {
: ({ name = this.name, type = this.type, nullable = this.nullable, metadata = this.metadata } = args[0]);
return Field.new<R>(name, type, nullable, metadata);
}

/**
* Create a new Field with replaced metadata. Accepts either a Map or a plain object.
* Pass `null` to clear existing metadata.
*
* @param metadata Replacement metadata entries.
*/
public withMetadata(metadata?: Map<string, string> | Record<string, string> | null): Field<T> {
if (metadata === undefined) { return this; }
const next = metadata === null ? new Map<string, string>() : toMetadataMap(metadata);
return new Field<T>(this.name, this.type, this.nullable, next);
}
}

// Add these here so they're picked up by the externs creator
Expand All @@ -157,6 +180,13 @@ function mergeMaps<TKey, TVal>(m1?: Map<TKey, TVal> | null, m2?: Map<TKey, TVal>
return new Map([...(m1 || new Map()), ...(m2 || new Map())]);
}

/** @ignore */
function toMetadataMap(metadata: Map<string, string> | Record<string, string>) {
return metadata instanceof Map
? new Map(metadata)
: new Map(Object.entries(metadata));
}

/** @ignore */
function generateDictionaryMap(fields: Field[], dictionaries = new Map<number, DataType>()): Map<number, DataType> {

Expand Down
66 changes: 66 additions & 0 deletions test/unit/schema-tests.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
// 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 updated = field.withMetadata({ baz: 'qux' });
expect(updated).not.toBe(field);
expect(updated.metadata.get('foo')).toBeUndefined();
expect(updated.metadata.get('baz')).toBe('qux');
});

test('replaces metadata from Maps', () => {
const field = new Field('col', new Int32(), true, new Map([['foo', 'bar']]));
const updated = field.withMetadata(new Map([['foo', 'baz']]));
expect(updated.metadata.get('foo')).toBe('baz');
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);
});
});

describe('Schema.withMetadata', () => {
test('replaces metadata from plain objects', () => {
const schema = new Schema([new Field('col', new Int32())], new Map([['foo', 'bar']]));
const updated = schema.withMetadata({ baz: 'qux' });
expect(updated).not.toBe(schema);
expect(schema.metadata.get('baz')).toBeUndefined();
expect(updated.metadata.get('foo')).toBeUndefined();
expect(updated.metadata.get('baz')).toBe('qux');
});

test('replaces metadata from Maps', () => {
const schema = new Schema([new Field('col', new Int32())], new Map([['foo', 'bar']]));
const updated = schema.withMetadata(new Map([['foo', 'baz']]));
expect(updated.metadata.get('foo')).toBe('baz');
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);
});
});