Skip to content
Permalink
Browse files
Merge pull request #738 from sergejey/revert-736-patch-1 
Revert "Добавлен выбор использования КЕШ в памяти"
  • Loading branch information
@sergejey
sergejey committed May 15, 2020
2 parents 3f1e9be + 8540daf commit e09b16647fb8a46c52a1a7979b5eacef0cff95de
Showing 4 changed files with 80 additions and 116 deletions.
8 lib/caching.class.php
View file
@@ -4,10 +4,10 @@
* Summary of saveToCache
* @param mixed $key Key
* @param mixed $value Value
* @param mixed $ttl TTL (532800) seconds (7 days)
* @param mixed $ttl TTL (default 60)
* @return void
*/
function saveToCache($key, $value, $ttl = 532800)
function saveToCache($key, $value, $ttl = 60)
{
if (is_array($value) || strlen($value) > 255) return;

@@ -16,12 +16,14 @@ function saveToCache($key, $value, $ttl = 532800)
$memory_cache[$key] = $value;
}

$rec = array('KEYWORD' => $key, 'DATAVALUE' => $value, 'EXPIRE' => date('Y-m-d H:i:s', time() + $ttl));
$rec = array('KEYWORD' => $key, 'DATAVALUE' => $value, 'EXPIRE' => date('Y-m-d H:i:s', time() + $ttl*60));
$sqlQuery = "REPLACE INTO cached_values (KEYWORD, DATAVALUE, EXPIRE) " .
" VALUES ('" . DbSafe1($rec['KEYWORD']) . "', " .
"'" . DbSafe1($rec['DATAVALUE']) . "'," .
"'" . $rec['EXPIRE'] . "')";
SQLExec($sqlQuery);
// почистим кеш
SQLExec("DELETE FROM cached_values WHERE EXPIRE < NOW()");
}

/**
9 lib/objects.class.php
View file
@@ -600,15 +600,18 @@ function getGlobal($varname)
} else {
$object_name = 'ThisComputer';
}
$cached_name = 'MJD:' . $object_name . '.' . $varname;
$cached_value = checkFromCache($cached_name);

if (defined('SYSTEM_DISABLE_CACHE') && SYSTEM_DISABLE_CACHE && false !== $value = checkFromCache('MJD:' . $object_name . '.' . $property) ) {
return $value;
if ($cached_value !== false) {
return $cached_value;
}

$obj = getObject($object_name);

if ($obj) {
$value = $obj->getProperty($varname);
saveToCache($cached_name, $value);
return $value;
} else {
return 0;
@@ -928,7 +931,7 @@ function setGlobal($varname, $value, $no_linked = 0, $source = '')
if ($obj) {
return $obj->setProperty($varname, $value, $no_linked, $source);
} else {
return false;
return 0;
}
}

159 modules/objects/objects.class.php
View file
@@ -706,9 +706,6 @@ function getProperty($property)
$property = trim($property);

if ($this->object_title) {
if (defined('SYSTEM_DISABLE_CACHE') && SYSTEM_DISABLE_CACHE && false !== $value = checkFromCache('MJD:' . $this->object_title . '.' . $property) ) {
return $value;
}
$value = SQLSelectOne("SELECT VALUE FROM pvalues WHERE PROPERTY_NAME = '" . DBSafe($this->object_title . '.' . $property) . "'");
if (isset($value['VALUE'])) {
startMeasure('getPropertyCached2');
@@ -763,34 +760,32 @@ function getProperty($property)
*
* @access public
*/
function setProperty($property, $value='', $no_linked = 0, $source = '')
function setProperty($property, $value, $no_linked = 0, $source = '')
{
if (is_array($value)) {
DebMes ('WARNING!!! Wrong property ' . $property . ' cannot to be array', 'property');
return ;
}
if (stripos($property, 'cycle_') === false) {

if (!preg_match('/cycle/is', $property) && function_exists('verbose_log')) {
verbose_log('Property [' . $this->object_title . '.' . $property . '] set to \'' . $value . '\'');
}
startMeasure('setProperty');
startMeasure('setProperty (' . $property . ')');

$property = trim($property);

if (is_null($value)) {
$value = '';
}

if (!$source && is_string($no_linked)) {
$source = $no_linked;
$no_linked = 0;
}
if (!$source && $_SERVER['REQUEST_URI']) {
$source = substr(urldecode($_SERVER['REQUEST_URI']), 0, 100);
$source = urldecode($_SERVER['REQUEST_URI']);
}
if (strlen($source) > 247) {
$source = substr($source, 0, 247) . '...';
if (strlen($source) > 250) {
$source = substr($source, 0, 250) . '...';
}

$property = trim($property);
$value = trim($value);

if (defined('TRACK_DATA_CHANGES') && TRACK_DATA_CHANGES == 1) {
$save = 1;

@@ -839,37 +834,42 @@ function setProperty($property, $value='', $no_linked = 0, $source = '')
startMeasure('getPropertyByName');
$id = $this->getPropertyByName($property, $this->class_id, $this->id);
endMeasure('getPropertyByName');
$old_value = '';

$cached_name = 'MJD:' . $this->object_title . '.' . $property;

startMeasure('setproperty_update');
if ($id) {
$prop = SQLSelectOne("SELECT * FROM properties WHERE ID='" . $id . "'");

// proverki na validnost dannih - nothing to change
switch ($prop['VALIDATION_TYPE']) {
case 1:
if (!is_numeric($value)) return false;
if ($prop['VALIDATION_NUM_MIN'] != '' && (float)$value < (float)$prop['VALIDATION_NUM_MIN']) return false;
if ($prop['VALIDATION_NUM_MAX'] != '' && (float)$value > (float)$prop['VALIDATION_NUM_MAX']) return false;
break;
case 2:
if ($value != '1' && $value != '0') return false;
break;
case 3:
$items = explode(',', $prop['VALIDATION_LIST']);
if (!in_array(mb_strtolower($value, 'UTF-8'), $items)) return false;
break;
case 100:
eval($prop['VALIDATION_CODE']);
if (is_null($value)) return false;
break;
if ($prop['VALIDATION_TYPE'] == 1) {
if (!is_numeric($value)) return false;
if ($prop['VALIDATION_NUM_MIN'] != '' && (float)$value < (float)$prop['VALIDATION_NUM_MIN']) {
return false;
}
if ($prop['VALIDATION_NUM_MAX'] != '' && (float)$value > (float)$prop['VALIDATION_NUM_MAX']) {
return false;
}
}
if ($prop['VALIDATION_TYPE'] == 2) {
if ($value != '1' && $value != '0') {
return false;
}
}
if ($prop['VALIDATION_TYPE'] == 3) {
$items = explode(',', $prop['VALIDATION_LIST']);
if (!in_array(mb_strtolower($value, 'UTF-8'), $items)) return false;
}
if ($prop['VALIDATION_TYPE'] == 100) {
eval($prop['VALIDATION_CODE']);
if (is_null($value)) return false;
}

$property = $prop['TITLE'];
startMeasure('setproperty_update_getvalue');
$v = SQLSelectOne("SELECT * FROM pvalues WHERE PROPERTY_ID=" . (int)$id . " AND OBJECT_ID=" . (int)$this->id);
endMeasure('setproperty_update_getvalue');

if ($v['ID']) $old_value = $v['VALUE'];
$old_value = $v['VALUE'];

if ($prop['DATA_TYPE'] == 5 && $value != $old_value) { // image
$path_parts = pathinfo($value);
@@ -905,7 +905,7 @@ function setProperty($property, $value='', $no_linked = 0, $source = '')
if ($value != '' && $old_value != '' && !$prop['KEEP_HISTORY'] && file_exists(ROOT . 'cms/images/' . $old_value)) {
@unlink(ROOT . 'cms/images/' . $old_value);
}
//if ($value == '') $value = $old_value;
if ($value == '') $value = $old_value;
}

$v['VALUE'] = $value . '';
@@ -940,45 +940,7 @@ function setProperty($property, $value='', $no_linked = 0, $source = '')
}
endMeasure('setproperty_update');

// esli staroe znachenie ravno novomu to - peresmotret
if (isset($old_value) && $old_value == $value) {
verbose_log('Property [' . $this->object_title . '.' . $property . '] no change');
} else {
// zapishem v kesh
if (defined('SYSTEM_DISABLE_CACHE') && SYSTEM_DISABLE_CACHE) saveToCache ('MJD:' . $this->object_title . '.' . $property, $value);

//zapostim v websockety
startMeasure('setproperty_postwebsocketqueue');
postToWebSocketQueue($this->object_title . '.' . $property, $value);
endMeasure('setproperty_postwebsocketqueue');

// esli nado sohranyat istoriy to pyshem
if (IsSet($prop['KEEP_HISTORY']) && ($prop['KEEP_HISTORY'] > 0)) {
$q_rec = array();
$q_rec['VALUE_ID'] = $v['ID'];
$q_rec['ADDED'] = date('Y-m-d H:i:s');
$q_rec['VALUE'] = $value . '';
$q_rec['SOURCE'] = $source . '';
$q_rec['OLD_VALUE'] = $old_value;
$q_rec['KEEP_HISTORY'] = $prop['KEEP_HISTORY'];
SQLInsert('phistory_queue', $q_rec);
}

if (isset($prop['ONCHANGE']) && $prop['ONCHANGE']) {
global $property_linked_history;
if (!$property_linked_history[$this->object_title . '.' . $property][$prop['ONCHANGE']]) {
$property_linked_history[$this->object_title . '.' . $property][$prop['ONCHANGE']] = 1;
$params = array();
$params['PROPERTY'] = $property;
$params['NEW_VALUE'] = (string)$value;
$params['OLD_VALUE'] = (string)$old_value;
$params['SOURCE'] = (string)$source;
//$this->callMethod($prop['ONCHANGE'], $params);
$this->callMethodSafe($prop['ONCHANGE'], $params);
unset($property_linked_history[$this->object_title . '.' . $property][$prop['ONCHANGE']]);
}
}
}
saveToCache($cached_name, $value);

$p_lower = strtolower($property);
if (!defined('DISABLE_SIMPLE_DEVICES') &&
@@ -1026,6 +988,38 @@ function setProperty($property, $value='', $no_linked = 0, $source = '')
endMeasure('linkedModulesProcessing');
}

if (function_exists('postToWebSocketQueue')) {
startMeasure('setproperty_postwebsocketqueue');
postToWebSocketQueue($this->object_title . '.' . $property, $value);
endMeasure('setproperty_postwebsocketqueue');
}

if (IsSet($prop['KEEP_HISTORY']) && ($prop['KEEP_HISTORY'] > 0)) {
$q_rec = array();
$q_rec['VALUE_ID'] = $v['ID'];
$q_rec['ADDED'] = date('Y-m-d H:i:s');
$q_rec['VALUE'] = $value . '';
$q_rec['SOURCE'] = $source . '';
$q_rec['OLD_VALUE'] = $old_value;
$q_rec['KEEP_HISTORY'] = $prop['KEEP_HISTORY'];
SQLInsert('phistory_queue', $q_rec);
}

if (isset($prop['ONCHANGE']) && $prop['ONCHANGE']) {
global $property_linked_history;
if (!$property_linked_history[$this->object_title . '.' . $property][$prop['ONCHANGE']]) {
$property_linked_history[$this->object_title . '.' . $property][$prop['ONCHANGE']] = 1;
$params = array();
$params['PROPERTY'] = $property;
$params['NEW_VALUE'] = (string)$value;
$params['OLD_VALUE'] = (string)$old_value;
$params['SOURCE'] = (string)$source;
//$this->callMethod($prop['ONCHANGE'], $params);
$this->callMethodSafe($prop['ONCHANGE'], $params);
unset($property_linked_history[$this->object_title . '.' . $property][$prop['ONCHANGE']]);
}
}

endMeasure('setProperty (' . $property . ')', 1);
endMeasure('setProperty', 1);

@@ -1066,19 +1060,6 @@ function processObject($object_id)
return $result;
}

/**
* terminals subscription events
*
* @access public
*/
function processSubscription($event, $details = '') {
if ($event == 'DAILY') {
// почистим кеш
SQLExec("DELETE FROM cached_values WHERE EXPIRE < NOW()");
}

}

/**
* Install
*
@@ -1088,7 +1069,6 @@ function processSubscription($event, $details = '') {
*/
function install($parent_name = "")
{
subscribeToEvent($this->name, 'DAILY');
parent::install($parent_name);
}

@@ -1101,7 +1081,6 @@ function install($parent_name = "")
*/
function uninstall()
{
unsubscribeFromEvent($this->name, 'DAILY');
SQLDropTable('objects');
parent::uninstall();
}
20 modules/settings/settings_search.inc.php
View file
@@ -95,26 +95,6 @@
}
}

if ($this->filter_name == 'system' && !defined('SYSTEM_DISABLE_CACHE')) {
$options = array(
'SYSTEM_DISABLE_CACHE' => 'Disable caching for objects and properties',
);
foreach ($options as $k => $v) {
$tmp = SQLSelectOne("SELECT ID FROM settings WHERE NAME LIKE '" . $k . "'");
if (!$tmp['ID']) {
$tmp = array();
$tmp['NAME'] = $k;
$tmp['TITLE'] = $v;
$tmp['TYPE'] = 'onoff';
$tmp['DEFAULTVALUE'] = '1';
$tmp['NOTES'] = '';
$tmp['VALUE'] = '1';
$tmp['DATA'] = '';
SQLInsert('settings', $tmp);
}
}
}

if ($this->filter_name == 'system' && !defined('SETTINGS_SYSTEM_DEBMES_PATH')) {
$options = array(
'SYSTEM_DEBMES_PATH' => 'Path to DebMes logs'

0 comments on commit e09b166

Please sign in to comment.