-
Notifications
You must be signed in to change notification settings - Fork 89
fix(parquet): bss encoding and tests on big endian systems #663
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
daniel-adam-tfs
wants to merge
2
commits into
apache:main
Choose a base branch
from
daniel-adam-tfs:bugfix/fix-bss-and-tests-on-big-endian
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
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,61 @@ | ||
| // 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. | ||
|
|
||
| //go:build s390x | ||
|
|
||
| package encoding | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "github.com/apache/arrow-go/v18/parquet/internal/debug" | ||
| ) | ||
|
|
||
| // decodeByteStreamSplitBatchWidth4InByteOrder decodes the batch of nValues raw bytes representing a 4-byte datatype provided | ||
| // by 'data', into the output buffer 'out' using BYTE_STREAM_SPLIT encoding. The values are expected to be in little-endian | ||
| // byte order and are be decoded into the 'out' array in machine's native endianness. | ||
| // 'out' must have space for at least len(data) bytes. | ||
| func decodeByteStreamSplitBatchWidth4InByteOrder(data []byte, nValues, stride int, out []byte) { | ||
| const width = 4 | ||
| debug.Assert(len(out) >= nValues*width, fmt.Sprintf("not enough space in output buffer for decoding, out: %d bytes, data: %d bytes", len(out), len(data))) | ||
| for element := 0; element < nValues; element++ { | ||
| // Big Endian: most significant byte first | ||
| out[width*element+0] = data[3*stride+element] | ||
| out[width*element+1] = data[2*stride+element] | ||
| out[width*element+2] = data[stride+element] | ||
| out[width*element+3] = data[element] | ||
| } | ||
| } | ||
|
|
||
| // decodeByteStreamSplitBatchWidth8InByteOrder decodes the batch of nValues raw bytes representing a 8-byte datatype provided | ||
| // by 'data', into the output buffer 'out' using BYTE_STREAM_SPLIT encoding. The values are expected to be in little-endian | ||
| // byte order and are be decoded into the 'out' array in machine's native endianness. | ||
| // 'out' must have space for at least len(data) bytes. | ||
| func decodeByteStreamSplitBatchWidth8InByteOrder(data []byte, nValues, stride int, out []byte) { | ||
| const width = 8 | ||
| debug.Assert(len(out) >= nValues*width, fmt.Sprintf("not enough space in output buffer for decoding, out: %d bytes, data: %d bytes", len(out), len(data))) | ||
| for element := 0; element < nValues; element++ { | ||
| // Big Endian: most significant byte first | ||
| out[width*element+0] = data[7*stride+element] | ||
| out[width*element+1] = data[6*stride+element] | ||
| out[width*element+2] = data[5*stride+element] | ||
| out[width*element+3] = data[4*stride+element] | ||
| out[width*element+4] = data[3*stride+element] | ||
| out[width*element+5] = data[2*stride+element] | ||
| out[width*element+6] = data[stride+element] | ||
| out[width*element+7] = data[element] | ||
| } | ||
| } |
61 changes: 61 additions & 0 deletions
61
parquet/internal/encoding/byte_stream_split_little_endian.go
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,61 @@ | ||
| // 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. | ||
|
|
||
| //go:build !s390x | ||
|
|
||
| package encoding | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "github.com/apache/arrow-go/v18/parquet/internal/debug" | ||
| ) | ||
|
|
||
| // decodeByteStreamSplitBatchWidth4InByteOrder decodes the batch of nValues raw bytes representing a 4-byte datatype provided | ||
| // by 'data', into the output buffer 'out' using BYTE_STREAM_SPLIT encoding. The values are expected to be in little-endian | ||
| // byte order and are be decoded into the 'out' array in machine's native endianness. | ||
| // 'out' must have space for at least len(data) bytes. | ||
| func decodeByteStreamSplitBatchWidth4InByteOrder(data []byte, nValues, stride int, out []byte) { | ||
| const width = 4 | ||
| debug.Assert(len(out) >= nValues*width, fmt.Sprintf("not enough space in output buffer for decoding, out: %d bytes, data: %d bytes", len(out), len(data))) | ||
| for element := 0; element < nValues; element++ { | ||
| // Little Endian: least significant byte first | ||
| out[width*element+0] = data[element] | ||
| out[width*element+1] = data[stride+element] | ||
| out[width*element+2] = data[2*stride+element] | ||
| out[width*element+3] = data[3*stride+element] | ||
| } | ||
| } | ||
|
|
||
| // decodeByteStreamSplitBatchWidth8InByteOrder decodes the batch of nValues raw bytes representing a 8-byte datatype provided | ||
| // by 'data', into the output buffer 'out' using BYTE_STREAM_SPLIT encoding. The values are expected to be in little-endian | ||
| // byte order and are be decoded into the 'out' array in machine's native endianness. | ||
| // 'out' must have space for at least len(data) bytes. | ||
| func decodeByteStreamSplitBatchWidth8InByteOrder(data []byte, nValues, stride int, out []byte) { | ||
| const width = 8 | ||
| debug.Assert(len(out) >= nValues*width, fmt.Sprintf("not enough space in output buffer for decoding, out: %d bytes, data: %d bytes", len(out), len(data))) | ||
| for element := 0; element < nValues; element++ { | ||
| // Little Endian: least significant byte first | ||
| out[width*element+0] = data[element] | ||
| out[width*element+1] = data[stride+element] | ||
| out[width*element+2] = data[2*stride+element] | ||
| out[width*element+3] = data[3*stride+element] | ||
| out[width*element+4] = data[4*stride+element] | ||
| out[width*element+5] = data[5*stride+element] | ||
| out[width*element+6] = data[6*stride+element] | ||
| out[width*element+7] = data[7*stride+element] | ||
| } | ||
| } |
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
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.
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.
there is a
ToLEfunction ininternal/utils/that might be better for this. For example:This would work because on LittleEndian systems,
ToLE(val)is just defined asreturn val.