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

fixed issue #348

This commit is contained in:
Jan Steemann 2013-02-14 15:19:08 +01:00
parent 494586af2b
commit 831b84ab2e
6 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -1,6 +1,9 @@
v1.2.alpha (XXXX-XX-XX)
-----------------------
* fixed issue #348: "HTTP Interface for Administration and Monitoring"
documentation errors.
* fix stringification of specific positive int64 values. Stringification of int64
values with the upper 32 bits cleared and the 33rd bit set were broken.

5
Documentation/Examples/request-statistics
View File

@ -11,6 +11,7 @@ HTTP/1.1 200 OK
"cuts" : [0.01, 0.05, 0.1, 0.2, 0.5, 1],
"count" : [1, 0],
"mean" : [0.0, 0.0],
"min" : [0.0, "INF"],
"max" : [0.0, "-INF"],
"distribution" : [[1, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0]]
},
@ -19,6 +20,7 @@ HTTP/1.1 200 OK
"cuts" : [0.01, 0.05, 0.1, 0.2, 0.5, 1],
"count" : [0, 0],
"mean" : [0.0, 0.0],
"min" : ["INF", "INF"],
"max" : ["-INF", "-INF"],
"distribution" : [[0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0]]
},
@ -27,6 +29,7 @@ HTTP/1.1 200 OK
"cuts" : [0.01, 0.05, 0.1, 0.2, 0.5, 1],
"count" : [1, 0],
"mean" : [0.0, 0.0],
"min" : [0.0, "INF"],
"max" : [0.0, "-INF"],
"distribution" : [[1, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0]]
},
@ -35,6 +38,7 @@ HTTP/1.1 200 OK
"cuts" : [250, 1000, 2000, 5000, 10000],
"count" : [1, 0],
"mean" : [1045, 0.0],
"min" : [1045, "INF"],
"max" : [1045, "-INF"],
"distribution" : [[0, 0, 1, 0, 0, 0], [0, 0, 0, 0, 0, 0]]
},
@ -43,6 +47,7 @@ HTTP/1.1 200 OK
"cuts" : [250, 1000, 2000, 5000, 10000],
"count" : [1, 0],
"mean" : [232, 0.0],
"min" : [232, "INF"],
"max" : [232, "-INF"],
"distribution" : [[1, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0]]
}

7
Documentation/Examples/request-statistics-current
View File

@ -9,6 +9,7 @@ HTTP/1.1 200 OK
"cuts" : [0.01, 0.05, 0.1, 0.2, 0.5, 1],
"count" : 38611,
"mean" : 0.000051798710212115704,
"min" : 0.0000005564,
"max" : 1,
"distribution" : [38609, 0, 0, 0, 0, 0, 2]
},
@ -17,6 +18,7 @@ HTTP/1.1 200 OK
"cuts" : [0.01, 0.05, 0.1, 0.2, 0.5, 1],
"count" : 0,
"mean" : 0.0,
"min" : "INF",
"max" : "-INF",
"distribution" : [0, 0, 0, 0, 0, 0, 0]
},
@ -25,6 +27,7 @@ HTTP/1.1 200 OK
"cuts" : [0.01, 0.05, 0.1, 0.2, 0.5, 1],
"count" : 38611,
"mean" : 0.000025899355106057852,
"min" : 0.00000174684866,
"max" : 1,
"distribution" : [38610, 0, 0, 0, 0, 0, 1]
},
@ -33,6 +36,7 @@ HTTP/1.1 200 OK
"cuts" : [250, 1000, 2000, 5000, 10000],
"count" : 38611,
"mean" : 204.18145088187304736,
"min" : 168,
"max" : 6477,
"distribution" : [38609, 1, 0, 0, 1, 0]
},
@ -41,7 +45,8 @@ HTTP/1.1 200 OK
"cuts" : [250, 1000, 2000, 5000, 10000],
"count" : 38611,
"mean" : 131.0053352671518496208,
"min" : 120,
"max" : 236,
"distribution" : [38611, 0, 0, 0, 0, 0]
}
}
}

4
arangod/RestHandler/ConnectionStatisticsHandler.h
View File

@ -119,10 +119,6 @@ namespace triagens {
///
/// - @LIT{totalLength}: the number of available intervals.
///
/// - @LIT{totalTime}: the distribution of the total time.
///
/// - @LIT{queueTime}: the distribution of the queue time.
///
/// - @LIT{httpConnections}: the number of opened http connections
/// during the interval.
///

3
arangod/RestHandler/RequestStatisticsHandler.h
View File

@ -138,6 +138,9 @@ namespace triagens {
/// - @LIT{mean}: a list describing the mean of the values per time
/// interval. This corresponds to the field @LIT{start}.
///
/// - @LIT{min}: a list describing the minimum of the values per time
/// interval. This corresponds to the field @LIT{start}.
///
/// - @LIT{max}: a list describing the maximum of the values per time
/// interval. This corresponds to the field @LIT{start}.
///

24
lib/Statistics/statistics.cpp
View File

@ -613,28 +613,28 @@ VariantArray* TRI_StatisticsInfo (TRI_statistics_granularity_e granularity,
result->add("start", new VariantUInt32((uint32_t) t[0]));
if (showTotalTime) {
RRF_GenerateVariantDistribution<StatisticsDesc::totalAccessor>(result, blocks[0], "totalTime", true, false, false);
RRF_GenerateVariantDistribution<StatisticsDesc::totalAccessor>(result, blocks[0], "totalTime", true, true, false);
}
if (showQueueTime) {
RRF_GenerateVariantDistribution<StatisticsDesc::queueAccessor>(result, blocks[0], "queueTime", true, false, false);
RRF_GenerateVariantDistribution<StatisticsDesc::queueAccessor>(result, blocks[0], "queueTime", true, true, false);
}
if (showRequestTime) {
RRF_GenerateVariantDistribution<StatisticsDesc::requestAccessor>(result, blocks[0], "requestTime", true, false, false);
RRF_GenerateVariantDistribution<StatisticsDesc::requestAccessor>(result, blocks[0], "requestTime", true, true, false);
}
if (showBytesSent) {
RRF_GenerateVariantDistribution<StatisticsDesc::bytesSentAccessor>(result, blocks[0], "bytesSent", true, false, false);
RRF_GenerateVariantDistribution<StatisticsDesc::bytesSentAccessor>(result, blocks[0], "bytesSent", true, true, false);
}
if (showBytesReceived) {
RRF_GenerateVariantDistribution<StatisticsDesc::bytesReceivedAccessor>(result, blocks[0], "bytesReceived", true, false, false);
RRF_GenerateVariantDistribution<StatisticsDesc::bytesReceivedAccessor>(result, blocks[0], "bytesReceived", true, true, false);
}
if (showHttp) {
RRF_GenerateVariantCounter<StatisticsDesc::httpConnectionsAccessor>(result, blocks[0], "httpConnections", resolution);
RRF_GenerateVariantDistribution<StatisticsDesc::httpDurationAccessor>(result, blocks[0], "httpDuration", true, false, false);
RRF_GenerateVariantDistribution<StatisticsDesc::httpDurationAccessor>(result, blocks[0], "httpDuration", true, true, false);
}
}
@ -670,28 +670,28 @@ VariantArray* TRI_StatisticsInfo (TRI_statistics_granularity_e granularity,
result->add("totalLength", new VariantUInt64(total));
if (showTotalTime) {
RRF_GenerateVariantDistribution<StatisticsDesc::totalAccessor>(result, blocks, "totalTime", true, false, false);
RRF_GenerateVariantDistribution<StatisticsDesc::totalAccessor>(result, blocks, "totalTime", true, true, false);
}
if (showQueueTime) {
RRF_GenerateVariantDistribution<StatisticsDesc::queueAccessor>(result, blocks, "queueTime", true, false, false);
RRF_GenerateVariantDistribution<StatisticsDesc::queueAccessor>(result, blocks, "queueTime", true, true, false);
}
if (showRequestTime) {
RRF_GenerateVariantDistribution<StatisticsDesc::requestAccessor>(result, blocks, "requestTime", true, false, false);
RRF_GenerateVariantDistribution<StatisticsDesc::requestAccessor>(result, blocks, "requestTime", true, true, false);
}
if (showBytesSent) {
RRF_GenerateVariantDistribution<StatisticsDesc::bytesSentAccessor>(result, blocks, "bytesSent", true, false, false);
RRF_GenerateVariantDistribution<StatisticsDesc::bytesSentAccessor>(result, blocks, "bytesSent", true, true, false);
}
if (showBytesReceived) {
RRF_GenerateVariantDistribution<StatisticsDesc::bytesReceivedAccessor>(result, blocks, "bytesReceived", true, false, false);
RRF_GenerateVariantDistribution<StatisticsDesc::bytesReceivedAccessor>(result, blocks, "bytesReceived", true, true, false);
}
if (showHttp) {
RRF_GenerateVariantCounter<StatisticsDesc::httpConnectionsAccessor>(result, blocks, "httpConnections", resolution);
RRF_GenerateVariantDistribution<StatisticsDesc::httpDurationAccessor>(result, blocks, "httpDuration", true, false, false);
RRF_GenerateVariantDistribution<StatisticsDesc::httpDurationAccessor>(result, blocks, "httpDuration", true, true, false);
}
}