mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
f094eff1d9
pointed data. I ran gcc -Wcast-qual on storage/maria, this identified un-needed casts, a couple of functions which said they had a const parameter though they changed the pointed content! This is fixed here. Some suspicious places receive a comment. The original intention of running -Wcast-qual was to find what code changes R-tree keys: I added const words, but hidden casts like those of int2store (casts target to (uint16*)) removed const checking; -Wcast-qual helped find those hidden casts. Log handler does not change the content pointed by LEX_STRING::str it receives, so we now use a struct which has a const inside, to emphasize this and be able to pass "const uchar*" buffers to log handler without fear of their content being changed by it. One-line fix for a merge glitch (when merging from MyISAM). include/m_string.h: As Maria's log handler uses LEX_STRING but never changes the content pointed by LEX_STRING::str, and assigns uchar* into this member most of the time, we introduce a new struct LEX_CUSTRING (C const U unsigned) for the log handler. include/my_global.h: In macros which read pointed content: use const pointers so that gcc -Wcast-qual does not warn about casting a const pointer to non-const. include/my_handler.h: In macros which read pointed content: use const pointers so that gcc -Wcast-qual does not warn about casting a const pointer to non-const. ha_find_null() does not change *a. include/my_sys.h: insert_dynamic() does not change *element. include/myisampack.h: In macros which read pointed content: use const pointers so that gcc -Wcast-qual does not warn about casting a const pointer to non-const. mysys/array.c: insert_dynamic() does not change *element mysys/my_handler.c: ha_find_null() does not change *a storage/maria/ma_bitmap.c: Log handler receives const strings now storage/maria/ma_blockrec.c: Log handler receives const strings now. _ma_apply_undo_row_delete/update() do change *header. storage/maria/ma_blockrec.h: correct prototype storage/maria/ma_check.c: Log handler receives const strings now. Un-needed casts storage/maria/ma_checkpoint.c: Log handler receives const strings now storage/maria/ma_checksum.c: unneeded cast storage/maria/ma_commit.c: Log handler receives const strings now storage/maria/ma_create.c: Log handler receives const strings now storage/maria/ma_dbug.c: fixing warning of gcc -Wcast-qual storage/maria/ma_delete.c: Log handler receives const strings now storage/maria/ma_delete_all.c: Log handler receives const strings now storage/maria/ma_delete_table.c: Log handler receives const strings now storage/maria/ma_dynrec.c: fixing some warnings of gcc -Wcast-qual. Unneeded casts removed. Comment about function which lies. storage/maria/ma_ft_parser.c: fix for warnings of gcc -Wcast-qual, removing unneeded casts storage/maria/ma_ft_update.c: less casts, comment storage/maria/ma_key.c: less casts, stay const (warnings of gcc -Wcast-qual) storage/maria/ma_key_recover.c: Log handler receives const strings now storage/maria/ma_loghandler.c: Log handler receives const strings now storage/maria/ma_loghandler.h: Log handler receives const strings now storage/maria/ma_loghandler_lsn.h: In macros which read pointed content: use const pointers so that gcc -Wcast-qual does not warn about casting a const pointer to non-const. storage/maria/ma_page.c: Log handler receives const strings now; more const storage/maria/ma_recovery.c: Log handler receives const strings now storage/maria/ma_rename.c: Log handler receives const strings now storage/maria/ma_rt_index.c: more const, to emphasize that functions don't change pointed content. best_key= NULL was forgotten during merge from MyISAM a few days ago, was causing a Valgrind warning storage/maria/ma_rt_index.h: new proto storage/maria/ma_rt_key.c: more const storage/maria/ma_rt_key.h: new proto storage/maria/ma_rt_mbr.c: more const for functions which deserve it storage/maria/ma_rt_mbr.h: new prototype storage/maria/ma_rt_split.c: make const what is not changed. storage/maria/ma_search.c: un-needed casts, more const storage/maria/ma_sp_key.c: more const storage/maria/ma_unique.c: un-needed casts. storage/maria/ma_write.c: Log handler receives const strings now storage/maria/maria_def.h: some more const storage/maria/unittest/ma_test_loghandler-t.c: Log handler receives const strings now storage/maria/unittest/ma_test_loghandler_first_lsn-t.c: Log handler receives const strings now storage/maria/unittest/ma_test_loghandler_max_lsn-t.c: Log handler receives const strings now storage/maria/unittest/ma_test_loghandler_multigroup-t.c: Log handler receives const strings now storage/maria/unittest/ma_test_loghandler_multithread-t.c: Log handler receives const strings now storage/maria/unittest/ma_test_loghandler_noflush-t.c: Log handler receives const strings now storage/maria/unittest/ma_test_loghandler_nologs-t.c: Log handler receives const strings now storage/maria/unittest/ma_test_loghandler_pagecache-t.c: Log handler receives const strings now storage/maria/unittest/ma_test_loghandler_purge-t.c: Log handler receives const strings now
286 lines
6.8 KiB
C
286 lines
6.8 KiB
C
/* Copyright (C) 2006 MySQL AB & Ramil Kalimullin
|
|
|
|
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
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#include "maria_def.h"
|
|
|
|
#ifdef HAVE_SPATIAL
|
|
|
|
#include "ma_sp_defs.h"
|
|
|
|
static int sp_add_point_to_mbr(uchar *(*wkb), uchar *end, uint n_dims,
|
|
uchar byte_order, double *mbr);
|
|
static int sp_get_point_mbr(uchar *(*wkb), uchar *end, uint n_dims,
|
|
uchar byte_order, double *mbr);
|
|
static int sp_get_linestring_mbr(uchar *(*wkb), uchar *end, uint n_dims,
|
|
uchar byte_order, double *mbr);
|
|
static int sp_get_polygon_mbr(uchar *(*wkb), uchar *end, uint n_dims,
|
|
uchar byte_order, double *mbr);
|
|
static int sp_get_geometry_mbr(uchar *(*wkb), uchar *end, uint n_dims,
|
|
double *mbr, int top);
|
|
static int sp_mbr_from_wkb(uchar (*wkb), uint size, uint n_dims, double *mbr);
|
|
|
|
uint _ma_sp_make_key(register MARIA_HA *info, uint keynr, uchar *key,
|
|
const uchar *record, my_off_t filepos)
|
|
{
|
|
HA_KEYSEG *keyseg;
|
|
MARIA_KEYDEF *keyinfo = &info->s->keyinfo[keynr];
|
|
uint len = 0;
|
|
const uchar *pos;
|
|
uint dlen;
|
|
uchar *dptr;
|
|
double mbr[SPDIMS * 2];
|
|
uint i;
|
|
|
|
keyseg = &keyinfo->seg[-1];
|
|
pos = record + keyseg->start;
|
|
|
|
dlen = _ma_calc_blob_length(keyseg->bit_start, pos);
|
|
memcpy_fixed(&dptr, pos + keyseg->bit_start, sizeof(char*));
|
|
if (!dptr)
|
|
{
|
|
my_errno= HA_ERR_NULL_IN_SPATIAL;
|
|
return 0;
|
|
}
|
|
sp_mbr_from_wkb(dptr + 4, dlen - 4, SPDIMS, mbr); /* SRID */
|
|
|
|
for (i = 0, keyseg = keyinfo->seg; keyseg->type; keyseg++, i++)
|
|
{
|
|
uint length = keyseg->length, start= keyseg->start;
|
|
double val;
|
|
|
|
DBUG_ASSERT(length == sizeof(double));
|
|
DBUG_ASSERT(!(start % sizeof(double)));
|
|
DBUG_ASSERT(start < sizeof(mbr));
|
|
DBUG_ASSERT(keyseg->type == HA_KEYTYPE_DOUBLE);
|
|
|
|
val= mbr[start / sizeof (double)];
|
|
#ifdef HAVE_ISNAN
|
|
if (isnan(val))
|
|
{
|
|
bzero(key, length);
|
|
key+= length;
|
|
len+= length;
|
|
continue;
|
|
}
|
|
#endif
|
|
|
|
if (keyseg->flag & HA_SWAP_KEY)
|
|
{
|
|
uchar buf[sizeof(double)];
|
|
|
|
float8store(buf, val);
|
|
pos= &buf[length];
|
|
while (pos > buf)
|
|
*key++ = *--pos;
|
|
}
|
|
else
|
|
{
|
|
float8store((uchar *)key, val);
|
|
key += length;
|
|
}
|
|
len+= length;
|
|
}
|
|
_ma_dpointer(info, key, filepos);
|
|
return len;
|
|
}
|
|
|
|
/*
|
|
Calculate minimal bounding rectangle (mbr) of the spatial object
|
|
stored in "well-known binary representation" (wkb) format.
|
|
*/
|
|
static int sp_mbr_from_wkb(uchar *wkb, uint size, uint n_dims, double *mbr)
|
|
{
|
|
uint i;
|
|
|
|
for (i=0; i < n_dims; ++i)
|
|
{
|
|
mbr[i * 2] = DBL_MAX;
|
|
mbr[i * 2 + 1] = -DBL_MAX;
|
|
}
|
|
|
|
return sp_get_geometry_mbr(&wkb, wkb + size, n_dims, mbr, 1);
|
|
}
|
|
|
|
/*
|
|
Add one point stored in wkb to mbr
|
|
*/
|
|
|
|
static int sp_add_point_to_mbr(uchar *(*wkb), uchar *end, uint n_dims,
|
|
uchar byte_order __attribute__((unused)),
|
|
double *mbr)
|
|
{
|
|
double ord;
|
|
double *mbr_end= mbr + n_dims * 2;
|
|
|
|
while (mbr < mbr_end)
|
|
{
|
|
if ((*wkb) > end - 8)
|
|
return -1;
|
|
float8get(ord, (const uchar*) *wkb);
|
|
(*wkb)+= 8;
|
|
if (ord < *mbr)
|
|
*mbr= ord;
|
|
mbr++;
|
|
if (ord > *mbr)
|
|
*mbr= ord;
|
|
mbr++;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
static int sp_get_point_mbr(uchar *(*wkb), uchar *end, uint n_dims,
|
|
uchar byte_order, double *mbr)
|
|
{
|
|
return sp_add_point_to_mbr(wkb, end, n_dims, byte_order, mbr);
|
|
}
|
|
|
|
|
|
static int sp_get_linestring_mbr(uchar *(*wkb), uchar *end, uint n_dims,
|
|
uchar byte_order, double *mbr)
|
|
{
|
|
uint n_points;
|
|
|
|
n_points = uint4korr(*wkb);
|
|
(*wkb) += 4;
|
|
for (; n_points > 0; --n_points)
|
|
{
|
|
/* Add next point to mbr */
|
|
if (sp_add_point_to_mbr(wkb, end, n_dims, byte_order, mbr))
|
|
return -1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
static int sp_get_polygon_mbr(uchar *(*wkb), uchar *end, uint n_dims,
|
|
uchar byte_order, double *mbr)
|
|
{
|
|
uint n_linear_rings;
|
|
uint n_points;
|
|
|
|
n_linear_rings = uint4korr((*wkb));
|
|
(*wkb) += 4;
|
|
|
|
for (; n_linear_rings > 0; --n_linear_rings)
|
|
{
|
|
n_points = uint4korr((*wkb));
|
|
(*wkb) += 4;
|
|
for (; n_points > 0; --n_points)
|
|
{
|
|
/* Add next point to mbr */
|
|
if (sp_add_point_to_mbr(wkb, end, n_dims, byte_order, mbr))
|
|
return -1;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int sp_get_geometry_mbr(uchar *(*wkb), uchar *end, uint n_dims,
|
|
double *mbr, int top)
|
|
{
|
|
int res;
|
|
uchar byte_order;
|
|
uint wkb_type;
|
|
|
|
byte_order = *(*wkb);
|
|
++(*wkb);
|
|
|
|
wkb_type = uint4korr((*wkb));
|
|
(*wkb) += 4;
|
|
|
|
switch ((enum wkbType) wkb_type)
|
|
{
|
|
case wkbPoint:
|
|
res = sp_get_point_mbr(wkb, end, n_dims, byte_order, mbr);
|
|
break;
|
|
case wkbLineString:
|
|
res = sp_get_linestring_mbr(wkb, end, n_dims, byte_order, mbr);
|
|
break;
|
|
case wkbPolygon:
|
|
res = sp_get_polygon_mbr(wkb, end, n_dims, byte_order, mbr);
|
|
break;
|
|
case wkbMultiPoint:
|
|
{
|
|
uint n_items;
|
|
n_items = uint4korr((*wkb));
|
|
(*wkb) += 4;
|
|
for (; n_items > 0; --n_items)
|
|
{
|
|
byte_order = *(*wkb);
|
|
++(*wkb);
|
|
(*wkb) += 4;
|
|
if (sp_get_point_mbr(wkb, end, n_dims, byte_order, mbr))
|
|
return -1;
|
|
}
|
|
res = 0;
|
|
break;
|
|
}
|
|
case wkbMultiLineString:
|
|
{
|
|
uint n_items;
|
|
n_items = uint4korr((*wkb));
|
|
(*wkb) += 4;
|
|
for (; n_items > 0; --n_items)
|
|
{
|
|
byte_order = *(*wkb);
|
|
++(*wkb);
|
|
(*wkb) += 4;
|
|
if (sp_get_linestring_mbr(wkb, end, n_dims, byte_order, mbr))
|
|
return -1;
|
|
}
|
|
res = 0;
|
|
break;
|
|
}
|
|
case wkbMultiPolygon:
|
|
{
|
|
uint n_items;
|
|
n_items = uint4korr((*wkb));
|
|
(*wkb) += 4;
|
|
for (; n_items > 0; --n_items)
|
|
{
|
|
byte_order = *(*wkb);
|
|
++(*wkb);
|
|
(*wkb) += 4;
|
|
if (sp_get_polygon_mbr(wkb, end, n_dims, byte_order, mbr))
|
|
return -1;
|
|
}
|
|
res = 0;
|
|
break;
|
|
}
|
|
case wkbGeometryCollection:
|
|
{
|
|
uint n_items;
|
|
|
|
if (!top)
|
|
return -1;
|
|
|
|
n_items = uint4korr((*wkb));
|
|
(*wkb) += 4;
|
|
for (; n_items > 0; --n_items)
|
|
{
|
|
if (sp_get_geometry_mbr(wkb, end, n_dims, mbr, 0))
|
|
return -1;
|
|
}
|
|
res = 0;
|
|
break;
|
|
}
|
|
default:
|
|
res = -1;
|
|
}
|
|
return res;
|
|
}
|
|
|
|
#endif /*HAVE_SPATIAL*/
|