Skip to content

Commit

Permalink
Add GeoJSON support. (apache#14405)
Browse files Browse the repository at this point in the history
  • Loading branch information
bziobrowski authored Nov 26, 2024
1 parent 8333688 commit b34e805
Show file tree
Hide file tree
Showing 22 changed files with 822 additions and 110 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,13 @@ public enum TransformFunctionType {
// Geo constructors
ST_GEOG_FROM_TEXT("ST_GeogFromText", ReturnTypes.VARBINARY, OperandTypes.CHARACTER),
ST_GEOM_FROM_TEXT("ST_GeomFromText", ReturnTypes.VARBINARY, OperandTypes.CHARACTER),

ST_GEOG_FROM_GEO_JSON("ST_GeogFromGeoJSON", ReturnTypes.VARBINARY, OperandTypes.CHARACTER),
ST_GEOM_FROM_GEO_JSON("ST_GeomFromGeoJSON", ReturnTypes.VARBINARY, OperandTypes.CHARACTER),

ST_GEOG_FROM_WKB("ST_GeogFromWKB", ReturnTypes.VARBINARY, OperandTypes.BINARY),
ST_GEOM_FROM_WKB("ST_GeomFromWKB", ReturnTypes.VARBINARY, OperandTypes.BINARY),

ST_POINT("ST_Point", ReturnTypes.VARBINARY,
OperandTypes.family(List.of(SqlTypeFamily.NUMERIC, SqlTypeFamily.NUMERIC, SqlTypeFamily.ANY), i -> i == 2)),
ST_POLYGON("ST_Polygon", ReturnTypes.VARBINARY, OperandTypes.CHARACTER),
Expand All @@ -190,6 +195,7 @@ public enum TransformFunctionType {
// Geo outputs
ST_AS_BINARY("ST_AsBinary", ReturnTypes.VARBINARY, OperandTypes.BINARY),
ST_AS_TEXT("ST_AsText", ReturnTypes.VARCHAR, OperandTypes.BINARY),
ST_AS_GEO_JSON("ST_AsGeoJSON", ReturnTypes.VARCHAR, OperandTypes.BINARY),

// Geo relationship
// TODO: Revisit whether we should return BOOLEAN instead
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,13 @@
package org.apache.pinot.core.geospatial.transform.function;

import com.google.common.base.Preconditions;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import org.apache.pinot.core.operator.ColumnContext;
import org.apache.pinot.core.operator.blocks.ValueBlock;
import org.apache.pinot.core.operator.transform.function.BaseTransformFunction;
import org.apache.pinot.core.operator.transform.function.LiteralTransformFunction;
import org.apache.pinot.core.operator.transform.function.TransformFunction;
import org.apache.pinot.core.plan.DocIdSetPlanNode;
import org.apache.pinot.segment.local.utils.GeometrySerializer;
import org.apache.pinot.spi.data.FieldSpec;
import org.locationtech.jts.geom.Geometry;
Expand All @@ -41,8 +39,6 @@ public abstract class BaseBinaryGeoTransformFunction extends BaseTransformFuncti
private TransformFunction _secondArgument;
private Geometry _firstLiteral;
private Geometry _secondLiteral;
private int[] _intResults;
private double[] _doubleResults;

@Override
public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
Expand Down Expand Up @@ -74,63 +70,68 @@ public void init(List<TransformFunction> arguments, Map<String, ColumnContext> c
}

protected int[] transformGeometryToIntValuesSV(ValueBlock valueBlock) {
if (_intResults == null) {
_intResults = new int[DocIdSetPlanNode.MAX_DOC_PER_CALL];
}
int numDocs = valueBlock.getNumDocs();
initIntValuesSV(numDocs);
byte[][] firstValues;
byte[][] secondValues;

if (_firstArgument == null && _secondArgument == null) {
_intResults = new int[Math.min(valueBlock.getNumDocs(), DocIdSetPlanNode.MAX_DOC_PER_CALL)];
Arrays.fill(_intResults, transformGeometryToInt(_firstLiteral, _secondLiteral));
int value = transformGeometryToInt(_firstLiteral, _secondLiteral);
for (int i = 0; i < numDocs; i++) {
_intValuesSV[i] = value;
}
} else if (_firstArgument == null) {
secondValues = _secondArgument.transformToBytesValuesSV(valueBlock);
for (int i = 0; i < valueBlock.getNumDocs(); i++) {
_intResults[i] = transformGeometryToInt(_firstLiteral, GeometrySerializer.deserialize(secondValues[i]));
for (int i = 0; i < numDocs; i++) {
_intValuesSV[i] = transformGeometryToInt(_firstLiteral, GeometrySerializer.deserialize(secondValues[i]));
}
} else if (_secondArgument == null) {
firstValues = _firstArgument.transformToBytesValuesSV(valueBlock);
for (int i = 0; i < valueBlock.getNumDocs(); i++) {
_intResults[i] = transformGeometryToInt(GeometrySerializer.deserialize(firstValues[i]), _secondLiteral);
for (int i = 0; i < numDocs; i++) {
_intValuesSV[i] = transformGeometryToInt(GeometrySerializer.deserialize(firstValues[i]), _secondLiteral);
}
} else {
firstValues = _firstArgument.transformToBytesValuesSV(valueBlock);
secondValues = _secondArgument.transformToBytesValuesSV(valueBlock);
for (int i = 0; i < valueBlock.getNumDocs(); i++) {
_intResults[i] = transformGeometryToInt(GeometrySerializer.deserialize(firstValues[i]),
for (int i = 0; i < numDocs; i++) {
_intValuesSV[i] = transformGeometryToInt(GeometrySerializer.deserialize(firstValues[i]),
GeometrySerializer.deserialize(secondValues[i]));
}
}
return _intResults;
return _intValuesSV;
}

protected double[] transformGeometryToDoubleValuesSV(ValueBlock valueBlock) {
if (_doubleResults == null) {
_doubleResults = new double[DocIdSetPlanNode.MAX_DOC_PER_CALL];
}
int numDocs = valueBlock.getNumDocs();
initDoubleValuesSV(numDocs);

byte[][] firstValues;
byte[][] secondValues;

if (_firstArgument == null && _secondArgument == null) {
_doubleResults = new double[Math.min(valueBlock.getNumDocs(), DocIdSetPlanNode.MAX_DOC_PER_CALL)];
Arrays.fill(_doubleResults, transformGeometryToDouble(_firstLiteral, _secondLiteral));
double value = transformGeometryToDouble(_firstLiteral, _secondLiteral);
for (int i = 0; i < numDocs; i++) {
_doubleValuesSV[i] = value;
}
} else if (_firstArgument == null) {
secondValues = _secondArgument.transformToBytesValuesSV(valueBlock);
for (int i = 0; i < valueBlock.getNumDocs(); i++) {
_doubleResults[i] = transformGeometryToDouble(_firstLiteral, GeometrySerializer.deserialize(secondValues[i]));
for (int i = 0; i < numDocs; i++) {
_doubleValuesSV[i] = transformGeometryToDouble(_firstLiteral, GeometrySerializer.deserialize(secondValues[i]));
}
} else if (_secondArgument == null) {
firstValues = _firstArgument.transformToBytesValuesSV(valueBlock);
for (int i = 0; i < valueBlock.getNumDocs(); i++) {
_doubleResults[i] = transformGeometryToDouble(GeometrySerializer.deserialize(firstValues[i]), _secondLiteral);
for (int i = 0; i < numDocs; i++) {
_doubleValuesSV[i] = transformGeometryToDouble(GeometrySerializer.deserialize(firstValues[i]), _secondLiteral);
}
} else {
firstValues = _firstArgument.transformToBytesValuesSV(valueBlock);
secondValues = _secondArgument.transformToBytesValuesSV(valueBlock);
for (int i = 0; i < valueBlock.getNumDocs(); i++) {
_doubleResults[i] = transformGeometryToDouble(GeometrySerializer.deserialize(firstValues[i]),
for (int i = 0; i < numDocs; i++) {
_doubleValuesSV[i] = transformGeometryToDouble(GeometrySerializer.deserialize(firstValues[i]),
GeometrySerializer.deserialize(secondValues[i]));
}
}
return _doubleResults;
return _doubleValuesSV;
}

public int transformGeometryToInt(Geometry firstGeometry, Geometry secondGeometry) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
/**
* 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.pinot.core.geospatial.transform.function;

import com.google.common.base.Preconditions;
import java.util.List;
import java.util.Map;
import org.apache.pinot.core.operator.ColumnContext;
import org.apache.pinot.core.operator.blocks.ValueBlock;
import org.apache.pinot.core.operator.transform.TransformResultMetadata;
import org.apache.pinot.core.operator.transform.function.BaseTransformFunction;
import org.apache.pinot.core.operator.transform.function.TransformFunction;
import org.apache.pinot.segment.local.utils.GeometrySerializer;
import org.apache.pinot.spi.data.FieldSpec;
import org.locationtech.jts.geom.Geometry;
import org.locationtech.jts.io.ParseException;
import org.locationtech.jts.io.geojson.GeoJsonReader;


/**
* An abstract class for implementing the geo constructor functions from GEO JSON.
*/
abstract class ConstructFromGeoJsonFunction extends BaseTransformFunction {

protected TransformFunction _transformFunction;
protected GeoJsonReader _reader;

@Override
public void init(List<TransformFunction> arguments, Map<String, ColumnContext> columnContextMap) {
super.init(arguments, columnContextMap);

Preconditions.checkArgument(arguments.size() == 1,
"Exactly 1 argument is required for transform function: " + getName());

TransformFunction transformFunction = arguments.get(0);

Preconditions.checkArgument(transformFunction.getResultMetadata().isSingleValue(),
"The argument must be single-valued for transform function: " + getName());
Preconditions.checkArgument(transformFunction.getResultMetadata().getDataType() == FieldSpec.DataType.STRING,
"The argument must be of string type");

_transformFunction = transformFunction;
_reader = getGeoJsonReader();
}

abstract protected GeoJsonReader getGeoJsonReader();

@Override
public TransformResultMetadata getResultMetadata() {
return BYTES_SV_NO_DICTIONARY_METADATA;
}

@Override
public byte[][] transformToBytesValuesSV(ValueBlock valueBlock) {
int numDocs = valueBlock.getNumDocs();
initBytesValuesSV(numDocs);
String[] argumentValues = _transformFunction.transformToStringValuesSV(valueBlock);
// use single reader instead of allocating separate instance per row
StringReader reader = new StringReader();
for (int i = 0; i < numDocs; i++) {
try {
reader.setString(argumentValues[i]);
Geometry geometry = _reader.read(reader);
_bytesValuesSV[i] = GeometrySerializer.serialize(geometry);
} catch (ParseException e) {
throw new RuntimeException(String.format("Failed to parse geometry from string: %s", argumentValues[i]));
}
}
return _bytesValuesSV;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,11 @@
import com.google.common.base.Preconditions;
import java.util.List;
import java.util.Map;
import org.apache.pinot.common.Utils;
import org.apache.pinot.core.operator.ColumnContext;
import org.apache.pinot.core.operator.blocks.ValueBlock;
import org.apache.pinot.core.operator.transform.TransformResultMetadata;
import org.apache.pinot.core.operator.transform.function.BaseTransformFunction;
import org.apache.pinot.core.operator.transform.function.TransformFunction;
import org.apache.pinot.core.plan.DocIdSetPlanNode;
import org.apache.pinot.segment.local.utils.GeometrySerializer;
import org.apache.pinot.spi.data.FieldSpec;
import org.locationtech.jts.geom.Geometry;
Expand All @@ -40,7 +38,6 @@
*/
abstract class ConstructFromTextFunction extends BaseTransformFunction {
protected TransformFunction _transformFunction;
protected byte[][] _results;
protected WKTReader _reader;

@Override
Expand All @@ -66,20 +63,17 @@ public TransformResultMetadata getResultMetadata() {

@Override
public byte[][] transformToBytesValuesSV(ValueBlock valueBlock) {
if (_results == null) {
_results = new byte[DocIdSetPlanNode.MAX_DOC_PER_CALL][];
}
int numDocs = valueBlock.getNumDocs();
initBytesValuesSV(numDocs);
String[] argumentValues = _transformFunction.transformToStringValuesSV(valueBlock);
int length = valueBlock.getNumDocs();
for (int i = 0; i < length; i++) {
for (int i = 0; i < numDocs; i++) {
try {
Geometry geometry = _reader.read(argumentValues[i]);
_results[i] = GeometrySerializer.serialize(geometry);
_bytesValuesSV[i] = GeometrySerializer.serialize(geometry);
} catch (ParseException e) {
Utils.rethrowException(
new RuntimeException(String.format("Failed to parse geometry from string: %s", argumentValues[i])));
throw new RuntimeException(String.format("Failed to parse geometry from string: %s", argumentValues[i]));
}
}
return _results;
return _bytesValuesSV;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import org.apache.pinot.core.operator.transform.TransformResultMetadata;
import org.apache.pinot.core.operator.transform.function.BaseTransformFunction;
import org.apache.pinot.core.operator.transform.function.TransformFunction;
import org.apache.pinot.core.plan.DocIdSetPlanNode;
import org.apache.pinot.segment.local.utils.GeometrySerializer;
import org.apache.pinot.spi.data.FieldSpec;
import org.apache.pinot.spi.utils.BytesUtils;
Expand All @@ -40,7 +39,6 @@
*/
abstract class ConstructFromWKBFunction extends BaseTransformFunction {
private TransformFunction _transformFunction;
private byte[][] _results;
private WKBReader _reader;

@Override
Expand All @@ -66,19 +64,18 @@ public TransformResultMetadata getResultMetadata() {

@Override
public byte[][] transformToBytesValuesSV(ValueBlock valueBlock) {
if (_results == null) {
_results = new byte[DocIdSetPlanNode.MAX_DOC_PER_CALL][];
}
int numDocs = valueBlock.getNumDocs();
initBytesValuesSV(numDocs);
byte[][] argumentValues = _transformFunction.transformToBytesValuesSV(valueBlock);
for (int i = 0; i < valueBlock.getNumDocs(); i++) {
for (int i = 0; i < numDocs; i++) {
try {
Geometry geometry = _reader.read(argumentValues[i]);
_results[i] = GeometrySerializer.serialize(geometry);
_bytesValuesSV[i] = GeometrySerializer.serialize(geometry);
} catch (ParseException e) {
throw new RuntimeException(
String.format("Failed to parse geometry from bytes %s", BytesUtils.toHexString(argumentValues[i])));
}
}
return _results;
return _bytesValuesSV;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import org.apache.pinot.core.operator.transform.function.BaseTransformFunction;
import org.apache.pinot.core.operator.transform.function.LiteralTransformFunction;
import org.apache.pinot.core.operator.transform.function.TransformFunction;
import org.apache.pinot.core.plan.DocIdSetPlanNode;
import org.apache.pinot.segment.local.utils.GeometrySerializer;
import org.apache.pinot.spi.data.FieldSpec;
import org.locationtech.jts.geom.Geometry;
Expand All @@ -43,7 +42,6 @@ public class GeoToH3Function extends BaseTransformFunction {
private TransformFunction _firstArgument;
private TransformFunction _secondArgument;
private TransformFunction _thirdArgument;
private long[] _results;

@Override
public String getName() {
Expand Down Expand Up @@ -98,26 +96,26 @@ public TransformResultMetadata getResultMetadata() {

@Override
public long[] transformToLongValuesSV(ValueBlock valueBlock) {
if (_results == null) {
_results = new long[DocIdSetPlanNode.MAX_DOC_PER_CALL];
}
int numDocs = valueBlock.getNumDocs();
initLongValuesSV(numDocs);

if (_thirdArgument == null) {
byte[][] geoValues = _firstArgument.transformToBytesValuesSV(valueBlock);
int[] resValues = _secondArgument.transformToIntValuesSV(valueBlock);
for (int i = 0; i < valueBlock.getNumDocs(); i++) {
for (int i = 0; i < numDocs; i++) {
Geometry geometry = GeometrySerializer.deserialize(geoValues[i]);
_results[i] = ScalarFunctions.geoToH3(geometry.getCoordinate().x, geometry.getCoordinate().y, resValues[i]);
_longValuesSV[i] =
ScalarFunctions.geoToH3(geometry.getCoordinate().x, geometry.getCoordinate().y, resValues[i]);
}
} else {
double[] lonValues = _firstArgument.transformToDoubleValuesSV(valueBlock);
double[] latValues = _secondArgument.transformToDoubleValuesSV(valueBlock);
int[] resValues = _thirdArgument.transformToIntValuesSV(valueBlock);
for (int i = 0; i < valueBlock.getNumDocs(); i++) {
_results[i] = ScalarFunctions.geoToH3(lonValues[i], latValues[i], resValues[i]);
for (int i = 0; i < numDocs; i++) {
_longValuesSV[i] = ScalarFunctions.geoToH3(lonValues[i], latValues[i], resValues[i]);
}
}

return _results;
return _longValuesSV;
}
}
Loading

0 comments on commit b34e805

Please sign in to comment.