pengjunjie/server
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/server.git synced 2026-04-07 14:04:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Поправил запись в базу данных. Была неправильная разбивка на части при достижении max_allowed_packet (каждый символ считался как 1 байт, а это неправильно).

Browse Source 
git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/nodeJSProjects@61865 954022d7-b5bf-4e40-9824-e11837661b57
This commit is contained in:
Alexander.Trofimov
2015-04-06 15:17:51 +00:00
parent 4e6e980aaa
commit 19ca4b0f73
2 changed files with 53 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
CoAuthoring/sources/baseConnector.js
View File

@ -1,19 +1,19 @@
var sqlDataBaseType = {
mySql : "mysql",
postgreSql : "postgres"
mySql : 'mysql',
postgreSql : 'postgres'
};
var config = require('./config.json');
var configSql = config["sql"];
var baseConnector = (sqlDataBaseType.mySql === configSql["type"]) ? require('./mySqlBaseConnector') : require('./postgreSqlBaseConnector');
var configSql = config['sql'];
var baseConnector = (sqlDataBaseType.mySql === configSql['type']) ? require('./mySqlBaseConnector') : require('./postgreSqlBaseConnector');
var tableChanges = configSql["tableChanges"],
tableCallbacks = configSql["tableCallbacks"],
tableResult = configSql["tableResult"],
tablePucker = configSql["tablePucker"];
var tableChanges = configSql['tableChanges'],
tableCallbacks = configSql['tableCallbacks'],
tableResult = configSql['tableResult'],
tablePucker = configSql['tablePucker'];
var g_oCriticalSection = {}, lockTimeOut = 200;
var maxPacketSize = 1024 * 1024 - 400; // Размер по умолчанию для запроса в базу данных (вычли 400 на поля)
var maxPacketSize = configSql['max_allowed_packet']; // Размер по умолчанию для запроса в базу данных 1Mb
function getDataFromTable (tableId, data, getCondition, callback) {
var table = getTableById(tableId);
@ -69,6 +69,9 @@ exports.insertInTable = function (tableId) {
exports.insertChanges = function (objChanges, docId, index, user) {
lockCriticalSection(docId, function () {_insertChanges(0, objChanges, docId, index, user);});
};
function _lengthInUtf8Bytes (s) {
return ~-encodeURI(s).split(/%..|./).length;
}
function _getDateTime(nTime) {
var oDate = new Date(nTime);
return oDate.getUTCFullYear() + '-' + ('0' + (oDate.getUTCMonth() + 1)).slice(-2) + '-' + ('0' + oDate.getUTCDate()).slice(-2)
@ -77,23 +80,37 @@ function _getDateTime(nTime) {
}
function _insertChanges (startIndex, objChanges, docId, index, user) {
var sqlCommand = "INSERT INTO " + tableChanges + " VALUES";
for (var i = startIndex, l = objChanges.length; i < l; ++i, ++index) {
sqlCommand += "('" + docId + "','" + index + "','" + user.id + "','" + user.idOriginal + "','"
var i = startIndex, l = objChanges.length, sqlNextRow = "", lengthUtf8Current = 0, lengthUtf8Row = 0;
if (i === l)
return;
for (; i < l; ++i, ++index) {
sqlNextRow = "('" + docId + "','" + index + "','" + user.id + "','" + user.idOriginal + "','"
+ user.name + "','" + objChanges[i].change + "','" + _getDateTime(objChanges[i].time) + "')";
if (i === l - 1)
sqlCommand += ';';
else if (sqlCommand.length + objChanges[i + 1].change.length >= maxPacketSize) {
sqlCommand += ';';
(function (tmpStart, tmpIndex) {
baseConnector.sqlQuery(sqlCommand, function () {
// lock не снимаем, а продолжаем добавлять
_insertChanges(tmpStart, objChanges, docId, tmpIndex, user);
});
})(i + 1, index + 1);
return;
} else
sqlCommand += ',';
lengthUtf8Row = _lengthInUtf8Bytes(sqlNextRow) + 1; // 1 - это на символ ',' или ';' в конце команды
if (i === startIndex) {
lengthUtf8Current = _lengthInUtf8Bytes(sqlCommand);
sqlCommand += sqlNextRow;
} else {
if (lengthUtf8Row + lengthUtf8Current >= maxPacketSize) {
sqlCommand += ';';
(function (tmpStart, tmpIndex) {
baseConnector.sqlQuery(sqlCommand, function () {
// lock не снимаем, а продолжаем добавлять
_insertChanges(tmpStart, objChanges, docId, tmpIndex, user);
});
})(i, index);
return;
} else {
sqlCommand += ',';
sqlCommand += sqlNextRow;
}
}
lengthUtf8Current += lengthUtf8Row;
}
sqlCommand += ';';
baseConnector.sqlQuery(sqlCommand, function () {unLockCriticalSection(docId);});
}

23
CoAuthoring/sources/config.json
View File

@ -9,16 +9,17 @@
"database": "coAuthoring"
},
"sql": {
"type" : "mysql",
"tableChanges" : "doc_changes",
"tableCallbacks" : "doc_callbacks",
"tableResult" : "tast_result",
"tablePucker" : "doc_pucker",
"host" : "localhost",
"dbport" : 3306,
"database" : "canvaseditors",
"user" : "canvas_usr",
"pass" : "canvas_usr",
"charset" : "utf8"
"type" : "mysql",
"tableChanges" : "doc_changes",
"tableCallbacks" : "doc_callbacks",
"tableResult" : "tast_result",
"tablePucker" : "doc_pucker",
"host" : "localhost",
"dbport" : 3306,
"database" : "canvaseditors",
"user" : "canvas_usr",
"pass" : "canvas_usr",
"charset" : "utf8",
"max_allowed_packet" : 1048576
}
}