Skip to content

Commit

Permalink
feat: port constructors and predicates
Browse files Browse the repository at this point in the history
  • Loading branch information
@yyy1000
yyy1000 committed Jul 11, 2023
1 parent 467f7ab commit a556641
Show file tree
Hide file tree
Showing 5 changed files with 166 additions and 10 deletions.
5 changes: 5 additions & 0 deletions flink/src/main/java/org/apache/sedona/flink/Catalog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public static UserDefinedFunction[] getFuncs() {
new Aggregators.ST_Envelope_Aggr(),
new Aggregators.ST_Union_Aggr(),
new Constructors.ST_Point(),
new Constructors.ST_PointZ(),
new Constructors.ST_PointFromText(),
new Constructors.ST_LineStringFromText(),
new Constructors.ST_LineFromText(),
Expand Down Expand Up @@ -138,11 +139,15 @@ public static UserDefinedFunction[] getPredicates() {
return new UserDefinedFunction[]{
new Predicates.ST_Intersects(),
new Predicates.ST_Contains(),
new Predicates.ST_Crosses(),
new Predicates.ST_Within(),
new Predicates.ST_Covers(),
new Predicates.ST_CoveredBy(),
new Predicates.ST_Disjoint(),
new Predicates.ST_Equals(),
new Predicates.ST_OrderingEquals(),
new Predicates.ST_Overlaps(),
new Predicates.ST_Touches(),
};
}
}
16 changes: 13 additions & 3 deletions flink/src/main/java/org/apache/sedona/flink/expressions/Constructors.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,19 @@ private static Geometry getGeometryByType(String geom, String inputDelimiter, Ge
public static class ST_Point extends ScalarFunction {
@DataTypeHint(value = "RAW", bridgedTo = org.locationtech.jts.geom.Geometry.class)
public Geometry eval(@DataTypeHint("Double") Double x, @DataTypeHint("Double") Double y) throws ParseException {
Coordinate coordinates = new Coordinate(x, y);
GeometryFactory geometryFactory = new GeometryFactory();
return geometryFactory.createPoint(coordinates);
return org.apache.sedona.common.Constructors.point(x, y);
}
}

public static class ST_PointZ extends ScalarFunction {
@DataTypeHint(value = "RAW", bridgedTo = org.locationtech.jts.geom.Geometry.class)
public Geometry eval(@DataTypeHint("Double") Double x, @DataTypeHint("Double") Double y, @DataTypeHint("Double") Double z) throws ParseException {
return eval(x, y, z, 0);
}

@DataTypeHint(value = "RAW", bridgedTo = org.locationtech.jts.geom.Geometry.class)
public Geometry eval(@DataTypeHint("Double") Double x, @DataTypeHint("Double") Double y, @DataTypeHint("Double") Double z, @DataTypeHint("Integer") Integer srid) throws ParseException {
return org.apache.sedona.common.Constructors.pointZ(x, y, z, srid);
}
}

Expand Down
92 changes: 85 additions & 7 deletions flink/src/main/java/org/apache/sedona/flink/expressions/Predicates.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public Boolean eval(@DataTypeHint(value = "RAW", bridgedTo = org.locationtech.jt
{
Geometry geom1 = (Geometry) o1;
Geometry geom2 = (Geometry) o2;
return geom1.intersects(geom2);
return org.apache.sedona.common.Predicates.intersects(geom1, geom2);
}
}

Expand All @@ -53,7 +53,7 @@ public Boolean eval(@DataTypeHint(value = "RAW", bridgedTo = org.locationtech.jt
{
Geometry geom1 = (Geometry) o1;
Geometry geom2 = (Geometry) o2;
return geom1.contains(geom2);
return org.apache.sedona.common.Predicates.contains(geom1, geom2);
}
}

Expand All @@ -72,7 +72,7 @@ public Boolean eval(@DataTypeHint(value = "RAW", bridgedTo = org.locationtech.jt
{
Geometry geom1 = (Geometry) o1;
Geometry geom2 = (Geometry) o2;
return geom1.within(geom2);
return org.apache.sedona.common.Predicates.within(geom1, geom2);
}
}

Expand All @@ -92,7 +92,7 @@ public Boolean eval(@DataTypeHint(value = "RAW", bridgedTo = org.locationtech.jt
{
Geometry geom1 = (Geometry) o1;
Geometry geom2 = (Geometry) o2;
return geom1.covers(geom2);
return org.apache.sedona.common.Predicates.covers(geom1, geom2);
}
}

Expand All @@ -112,7 +112,25 @@ public Boolean eval(@DataTypeHint(value = "RAW", bridgedTo = org.locationtech.jt
{
Geometry geom1 = (Geometry) o1;
Geometry geom2 = (Geometry) o2;
return geom1.coveredBy(geom2);
return org.apache.sedona.common.Predicates.coveredBy(geom1, geom2);
}
}

public static class ST_Crosses extends ScalarFunction
{
/**
* Constructor for relation checking without duplicate removal
*/
public ST_Crosses()
{
}

@DataTypeHint("Boolean")
public Boolean eval(@DataTypeHint(value = "RAW", bridgedTo = org.locationtech.jts.geom.Geometry.class) Object o1, @DataTypeHint(value = "RAW", bridgedTo = org.locationtech.jts.geom.Geometry.class) Object o2)
{
Geometry geom1 = (Geometry) o1;
Geometry geom2 = (Geometry) o2;
return org.apache.sedona.common.Predicates.crosses(geom1, geom2);
}
}

Expand All @@ -132,7 +150,27 @@ public Boolean eval(@DataTypeHint(value = "RAW", bridgedTo = org.locationtech.jt
{
Geometry geom1 = (Geometry) o1;
Geometry geom2 = (Geometry) o2;
return geom1.disjoint(geom2);
return org.apache.sedona.common.Predicates.disjoint(geom1, geom2);
}
}

public static class ST_Equals
extends ScalarFunction
{

/**
* Constructor for relation checking without duplicate removal
*/
public ST_Equals()
{
}

@DataTypeHint("Boolean")
public Boolean eval(@DataTypeHint(value = "RAW", bridgedTo = org.locationtech.jts.geom.Geometry.class) Object o1, @DataTypeHint(value = "RAW", bridgedTo = org.locationtech.jts.geom.Geometry.class) Object o2)
{
Geometry geom1 = (Geometry) o1;
Geometry geom2 = (Geometry) o2;
return org.apache.sedona.common.Predicates.equals(geom1, geom2);
}
}

Expand All @@ -152,7 +190,47 @@ public Boolean eval(@DataTypeHint(value = "RAW", bridgedTo = org.locationtech.jt
{
Geometry geom1 = (Geometry) o1;
Geometry geom2 = (Geometry) o2;
return geom1.equalsExact(geom2);
return org.apache.sedona.common.Predicates.orderingEquals(geom1, geom2);
}
}

public static class ST_Overlaps
extends ScalarFunction
{

/**
* Constructor for relation checking without duplicate removal
*/
public ST_Overlaps()
{
}

@DataTypeHint("Boolean")
public Boolean eval(@DataTypeHint(value = "RAW", bridgedTo = org.locationtech.jts.geom.Geometry.class) Object o1, @DataTypeHint(value = "RAW", bridgedTo = org.locationtech.jts.geom.Geometry.class) Object o2)
{
Geometry geom1 = (Geometry) o1;
Geometry geom2 = (Geometry) o2;
return org.apache.sedona.common.Predicates.overlaps(geom1, geom2);
}
}

public static class ST_Touches
extends ScalarFunction
{

/**
* Constructor for relation checking without duplicate removal
*/
public ST_Touches()
{
}

@DataTypeHint("Boolean")
public Boolean eval(@DataTypeHint(value = "RAW", bridgedTo = org.locationtech.jts.geom.Geometry.class) Object o1, @DataTypeHint(value = "RAW", bridgedTo = org.locationtech.jts.geom.Geometry.class) Object o2)
{
Geometry geom1 = (Geometry) o1;
Geometry geom2 = (Geometry) o2;
return org.apache.sedona.common.Predicates.touches(geom1, geom2);
}
}
}
28 changes: 28 additions & 0 deletions flink/src/test/java/org/apache/sedona/flink/ConstructorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,34 @@ public void test2DPoint() {
assertEquals(expected, result);
}

@Test
public void testPointZ() {
List<Row> data = new ArrayList<>();
data.add(Row.of(1.0, 2.0, 3.0, "point"));
String[] colNames = new String[]{"x", "y", "z", "name_point"};

TypeInformation<?>[] colTypes = {
BasicTypeInfo.DOUBLE_TYPE_INFO,
BasicTypeInfo.DOUBLE_TYPE_INFO,
BasicTypeInfo.DOUBLE_TYPE_INFO,
BasicTypeInfo.STRING_TYPE_INFO};
RowTypeInfo typeInfo = new RowTypeInfo(colTypes, colNames);
DataStream<Row> ds = env.fromCollection(data).returns(typeInfo);
Table pointTable = tableEnv.fromDataStream(ds);

Table geomTable = pointTable
.select(call(Constructors.ST_PointZ.class.getSimpleName(), $(colNames[0]), $(colNames[1]), $(colNames[2]))
.as(colNames[2]));

String result = first(geomTable)
.getFieldAs(colNames[2])
.toString();

String expected = "POINT (1 2 3)";

assertEquals(expected, result);
}

@Test
public void testPointFromText() {
List<Row> data = createPointWKT(testDataSize);
Expand Down
35 changes: 35 additions & 0 deletions flink/src/test/java/org/apache/sedona/flink/PredicateTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,13 @@
package org.apache.sedona.flink;

import org.apache.flink.table.api.Table;
import org.apache.sedona.flink.expressions.Predicates;
import org.junit.BeforeClass;
import org.junit.Test;

import static org.junit.Assert.assertEquals;
import static org.apache.flink.table.api.Expressions.$;
import static org.apache.flink.table.api.Expressions.call;

public class PredicateTest extends TestBase{
@BeforeClass
Expand Down Expand Up @@ -79,6 +82,22 @@ public void testCoveredBy() {
assertEquals(1, count(result));
}

@Test
public void testCrosses() {
Table table = tableEnv.sqlQuery("SELECT ST_GeomFromWKT('MULTIPOINT((0 0), (2 2))') AS g1, ST_GeomFromWKT('LINESTRING(-1 -1, 1 1)') as g2");
table = table.select(call(Predicates.ST_Crosses.class.getSimpleName(), $("g1"), $("g2")));
Boolean actual = (Boolean) first(table).getField(0);
assertEquals(true, actual);
}

@Test
public void testEquals() {
Table table = tableEnv.sqlQuery("SELECT ST_GeomFromWKT('LINESTRING (0 0, 2 2)') AS g1, ST_GeomFromWKT('LINESTRING (0 0, 1 1, 2 2)') as g2");
table = table.select(call(Predicates.ST_Equals.class.getSimpleName(), $("g1"), $("g2")));
Boolean actual = (Boolean) first(table).getField(0);
assertEquals(true, actual);
}

@Test
public void testOrderingEquals() {
Table lineStringTable = createLineStringTable(testDataSize);
Expand All @@ -87,4 +106,20 @@ public void testOrderingEquals() {
Table result = lineStringTable.filter(expr);
assertEquals(1, count(result));
}

@Test
public void testOverlaps() {
Table table = tableEnv.sqlQuery("SELECT ST_GeomFromWKT('LINESTRING (0 0, 2 2)') AS g1, ST_GeomFromWKT('LINESTRING (1 1, 3 3)') as g2");
table = table.select(call(Predicates.ST_Overlaps.class.getSimpleName(), $("g1"), $("g2")));
Boolean actual = (Boolean) first(table).getField(0);
assertEquals(true, actual);
}

@Test
public void testTouches() {
Table table = tableEnv.sqlQuery("SELECT ST_GeomFromWKT('LINESTRING (0 0, 1 0)') AS g1, ST_GeomFromWKT('LINESTRING (0 0, 1 1)') as g2");
table = table.select(call(Predicates.ST_Touches.class.getSimpleName(), $("g1"), $("g2")));
Boolean actual = (Boolean) first(table).getField(0);
assertEquals(true, actual);
}
}

0 comments on commit a556641

Please sign in to comment.