OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

moved waypoint assignment code to database trigger (before insert caches)

Browse Source
This commit is contained in:
ocoliver
2012-11-17 22:52:49 +01:00
parent a4aee625a9
commit 39a25f997f
7 changed files with 990 additions and 1027 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
htdocs/doc/sql/stored-proc/maintain.php
View File

@ -521,7 +521,43 @@
IF ISNULL(NEW.`uuid`) OR NEW.`uuid`='' THEN
SET NEW.`uuid`=CREATE_UUID();
END IF;
END;");
/* reserve and set cache waypoint
*
* Table cache_waypoint_pool is used to prevent race conditions
* when 2 caches will be inserted simultaneously
*/
IF ISNULL(NEW.`wp_oc`) OR NEW.`wp_oc`='' THEN
/* cleanup previous assignments failures /*
DELETE FROM `cache_waypoint_pool` WHERE `uuid`=NEW.`uuid`;
/* reserve a waypoint */
UPDATE `cache_waypoint_pool` SET `uuid`=NEW.`uuid` WHERE `uuid` IS NULL ORDER BY WPTODEC(`wp_oc`, '&1') ASC LIMIT 1;
IF (SELECT COUNT(*) FROM `cache_waypoint_pool` WHERE `uuid`=NEW.`uuid`) = 0 THEN
/* waypoint reservation was not successfull. Maybe we are on a development machine, where cronjob for waypoint pool
* generation did not run or the pool is empty. To get a valid waypoint, we simply increment the highest used waypoint by one.
* NOTE: This ignores the setting of $opt['logic']['waypoint_pool']['fill_gaps']
* CAUTION: This statement is realy slow and you should always keep your waypoint pool filled with some waypoint on a production server
*/
INSERT INTO `cache_waypoint_pool` (`wp_oc`, `uuid`)
SELECT DECTOWP(MAX(`dec_wp`)+1, '&1'), NEW.`uuid` AS `uuid`
FROM (
SELECT MAX(WPTODEC(`wp_oc`, '&1')) AS dec_wp FROM `caches` WHERE `wp_oc` REGEXP '&2'
UNION SELECT MAX(WPTODEC(`wp_oc`, '&1')) AS dec_wp FROM `cache_waypoint_pool`
) AS `tbl`;
END IF;
/* query and assign the reserved waypoint */
SET NEW.`wp_oc` = (SELECT `wp_oc` FROM `cache_waypoint_pool` WHERE `uuid`=`NEW`.`uuid`);
END IF;
END;",
$opt['logic']['waypoint_pool']['prefix'],
'^' . $opt['logic']['waypoint_pool']['prefix'] . '[' . $opt['logic']['waypoint_pool']['valid_chars'] . ']{1,}$');
sql_dropTrigger('cachesAfterInsert');
sql("CREATE TRIGGER `cachesAfterInsert` AFTER INSERT ON `caches`
@ -534,9 +570,12 @@
CALL sp_update_hiddenstat(NEW.`user_id`, FALSE);
IF NEW.`status`=1 THEN
CALL sp_notify_new_cache(NEW.`cache_id`, NEW.`longitude`, NEW.`latitude`);
END IF;
IF NEW.`status`=1 THEN
CALL sp_notify_new_cache(NEW.`cache_id`, NEW.`longitude`, NEW.`latitude`);
END IF;
/* cleanup/delete reserved waypoint */
DELETE FROM `cache_waypoint_pool` WHERE `uuid`=NEW.`uuid`;
END;");
sql_dropTrigger('cachesBeforeUpdate');

4
htdocs/doc/sql/tables/cache_waypoint_pool.sql
View File

@ -2,7 +2,7 @@ SET NAMES 'utf8';
DROP TABLE IF EXISTS `cache_waypoint_pool`;
CREATE TABLE `cache_waypoint_pool` (
`wp_oc` char(7) NOT NULL,
`cache_id` int(10) unsigned default NULL,
`uuid` varchar(36) default NULL,
PRIMARY KEY (`wp_oc`),
KEY `cache_id` (`cache_id`)
UNIQUE KEY `uuid` (`uuid`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;

2
htdocs/doc/sql/tables/caches.sql
View File

@ -23,7 +23,7 @@ CREATE TABLE `caches` (
`way_length` float unsigned NOT NULL default '0',
`wp_gc` varchar(7) NOT NULL,
`wp_nc` varchar(6) NOT NULL,
`wp_oc` varchar(7) default NULL,
`wp_oc` varchar(7) NOT NULL,
`desc_languages` varchar(60) NOT NULL COMMENT 'via Trigger (cache_desc)',
`default_desclang` char(2) NOT NULL,
`date_activate` datetime default NULL,

37
htdocs/lib/clicompatbase.inc.php
View File

@ -69,43 +69,6 @@
$module, $eventid, $userid, $objectid1, $objectid2, $logtext, serialize($details));
}
// set a unique waypoint to this cache
function setCacheWaypoint($cacheid)
{
global $opt;
// cleanup previous assignments failures
sql("DELETE FROM `cache_waypoint_pool` WHERE `cache_id`='&1'", $cacheid);
// reserve a waypoint
sql("UPDATE `cache_waypoint_pool` SET `cache_id`='&1' WHERE `cache_id` IS NULL ORDER BY WPTODEC(`wp_oc`, '&2') ASC LIMIT 1", $cacheid, $opt['logic']['waypoint_pool']['prefix']);
if (sqlValue("SELECT `wp_oc` FROM `cache_waypoint_pool` WHERE `cache_id`='" . ($cacheid+0) . "'", "") == "")
{
// waypoint reservation was not successfull. Maybe we are on a development machine, where cronjob for waypoint pool
// generation did not run or the pool is empty. To get a valid waypoint, we simply increment the highest used waypoint by one.
// (note: this ignores the setting of $opt['logic']['waypoint_pool']['fill_gaps'])
// CAUTION: This statement is realy slow and you should always keep your waypoint pool filled with some waypoint on a production server
sql("INSERT INTO `cache_waypoint_pool` (`wp_oc`, `cache_id`)
SELECT DECTOWP(MAX(`dec_wp`)+1, '&1'), '&2' AS `cache_id`
FROM (
SELECT MAX(WPTODEC(`wp_oc`, '&1')) AS dec_wp FROM `caches` WHERE `wp_oc` REGEXP '&3'
UNION SELECT MAX(WPTODEC(`wp_oc`, '&1')) AS dec_wp FROM `cache_waypoint_pool`
) AS `tbl`",
$opt['logic']['waypoint_pool']['prefix'],
$cacheid,
'^' . $opt['logic']['waypoint_pool']['prefix'] . '[' . $opt['logic']['waypoint_pool']['valid_chars'] . ']{1,}$');
}
// assign reserved waypoint to the cache
// for the moment, we use IGNORE to catch duplicate keys that occur in any failure case
// the cache keeps without a waypoint in this case. Later we change field caches.wp_oc to NOT NULL and assign waypoint in BEFORE INSERT trigger
sql("UPDATE IGNORE `caches` INNER JOIN `cache_waypoint_pool` ON `caches`.`cache_id`=`cache_waypoint_pool`.`cache_id` SET `caches`.`wp_oc`=`cache_waypoint_pool`.`wp_oc` WHERE `caches`.`cache_id`='&1'", $cacheid);
// cleanup
sql("DELETE FROM `cache_waypoint_pool` WHERE `cache_id`='&1'", $cacheid);
}
function setLastFound($cacheid)
{
$rs = sql("SELECT MAX(`date`) `date` FROM `cache_logs` WHERE `cache_id`=&1 AND `type`=1", $cacheid);

1890
htdocs/newcache.php
View File

File diff suppressed because it is too large Load Diff

4
htdocs/util/mkwaypoints/.htaccess
View File

@ -1,4 +0,0 @@
<FilesMatch "*">
Order Deny,Allow
Deny from All
</FilesMatch>

33
htdocs/util/mkwaypoints/index.php
View File

@ -1,33 +0,0 @@
#!/usr/local/bin/php -q
<?php
/***************************************************************************
* For license information see doc/license.txt
*
Unicode Reminder メモ
***************************************************************************/
// needs absolute rootpath because called as cronjob
$rootpath = dirname(__FILE__) . '/../../';
// chdir to proper directory (needed for cronjobs)
chdir(substr(realpath($_SERVER['PHP_SELF']), 0, strrpos(realpath($_SERVER['PHP_SELF']), '/')));
require_once($rootpath . 'lib/settings.inc.php');
require_once($rootpath . 'lib/clicompatbase.inc.php');
/* begin db connect */
db_connect();
if ($dblink === false)
{
echo 'Unable to connect to database';
exit;
}
/* end db connect */
$rs = sql('SELECT `cache_id` FROM `caches` WHERE ISNULL(`wp_oc`)');
while ($r = sql_fetch_array($rs))
{
setCacheWaypoint($r['cache_id']);
}
mysql_free_result($rs);
?>