[
https://issues.apache.org/jira/browse/ARROW-2234?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16388366#comment-16388366
]
ASF GitHub Bot commented on ARROW-2234:
---------------------------------------
wesm closed pull request #1678: ARROW-2234: [JS] Read timestamp low bits as
Uint32s
URL: https://github.com/apache/arrow/pull/1678
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/js/package.json b/js/package.json
index 507babfbb..af3c97f5e 100644
--- a/js/package.json
+++ b/js/package.json
@@ -125,7 +125,6 @@
"ts",
"tsx"
],
- "mapCoverage": true,
"coverageReporters": [
"lcov"
],
diff --git a/js/src/Arrow.externs.js b/js/src/Arrow.externs.js
index cf4db9134..a14f959bb 100644
--- a/js/src/Arrow.externs.js
+++ b/js/src/Arrow.externs.js
@@ -510,24 +510,42 @@ var FloatVector = function() {};
FloatVector.from = function() {};
var DateVector = function() {};
+/** @type {?} */
+DateVector.prototype.asEpochMilliseconds;
var DecimalVector = function() {};
var TimeVector = function() {};
var TimestampVector = function() {};
+/** @type {?} */
+TimestampVector.prototype.asEpochMilliseconds;
var IntervalVector = function() {};
var BinaryVector = function() {};
+/** @type {?} */
+BinaryVector.prototype.asUtf8;
var FixedSizeBinaryVector = function() {};
var Utf8Vector = function() {};
+/** @type {?} */
+Utf8Vector.prototype.asBinary;
var ListVector = function() {};
var FixedSizeListVector = function() {};
var MapVector = function() {};
+/** @type {?} */
+MapVector.prototype.asStruct;
var StructVector = function() {};
+/** @type {?} */
+StructVector.prototype.asMap;
var UnionVector = function() {};
var DictionaryVector = function() {};
/** @type {?} */
+DictionaryVector.prototype.indices;
+/** @type {?} */
+DictionaryVector.prototype.dictionary;
+/** @type {?} */
DictionaryVector.prototype.getKey;
/** @type {?} */
DictionaryVector.prototype.getValue;
+/** @type {?} */
+DictionaryVector.prototype.reverseLookup;
var FlatView = function() {};
/** @type {?} */
diff --git a/js/src/vector/flat.ts b/js/src/vector/flat.ts
index acc2f1af9..06189c47d 100644
--- a/js/src/vector/flat.ts
+++ b/js/src/vector/flat.ts
@@ -326,9 +326,9 @@ export class IntervalMonthView extends PrimitiveView<Int32>
{
export function epochSecondsToMs(data: Int32Array, index: number) { return
1000 * data[index]; }
export function epochDaysToMs(data: Int32Array, index: number) { return
86400000 * data[index]; }
-export function epochMillisecondsLongToMs(data: Int32Array, index: number) {
return 4294967296 * (data[index + 1]) + data[index]; }
-export function epochMicrosecondsLongToMs(data: Int32Array, index: number) {
return 4294967296 * (data[index + 1] / 1000) + (data[index] / 1000); }
-export function epochNanosecondsLongToMs(data: Int32Array, index: number) {
return 4294967296 * (data[index + 1] / 1000000) + (data[index] / 1000000); }
+export function epochMillisecondsLongToMs(data: Int32Array, index: number) {
return 4294967296 * (data[index + 1]) + (data[index] >>> 0); }
+export function epochMicrosecondsLongToMs(data: Int32Array, index: number) {
return 4294967296 * (data[index + 1] / 1000) + ((data[index] >>> 0) / 1000); }
+export function epochNanosecondsLongToMs(data: Int32Array, index: number) {
return 4294967296 * (data[index + 1] / 1000000) + ((data[index] >>> 0) /
1000000); }
export function epochMillisecondsToDate(epochMs: number) { return new
Date(epochMs); }
export function epochDaysToDate(data: Int32Array, index: number) { return
epochMillisecondsToDate(epochDaysToMs(data, index)); }
diff --git a/js/test/unit/date-vector-tests.ts
b/js/test/unit/date-vector-tests.ts
new file mode 100644
index 000000000..b30d0498b
--- /dev/null
+++ b/js/test/unit/date-vector-tests.ts
@@ -0,0 +1,120 @@
+// 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 Arrow from '../Arrow';
+import { DateVector } from '../../src/vector';
+const { Table } = Arrow;
+
+describe(`DateVector`, () => {
+ it('returns days since the epoch as correct JS Dates', () => {
+ const table = Table.from(test_data);
+ const date32 = table.getColumnAt(0) as DateVector;
+ const expectedMillis = expectedMillis32();
+ for (const date of date32) {
+ const millis = expectedMillis.shift();
+ expect(date).toEqual(millis === null ? null : new Date(millis!));
+ }
+ });
+ it('returns millisecond longs since the epoch as correct JS Dates', () => {
+ const table = Table.from(test_data);
+ const date64 = table.getColumnAt(1) as DateVector;
+ const expectedMillis = expectedMillis64();
+ for (const date of date64) {
+ const millis = expectedMillis.shift();
+ expect(date).toEqual(millis === null ? null : new Date(millis!));
+ }
+ });
+ it('converts days since the epoch to milliseconds', () => {
+ const table = Table.from(test_data);
+ const date32 = table.getColumnAt(0) as DateVector;
+ const expectedMillis = expectedMillis32();
+ for (const timestamp of date32.asEpochMilliseconds()) {
+ expect(timestamp).toEqual(expectedMillis.shift());
+ }
+ });
+ it('converts millisecond longs since the epoch to millisecond ints', () =>
{
+ const table = Table.from(test_data);
+ const date64 = table.getColumnAt(1) as DateVector;
+ const expectedMillis = expectedMillis64();
+ for (const timestamp of date64.asEpochMilliseconds()) {
+ expect(timestamp).toEqual(expectedMillis.shift());
+ }
+ });
+});
+
+const expectedMillis32 = () => [
+ 165247430400000, 34582809600000, 232604524800000, null,
+ 199808812800000, 165646771200000, 209557238400000, null
+];
+
+const expectedMillis64 = () => [
+ 27990830234011, -41278585914325, 12694624797111,
+ null, null, 10761360520213, null, 1394015437000
+];
+
+const test_data = {
+ 'schema': {
+ 'fields': [
+ {
+ 'name': 'f0',
+ 'type': {
+ 'name': 'date',
+ 'unit': 'DAY'
+ },
+ 'nullable': true,
+ 'children': []
+ },
+ {
+ 'name': 'f1',
+ 'type': {
+ 'name': 'date',
+ 'unit': 'MILLISECOND'
+ },
+ 'nullable': true,
+ 'children': []
+ }
+ ]
+ },
+ 'batches': [
+ {
+ 'count': 8,
+ 'columns': [
+ {
+ 'name': 'f0',
+ 'count': 8,
+ 'VALIDITY': [1, 1, 1, 0, 1, 1, 1, 0],
+ 'DATA': [1912586, 400264, 2692182, 2163746, 2312602,
1917208, 2425431]
+ },
+ {
+ 'name': 'f1',
+ 'count': 8,
+ 'VALIDITY': [1, 1, 1, 0, 0, 1, 0, 1],
+ 'DATA': [
+ 27990830234011,
+ -41278585914325,
+ 12694624797111,
+ -38604948562547,
+ -37802308043516,
+ 10761360520213,
+ -25129181633384,
+ 1394015437000 // <-- the tricky one
+ ]
+ }
+ ]
+ }
+ ]
+};
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> [JS] Read timestamp low bits as Uint32s
> ---------------------------------------
>
> Key: ARROW-2234
> URL: https://issues.apache.org/jira/browse/ARROW-2234
> Project: Apache Arrow
> Issue Type: Bug
> Components: JavaScript
> Reporter: Brian Hulette
> Assignee: Paul Taylor
> Priority: Major
> Labels: pull-request-available
> Fix For: 0.9.0
>
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
