Skip to content

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions lib/trino-hive-formats/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
</properties>

<dependencies>
<dependency>
Copy link
Contributor

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.

Copy link
Contributor

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?

Copy link
Member

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.

<groupId>com.esri.geometry</groupId>
<artifactId>esri-geometry-api</artifactId>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ public final class HiveClassNames
public static final String SEQUENCEFILE_INPUT_FORMAT_CLASS = "org.apache.hadoop.mapred.SequenceFileInputFormat";
public static final String SYMLINK_TEXT_INPUT_FORMAT_CLASS = "org.apache.hadoop.hive.ql.io.SymlinkTextInputFormat";
public static final String TEXT_INPUT_FORMAT_CLASS = "org.apache.hadoop.mapred.TextInputFormat";
public static final String ESRI_SERDE_CLASS = "com.esri.hadoop.hive.serde.EsriJsonSerDe";
public static final String ESRI_INPUT_FORMAT_CLASS = "com.esri.json.hadoop.EnclosedEsriJsonInputFormat";

private HiveClassNames() {}
}

Large diffs are not rendered by default.

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
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;
}
}
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;
}
}
Loading