This is an automated email from the ASF dual-hosted git repository.
bhulette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 3d4b6c1 ARROW-2356: [JS] Fix JSON Reader FixedSizeBinary Vectors
3d4b6c1 is described below
commit 3d4b6c1ecf833d077dfd23624c0d8d492d4bef59
Author: Paul Taylor <[email protected]>
AuthorDate: Tue Mar 27 11:12:07 2018 -0400
ARROW-2356: [JS] Fix JSON Reader FixedSizeBinary Vectors
Resolves https://issues.apache.org/jira/browse/ARROW-2356
Author: Paul Taylor <[email protected]>
Closes #1796 from trxcllnt/js-fix-json-reader-fixedsizebinary and squashes
the following commits:
c231755 <Paul Taylor> make JSON reader read FixedSizeBinary data buffers
5c8fda0 <Paul Taylor> make integration test runner exit with code 1
---
js/bin/integration.js | 4 ++--
js/src/ipc/reader/json.ts | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/js/bin/integration.js b/js/bin/integration.js
index 2aeb14d..73162b6 100755
--- a/js/bin/integration.js
+++ b/js/bin/integration.js
@@ -106,13 +106,13 @@ switch (mode) {
jsonPaths.forEach((p, i) => {
args.push('-j', p, '-a', arrowPaths[i]);
});
- child_process.spawnSync(
+ process.exitCode = child_process.spawnSync(
gulp, args,
{
cwd: path.resolve(__dirname, '..'),
stdio: ['ignore', 'inherit', 'inherit']
}
- );
+ ).status || process.exitCode || 0;
// for (let i = -1, n = jsonPaths.length; ++i < n;) {
// const jsonPath = jsonPaths[i];
// const arrowPath = arrowPaths[i];
diff --git a/js/src/ipc/reader/json.ts b/js/src/ipc/reader/json.ts
index 1081998..67bb5ca 100644
--- a/js/src/ipc/reader/json.ts
+++ b/js/src/ipc/reader/json.ts
@@ -106,7 +106,7 @@ export class JSONDataLoader extends TypeDataLoader {
return new Uint8Array(int64DataFromJSON(sources[offset] as
string[]));
} else if (DataType.isDecimal(type) === true) {
return new Uint8Array(decimalDataFromJSON(sources[offset] as
string[]));
- } else if (DataType.isBinary(type) === true) {
+ } else if (DataType.isBinary(type) === true ||
DataType.isFixedSizeBinary(type) === true) {
return new Uint8Array(binaryDataFromJSON(sources[offset] as
string[]));
} else if (DataType.isBool(type) === true) {
return new Uint8Array(packBools(sources[offset] as
number[]).buffer);
--
To stop receiving notification emails like this one, please contact
[email protected].
