percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-11 21:51:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix queries

Browse Source
This commit is contained in:
Kamil Dziedzic
2017-08-21 18:55:05 +02:00
parent 0ea1cda59c
commit 6d571cd708
5 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/go/mongolib/profiler/profiler_test.go
View File

@@ -73,7 +73,7 @@ func TestRegularIterator(t *testing.T) {
ID: "16196765fb4c14edb91efdbe4f5c5973", ID: "16196765fb4c14edb91efdbe4f5c5973",
Namespace: "samples.col1", Namespace: "samples.col1",
Operation: "query", Operation: "query",
Query: "", Query: "{\"find\":\"col1\",\"shardVersion\":[0,\"000000000000000000000000\"]}\n",
Fingerprint: "FIND col1 find", Fingerprint: "FIND col1 find",
FirstSeen: firstSeen, FirstSeen: firstSeen,
LastSeen: lastSeen, LastSeen: lastSeen,
@@ -130,7 +130,7 @@ func TestIteratorTimeout(t *testing.T) {
ID: "16196765fb4c14edb91efdbe4f5c5973", ID: "16196765fb4c14edb91efdbe4f5c5973",
Namespace: "samples.col1", Namespace: "samples.col1",
Operation: "query", Operation: "query",
Query: "", Query: "{\"find\":\"col1\",\"shardVersion\":[0,\"000000000000000000000000\"]}\n",
Fingerprint: "FIND col1 find", Fingerprint: "FIND col1 find",
FirstSeen: firstSeen, FirstSeen: firstSeen,
LastSeen: lastSeen, LastSeen: lastSeen,
@@ -211,7 +211,7 @@ func TestTailIterator(t *testing.T) {
ID: "16196765fb4c14edb91efdbe4f5c5973", ID: "16196765fb4c14edb91efdbe4f5c5973",
Namespace: "samples.col1", Namespace: "samples.col1",
Operation: "query", Operation: "query",
Query: "", Query: "{\"find\":\"col1\",\"shardVersion\":[0,\"000000000000000000000000\"]}\n",
Fingerprint: "FIND col1 find", Fingerprint: "FIND col1 find",
FirstSeen: parseDate("2017-04-01T23:01:20.214+00:00"), FirstSeen: parseDate("2017-04-01T23:01:20.214+00:00"),
LastSeen: parseDate("2017-04-01T23:01:20.214+00:00"), LastSeen: parseDate("2017-04-01T23:01:20.214+00:00"),
@@ -226,7 +226,7 @@ func TestTailIterator(t *testing.T) {
ID: "16196765fb4c14edb91efdbe4f5c5973", ID: "16196765fb4c14edb91efdbe4f5c5973",
Namespace: "samples.col1", Namespace: "samples.col1",
Operation: "query", Operation: "query",
Query: "", Query: "{\"find\":\"col1\",\"shardVersion\":[0,\"000000000000000000000000\"]}\n",
Fingerprint: "FIND col1 find", Fingerprint: "FIND col1 find",
FirstSeen: parseDate("2017-04-01T23:01:19.914+00:00"), FirstSeen: parseDate("2017-04-01T23:01:19.914+00:00"),
LastSeen: parseDate("2017-04-01T23:01:19.914+00:00"), LastSeen: parseDate("2017-04-01T23:01:19.914+00:00"),

4
src/go/mongolib/stats/stats.go
View File

@@ -2,7 +2,6 @@ package stats
import ( import (
"crypto/md5" "crypto/md5"
"encoding/json"
"fmt" "fmt"
"sort" "sort"
"sync" "sync"
@@ -252,12 +251,11 @@ type Statistics struct {
} }
func countersToStats(query QueryInfoAndCounters, uptime int64, tc totalCounters) QueryStats { func countersToStats(query QueryInfoAndCounters, uptime int64, tc totalCounters) QueryStats {
buf, _ := json.Marshal(query.Query)
queryStats := QueryStats{ queryStats := QueryStats{
Count: query.Count, Count: query.Count,
ID: query.ID, ID: query.ID,
Operation: query.Operation, Operation: query.Operation,
Query: string(buf), Query: query.Query,
Fingerprint: query.Fingerprint, Fingerprint: query.Fingerprint,
Scanned: calcStats(query.NScanned), Scanned: calcStats(query.NScanned),
Returned: calcStats(query.NReturned), Returned: calcStats(query.NReturned),

2
src/go/mongolib/stats/stats_test.go
View File

@@ -142,7 +142,7 @@ func TestStats(t *testing.T) {
ID: "4e4774ad26f934a193757002a991ebb8", ID: "4e4774ad26f934a193757002a991ebb8",
Namespace: "samples.col1", Namespace: "samples.col1",
Operation: "query", Operation: "query",
Query: "", Query: "{\"find\":\"col1\",\"filter\":{\"s2\":{\"$gte\":\"41991\",\"$lt\":\"33754\"}},\"shardVersion\":[0,\"000000000000000000000000\"]}\n",
Fingerprint: "FIND col1 s2", Fingerprint: "FIND col1 s2",
FirstSeen: parseDate("2017-04-10T13:15:53.532-03:00"), FirstSeen: parseDate("2017-04-10T13:15:53.532-03:00"),
LastSeen: parseDate("2017-04-10T13:15:53.532-03:00"), LastSeen: parseDate("2017-04-10T13:15:53.532-03:00"),

6
src/go/tests/profiler_docs_stats.want.json
View File

@@ -3,7 +3,7 @@
"ID": "16196765fb4c14edb91efdbe4f5c5973", "ID": "16196765fb4c14edb91efdbe4f5c5973",
"Namespace": "samples.col1", "Namespace": "samples.col1",
"Operation": "query", "Operation": "query",
"Query": "\"\"", "Query": "{\"find\":\"col1\",\"shardVersion\":[0,\"000000000000000000000000\"]}\n",
"Fingerprint": "FIND col1 find", "Fingerprint": "FIND col1 find",
"FirstSeen": "2017-04-10T13:16:23.29-03:00", "FirstSeen": "2017-04-10T13:16:23.29-03:00",
"LastSeen": "2017-04-10T13:16:23.29-03:00", "LastSeen": "2017-04-10T13:16:23.29-03:00",
@@ -56,7 +56,7 @@
"ID": "4e4774ad26f934a193757002a991ebb8", "ID": "4e4774ad26f934a193757002a991ebb8",
"Namespace": "samples.col1", "Namespace": "samples.col1",
"Operation": "query", "Operation": "query",
"Query": "\"\"", "Query": "{\"find\":\"col1\",\"filter\":{\"s2\":{\"$gte\":\"41991\",\"$lt\":\"33754\"}},\"shardVersion\":[0,\"000000000000000000000000\"]}\n",
"Fingerprint": "FIND col1 s2", "Fingerprint": "FIND col1 s2",
"FirstSeen": "2017-04-10T13:15:53.532-03:00", "FirstSeen": "2017-04-10T13:15:53.532-03:00",
"LastSeen": "2017-04-10T13:15:53.532-03:00", "LastSeen": "2017-04-10T13:15:53.532-03:00",
@@ -109,7 +109,7 @@
"ID": "8cb8666ace7e54767b4d3c4f61860cf9", "ID": "8cb8666ace7e54767b4d3c4f61860cf9",
"Namespace": "samples.col1", "Namespace": "samples.col1",
"Operation": "query", "Operation": "query",
"Query": "\"\"", "Query": "{\"find\":\"col1\",\"filter\":{\"user_id\":{\"$gte\":3384024924,\"$lt\":195092007}},\"projection\":{\"$sortKey\":{\"$meta\":\"sortKey\"}},\"shardVersion\":[0,\"000000000000000000000000\"],\"sort\":{\"user_id\":1}}\n",
"Fingerprint": "FIND col1 user_id", "Fingerprint": "FIND col1 user_id",
"FirstSeen": "2017-04-10T13:15:53.524-03:00", "FirstSeen": "2017-04-10T13:15:53.524-03:00",
"LastSeen": "2017-04-10T13:15:53.524-03:00", "LastSeen": "2017-04-10T13:15:53.524-03:00",

2
src/go/tests/profiler_docs_total_stats.want.json
View File

@@ -2,7 +2,7 @@
"ID": "", "ID": "",
"Namespace": "", "Namespace": "",
"Operation": "", "Operation": "",
"Query": "\"\"", "Query": "",
"Fingerprint": "", "Fingerprint": "",
"FirstSeen": "0001-01-01T00:00:00Z", "FirstSeen": "0001-01-01T00:00:00Z",
"LastSeen": "0001-01-01T00:00:00Z", "LastSeen": "0001-01-01T00:00:00Z",