Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
Max Neunhoeffer 2014-10-30 14:59:18 +01:00
parent c07bfb894d 501c721e72
commit d4986a6711
5 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/Books/Users/Aql/StringFunctions.mdpp
View File

@ -18,7 +18,8 @@ For string processing, AQL offers the following functions:
- *SUBSTRING(value, offset, length)*: Return a substring of *value*,
starting at *offset* and with a maximum length of *length* characters. Offsets
start at position 0
start at position 0. Length is optional and if omitted the substring from *offset*
to the end of the string will be returned.
- *LEFT(value, LENGTH)*: Returns the *LENGTH* leftmost characters of
the string *value*

4
UnitTests/Makefile.unittests
View File

@ -632,10 +632,10 @@ SHELL_SERVER_AQL = @top_srcdir@/js/server/tests/aql-arithmetic.js \
@top_srcdir@/js/server/tests/aql-queries-fulltext.js \
@top_srcdir@/js/server/tests/aql-queries-geo.js \
@top_srcdir@/js/server/tests/aql-queries-noncollection.js \
@top_srcdir@/js/server/tests/aql-queries-optimiser-in.js \
@top_srcdir@/js/server/tests/aql-queries-optimiser-in-noncluster.js \
@top_srcdir@/js/server/tests/aql-queries-optimiser.js \
@top_srcdir@/js/server/tests/aql-queries-optimiser-limit-noncluster.js \
@top_srcdir@/js/server/tests/aql-queries-optimiser-ref.js \
@top_srcdir@/js/server/tests/aql-queries-optimiser-ref-noncluster.js \
@top_srcdir@/js/server/tests/aql-queries-optimiser-sort-noncluster.js \
@top_srcdir@/js/server/tests/aql-queries-simple.js \
@top_srcdir@/js/server/tests/aql-queries-variables.js \

25
js/common/modules/reportgenerator.js
View File

@ -64,5 +64,28 @@ var generatePerfReportGrinderCSV = function (reportName, testdata) {
};
var generatePerfReportJTL = function(reportName, testdata) {
var testFileName = "out_" + reportName + "_perftest.jtl";
var x = '<?xml version="1.0" encoding="UTF-8"?>\n<testResults version="1.2">\n';
for (var testname in testdata) {
if (testdata.hasOwnProperty(testname)) {
for (var testCalculation in testdata[testname]) {
if (testdata[testname].hasOwnProperty(testCalculation) &&
(testCalculation !== 'status'))
{
var s = testdata[testname][testCalculation].duration;
if (!isNaN(s)) {
x = x + '<httpSample t="' + Math.floor(s*1000) + '" lt="0" ts="' + (require("internal").time() * 1000) + '" s="true" lb="' + testname + '/' + testCalculation + '" rc="200" rm="OK" tn="Thread Group 1-1" dt=""/>\n'
}
}
}
}
}
x = x + '</testResults>';
fs.write(testFileName, x);
}
exports.reportGeneratorXML = generatePerfReportXML;
exports.generatePerfReportGrinderCSV = generatePerfReportGrinderCSV;
exports.generatePerfReportGrinderCSV = generatePerfReportGrinderCSV;
exports.generatePerfReportJTL = generatePerfReportJTL;

2
js/server/perftests/sort.js
View File

@ -399,7 +399,7 @@ var repgen = require("reportgenerator");
var ret = loadTestRunner.loadTestRunner(optimizerRuleTestSuite, testOptions, testMethods);
//require("internal").print(JSON.stringify(ret));
repgen.generatePerfReportGrinderCSV("sort", ret);
repgen.generatePerfReportJTL("sort", ret);
return ret;
// Local Variables:

4
lib/Rest/EndpointIp.cpp
View File

@ -155,9 +155,9 @@ TRI_socket_t EndpointIp::connectSocket (const struct addrinfo* aip,
if (result != 0) {
// error
#ifndef _WIN32
LOG_ERROR("bind() failed with %d (%s)", errno, strerror(errno));
LOG_ERROR("bind(address '%s', port %d) failed with %d (%s)", host, (int) _port, errno, strerror(errno));
#else
LOG_ERROR("bind() failed with %d", WSAGetLastError());
LOG_ERROR("bind(address '%s', port %d) failed with %d", host, (int) _port, WSAGetLastError());
#endif
TRI_CLOSE_SOCKET(listenSocket);