Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
c14b95f6
Commit
c14b95f6
authored
Sep 24, 2004
by
hf@deer.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merging
parents
b5b78019
02595629
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
189 additions
and
4 deletions
+189
-4
myisam/rt_mbr.c
myisam/rt_mbr.c
+7
-4
mysql-test/r/gis.result
mysql-test/r/gis.result
+92
-0
mysql-test/t/gis.test
mysql-test/t/gis.test
+90
-0
No files found.
myisam/rt_mbr.c
View file @
c14b95f6
...
@@ -505,7 +505,7 @@ double rtree_overlapping_area(HA_KEYSEG *keyseg, uchar* a, uchar* b,
...
@@ -505,7 +505,7 @@ double rtree_overlapping_area(HA_KEYSEG *keyseg, uchar* a, uchar* b,
amax = korr_func(a+len); \
amax = korr_func(a+len); \
bmax = korr_func(b+len); \
bmax = korr_func(b+len); \
a_area *= (((double)amax) - ((double)amin)); \
a_area *= (((double)amax) - ((double)amin)); \
*
ab_area *= ((double)max(amax, bmax) - (double)min(amin, bmin)); \
loc_
ab_area *= ((double)max(amax, bmax) - (double)min(amin, bmin)); \
}
}
#define RT_AREA_INC_GET(type, get_func, len)\
#define RT_AREA_INC_GET(type, get_func, len)\
...
@@ -516,7 +516,7 @@ double rtree_overlapping_area(HA_KEYSEG *keyseg, uchar* a, uchar* b,
...
@@ -516,7 +516,7 @@ double rtree_overlapping_area(HA_KEYSEG *keyseg, uchar* a, uchar* b,
get_func(amax, a+len); \
get_func(amax, a+len); \
get_func(bmax, b+len); \
get_func(bmax, b+len); \
a_area *= (((double)amax) - ((double)amin)); \
a_area *= (((double)amax) - ((double)amin)); \
*
ab_area *= ((double)max(amax, bmax) - (double)min(amin, bmin)); \
loc_
ab_area *= ((double)max(amax, bmax) - (double)min(amin, bmin)); \
}
}
/*
/*
...
@@ -526,6 +526,7 @@ double rtree_area_increase(HA_KEYSEG *keyseg, uchar* a, uchar* b,
...
@@ -526,6 +526,7 @@ double rtree_area_increase(HA_KEYSEG *keyseg, uchar* a, uchar* b,
uint
key_length
,
double
*
ab_area
)
uint
key_length
,
double
*
ab_area
)
{
{
double
a_area
=
1
.
0
;
double
a_area
=
1
.
0
;
double
loc_ab_area
=
1
.
0
;
*
ab_area
=
1
.
0
;
*
ab_area
=
1
.
0
;
for
(;
(
int
)
key_length
>
0
;
keyseg
+=
2
)
for
(;
(
int
)
key_length
>
0
;
keyseg
+=
2
)
...
@@ -575,7 +576,7 @@ double rtree_area_increase(HA_KEYSEG *keyseg, uchar* a, uchar* b,
...
@@ -575,7 +576,7 @@ double rtree_area_increase(HA_KEYSEG *keyseg, uchar* a, uchar* b,
RT_AREA_INC_GET
(
double
,
mi_float8get
,
8
);
RT_AREA_INC_GET
(
double
,
mi_float8get
,
8
);
break
;
break
;
case
HA_KEYTYPE_END
:
case
HA_KEYTYPE_END
:
return
*
ab_area
-
a_area
;
goto
safe_end
;
default:
default:
return
-
1
;
return
-
1
;
}
}
...
@@ -584,7 +585,9 @@ double rtree_area_increase(HA_KEYSEG *keyseg, uchar* a, uchar* b,
...
@@ -584,7 +585,9 @@ double rtree_area_increase(HA_KEYSEG *keyseg, uchar* a, uchar* b,
a
+=
keyseg_length
;
a
+=
keyseg_length
;
b
+=
keyseg_length
;
b
+=
keyseg_length
;
}
}
return
*
ab_area
-
a_area
;
safe_end:
*
ab_area
=
loc_ab_area
;
return
loc_ab_area
-
a_area
;
}
}
#define RT_PERIM_INC_KORR(type, korr_func, len) \
#define RT_PERIM_INC_KORR(type, korr_func, len) \
...
...
mysql-test/r/gis.result
View file @
c14b95f6
...
@@ -485,10 +485,102 @@ MBRContains(GeomFromText('Polygon((0 0, 0 7, 7 7, 7 0, 0 0))'), a);
...
@@ -485,10 +485,102 @@ MBRContains(GeomFromText('Polygon((0 0, 0 7, 7 7, 7 0, 0 0))'), a);
AsText(a)
AsText(a)
POINT(1 1)
POINT(1 1)
drop table t1;
drop table t1;
CREATE TABLE t1 (Coordinates POINT NOT NULL, SPATIAL INDEX(Coordinates));
INSERT INTO t1 VALUES(GeomFromText('POINT(383293632 1754448)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(564952612 157516260)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(903994614 180726515)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(98128178 141127631)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(862547902 799334546)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(341989013 850270906)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(803302376 93039099)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(857439153 817431356)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(319757546 343162742)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(826341972 717484432)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(305066789 201736238)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(626068992 616241497)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(55789424 755830108)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(802874458 312435220)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(153795660 551723671)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(242207428 537089292)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(553478119 807160039)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(694605552 457472733)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(987886554 792733729)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(598600363 850434457)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(592068275 940589376)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(700705362 395370650)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(33628474 558144514)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(212802006 353386020)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(901307256 39143977)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(70870451 206374045)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(240880214 696939443)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(822615542 296669638)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(452769551 625489999)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(609104858 606565210)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(177213669 851312285)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(143654501 730691787)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(658472325 838260052)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(188164520 646358878)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(630993781 786764883)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(496793334 223062055)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(727354258 197498696)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(618432704 760982731)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(755643210 831234710)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(114368751 656950466)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(870378686 185239202)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(863324511 111258900)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(882178645 685940052)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(407928538 334948195)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(311430051 17033395)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(941513405 488643719)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(868345680 85167906)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(219335507 526818004)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(923427958 407500026)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(173176882 554421738)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(194264908 669970217)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(777483793 921619165)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(867468912 395916497)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(682601897 623112122)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(227151206 796970647)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(280062588 97529892)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(982209849 143387099)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(208788792 864388493)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(829327151 616717329)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(199336688 140757201)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(633750724 140850093)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(629400920 502096404)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(226017998 848736426)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(28914408 149445955)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(256236452 202091290)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(703867693 450501360)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(872061506 481351486)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(372120524 739530418)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(877267982 54722420)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(362642540 104419188)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(851693067 642705127)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(201949080 833902916)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(786092225 410737872)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(698291409 615419376)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(27455201 897628096)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(756176576 661205925)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(38478189 385577496)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(163302328 264496186)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(234313922 192216735)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(413942141 490550373)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(394308025 117809834)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(941051732 266369530)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(599161319 313172256)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(5899948 476429301)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(367894677 368542487)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(580848489 219587743)'));
INSERT INTO t1 VALUES(GeomFromText('POINT(11247614 782797569)'));
drop table t1;
create table t1 select POINT(1,3);
create table t1 select POINT(1,3);
show create table t1;
show create table t1;
Table Create Table
Table Create Table
t1 CREATE TABLE `t1` (
t1 CREATE TABLE `t1` (
`POINT(1,3)` longblob NOT NULL
`POINT(1,3)` longblob NOT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;
drop table t1;
mysql-test/t/gis.test
View file @
c14b95f6
...
@@ -191,6 +191,96 @@ select AsText(a) from t1 where
...
@@ -191,6 +191,96 @@ select AsText(a) from t1 where
MBRContains
(
GeomFromText
(
'Polygon((0 0, 0 7, 7 7, 7 0, 0 0))'
),
a
);
MBRContains
(
GeomFromText
(
'Polygon((0 0, 0 7, 7 7, 7 0, 0 0))'
),
a
);
drop
table
t1
;
drop
table
t1
;
CREATE
TABLE
t1
(
Coordinates
POINT
NOT
NULL
,
SPATIAL
INDEX
(
Coordinates
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(383293632 1754448)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(564952612 157516260)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(903994614 180726515)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(98128178 141127631)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(862547902 799334546)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(341989013 850270906)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(803302376 93039099)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(857439153 817431356)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(319757546 343162742)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(826341972 717484432)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(305066789 201736238)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(626068992 616241497)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(55789424 755830108)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(802874458 312435220)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(153795660 551723671)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(242207428 537089292)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(553478119 807160039)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(694605552 457472733)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(987886554 792733729)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(598600363 850434457)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(592068275 940589376)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(700705362 395370650)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(33628474 558144514)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(212802006 353386020)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(901307256 39143977)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(70870451 206374045)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(240880214 696939443)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(822615542 296669638)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(452769551 625489999)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(609104858 606565210)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(177213669 851312285)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(143654501 730691787)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(658472325 838260052)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(188164520 646358878)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(630993781 786764883)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(496793334 223062055)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(727354258 197498696)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(618432704 760982731)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(755643210 831234710)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(114368751 656950466)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(870378686 185239202)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(863324511 111258900)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(882178645 685940052)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(407928538 334948195)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(311430051 17033395)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(941513405 488643719)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(868345680 85167906)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(219335507 526818004)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(923427958 407500026)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(173176882 554421738)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(194264908 669970217)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(777483793 921619165)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(867468912 395916497)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(682601897 623112122)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(227151206 796970647)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(280062588 97529892)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(982209849 143387099)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(208788792 864388493)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(829327151 616717329)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(199336688 140757201)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(633750724 140850093)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(629400920 502096404)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(226017998 848736426)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(28914408 149445955)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(256236452 202091290)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(703867693 450501360)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(872061506 481351486)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(372120524 739530418)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(877267982 54722420)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(362642540 104419188)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(851693067 642705127)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(201949080 833902916)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(786092225 410737872)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(698291409 615419376)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(27455201 897628096)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(756176576 661205925)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(38478189 385577496)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(163302328 264496186)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(234313922 192216735)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(413942141 490550373)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(394308025 117809834)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(941051732 266369530)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(599161319 313172256)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(5899948 476429301)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(367894677 368542487)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(580848489 219587743)'
));
INSERT
INTO
t1
VALUES
(
GeomFromText
(
'POINT(11247614 782797569)'
));
drop
table
t1
;
create
table
t1
select
POINT
(
1
,
3
);
create
table
t1
select
POINT
(
1
,
3
);
show
create
table
t1
;
show
create
table
t1
;
drop
table
t1
;
drop
table
t1
;
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment