-
Notifications
You must be signed in to change notification settings - Fork 3.2k
Implement native ESRI reader #25241
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
ljw9111
wants to merge
1
commit into
trinodb:master
Choose a base branch
from
ljw9111:native-esri-reader
base: master
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.
+6,723
−4
Open
Implement native ESRI reader #25241
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
383 changes: 383 additions & 0 deletions
383
lib/trino-hive-formats/src/main/java/io/trino/hive/formats/esri/EsriDeserializer.java
Large diffs are not rendered by default.
Oops, something went wrong.
120 changes: 120 additions & 0 deletions
120
lib/trino-hive-formats/src/main/java/io/trino/hive/formats/esri/EsriReader.java
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,120 @@ | ||
/* | ||
* Licensed 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 io.trino.hive.formats.esri; | ||
|
||
import com.fasterxml.jackson.core.JsonFactory; | ||
import com.fasterxml.jackson.core.JsonParser; | ||
import com.fasterxml.jackson.core.JsonToken; | ||
import com.google.common.io.Closer; | ||
import com.google.common.io.CountingInputStream; | ||
import io.trino.spi.PageBuilder; | ||
|
||
import java.io.Closeable; | ||
import java.io.IOException; | ||
import java.io.InputStream; | ||
|
||
import static com.fasterxml.jackson.core.JsonFactory.Feature.INTERN_FIELD_NAMES; | ||
import static io.trino.plugin.base.util.JsonUtils.jsonFactoryBuilder; | ||
import static java.util.Objects.requireNonNull; | ||
|
||
public class EsriReader | ||
ljw9111 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
implements Closeable | ||
{ | ||
private static final JsonFactory JSON_FACTORY = jsonFactoryBuilder() | ||
.disable(INTERN_FIELD_NAMES) | ||
.build(); | ||
|
||
private final CountingInputStream inputStream; | ||
private final EsriDeserializer esriDeserializer; | ||
private JsonParser parser; | ||
private long readTimeNanos; | ||
private boolean closed; | ||
|
||
private static final String FEATURES_ARRAY_NAME = "features"; | ||
|
||
public EsriReader(InputStream inputStream, EsriDeserializer esriDeserializer) | ||
throws IOException | ||
{ | ||
requireNonNull(inputStream, "inputStream is null"); | ||
this.inputStream = new CountingInputStream(inputStream); | ||
this.esriDeserializer = requireNonNull(esriDeserializer, "esriDeserializer is null"); | ||
|
||
this.initializeParser(); | ||
} | ||
|
||
private void initializeParser() | ||
throws IOException | ||
{ | ||
parser = JSON_FACTORY.createParser(inputStream); | ||
|
||
// Find features array | ||
while (true) { | ||
JsonToken token = parser.nextToken(); | ||
if (token == null) { | ||
return; | ||
} | ||
if (token == JsonToken.START_ARRAY && | ||
FEATURES_ARRAY_NAME.equals(parser.currentName())) { | ||
break; | ||
} | ||
} | ||
} | ||
|
||
@Override | ||
public void close() | ||
throws IOException | ||
{ | ||
closed = true; | ||
try (Closer closer = Closer.create()) { | ||
closer.register(inputStream); | ||
closer.register(parser); | ||
} | ||
} | ||
|
||
public boolean next(PageBuilder pageBuilder) | ||
throws IOException | ||
{ | ||
long start = System.nanoTime(); | ||
|
||
try { | ||
JsonToken token = parser.nextToken(); | ||
if (token == JsonToken.START_OBJECT && parser.currentName() == null) { | ||
esriDeserializer.deserialize(pageBuilder, parser); | ||
return true; | ||
} | ||
else { | ||
return false; | ||
} | ||
} | ||
finally { | ||
long duration = System.nanoTime() - start; | ||
readTimeNanos += duration; | ||
} | ||
} | ||
|
||
public long getBytesRead() | ||
{ | ||
return inputStream.getCount(); | ||
} | ||
|
||
public long getReadTimeNanos() | ||
{ | ||
return readTimeNanos; | ||
} | ||
|
||
public boolean isClosed() | ||
{ | ||
return closed; | ||
} | ||
} |
36 changes: 36 additions & 0 deletions
36
lib/trino-hive-formats/src/main/java/io/trino/hive/formats/esri/OGCType.java
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,36 @@ | ||
/* | ||
* Licensed 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 io.trino.hive.formats.esri; | ||
|
||
public enum OGCType { | ||
UNKNOWN(0), | ||
ST_POINT(1), | ||
ST_LINESTRING(2), | ||
ST_POLYGON(3), | ||
ST_MULTIPOINT(4), | ||
ST_MULTILINESTRING(5), | ||
ST_MULTIPOLYGON(6); | ||
|
||
private final int index; | ||
|
||
OGCType(int index) | ||
{ | ||
this.index = index; | ||
} | ||
|
||
public int getIndex() | ||
{ | ||
return this.index; | ||
} | ||
} |
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.
One thing that stands out is that the library https://github.com/Esri/geometry-api-java has not received any update for almost a year and its latest release is over 4 years ago.
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.
from the community point of view, what would you suggest?
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.
@findinpath we already ship esri so this doesn't change anything.