Skip to content
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

Optimize usage of Intl API to speed up response parsing with many datetime objects #1174

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -157,18 +157,30 @@ function getOffsetFromZoneId (timeZoneId, epochSecond, nanosecond) {
return offset
}

const dateTimeFormatCache = new Map()

function getDateTimeFormatForZoneId (timeZoneId) {
if (!dateTimeFormatCache.has(timeZoneId)) {
const formatter = new Intl.DateTimeFormat('en-US', {
timeZone: timeZoneId,
year: 'numeric',
month: 'numeric',
day: 'numeric',
hour: 'numeric',
minute: 'numeric',
second: 'numeric',
hour12: false,
era: 'narrow'
})

dateTimeFormatCache.set(timeZoneId, formatter)
}

return dateTimeFormatCache.get(timeZoneId)
}

function getTimeInZoneId (timeZoneId, epochSecond, nano) {
const formatter = new Intl.DateTimeFormat('en-US', {
timeZone: timeZoneId,
year: 'numeric',
month: 'numeric',
day: 'numeric',
hour: 'numeric',
minute: 'numeric',
second: 'numeric',
hour12: false,
era: 'narrow'
})
const formatter = getDateTimeFormatForZoneId(timeZoneId)

const utc = int(epochSecond)
.multiply(1000)
Expand Down
23 changes: 19 additions & 4 deletions packages/core/src/internal/temporal-util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/

import Integer, { int, isInt } from '../integer'
import { newError } from '../error'
import { Neo4jError, newError } from '../error'
import { assertNumberOrInteger } from './util'
import { NumberOrInteger } from '../graph-types'

Expand Down Expand Up @@ -428,13 +428,28 @@ export function assertValidNanosecond (
)
}

const timeZoneValidityCache = new Map<string, boolean>()
const newInvalidZoneIdError = (zoneId: string, fieldName: string): Neo4jError => newError(
`${fieldName} is expected to be a valid ZoneId but was: "${zoneId}"`
)

export function assertValidZoneId (fieldName: string, zoneId: string): void {
const cachedResult = timeZoneValidityCache.get(zoneId)

if (cachedResult === true) {
return
}

if (cachedResult === false) {
throw newInvalidZoneIdError(zoneId, fieldName)
}

try {
Intl.DateTimeFormat(undefined, { timeZone: zoneId })
timeZoneValidityCache.set(zoneId, true)
} catch (e) {
throw newError(
`${fieldName} is expected to be a valid ZoneId but was: "${zoneId}"`
)
timeZoneValidityCache.set(zoneId, false)
throw newInvalidZoneIdError(zoneId, fieldName)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,18 +157,30 @@ function getOffsetFromZoneId (timeZoneId, epochSecond, nanosecond) {
return offset
}

const dateTimeFormatCache = new Map()

function getDateTimeFormatForZoneId (timeZoneId) {
if (!dateTimeFormatCache.has(timeZoneId)) {
const formatter = new Intl.DateTimeFormat('en-US', {
timeZone: timeZoneId,
year: 'numeric',
month: 'numeric',
day: 'numeric',
hour: 'numeric',
minute: 'numeric',
second: 'numeric',
hour12: false,
era: 'narrow'
})

dateTimeFormatCache.set(timeZoneId, formatter)
}

return dateTimeFormatCache.get(timeZoneId)
}

function getTimeInZoneId (timeZoneId, epochSecond, nano) {
const formatter = new Intl.DateTimeFormat('en-US', {
timeZone: timeZoneId,
year: 'numeric',
month: 'numeric',
day: 'numeric',
hour: 'numeric',
minute: 'numeric',
second: 'numeric',
hour12: false,
era: 'narrow'
})
const formatter = getDateTimeFormatForZoneId(timeZoneId)

const utc = int(epochSecond)
.multiply(1000)
Expand Down
23 changes: 19 additions & 4 deletions packages/neo4j-driver-deno/lib/core/internal/temporal-util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/

import Integer, { int, isInt } from '../integer.ts'
import { newError } from '../error.ts'
import { Neo4jError, newError } from '../error.ts'
import { assertNumberOrInteger } from './util.ts'
import { NumberOrInteger } from '../graph-types.ts'

Expand Down Expand Up @@ -428,13 +428,28 @@ export function assertValidNanosecond (
)
}

const timeZoneValidityCache = new Map<string, boolean>()
const newInvalidZoneIdError = (zoneId: string, fieldName: string): Neo4jError => newError(
`${fieldName} is expected to be a valid ZoneId but was: "${zoneId}"`
)

export function assertValidZoneId (fieldName: string, zoneId: string): void {
const cachedResult = timeZoneValidityCache.get(zoneId)

if (cachedResult === true) {
return
}

if (cachedResult === false) {
throw newInvalidZoneIdError(zoneId, fieldName)
}

try {
Intl.DateTimeFormat(undefined, { timeZone: zoneId })
timeZoneValidityCache.set(zoneId, true)
} catch (e) {
throw newError(
`${fieldName} is expected to be a valid ZoneId but was: "${zoneId}"`
)
timeZoneValidityCache.set(zoneId, false)
throw newInvalidZoneIdError(zoneId, fieldName)
}
}

Expand Down
26 changes: 26 additions & 0 deletions runTests.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
npm install -g gulp typescript jest

npm ci
npm run build -- --no-private

if [ -n "$2" ]; then
export NEOCTRL_ARGS="$2"
fi

trap "npm run stop-neo4j" EXIT

npm run start-neo4j

if [ $? -ne 0 ]; then
echo "Unable to start neo4j"
exit 1
fi

npm test -- --no-private

if [ $? -eq 0 ]; then
echo "Exit with code 0"
else
echo "Exit with code 1"
exit 1
fi