-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
PARQUET-2471: Add support for geometry logical type #1379
Closed
Closed
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
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 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
153 changes: 153 additions & 0 deletions
153
parquet-column/src/main/java/org/apache/parquet/column/statistics/geometry/BoundingBox.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,153 @@ | ||
/* | ||
* 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.parquet.column.statistics.geometry; | ||
|
||
import org.apache.parquet.Preconditions; | ||
import org.locationtech.jts.geom.Coordinate; | ||
import org.locationtech.jts.geom.Geometry; | ||
|
||
public class BoundingBox { | ||
|
||
private double xMin = Double.MAX_VALUE; | ||
private double xMax = Double.MIN_VALUE; | ||
private double yMin = Double.MAX_VALUE; | ||
private double yMax = Double.MIN_VALUE; | ||
private double zMin = Double.MAX_VALUE; | ||
private double zMax = Double.MIN_VALUE; | ||
private double mMin = Double.MAX_VALUE; | ||
private double mMax = Double.MIN_VALUE; | ||
|
||
public BoundingBox( | ||
double xMin, double xMax, double yMin, double yMax, double zMin, double zMax, double mMin, double mMax) { | ||
this.xMin = xMin; | ||
this.xMax = xMax; | ||
this.yMin = yMin; | ||
this.yMax = yMax; | ||
this.zMin = zMin; | ||
this.zMax = zMax; | ||
this.mMin = mMin; | ||
this.mMax = mMax; | ||
} | ||
|
||
public BoundingBox() {} | ||
|
||
public double getXMin() { | ||
return xMin; | ||
} | ||
|
||
public double getXMax() { | ||
return xMax; | ||
} | ||
|
||
public double getYMin() { | ||
return yMin; | ||
} | ||
|
||
public double getYMax() { | ||
return yMax; | ||
} | ||
|
||
public double getZMin() { | ||
return zMin; | ||
} | ||
|
||
public double getZMax() { | ||
return zMax; | ||
} | ||
|
||
public double getMMin() { | ||
return mMin; | ||
} | ||
|
||
public double getMMax() { | ||
return mMax; | ||
} | ||
|
||
public void update(Geometry geom) { | ||
if (geom == null || geom.isEmpty()) { | ||
return; | ||
} | ||
Coordinate[] coordinates = geom.getCoordinates(); | ||
for (Coordinate coordinate : coordinates) { | ||
update(coordinate.getX(), coordinate.getY(), coordinate.getZ(), coordinate.getM()); | ||
} | ||
Comment on lines
+87
to
+89
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I am surprised that JTS doesn't have an optimized method for this (it almost certainly has at least an internal one for building indexes internally) |
||
} | ||
|
||
public void update(double x, double y, double z, double m) { | ||
xMin = Math.min(xMin, x); | ||
xMax = Math.max(xMax, x); | ||
yMin = Math.min(yMin, y); | ||
yMax = Math.max(yMax, y); | ||
zMin = Math.min(zMin, z); | ||
zMax = Math.max(zMax, z); | ||
mMin = Math.min(mMin, m); | ||
mMax = Math.max(mMax, m); | ||
} | ||
|
||
public void merge(BoundingBox other) { | ||
Preconditions.checkArgument(other != null, "Cannot merge with null bounding box"); | ||
xMin = Math.min(xMin, other.xMin); | ||
xMax = Math.max(xMax, other.xMax); | ||
yMin = Math.min(yMin, other.yMin); | ||
yMax = Math.max(yMax, other.yMax); | ||
zMin = Math.min(zMin, other.zMin); | ||
zMax = Math.max(zMax, other.zMax); | ||
mMin = Math.min(mMin, other.mMin); | ||
mMax = Math.max(mMax, other.mMax); | ||
} | ||
|
||
public void reset() { | ||
xMin = Double.MAX_VALUE; | ||
xMax = Double.MIN_VALUE; | ||
yMin = Double.MAX_VALUE; | ||
yMax = Double.MIN_VALUE; | ||
zMin = Double.MAX_VALUE; | ||
zMax = Double.MIN_VALUE; | ||
mMin = Double.MAX_VALUE; | ||
mMax = Double.MIN_VALUE; | ||
} | ||
|
||
public void abort() { | ||
xMin = Double.NaN; | ||
xMax = Double.NaN; | ||
yMin = Double.NaN; | ||
yMax = Double.NaN; | ||
zMin = Double.NaN; | ||
zMax = Double.NaN; | ||
mMin = Double.NaN; | ||
mMax = Double.NaN; | ||
} | ||
|
||
public BoundingBox copy() { | ||
return new BoundingBox(xMin, xMax, yMin, yMax, zMin, zMax, mMin, mMax); | ||
} | ||
|
||
@Override | ||
public String toString() { | ||
return "BoundingBox{" + "xMin=" | ||
+ xMin + ", xMax=" | ||
+ xMax + ", yMin=" | ||
+ yMin + ", yMax=" | ||
+ yMax + ", zMin=" | ||
+ zMin + ", zMax=" | ||
+ zMax + ", mMin=" | ||
+ mMin + ", mMax=" | ||
+ mMax + '}'; | ||
} | ||
} |
84 changes: 84 additions & 0 deletions
84
parquet-column/src/main/java/org/apache/parquet/column/statistics/geometry/Covering.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,84 @@ | ||
/* | ||
* 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.parquet.column.statistics.geometry; | ||
|
||
import java.nio.ByteBuffer; | ||
import org.apache.parquet.Preconditions; | ||
import org.apache.parquet.schema.LogicalTypeAnnotation; | ||
import org.locationtech.jts.geom.Geometry; | ||
import org.locationtech.jts.io.ParseException; | ||
import org.locationtech.jts.io.WKBReader; | ||
import org.locationtech.jts.io.WKBWriter; | ||
|
||
public class Covering { | ||
|
||
protected final LogicalTypeAnnotation.Edges edges; | ||
protected ByteBuffer geometry; | ||
|
||
public Covering(ByteBuffer geometry, LogicalTypeAnnotation.Edges edges) { | ||
Preconditions.checkArgument(geometry != null, "Geometry cannot be null"); | ||
Preconditions.checkArgument(edges != null, "Edges cannot be null"); | ||
this.geometry = geometry; | ||
this.edges = edges; | ||
} | ||
|
||
public ByteBuffer getGeometry() { | ||
return geometry; | ||
} | ||
|
||
public LogicalTypeAnnotation.Edges getEdges() { | ||
return edges; | ||
} | ||
|
||
void update(Geometry geom) { | ||
geometry = ByteBuffer.wrap(new WKBWriter().write(geom)); | ||
} | ||
|
||
public void merge(Covering other) { | ||
throw new UnsupportedOperationException( | ||
"Merge is not supported for " + this.getClass().getSimpleName()); | ||
} | ||
|
||
public void reset() { | ||
throw new UnsupportedOperationException( | ||
"Reset is not supported for " + this.getClass().getSimpleName()); | ||
} | ||
|
||
public void abort() { | ||
throw new UnsupportedOperationException( | ||
"Abort is not supported for " + this.getClass().getSimpleName()); | ||
} | ||
|
||
public Covering copy() { | ||
throw new UnsupportedOperationException( | ||
"Copy is not supported for " + this.getClass().getSimpleName()); | ||
} | ||
|
||
@Override | ||
public String toString() { | ||
String geomText; | ||
try { | ||
geomText = new WKBReader().read(geometry.array()).toText(); | ||
} catch (ParseException e) { | ||
geomText = "Invalid Geometry"; | ||
} | ||
|
||
return "Covering{" + "geometry=" + geomText + ", edges=" + edges + '}'; | ||
} | ||
} |
Oops, something went wrong.
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.
For the init value of xMax, yMax, ..., please use
-Double.MAX_VALUE
because Double.MIN_VALUE is not guaranteed to be negative. See https://stackoverflow.com/questions/3884793/why-is-double-min-value-in-not-negativeThere 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.
Double.POSITIVE_INFINITY
andDouble.NEGATIVE_INFINITY
are also valid choices for initial min/max values.For extracting the bounds for each ordinate,
org.locationtech.jts.io.twkb.BoundsExtractor
in the JTS code base is also a good example.