You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sedona.apache.org by ji...@apache.org on 2020/11/08 19:04:51 UTC
[incubator-sedona] branch sedona-release-3.0 updated (2b8cdf2 ->
0f5b754)
This is an automated email from the ASF dual-hosted git repository.
jiayu pushed a change to branch sedona-release-3.0
in repository https://gitbox.apache.org/repos/asf/incubator-sedona.git.
from 2b8cdf2 Recovery the test cases in Viz
add 0f5b754 [SEDONA-3] Sedona release 3.0 python adapter [WIP] (#487)
No new revisions were added by this update.
Summary of changes:
.travis.yml | 46 +-
core/pom.xml | 2 +-
.../sedona/core/{python => }/SparkUtil.scala | 4 +-
.../sedona/core/monitoring/MetricSuite.scala | 2 +-
.../apache/sedona/core/python/PythonTestSpec.scala | 30 -
.../scala/org/apache/sedona/core/scalaTest.scala | 1 -
docs/tutorial/geospark-core-python.md | 185 +--
docs/tutorial/geospark-sql-python.md | 150 +--
pom.xml | 1 +
python-adapter/pom.xml | 93 ++
.../SerializationException.scala | 4 +-
.../adapters/EnvelopeAdapter.scala | 2 +-
.../adapters/GeomSerializer.scala | 4 +-
.../adapters/GeometryAdapter.scala | 2 +-
.../adapters/JoinParamsAdapter.scala | 2 +-
.../adapters/PythonConverter.scala | 4 +-
.../adapters/PythonRddToJavaRDDAdapter.scala | 2 +-
.../adapters/RawJvmIndexRDDAdapter.scala | 2 +-
.../adapters/SpatialObjectLoaderAdapter.scala | 2 +-
.../translation/CircleSerializer.scala | 4 +-
.../translation/FlatPairRddConverter.scala | 4 +-
.../translation/GeometryRddConverter.scala | 4 +-
.../translation/GeometrySeqToPythonConverter.scala | 4 +-
.../translation/GeometrySerializer.scala | 4 +-
.../translation/HashSetPairRddConverter.scala | 4 +-
.../translation/PythonGeometrySerializer.scala | 4 +-
.../translation/PythonRDDToJavaConverter.scala | 4 +-
.../translation/PythonRddToJavaRDDConverter.scala | 2 +-
.../translation/RDDToPythonConverter.scala | 2 +-
.../utils/PythonAdapterWrapper.scala | 6 +-
.../utils/implicits.scala | 2 +-
.../src/test/resources/python/sampleLines | 0
.../src/test/resources/python/samplePoints | 0
.../src/test/resources/python/samplePolygons | 0
.../sedona/python/wrapper}/GeometrySample.scala | 22 +-
.../sedona/python/wrapper}/PythonTestSpec.scala | 8 +-
.../apache/sedona/python/wrapper}/SparkUtil.scala | 2 +-
.../wrapper}/TestToPythonSerialization.scala | 13 +-
.../{GeoSparkCore.ipynb => ApacheSedonaCore.ipynb} | 396 +++---
.../{GeoSparkSQL.ipynb => ApacheSedonaSQL.ipynb} | 196 ++-
python/Pipfile | 5 +-
python/Pipfile.lock | 1292 --------------------
python/README.md | 15 +-
python/geospark/core/geom/__init__.py | 17 -
python/geospark/core/jvm/__init__.py | 17 -
python/geospark/jars/2_3/__init__.py | 17 -
python/geospark/jars/2_3/geospark-1.3.1.jar | Bin 12070571 -> 0 bytes
python/geospark/jars/2_3/geospark-1.3.2.jar | Bin 12071560 -> 0 bytes
.../geospark/jars/2_3/geospark-sql_2.3-1.3.1.jar | Bin 291350 -> 0 bytes
.../geospark/jars/2_3/geospark-sql_2.3-1.3.2.jar | Bin 384603 -> 0 bytes
python/geospark/jars/2_4/geospark-1.3.1.jar | Bin 12070571 -> 0 bytes
python/geospark/jars/2_4/geospark-1.3.2.jar | Bin 12071560 -> 0 bytes
.../geospark/jars/2_4/geospark-sql_2.3-1.3.1.jar | Bin 291350 -> 0 bytes
.../geospark/jars/2_4/geospark-sql_2.3-1.3.2.jar | Bin 384603 -> 0 bytes
python/geospark/register/__init__.py | 21 -
python/geospark/register/java_libs.py | 58 -
python/geospark/register/uploading.py | 57 -
python/{geospark => sedona}/__init__.py | 0
.../core/SpatialRDD/__init__.py | 0
.../core/SpatialRDD/circle_rdd.py | 14 +-
.../core/SpatialRDD/linestring_rdd.py | 16 +-
.../core/SpatialRDD/point_rdd.py | 12 +-
.../core/SpatialRDD/polygon_rdd.py | 14 +-
.../core/SpatialRDD/rectangle_rdd.py | 10 +-
.../core/SpatialRDD/spatial_rdd.py | 36 +-
.../core/SpatialRDD/spatial_rdd_factory.py | 2 +-
python/{geospark => sedona}/core/__init__.py | 0
python/{geospark => sedona}/core/enums/__init__.py | 0
.../core/enums/file_data_splitter.py | 4 +-
.../{geospark => sedona}/core/enums/grid_type.py | 4 +-
.../{geospark => sedona}/core/enums/index_type.py | 4 +-
.../core/enums/join_build_side.py | 2 +-
python/{geospark => sedona}/core/enums/spatial.py | 0
.../core/formatMapper/__init__.py | 0
.../core/formatMapper/disc_utils.py | 6 +-
.../core/formatMapper/geo_json_reader.py | 18 +-
.../core/formatMapper/geo_reader.py | 2 +-
.../core/formatMapper/shapefileParser/__init__.py | 0
.../shapefileParser/shape_file_reader.py | 14 +-
.../core/formatMapper/wkb_reader.py | 15 +-
.../core/formatMapper/wkt_reader.py | 19 +-
.../{geospark/sql => sedona/core/geom}/__init__.py | 0
python/{geospark => sedona}/core/geom/circle.py | 2 +-
python/{geospark => sedona}/core/geom/envelope.py | 9 +-
.../{geospark/jars => sedona/core/jvm}/__init__.py | 0
python/{geospark => sedona}/core/jvm/abstract.py | 0
python/{geospark => sedona}/core/jvm/config.py | 21 +-
.../{geospark => sedona}/core/jvm/partitioner.py | 0
python/{geospark => sedona}/core/jvm/translate.py | 16 +-
.../core/spatialOperator/__init__.py | 0
.../core/spatialOperator/join_params.py | 6 +-
.../core/spatialOperator/join_query.py | 30 +-
.../core/spatialOperator/knn_query.py | 14 +-
.../core/spatialOperator/range_query.py | 14 +-
python/{geospark => sedona}/core/utils.py | 0
python/{geospark => sedona}/exceptions.py | 0
python/{geospark => sedona/register}/__init__.py | 4 +-
.../register/geo_registrator.py | 14 +-
python/sedona/register/java_libs.py | 58 +
.../{geospark/jars/2_4 => sedona/sql}/__init__.py | 0
python/{geospark => sedona}/sql/exceptions.py | 0
python/{geospark => sedona}/sql/types.py | 2 +-
python/{geospark => sedona}/utils/__init__.py | 4 +-
.../{geospark => sedona}/utils/abstract_parser.py | 0
python/{geospark => sedona}/utils/adapter.py | 8 +-
python/{geospark => sedona}/utils/binary_parser.py | 0
python/{geospark => sedona}/utils/decorators.py | 4 +-
.../{geospark => sedona}/utils/geometry_adapter.py | 6 +-
python/{geospark => sedona}/utils/jvm.py | 4 +-
python/{geospark => sedona}/utils/meta.py | 7 +-
python/{geospark => sedona}/utils/prep.py | 2 +-
python/{geospark => sedona}/utils/serde.py | 6 +-
.../utils/spatial_rdd_parser.py | 8 +-
python/{geospark => sedona}/utils/types.py | 0
python/{geospark => sedona}/version.py | 2 +-
python/setup.py | 20 +-
python/tests/core/test_core_geom_primitives.py | 2 +-
python/tests/core/test_core_rdd.py | 6 +-
python/tests/core/test_core_spatial_relations.py | 6 +-
python/tests/core/test_rdd.py | 12 +-
python/tests/core/test_spatial_rdd_from_disc.py | 8 +-
python/tests/format_mapper/test_geo_json_reader.py | 13 +-
.../tests/format_mapper/test_shapefile_reader.py | 27 +-
python/tests/format_mapper/test_wkb_reader.py | 2 +-
python/tests/format_mapper/test_wkt_reader.py | 2 +-
python/tests/properties/crs_transform.py | 4 +-
python/tests/properties/linestring_properties.py | 4 +-
python/tests/properties/point_properties.py | 4 +-
python/tests/properties/polygon_properties.py | 4 +-
.../serialization/test_direct_serialization.py | 2 +-
.../serialization/test_geospark_serializers.py | 2 +-
.../tests/serialization/test_rdd_serialization.py | 4 +-
python/tests/serialization/test_serializers.py | 2 +-
.../tests/serialization/test_with_sc_parellize.py | 4 +-
python/tests/spatial_operator/test_join_base.py | 6 +-
.../test_join_query_correctness.py | 10 +-
.../tests/spatial_operator/test_linestring_join.py | 8 +-
.../tests/spatial_operator/test_linestring_knn.py | 6 +-
.../spatial_operator/test_linestring_range.py | 8 +-
python/tests/spatial_operator/test_point_join.py | 8 +-
python/tests/spatial_operator/test_point_knn.py | 6 +-
python/tests/spatial_operator/test_point_range.py | 8 +-
python/tests/spatial_operator/test_polygon_join.py | 8 +-
python/tests/spatial_operator/test_polygon_knn.py | 6 +-
.../tests/spatial_operator/test_polygon_range.py | 8 +-
.../tests/spatial_operator/test_rectangle_join.py | 10 +-
.../tests/spatial_operator/test_rectangle_knn.py | 8 +-
.../tests/spatial_operator/test_rectangle_range.py | 8 +-
python/tests/spatial_rdd/test_circle_rdd.py | 2 +-
python/tests/spatial_rdd/test_linestring_rdd.py | 6 +-
python/tests/spatial_rdd/test_point_rdd.py | 8 +-
python/tests/spatial_rdd/test_polygon_rdd.py | 8 +-
python/tests/spatial_rdd/test_rectangle_rdd.py | 6 +-
python/tests/spatial_rdd/test_spatial_rdd.py | 8 +-
.../tests/spatial_rdd/test_spatial_rdd_writer.py | 6 +-
python/tests/sql/resource/sample_data.py | 2 +-
python/tests/sql/test_adapter.py | 49 +-
python/tests/sql/test_function.py | 40 +-
.../sql/test_spatial_rdd_to_spatial_dataframe.py | 6 +-
python/tests/test_assign_raw_spatial_rdd.py | 2 +-
python/tests/test_base.py | 12 +-
python/tests/test_circle.py | 4 +-
python/tests/test_multiple_meta.py | 2 +-
python/tests/test_scala_example.py | 8 +-
python/tests/tools.py | 2 +-
python/tests/utils/test_crs_transformation.py | 8 +-
python/tests/utils/test_geo_spark_meta.py | 10 +-
sql/pom.xml | 4 +-
viz/pom.xml | 6 +-
169 files changed, 932 insertions(+), 2654 deletions(-)
copy core/src/test/scala/org/apache/sedona/core/{python => }/SparkUtil.scala (97%)
delete mode 100644 core/src/test/scala/org/apache/sedona/core/python/PythonTestSpec.scala
create mode 100644 python-adapter/pom.xml
rename {core/src/main/scala/org/apache/sedona/core/python => python-adapter/src/main/scala/org.apache.sedona.python.wrapper}/SerializationException.scala (92%)
rename {core/src/main/scala/org/apache/sedona/core/python => python-adapter/src/main/scala/org.apache.sedona.python.wrapper}/adapters/EnvelopeAdapter.scala (97%)
rename {core/src/main/scala/org/apache/sedona/core/python => python-adapter/src/main/scala/org.apache.sedona.python.wrapper}/adapters/GeomSerializer.scala (87%)
rename {core/src/main/scala/org/apache/sedona/core/python => python-adapter/src/main/scala/org.apache.sedona.python.wrapper}/adapters/GeometryAdapter.scala (95%)
rename {core/src/main/scala/org/apache/sedona/core/python => python-adapter/src/main/scala/org.apache.sedona.python.wrapper}/adapters/JoinParamsAdapter.scala (96%)
rename {core/src/main/scala/org/apache/sedona/core/python => python-adapter/src/main/scala/org.apache.sedona.python.wrapper}/adapters/PythonConverter.scala (89%)
rename {core/src/main/scala/org/apache/sedona/core/python => python-adapter/src/main/scala/org.apache.sedona.python.wrapper}/adapters/PythonRddToJavaRDDAdapter.scala (97%)
rename {core/src/main/scala/org/apache/sedona/core/python => python-adapter/src/main/scala/org.apache.sedona.python.wrapper}/adapters/RawJvmIndexRDDAdapter.scala (95%)
rename {core/src/main/scala/org/apache/sedona/core/python => python-adapter/src/main/scala/org.apache.sedona.python.wrapper}/adapters/SpatialObjectLoaderAdapter.scala (97%)
rename {core/src/main/scala/org/apache/sedona/core/python => python-adapter/src/main/scala/org.apache.sedona.python.wrapper}/translation/CircleSerializer.scala (93%)
rename {core/src/main/scala/org/apache/sedona/core/python => python-adapter/src/main/scala/org.apache.sedona.python.wrapper}/translation/FlatPairRddConverter.scala (93%)
rename {core/src/main/scala/org/apache/sedona/core/python => python-adapter/src/main/scala/org.apache.sedona.python.wrapper}/translation/GeometryRddConverter.scala (92%)
rename {core/src/main/scala/org/apache/sedona/core/python => python-adapter/src/main/scala/org.apache.sedona.python.wrapper}/translation/GeometrySeqToPythonConverter.scala (91%)
rename {core/src/main/scala/org/apache/sedona/core/python => python-adapter/src/main/scala/org.apache.sedona.python.wrapper}/translation/GeometrySerializer.scala (92%)
rename {core/src/main/scala/org/apache/sedona/core/python => python-adapter/src/main/scala/org.apache.sedona.python.wrapper}/translation/HashSetPairRddConverter.scala (93%)
rename {core/src/main/scala/org/apache/sedona/core/python => python-adapter/src/main/scala/org.apache.sedona.python.wrapper}/translation/PythonGeometrySerializer.scala (94%)
rename {core/src/main/scala/org/apache/sedona/core/python => python-adapter/src/main/scala/org.apache.sedona.python.wrapper}/translation/PythonRDDToJavaConverter.scala (95%)
rename {core/src/main/scala/org/apache/sedona/core/python => python-adapter/src/main/scala/org.apache.sedona.python.wrapper}/translation/PythonRddToJavaRDDConverter.scala (97%)
rename {core/src/main/scala/org/apache/sedona/core/python => python-adapter/src/main/scala/org.apache.sedona.python.wrapper}/translation/RDDToPythonConverter.scala (94%)
rename {sql/src/main/scala/org/apache/sedona/sql => python-adapter/src/main/scala/org.apache.sedona.python.wrapper}/utils/PythonAdapterWrapper.scala (91%)
rename {core/src/main/scala/org/apache/sedona/core/python => python-adapter/src/main/scala/org.apache.sedona.python.wrapper}/utils/implicits.scala (97%)
rename {core => python-adapter}/src/test/resources/python/sampleLines (100%)
rename {core => python-adapter}/src/test/resources/python/samplePoints (100%)
rename {core => python-adapter}/src/test/resources/python/samplePolygons (100%)
rename {core/src/test/scala/org/apache/sedona/core/python => python-adapter/src/test/scala/org/apache/sedona/python/wrapper}/GeometrySample.scala (56%)
copy {trunk/import/core/src/test/scala/org/datasyslab/geospark/python => python-adapter/src/test/scala/org/apache/sedona/python/wrapper}/PythonTestSpec.scala (54%)
rename {core/src/test/scala/org/apache/sedona/core/python => python-adapter/src/test/scala/org/apache/sedona/python/wrapper}/SparkUtil.scala (97%)
rename {core/src/test/scala/org/apache/sedona/core/python => python-adapter/src/test/scala/org/apache/sedona/python/wrapper}/TestToPythonSerialization.scala (83%)
rename python/{GeoSparkCore.ipynb => ApacheSedonaCore.ipynb} (91%)
rename python/{GeoSparkSQL.ipynb => ApacheSedonaSQL.ipynb} (78%)
delete mode 100644 python/Pipfile.lock
delete mode 100644 python/geospark/core/geom/__init__.py
delete mode 100644 python/geospark/core/jvm/__init__.py
delete mode 100644 python/geospark/jars/2_3/__init__.py
delete mode 100644 python/geospark/jars/2_3/geospark-1.3.1.jar
delete mode 100644 python/geospark/jars/2_3/geospark-1.3.2.jar
delete mode 100644 python/geospark/jars/2_3/geospark-sql_2.3-1.3.1.jar
delete mode 100644 python/geospark/jars/2_3/geospark-sql_2.3-1.3.2.jar
delete mode 100644 python/geospark/jars/2_4/geospark-1.3.1.jar
delete mode 100644 python/geospark/jars/2_4/geospark-1.3.2.jar
delete mode 100644 python/geospark/jars/2_4/geospark-sql_2.3-1.3.1.jar
delete mode 100644 python/geospark/jars/2_4/geospark-sql_2.3-1.3.2.jar
delete mode 100644 python/geospark/register/__init__.py
delete mode 100644 python/geospark/register/java_libs.py
delete mode 100644 python/geospark/register/uploading.py
copy python/{geospark => sedona}/__init__.py (100%)
rename python/{geospark => sedona}/core/SpatialRDD/__init__.py (100%)
rename python/{geospark => sedona}/core/SpatialRDD/circle_rdd.py (85%)
rename python/{geospark => sedona}/core/SpatialRDD/linestring_rdd.py (97%)
rename python/{geospark => sedona}/core/SpatialRDD/point_rdd.py (97%)
rename python/{geospark => sedona}/core/SpatialRDD/polygon_rdd.py (97%)
rename python/{geospark => sedona}/core/SpatialRDD/rectangle_rdd.py (97%)
rename python/{geospark => sedona}/core/SpatialRDD/spatial_rdd.py (92%)
rename python/{geospark => sedona}/core/SpatialRDD/spatial_rdd_factory.py (97%)
rename python/{geospark => sedona}/core/__init__.py (100%)
rename python/{geospark => sedona}/core/enums/__init__.py (100%)
rename python/{geospark => sedona}/core/enums/file_data_splitter.py (94%)
rename python/{geospark => sedona}/core/enums/grid_type.py (94%)
rename python/{geospark => sedona}/core/enums/index_type.py (93%)
rename python/{geospark => sedona}/core/enums/join_build_side.py (92%)
rename python/{geospark => sedona}/core/enums/spatial.py (100%)
rename python/{geospark => sedona}/core/formatMapper/__init__.py (100%)
rename python/{geospark => sedona}/core/formatMapper/disc_utils.py (93%)
rename python/{geospark => sedona}/core/formatMapper/geo_json_reader.py (84%)
rename python/{geospark => sedona}/core/formatMapper/geo_reader.py (91%)
rename python/{geospark => sedona}/core/formatMapper/shapefileParser/__init__.py (100%)
rename python/{geospark => sedona}/core/formatMapper/shapefileParser/shape_file_reader.py (89%)
rename python/{geospark => sedona}/core/formatMapper/wkb_reader.py (83%)
rename python/{geospark => sedona}/core/formatMapper/wkt_reader.py (81%)
rename python/{geospark/sql => sedona/core/geom}/__init__.py (100%)
rename python/{geospark => sedona}/core/geom/circle.py (98%)
rename python/{geospark => sedona}/core/geom/envelope.py (93%)
rename python/{geospark/jars => sedona/core/jvm}/__init__.py (100%)
rename python/{geospark => sedona}/core/jvm/abstract.py (100%)
rename python/{geospark => sedona}/core/jvm/config.py (88%)
rename python/{geospark => sedona}/core/jvm/partitioner.py (100%)
rename python/{geospark => sedona}/core/jvm/translate.py (86%)
rename python/{geospark => sedona}/core/spatialOperator/__init__.py (100%)
rename python/{geospark => sedona}/core/spatialOperator/join_params.py (91%)
rename python/{geospark => sedona}/core/spatialOperator/join_query.py (85%)
rename python/{geospark => sedona}/core/spatialOperator/knn_query.py (79%)
rename python/{geospark => sedona}/core/spatialOperator/range_query.py (78%)
rename python/{geospark => sedona}/core/utils.py (100%)
rename python/{geospark => sedona}/exceptions.py (100%)
rename python/{geospark => sedona/register}/__init__.py (89%)
rename python/{geospark => sedona}/register/geo_registrator.py (82%)
create mode 100644 python/sedona/register/java_libs.py
rename python/{geospark/jars/2_4 => sedona/sql}/__init__.py (100%)
rename python/{geospark => sedona}/sql/exceptions.py (100%)
rename python/{geospark => sedona}/sql/types.py (97%)
rename python/{geospark => sedona}/utils/__init__.py (89%)
rename python/{geospark => sedona}/utils/abstract_parser.py (100%)
rename python/{geospark => sedona}/utils/adapter.py (95%)
rename python/{geospark => sedona}/utils/binary_parser.py (100%)
rename python/{geospark => sedona}/utils/decorators.py (90%)
rename python/{geospark => sedona}/utils/geometry_adapter.py (88%)
rename python/{geospark => sedona}/utils/jvm.py (91%)
rename python/{geospark => sedona}/utils/meta.py (95%)
rename python/{geospark => sedona}/utils/prep.py (97%)
rename python/{geospark => sedona}/utils/serde.py (86%)
rename python/{geospark => sedona}/utils/spatial_rdd_parser.py (97%)
rename python/{geospark => sedona}/utils/types.py (100%)
rename python/{geospark => sedona}/version.py (97%)