forked from apache/drill
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
360a7a3
commit 7eefe01
Showing
8 changed files
with
336 additions
and
56 deletions.
There are no files selected for viewing
This file contains 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 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 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 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
73 changes: 73 additions & 0 deletions
73
...exec/src/main/java/org/apache/drill/exec/store/easy/json/values/UtcDateValueListener.java
This file contains 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,73 @@ | ||
/* | ||
* 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. | ||
*/ | ||
package org.apache.drill.exec.store.easy.json.values; | ||
|
||
import java.time.LocalDate; | ||
import java.time.ZoneOffset; | ||
import java.time.ZonedDateTime; | ||
|
||
import org.apache.drill.exec.expr.fn.impl.DateUtility; | ||
import org.apache.drill.exec.store.easy.json.loader.JsonLoaderImpl; | ||
import org.apache.drill.exec.store.easy.json.parser.TokenIterator; | ||
import org.apache.drill.exec.vector.accessor.ScalarWriter; | ||
|
||
import com.fasterxml.jackson.core.JsonToken; | ||
|
||
/** | ||
* Drill-specific extension to allow dates only, expressed in UTC | ||
* to be consistent with Mongo timestamps. | ||
* <p> | ||
* Drill dates are in the local time zone, so conversion is needed. | ||
* Drill dates are stored in ms, which is odd. | ||
*/ | ||
public class UtcDateValueListener extends ScalarListener { | ||
|
||
public UtcDateValueListener(JsonLoaderImpl loader, ScalarWriter writer) { | ||
super(loader, writer); | ||
} | ||
|
||
@Override | ||
public void onValue(JsonToken token, TokenIterator tokenizer) { | ||
switch (token) { | ||
case VALUE_NULL: | ||
setNull(); | ||
break; | ||
case VALUE_NUMBER_INT: | ||
writer.setLong(tokenizer.longValue()); | ||
break; | ||
case VALUE_STRING: | ||
try { | ||
|
||
// A Drill date is ms since the epoch, local time. Our input | ||
// is in UTC. We DO NOT want to convert from the date, midnight, UTC | ||
// to local time since that will change the date. Instead, we just | ||
// want to copy the offset since the epoch from UTC to our local | ||
// time, so that we retain the date, even if the span of the date | ||
// is different locally than UTC. A mess. | ||
LocalDate localDate = LocalDate.parse(tokenizer.stringValue(), DateUtility.isoFormatDate); | ||
ZonedDateTime utc = localDate.atStartOfDay(ZoneOffset.UTC); | ||
writer.setLong(utc.toEpochSecond() * 1000); | ||
} catch (Exception e) { | ||
throw loader.dataConversionError(schema(), "date", tokenizer.stringValue()); | ||
} | ||
break; | ||
default: | ||
throw tokenizer.invalidValue(token); | ||
} | ||
} | ||
} |
72 changes: 72 additions & 0 deletions
72
...src/main/java/org/apache/drill/exec/store/easy/json/values/UtcTimestampValueListener.java
This file contains 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,72 @@ | ||
/* | ||
* 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. | ||
*/ | ||
package org.apache.drill.exec.store.easy.json.values; | ||
|
||
import java.time.Instant; | ||
import java.time.ZoneId; | ||
|
||
import org.apache.drill.exec.store.easy.json.loader.JsonLoaderImpl; | ||
import org.apache.drill.exec.store.easy.json.parser.TokenIterator; | ||
import org.apache.drill.exec.vector.accessor.ScalarWriter; | ||
|
||
import com.fasterxml.jackson.core.JsonToken; | ||
|
||
/** | ||
* Per the <a href="https://docs.mongodb.com/manual/reference/mongodb-extended-json-v1/#bson.data_date"> | ||
* V1 docs</a>: | ||
* <quote> | ||
* In Strict mode, {@code <date>} is an ISO-8601 date format with a mandatory time zone field | ||
* following the template YYYY-MM-DDTHH:mm:ss.mmm<+/-Offset>. | ||
* <p> | ||
* In Shell mode, {@code <date>} is the JSON representation of a 64-bit signed | ||
* integer giving the number of milliseconds since epoch UTC. | ||
* </quote> | ||
* <p> | ||
* Drill dates are in the local time zone, so conversion is needed. | ||
*/ | ||
public class UtcTimestampValueListener extends ScalarListener { | ||
|
||
private final ZoneId localZoneId = ZoneId.systemDefault(); | ||
|
||
public UtcTimestampValueListener(JsonLoaderImpl loader, ScalarWriter writer) { | ||
super(loader, writer); | ||
} | ||
|
||
@Override | ||
public void onValue(JsonToken token, TokenIterator tokenizer) { | ||
Instant instant; | ||
switch (token) { | ||
case VALUE_NULL: | ||
setNull(); | ||
return; | ||
case VALUE_NUMBER_INT: | ||
instant = Instant.ofEpochMilli(tokenizer.longValue()); | ||
break; | ||
case VALUE_STRING: | ||
try { | ||
instant = Instant.parse(tokenizer.stringValue()); | ||
} catch (Exception e) { | ||
throw loader.dataConversionError(schema(), "date", tokenizer.stringValue()); | ||
} | ||
break; | ||
default: | ||
throw tokenizer.invalidValue(token); | ||
} | ||
writer.setLong(instant.toEpochMilli() + localZoneId.getRules().getOffset(instant).getTotalSeconds() * 1000); | ||
} | ||
} |
This file contains 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.