-
Notifications
You must be signed in to change notification settings - Fork 22
fix: Respect typed-array byteOffset in bigNumsToStrings #439
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
Karakatiza666
wants to merge
1
commit into
apache:main
Choose a base branch
from
Karakatiza666:fix-json-write
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
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,108 @@ | ||
| // 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. | ||
|
|
||
| // Focused unit tests for bigNumsToStrings(), the helper every 64-/128-bit | ||
| // JSON callsite (Int64, Uint64, Date, Timestamp, Time, Duration, Decimal, | ||
| // LargeUtf8/Binary/List offsets) routes through. The end-to-end matrix in | ||
| // json-offset-views-tests.ts exercises it through JSONVectorAssembler; these | ||
| // tests pin the helper's contract directly: | ||
| // | ||
| // - it reinterprets the backing buffer as little-endian u32 words and groups | ||
| // `stride` words per emitted value, | ||
| // - it always formats UNSIGNED (BN.new(words, false)), so a signed input's | ||
| // negative values come out as their two's-complement 64-bit magnitude, | ||
| // - it honours values.byteOffset/byteLength rather than the whole buffer | ||
| // (the regression fixed in "Respect typed-array byteOffset in | ||
| // bigNumsToStrings"): reverting that fix breaks the offset-view cases here. | ||
|
|
||
| import { bigNumsToStrings } from 'apache-arrow/visitor/jsonvectorassembler'; | ||
|
|
||
| // JSONVectorAssembler's module is an internal (non-public) deep import. UMD / | ||
| // single-bundle build targets collapse every `apache-arrow/*` path onto the | ||
| // public bundle, which does not re-export this helper. Skip there; the same | ||
| // behaviour is covered via the public API in json-writer-tests.ts. | ||
| const describeHelper = bigNumsToStrings ? describe : describe.skip; | ||
| if (!bigNumsToStrings) { | ||
| console.warn('Skipping "bigNumsToStrings" unit test under UMD build.'); | ||
| } | ||
|
|
||
| /** | ||
| * Place `arr`'s contents at a nonzero byteOffset inside a larger buffer and | ||
| * return a subarray view over them — the memory layout a typed array has after | ||
| * coming out of tableFromIPC or a slice. | ||
| */ | ||
| function atOffset<T extends { length: number; set(a: any, o: number): void; subarray(a: number, b: number): T }>( | ||
| Ctor: new (n: number) => T, | ||
| values: ArrayLike<any>, | ||
| ): T { | ||
| const pad = 3; | ||
| const backing = new Ctor(values.length + pad * 2); | ||
| backing.set(values as any, pad); | ||
| return backing.subarray(pad, pad + values.length); | ||
| } | ||
|
|
||
| describeHelper('bigNumsToStrings', () => { | ||
| test('formats unsigned 64-bit values (stride 2)', () => { | ||
| const values = [0n, 1n, 42n, 0xFFFFFFFFn, 0x1_0000_0000n, 1234567890123456789n, 0xFFFFFFFFFFFFFFFFn]; | ||
| const arr = BigUint64Array.from(values); | ||
| expect([...bigNumsToStrings(arr, 2)]).toEqual(values.map(String)); | ||
| }); | ||
|
|
||
| test('formats signed 64-bit values as their unsigned two\'s-complement (stride 2)', () => { | ||
| const values = [-1n, -2n, -1234567890n, 5n]; | ||
| const arr = BigInt64Array.from(values); | ||
| const expected = values.map((v) => String(BigInt.asUintN(64, v))); | ||
| expect([...bigNumsToStrings(arr, 2)]).toEqual(expected); | ||
| // sanity: -1 is the all-ones 64-bit word | ||
| expect(expected[0]).toBe('18446744073709551615'); | ||
| }); | ||
|
|
||
| test('formats unsigned 128-bit values (stride 4)', () => { | ||
| // little-endian u32 words: value = w0 + w1*2^32 + w2*2^64 + w3*2^96 | ||
| const one = [1, 0, 0, 0]; | ||
| const twoTo96 = [0, 0, 0, 1]; | ||
| const arr = Uint32Array.from([...one, ...twoTo96]); | ||
| expect([...bigNumsToStrings(arr, 4)]).toEqual([ | ||
| '1', | ||
| String(2n ** 96n), | ||
| ]); | ||
| }); | ||
|
|
||
| test('yields one string per group of `stride` words', () => { | ||
| const arr = BigUint64Array.from([10n, 20n, 30n]); | ||
| expect([...bigNumsToStrings(arr, 2)]).toHaveLength(3); | ||
| }); | ||
|
|
||
| test('honours byteOffset for 64-bit views (regression)', () => { | ||
| const values = [0n, 1n, 1234567890123456789n, 0xFFFFFFFFFFFFFFFFn]; | ||
| const view = atOffset(BigUint64Array, values); | ||
|
|
||
| // precondition: the view really starts past the buffer origin | ||
| expect(view.byteOffset).toBeGreaterThan(0); | ||
|
|
||
| expect([...bigNumsToStrings(view, 2)]).toEqual(values.map(String)); | ||
| }); | ||
|
|
||
| test('offset view and fresh array agree for signed 64-bit', () => { | ||
| const values = [-1n, 9223372036854775807n, -9223372036854775808n, 0n]; | ||
| const fresh = BigInt64Array.from(values); | ||
| const view = atOffset(BigInt64Array, values); | ||
|
|
||
| expect(view.byteOffset).toBeGreaterThan(0); | ||
| expect([...bigNumsToStrings(view, 2)]).toEqual([...bigNumsToStrings(fresh, 2)]); | ||
| }); | ||
| }); |
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,116 @@ | ||
| // 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. | ||
|
|
||
| // JSONVectorAssembler must serialize a vector the same way regardless of where | ||
| // its backing typed arrays sit in their buffers. For each affected type we take | ||
| // a freshly-generated Vector (byteOffset === 0), rewrap every backing typed | ||
| // array in a subarray view at byteOffset > 0, and assert both serialize to | ||
| // identical JSON. | ||
|
|
||
| import { | ||
| Data, DataType, Field, RecordBatch, Schema, Struct, | ||
| } from 'apache-arrow'; | ||
| import { JSONVectorAssembler } from 'apache-arrow/visitor/jsonvectorassembler'; | ||
| import * as generate from '../../../generate-test-data.js'; | ||
|
|
||
| /** | ||
| * Return a copy of `arr` whose data lives at a nonzero byteOffset inside a | ||
| * larger underlying buffer. Equivalent to the state of a typed array that | ||
| * came out of `tableFromIPC` — same logical contents, shifted memory layout. | ||
| */ | ||
| function padBuffer<T extends ArrayBufferView>(arr: T | undefined): T | undefined { | ||
| if (!arr) return arr; | ||
| const Ctor = arr.constructor as new (n: number) => any; | ||
| const padding = 4; | ||
| const padded = new Ctor((arr as any).length + padding * 2); | ||
| padded.set(arr, padding); | ||
| return padded.subarray(padding, padding + (arr as any).length) as T; | ||
| } | ||
|
|
||
| /** | ||
| * Clone a Data so every backing typed array sits at byteOffset > 0. | ||
| * Recurses into children so nested types stay consistent. | ||
| */ | ||
| function withOffsetViews<T extends DataType>(d: Data<T>): Data<T> { | ||
| const newBuffers = Array.from(d.buffers as unknown as Array<ArrayBufferView | undefined>, padBuffer); | ||
| const newChildren = d.children.map((c) => withOffsetViews(c)); | ||
| return d.clone(d.type, d.offset, d.length, d.nullCount, newBuffers as any, newChildren); | ||
| } | ||
|
|
||
| /** | ||
| * Wrap a Data in a single-field RecordBatch so we can hand it to assemble(). | ||
| */ | ||
| function batchOf<T extends DataType>(type: T, data: Data<T>): RecordBatch<any> { | ||
| const field = new Field('x', type, true); | ||
| const schema = new Schema([field]); | ||
| const structType = new Struct([field]); | ||
| const root = data.clone(structType as any, 0, data.length, 0, [undefined, undefined, undefined, undefined] as any, [data]); | ||
| return new RecordBatch(schema, root as Data<Struct>); | ||
| } | ||
|
|
||
| // Every affected callsite of bigNumsToStrings, one entry per type. Adding | ||
| // a new affected type is a one-line addition here. | ||
| const affectedTypeCases: Array<{ name: string; gen: () => generate.GeneratedVector<any> }> = [ | ||
| { name: 'Int64', gen: () => generate.int64() }, | ||
| { name: 'Uint64', gen: () => generate.uint64() }, | ||
| { name: 'DateMillisecond', gen: () => generate.dateMillisecond() }, | ||
| { name: 'TimestampSecond', gen: () => generate.timestampSecond() }, | ||
| { name: 'TimestampMillisecond', gen: () => generate.timestampMillisecond() }, | ||
| { name: 'TimestampMicrosecond', gen: () => generate.timestampMicrosecond() }, | ||
| { name: 'TimestampNanosecond', gen: () => generate.timestampNanosecond() }, | ||
| { name: 'TimeMicrosecond', gen: () => generate.timeMicrosecond() }, | ||
| { name: 'TimeNanosecond', gen: () => generate.timeNanosecond() }, | ||
| { name: 'DurationSecond', gen: () => generate.durationSecond() }, | ||
| { name: 'DurationMillisecond', gen: () => generate.durationMillisecond() }, | ||
| { name: 'DurationMicrosecond', gen: () => generate.durationMicrosecond() }, | ||
| { name: 'DurationNanosecond', gen: () => generate.durationNanosecond() }, | ||
| { name: 'Decimal', gen: () => generate.decimal() }, | ||
| { name: 'LargeUtf8', gen: () => generate.largeUtf8() }, | ||
| { name: 'LargeBinary', gen: () => generate.largeBinary() }, | ||
| ]; | ||
|
|
||
| // JSONVectorAssembler is an internal (non-public) export. Single-bundle build | ||
| // targets such as the UMD bundle collapse every `apache-arrow/*` deep import to | ||
| // the public bundle, which doesn't re-export it. | ||
| // So, skip the test on UMD builds (covered there via the public API in | ||
| // json-writer-tests.ts). | ||
| if (!JSONVectorAssembler) { | ||
| console.warn( | ||
| 'Skipping "JSONVectorAssembler offset-view safety" test under UMD build.' | ||
| ); | ||
| } | ||
| const describeAssembler = JSONVectorAssembler ? describe : describe.skip; | ||
|
|
||
| describeAssembler('JSONVectorAssembler offset-view safety', () => { | ||
| for (const { name, gen } of affectedTypeCases) { | ||
| test(name, () => { | ||
| const { vector } = gen(); | ||
| const fresh = vector.data[0]; | ||
| const viewed = withOffsetViews(fresh); | ||
|
|
||
| // Sanity: the rewrap really did shift at least one buffer | ||
| // past byteOffset 0, so this run actually exercises the bug | ||
| // precondition. | ||
| const buffers = Array.from(viewed.buffers as unknown as Array<ArrayBufferView | undefined>); | ||
| expect(buffers.some((b) => b && b.byteOffset > 0)).toBe(true); | ||
|
|
||
| const [[jsonFresh]] = JSONVectorAssembler.assemble(batchOf(fresh.type, fresh)); | ||
| const [[jsonViewed]] = JSONVectorAssembler.assemble(batchOf(fresh.type, viewed)); | ||
| expect(jsonViewed).toEqual(jsonFresh); | ||
| }); | ||
| } | ||
| }); | ||
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.