ST_YMAX/ST_XMIN/ST_YMIN

Signed-off-by: Fan Yang <[email protected]>

Cargo.toml

@@ -162,7 +162,7 @@ ethnum = { version = "1.5.0" }
 feature-set = { version = "0.1.1" }
 geo = { version = "0.27.0", features = ["use-serde"] }
 geos = { version = "8.3", features = ["static", "geo", "geo-types"] }
-geozero = { version = "0.12.0", features = ["default", "with-wkb", "with-geos", "with-geojson"] }
+geozero = { version = "0.13.0", features = ["default", "with-wkb", "with-geos", "with-geojson"] }
 itertools = "0.10.5"
 match-template = "0.0.1"
 mysql_async = { version = "0.34", default-features = false, features = ["rustls-tls"] }

src/common/io/Cargo.toml

@@ -30,7 +30,6 @@ lexical-core = "0.8.5"
 micromarshal = "0.5.0"
 ordered-float = { workspace = true }
 roaring = { version = "0.10.1", features = ["serde"] }
-scroll = "0.12.0"
 serde = { workspace = true }
 wkt = "0.10.3"
 

src/common/io/src/geometry.rs

@@ -13,8 +13,6 @@
 // limitations under the License.
 
 use std::fmt::Display;
-use std::io;
-use std::io::Read;
 use std::str::FromStr;
 
 use databend_common_exception::ErrorCode;
@@ -26,14 +24,10 @@ use geozero::GeozeroGeometry;
 use geozero::ToJson;
 use geozero::ToWkb;
 use geozero::ToWkt;
-use scroll::Endian;
-use scroll::IOread;
 use serde::Deserialize;
 use serde::Serialize;
 use wkt::TryFromWkt;
 
-const GEO_TYPE_ID_MASK: u32 = 0x2000_0000;
-
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Default, Serialize, Deserialize)]
 pub enum GeometryDataType {
     WKB,
@@ -44,6 +38,18 @@ pub enum GeometryDataType {
     GEOJSON,
 }
 
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+pub enum Axis {
+    X,
+    Y,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+pub enum Extremum {
+    Max,
+    Min,
+}
+
 impl FromStr for GeometryDataType {
     type Err = ErrorCode;
 
@@ -168,21 +174,6 @@ pub fn parse_to_subtype(buf: &[u8]) -> Result<GeometryDataType> {
         }
     }
 }
-
-pub fn read_ewkb_srid<R: Read>(raw: &mut R) -> std::result::Result<Option<i32>, io::Error> {
-    let byte_order = raw.ioread::<u8>()?;
-    let is_little_endian = byte_order != 0;
-    let endian = Endian::from(is_little_endian);
-    let type_id = raw.ioread_with::<u32>(endian)?;
-    let srid = if type_id & GEO_TYPE_ID_MASK == GEO_TYPE_ID_MASK {
-        Some(raw.ioread_with::<i32>(endian)?)
-    } else {
-        None
-    };
-
-    Ok(srid)
-}
-
 pub trait GeometryFormatOutput {
     fn format(self, data_type: GeometryDataType) -> Result<String>;
 }

src/common/io/src/lib.rs

@@ -50,5 +50,6 @@ pub use escape::escape_string_with_quote;
 pub use geometry::geometry_format;
 pub use geometry::parse_to_ewkb;
 pub use geometry::parse_to_subtype;
-pub use geometry::read_ewkb_srid;
+pub use geometry::Axis;
+pub use geometry::Extremum;
 pub use geometry::GeometryDataType;

src/query/expression/src/utils/display.rs

@@ -15,15 +15,15 @@
 use std::fmt::Debug;
 use std::fmt::Display;
 use std::fmt::Formatter;
-use std::io;
 
 use chrono_tz::Tz;
 use comfy_table::Cell;
 use comfy_table::Table;
 use databend_common_io::display_decimal_128;
 use databend_common_io::display_decimal_256;
-use databend_common_io::read_ewkb_srid;
 use geozero::wkb::Ewkb;
+use geozero::GeozeroGeometry;
+use geozero::ToGeos;
 use geozero::ToWkt;
 use itertools::Itertools;
 use num_traits::FromPrimitive;
@@ -167,9 +167,9 @@ impl<'a> Debug for ScalarRef<'a> {
                 Ok(())
             }
             ScalarRef::Geometry(s) => {
-                let geom = Ewkb(s.to_vec())
-                    .to_ewkt(read_ewkb_srid(&mut io::Cursor::new(s)).unwrap())
-                    .unwrap();
+                let ewkb = Ewkb(s.to_vec());
+                let geos = ewkb.to_geos().unwrap();
+                let geom = geos.to_ewkt(geos.srid()).unwrap();
                 write!(f, "{geom:?}")
             }
         }
@@ -258,9 +258,9 @@ impl<'a> Display for ScalarRef<'a> {
                 write!(f, "'{value}'")
             }
             ScalarRef::Geometry(s) => {
-                let geom = Ewkb(s.to_vec())
-                    .to_ewkt(read_ewkb_srid(&mut io::Cursor::new(s)).unwrap())
-                    .unwrap();
+                let ewkb = Ewkb(s.to_vec());
+                let geos = ewkb.to_geos().unwrap();
+                let geom = geos.to_ewkt(geos.srid()).unwrap();
                 write!(f, "'{geom}'")
             }
         }

src/query/formats/src/field_encoder/values.rs

@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::io;
-
 use bstr::ByteSlice;
 use chrono_tz::Tz;
 use databend_common_arrow::arrow::bitmap::Bitmap;
@@ -35,10 +33,11 @@ use databend_common_io::constants::NAN_BYTES_LOWER;
 use databend_common_io::constants::NAN_BYTES_SNAKE;
 use databend_common_io::constants::NULL_BYTES_UPPER;
 use databend_common_io::constants::TRUE_BYTES_NUM;
-use databend_common_io::read_ewkb_srid;
 use databend_common_io::GeometryDataType;
 use geozero::wkb::Ewkb;
 use geozero::CoordDimensions;
+use geozero::GeozeroGeometry;
+use geozero::ToGeos;
 use geozero::ToJson;
 use geozero::ToWkb;
 use geozero::ToWkt;
@@ -318,11 +317,11 @@ impl FieldEncoderValues {
             .to_vec(),
             GeometryDataType::WKT => Ewkb(v.to_vec()).to_wkt().unwrap().as_bytes().to_vec(),
             GeometryDataType::EWKB => hex::encode_upper(v).as_bytes().to_vec(),
-            GeometryDataType::EWKT => Ewkb(v.to_vec())
-                .to_ewkt(read_ewkb_srid(&mut io::Cursor::new(&v)).unwrap())
-                .unwrap()
-                .as_bytes()
-                .to_vec(),
+            GeometryDataType::EWKT => {
+                let ewkb = Ewkb(v.to_vec());
+                let geos = ewkb.to_geos().unwrap();
+                geos.to_ewkt(geos.srid()).unwrap().as_bytes().to_vec()
+            }
             GeometryDataType::GEOJSON => Ewkb(v.to_vec()).to_json().unwrap().as_bytes().to_vec(),
         };