summaryrefslogtreecommitdiff
path: root/storage/innobase/include/gis0geo.h
diff options
context:
space:
mode:
Diffstat (limited to 'storage/innobase/include/gis0geo.h')
-rw-r--r--storage/innobase/include/gis0geo.h44
1 files changed, 8 insertions, 36 deletions
diff --git a/storage/innobase/include/gis0geo.h b/storage/innobase/include/gis0geo.h
index dea6d63f4e0..3fd01a3ae54 100644
--- a/storage/innobase/include/gis0geo.h
+++ b/storage/innobase/include/gis0geo.h
@@ -1,6 +1,6 @@
/*****************************************************************************
Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
-Copyright (c) 2019, MariaDB Corporation.
+Copyright (c) 2019, 2020, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -106,45 +106,17 @@ split_rtree_node(
int n_dim, /*!< in: dimensions. */
uchar* first_rec); /*!< in: the first rec. */
-/*************************************************************//**
-Compares two keys a and b depending on nextflag
-nextflag can contain these flags:
+/** Compare two minimum bounding rectangles.
+@param mode comparison operator
MBR_INTERSECT(a,b) a overlaps b
MBR_CONTAIN(a,b) a contains b
MBR_DISJOINT(a,b) a disjoint b
MBR_WITHIN(a,b) a within b
MBR_EQUAL(a,b) All coordinates of MBRs are equal
MBR_DATA(a,b) Data reference is the same
-Returns 0 on success. */
-int
-rtree_key_cmp(
-/*==========*/
- page_cur_mode_t mode, /*!< in: compare method. */
- const uchar* b, /*!< in: first key. */
- int b_len, /*!< in: first key len. */
- const uchar* a, /*!< in: second key. */
- int a_len); /*!< in: second key len. */
-
-/*************************************************************//**
-Calculates MBR_AREA(a+b) - MBR_AREA(a)
-Note: when 'a' and 'b' objects are far from each other,
-the area increase can be really big, so this function
-can return 'inf' as a result. */
-double
-rtree_area_increase(
- const uchar* a, /*!< in: first mbr. */
- const uchar* b, /*!< in: second mbr. */
- int a_len, /*!< in: mbr length. */
- double* ab_area); /*!< out: increased area. */
-
-/** Calculates overlapping area
-@param[in] a mbr a
-@param[in] b mbr b
-@param[in] mbr_len mbr length
-@return overlapping area */
-double
-rtree_area_overlapping(
- const uchar* a,
- const uchar* b,
- int mbr_len);
+@param b first MBR
+@param a second MBR
+@retval 0 if the predicate holds
+@retval 1 if the precidate does not hold */
+int rtree_key_cmp(page_cur_mode_t mode, const void *b, const void *a);
#endif