From 6d571cd708d09591f17428d0c137357a647a717f Mon Sep 17 00:00:00 2001 From: Kamil Dziedzic Date: Mon, 21 Aug 2017 18:55:05 +0200 Subject: [PATCH] fix queries --- src/go/mongolib/profiler/profiler_test.go | 8 ++++---- src/go/mongolib/stats/stats.go | 4 +--- src/go/mongolib/stats/stats_test.go | 2 +- src/go/tests/profiler_docs_stats.want.json | 6 +++--- src/go/tests/profiler_docs_total_stats.want.json | 2 +- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/go/mongolib/profiler/profiler_test.go b/src/go/mongolib/profiler/profiler_test.go index fd42ba7c..4dc37c75 100644 --- a/src/go/mongolib/profiler/profiler_test.go +++ b/src/go/mongolib/profiler/profiler_test.go @@ -73,7 +73,7 @@ func TestRegularIterator(t *testing.T) { ID: "16196765fb4c14edb91efdbe4f5c5973", Namespace: "samples.col1", Operation: "query", - Query: "", + Query: "{\"find\":\"col1\",\"shardVersion\":[0,\"000000000000000000000000\"]}\n", Fingerprint: "FIND col1 find", FirstSeen: firstSeen, LastSeen: lastSeen, @@ -130,7 +130,7 @@ func TestIteratorTimeout(t *testing.T) { ID: "16196765fb4c14edb91efdbe4f5c5973", Namespace: "samples.col1", Operation: "query", - Query: "", + Query: "{\"find\":\"col1\",\"shardVersion\":[0,\"000000000000000000000000\"]}\n", Fingerprint: "FIND col1 find", FirstSeen: firstSeen, LastSeen: lastSeen, @@ -211,7 +211,7 @@ func TestTailIterator(t *testing.T) { ID: "16196765fb4c14edb91efdbe4f5c5973", Namespace: "samples.col1", Operation: "query", - Query: "", + Query: "{\"find\":\"col1\",\"shardVersion\":[0,\"000000000000000000000000\"]}\n", Fingerprint: "FIND col1 find", FirstSeen: 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", Namespace: "samples.col1", Operation: "query", - Query: "", + Query: "{\"find\":\"col1\",\"shardVersion\":[0,\"000000000000000000000000\"]}\n", Fingerprint: "FIND col1 find", FirstSeen: parseDate("2017-04-01T23:01:19.914+00:00"), LastSeen: parseDate("2017-04-01T23:01:19.914+00:00"), diff --git a/src/go/mongolib/stats/stats.go b/src/go/mongolib/stats/stats.go index 1752140a..31af1e99 100644 --- a/src/go/mongolib/stats/stats.go +++ b/src/go/mongolib/stats/stats.go @@ -2,7 +2,6 @@ package stats import ( "crypto/md5" - "encoding/json" "fmt" "sort" "sync" @@ -252,12 +251,11 @@ type Statistics struct { } func countersToStats(query QueryInfoAndCounters, uptime int64, tc totalCounters) QueryStats { - buf, _ := json.Marshal(query.Query) queryStats := QueryStats{ Count: query.Count, ID: query.ID, Operation: query.Operation, - Query: string(buf), + Query: query.Query, Fingerprint: query.Fingerprint, Scanned: calcStats(query.NScanned), Returned: calcStats(query.NReturned), diff --git a/src/go/mongolib/stats/stats_test.go b/src/go/mongolib/stats/stats_test.go index 56c492f3..df3fb5eb 100644 --- a/src/go/mongolib/stats/stats_test.go +++ b/src/go/mongolib/stats/stats_test.go @@ -142,7 +142,7 @@ func TestStats(t *testing.T) { ID: "4e4774ad26f934a193757002a991ebb8", Namespace: "samples.col1", Operation: "query", - Query: "", + Query: "{\"find\":\"col1\",\"filter\":{\"s2\":{\"$gte\":\"41991\",\"$lt\":\"33754\"}},\"shardVersion\":[0,\"000000000000000000000000\"]}\n", Fingerprint: "FIND col1 s2", FirstSeen: parseDate("2017-04-10T13:15:53.532-03:00"), LastSeen: parseDate("2017-04-10T13:15:53.532-03:00"), diff --git a/src/go/tests/profiler_docs_stats.want.json b/src/go/tests/profiler_docs_stats.want.json index 1aea268b..f7f4849c 100644 --- a/src/go/tests/profiler_docs_stats.want.json +++ b/src/go/tests/profiler_docs_stats.want.json @@ -3,7 +3,7 @@ "ID": "16196765fb4c14edb91efdbe4f5c5973", "Namespace": "samples.col1", "Operation": "query", - "Query": "\"\"", + "Query": "{\"find\":\"col1\",\"shardVersion\":[0,\"000000000000000000000000\"]}\n", "Fingerprint": "FIND col1 find", "FirstSeen": "2017-04-10T13:16:23.29-03:00", "LastSeen": "2017-04-10T13:16:23.29-03:00", @@ -56,7 +56,7 @@ "ID": "4e4774ad26f934a193757002a991ebb8", "Namespace": "samples.col1", "Operation": "query", - "Query": "\"\"", + "Query": "{\"find\":\"col1\",\"filter\":{\"s2\":{\"$gte\":\"41991\",\"$lt\":\"33754\"}},\"shardVersion\":[0,\"000000000000000000000000\"]}\n", "Fingerprint": "FIND col1 s2", "FirstSeen": "2017-04-10T13:15:53.532-03:00", "LastSeen": "2017-04-10T13:15:53.532-03:00", @@ -109,7 +109,7 @@ "ID": "8cb8666ace7e54767b4d3c4f61860cf9", "Namespace": "samples.col1", "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", "FirstSeen": "2017-04-10T13:15:53.524-03:00", "LastSeen": "2017-04-10T13:15:53.524-03:00", diff --git a/src/go/tests/profiler_docs_total_stats.want.json b/src/go/tests/profiler_docs_total_stats.want.json index 6ca1a6ae..954845b7 100755 --- a/src/go/tests/profiler_docs_total_stats.want.json +++ b/src/go/tests/profiler_docs_total_stats.want.json @@ -2,7 +2,7 @@ "ID": "", "Namespace": "", "Operation": "", - "Query": "\"\"", + "Query": "", "Fingerprint": "", "FirstSeen": "0001-01-01T00:00:00Z", "LastSeen": "0001-01-01T00:00:00Z",