From f8fc45b68ca6f73b28776685ed3b823a123be19b Mon Sep 17 00:00:00 2001 From: Borys Belinsky Date: Wed, 3 Jan 2018 17:21:35 +0200 Subject: [PATCH 01/17] Correct a small layout problem in the release notes document --- docs/release_notes.rst | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/docs/release_notes.rst b/docs/release_notes.rst index 8afd87fb..9f7a02fa 100644 --- a/docs/release_notes.rst +++ b/docs/release_notes.rst @@ -1,13 +1,7 @@ Release Notes ************* -v3.0.6 released 2017-12-20 -========================== - -Release Notes -************* - -v3.0.6 released 2017-11-20 +v3.0.6 released 2017-12-04 ========================== Percona Toolkit 3.0.6 includes the following changes: From 3f71106ae14ddcf117f8cbac72b18feb2c0867ad Mon Sep 17 00:00:00 2001 From: Borys Belinsky Date: Wed, 3 Jan 2018 17:35:50 +0200 Subject: [PATCH 02/17] Fixing the date for release 3.0.6 in the release notes --- docs/release_notes.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/release_notes.rst b/docs/release_notes.rst index 9f7a02fa..b49ea58b 100644 --- a/docs/release_notes.rst +++ b/docs/release_notes.rst @@ -1,7 +1,7 @@ Release Notes ************* -v3.0.6 released 2017-12-04 +v3.0.6 released 2018-12-04 ========================== Percona Toolkit 3.0.6 includes the following changes: From 5cb75d7a25d0c3df580fd1a998fcef0a687d19d7 Mon Sep 17 00:00:00 2001 From: Borys Belinsky Date: Thu, 4 Jan 2018 22:26:12 +0200 Subject: [PATCH 03/17] Release notes 3.0.6: Add Known issues section --- docs/release_notes.rst | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/docs/release_notes.rst b/docs/release_notes.rst index b49ea58b..67f98f16 100644 --- a/docs/release_notes.rst +++ b/docs/release_notes.rst @@ -10,16 +10,24 @@ New Features * :jirabug:`PT-221`: Improve ``pt-table-sync`` support for ``MyRocks`` * :jirabug:`PT-218`: ``pt-stalk`` now checks the ``RocksDB`` status -* :jirabug:`PT-214`: ``pt-mysql-summary`` contains the ``RocksDB`` section -* :jirabug:`PT-205`: ``pt-osc`` shows a message if trying to set the engine to ``rocksdb`` and ``binlog_format != row`` -* :jirabug:`PT-204`: ``pt-table-checksum`` skips ``RocksDB`` tables +* :jirabug:`PT-214`: ``pt-mysql-summary`` contains the ``RocksDB`` section +* :jirabug:`PT-205`: ``pt-osc`` shows a message if trying to set the engine to + ``rocksdb`` and ``binlog_format != row``. +* :jirabug:`PT-204`: ``pt-table-checksum`` skips ``RocksDB`` tables. -Bug fixes +Known Issues -* :jirabug:`PT-234`: The genaral log parser cannot handle timestamps which include time zones +* :jirabug:`PT-238`: The information message implemented for :jirabug:`PT-204` has a typo when referring to the ``--ignore-engines`` parameter. This problem is planned to be fixed in the next release. +* :jirabug:`PT-240`: It has been detected that the implementation of :jirabug:`PT-205` is not complete and ``pt-osc`` may fail when altering tables. This problem is planned to be fixed in the next release. + +Bug Fixes + +* :jirabug:`PT-234`: The general log parser cannot handle timestamps which include time zones * :jirabug:`PT-229`: ``pt-online-schema-change`` does not retry on a deadlock error when using ``Percona Server`` 5.7 * :jirabug:`PT-225`: ``pt-table-checksum`` ignores generated columns + + v3.0.5 released 2017-11-20 ========================== From a08b6779486db60a57983d62b5377eef1b606ccd Mon Sep 17 00:00:00 2001 From: hrvojem Date: Fri, 5 Jan 2018 20:54:04 +0100 Subject: [PATCH 04/17] Fixed incorrect release date --- docs/release_notes.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/release_notes.rst b/docs/release_notes.rst index 67f98f16..8fcbfd3b 100644 --- a/docs/release_notes.rst +++ b/docs/release_notes.rst @@ -1,7 +1,7 @@ Release Notes ************* -v3.0.6 released 2018-12-04 +v3.0.6 released 2018-01-04 ========================== Percona Toolkit 3.0.6 includes the following changes: From 7c1c99d9ca198385c6eef738abb893befd20a21d Mon Sep 17 00:00:00 2001 From: Carlos Salguero Date: Tue, 16 Jan 2018 15:57:06 -0300 Subject: [PATCH 05/17] PT-244 Fixed --data-dir with partitions Made DATA DIRECTORY to be inserted at the correct place, not at the end of the create table query. --- bin/pt-online-schema-change | 23 +++- t/pt-online-schema-change/pt-244.t | 109 +++++++++++++++++++ t/pt-online-schema-change/samples/pt-244.sql | 10 ++ 3 files changed, 138 insertions(+), 4 deletions(-) create mode 100644 t/pt-online-schema-change/pt-244.t create mode 100644 t/pt-online-schema-change/samples/pt-244.sql diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change index d55dbffe..91184b0d 100755 --- a/bin/pt-online-schema-change +++ b/bin/pt-online-schema-change @@ -56,7 +56,7 @@ BEGIN { { package Percona::Toolkit; -our $VERSION = '3.0.6'; +our $VERSION = '3.0.7'; use strict; use warnings FATAL => 'all'; @@ -10393,15 +10393,15 @@ sub create_new_table { } if ( $o->get('data-dir') && !$o->got('remove-data-dir') ) { if ( (-d $o->get('data-dir')) && (-w $o->get('data-dir')) ){ - $sql =~ s/DATA DIRECTORY='.*?'//; - $sql .= sprintf(" DATA DIRECTORY='%s' ",$o->get('data-dir')); + $sql = insert_data_directory($sql, $o->get('data-dir')); PTDEBUG && _d("adding data dir ".$o->get('data-dir')); + PTDEBUG && _d("New query\n$sql\n"); } else { die $o->get('data-dir') . " is not a directory or it is not writable"; } } if ( $o->got('remove-data-dir') ) { - $sql =~ s/DATA DIRECTORY='.*?'//; + $sql =~ s/DATA DIRECTORY\s*=\s*'.*?'//; PTDEBUG && _d("removing data dir"); } PTDEBUG && _d($sql); @@ -10440,6 +10440,21 @@ sub create_new_table { . "no longer need, then re-run the tool.\n"; } +sub insert_data_directory { + my ($sql, $data_dir) = @_; + $sql =~ s/DATA DIRECTORY\s*=\s*'.*?'//; + + my $re_ps=qr/(\/\*!50100 )?(PARTITION|SUBPARTITION)/; + + if ($sql=~ m/$re_ps/) { + my $insert_pos=$-[0]; + $sql = substr($sql, 0, $insert_pos - 1). " DATA DIRECTORY = '$data_dir' " .substr($sql, $insert_pos); + } else { + $sql .= " DATA DIRECTORY = '$data_dir' "; + } + return $sql; +} + sub swap_tables { my (%args) = @_; my @required_args = qw(orig_tbl new_tbl Cxn Quoter OptionParser Retry tries stats); diff --git a/t/pt-online-schema-change/pt-244.t b/t/pt-online-schema-change/pt-244.t new file mode 100644 index 00000000..79d396b4 --- /dev/null +++ b/t/pt-online-schema-change/pt-244.t @@ -0,0 +1,109 @@ +#!/usr/bin/env perl + +BEGIN { + die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n" + unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH}; + unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib"; +}; + +use strict; +use warnings FATAL => 'all'; +use threads; +use threads::shared; +use Thread::Semaphore; + +use English qw(-no_match_vars); +use Test::More; + +use Data::Dumper; +use PerconaTest; +use Sandbox; +use SqlModes; +use File::Temp qw/ tempdir /; + +plan tests => 4; + +require "$trunk/bin/pt-online-schema-change"; + +my $dp = new DSNParser(opts=>$dsn_opts); +my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp); + +my $master3_port = 2900; +my $master_basedir = "/tmp/$master3_port"; + +diag(`$trunk/sandbox/stop-sandbox $master3_port >/dev/null`); +diag(`$trunk/sandbox/start-sandbox master $master3_port >/dev/null`); + +my $dbh3 = $sb->get_dbh_for("master3"); +my $dsn3 = $sb->dsn_for("master3"); + +if ( !$dbh3 ) { + plan skip_all => 'Cannot connect to sandbox master'; +} + +# The sandbox servers run with lock_wait_timeout=3 and it's not dynamic +# so we need to specify --set-vars innodb_lock_wait_timeout=3 else the +# tool will die. +my @args = (qw(--set-vars innodb_lock_wait_timeout=3)); +my $output; +my $exit_status; + +diag("1"); +$sb->load_file('master3', "t/pt-online-schema-change/samples/pt-244.sql"); + +my $num_rows = 1000; +diag("Loading $num_rows into the table. This might take some time."); +diag(`util/mysql_random_data_load_linux_amd64 --host=127.1 --port=$master3_port --user=msandbox --password=msandbox test t3 $num_rows`); +diag("$num_rows rows loaded. Starting tests."); + +$dbh3->do("FLUSH TABLES"); + +my $new_dir='/tmp/tdir'; +diag(`rm -rf $new_dir`); +diag(`mkdir $new_dir`); + +diag("2"); +($output, $exit_status) = full_output( + sub { pt_online_schema_change::main(@args, "$dsn3,D=test,t=t3", + '--execute', + '--alter', "engine=innodb", + '--data-dir', $new_dir, + ), + }, + stderr => 1, +); +diag("3"); + +is( + $exit_status, + 0, + "PT-244 Successfully altered. Exit status = 0", +); + +like( + $output, + qr/Successfully altered/s, + "PT-244 Got successfully altered message.", +); + + +my $db_dir="$new_dir/test/"; +opendir(my $dh, $db_dir) || die "Can't opendir $db_dir: $!"; +my @files = grep { /^t3#P#p/ } readdir($dh); +closedir $dh; + +is( + scalar @files, + 4, + "PT-224 Number of files is correct", +); + +$dbh3->do("DROP DATABASE IF EXISTS test"); + +# ############################################################################# +# Done. +# ############################################################################# +$sb->wipe_clean($dbh3); +diag(`$trunk/sandbox/stop-sandbox $master3_port >/dev/null`); +ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox"); +done_testing; diff --git a/t/pt-online-schema-change/samples/pt-244.sql b/t/pt-online-schema-change/samples/pt-244.sql new file mode 100644 index 00000000..7a06376b --- /dev/null +++ b/t/pt-online-schema-change/samples/pt-244.sql @@ -0,0 +1,10 @@ +DROP DATABASE IF EXISTS test; +CREATE DATABASE test; +USE test; + + +CREATE TABLE t3 ( + c INT PRIMARY KEY AUTO_INCREMENT +) ENGINE=InnoDB PARTITION BY HASH(c) PARTITIONS 4; + +INSERT INTO t3 VALUES (1), (2), (3), (4), (5); From 56f97843f15be53c83ad3e18190256d0acd9c302 Mon Sep 17 00:00:00 2001 From: Carlos Salguero Date: Tue, 6 Feb 2018 14:14:29 -0300 Subject: [PATCH 06/17] PT-1455 Added test case --- t/pt-online-schema-change/pt-1455.t | 110 ++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 t/pt-online-schema-change/pt-1455.t diff --git a/t/pt-online-schema-change/pt-1455.t b/t/pt-online-schema-change/pt-1455.t new file mode 100644 index 00000000..8e3c6efc --- /dev/null +++ b/t/pt-online-schema-change/pt-1455.t @@ -0,0 +1,110 @@ +#!/usr/bin/env perl + +BEGIN { + die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n" + unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH}; + unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib"; +}; + +use strict; +use warnings FATAL => 'all'; +use threads; +use threads::shared; +use Thread::Semaphore; + +use English qw(-no_match_vars); +use Test::More; + +use Data::Dumper; +use PerconaTest; +use Sandbox; +use SqlModes; +use File::Temp qw/ tempdir /; + +plan tests => 4; + +require "$trunk/bin/pt-online-schema-change"; + +my $dp = new DSNParser(opts=>$dsn_opts); +my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp); + +my $master_dbh = $sb->get_dbh_for("master"); +my $master_dsn = $sb->dsn_for("master"); + +my $slave1_dbh = $sb->get_dbh_for("slave1"); +my $slave1_dsn = $sb->dsn_for("slave1"); + +# The sandbox servers run with lock_wait_timeout=3 and it's not dynamic +# so we need to specify --set-vars innodb_lock_wait_timeout=3 else the +# tool will die. +my @args = (qw(--set-vars innodb_lock_wait_timeout=3)); +my $output; +my $exit_status; + +# $sb->load_file('master3', "t/pt-online-schema-change/samples/pt-244.sql"); +$slave1_dbh->do("STOP SLAVE"); +$slave1_dbh->do("CHANGE REPLICATION FILTER REPLICATE_IGNORE_DB = (ignored_db)"); +$slave1_dbh->do("START SLAVE"); + +$master_dbh->do("DROP DATABASE IF EXISTS ignored_db"); +$master_dbh->do("CREATE DATABASE ignored_db"); +$master_dbh->do("CREATE TABLE ignored_db.t1 (id int, f2 int) ENGINE=InnoDB"); + +my $num_rows = 1000; +my $master_port = $Sandbox::port_for{master}; + +diag("Loading $num_rows into the table. This might take some time."); +diag(`util/mysql_random_data_load_linux_amd64 --host=127.1 --port=$master_port --user=msandbox --password=msandbox test t3 $num_rows`); +diag("$num_rows rows loaded. Starting tests."); + +$master_dbh->do("FLUSH TABLES"); + +my $new_dir='/tmp/tdir'; +diag(`rm -rf $new_dir`); +diag(`mkdir $new_dir`); + +diag("2"); +($output, $exit_status) = full_output( + sub { pt_online_schema_change::main(@args, "$master_dsn,D=test,t=t3", + '--execute', + '--alter', "engine=innodb", + '--data-dir', $new_dir, + ), + }, + stderr => 1, +); +diag("3"); + +is( + $exit_status, + 0, + "PT-244 Successfully altered. Exit status = 0", +); + +like( + $output, + qr/Successfully altered/s, + "PT-244 Got successfully altered message.", +); + + +my $db_dir="$new_dir/test/"; +opendir(my $dh, $db_dir) || die "Can't opendir $db_dir: $!"; +my @files = grep { /^t3#P#p/ } readdir($dh); +closedir $dh; + +is( + scalar @files, + 4, + "PT-224 Number of files is correct", +); + +$dbh3->do("DROP DATABASE IF EXISTS test"); + +# ############################################################################# +# Done. +# ############################################################################# +$sb->wipe_clean($dbh3); +diag(`$trunk/sandbox/stop-sandbox $master3_port >/dev/null`); +ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox"); +done_testing; From 943cb68ee0f69b250183687723f5e2d816d955ef Mon Sep 17 00:00:00 2001 From: Carlos Salguero Date: Thu, 8 Feb 2018 13:07:13 -0300 Subject: [PATCH 07/17] PMM-1455 Tests added --- bin/pt-online-schema-change | 11 ++++--- t/pt-online-schema-change/pt-1455.t | 29 +++++++------------ .../samples/pt-1455_master.sql | 6 ++++ .../samples/pt-1455_slave.sql | 4 +++ util/check-load-data | 2 +- 5 files changed, 28 insertions(+), 24 deletions(-) create mode 100644 t/pt-online-schema-change/samples/pt-1455_master.sql create mode 100644 t/pt-online-schema-change/samples/pt-1455_slave.sql diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change index 91184b0d..3d6cfccd 100755 --- a/bin/pt-online-schema-change +++ b/bin/pt-online-schema-change @@ -4281,7 +4281,8 @@ sub recurse_to_slaves { PTDEBUG && _d('Connected to', $dp->as_string($slave_dsn)); }; if ( $EVAL_ERROR ) { - print STDERR "Cannot connect to ", $dp->as_string($slave_dsn), "\n" + #TODO REMOVE DEBUG + print STDERR "1> Cannot connect to ", $dp->as_string($slave_dsn), "\n" or die "Cannot print: $OS_ERROR"; return; } @@ -8693,7 +8694,8 @@ sub main { # to stop lagging. If any replica is stopped, the tool # waits forever until the replica is started." # https://bugs.launchpad.net/percona-toolkit/+bug/1402051 - PTDEBUG && _d('Cannot connect to', $cxn->name(), ':', + #TODO REMOVE DEBUG + PTDEBUG && _d('2> Cannot connect to', $cxn->name(), ':', $EVAL_ERROR); # Make ReplicaLagWaiter::wait() report slave is stopped. return undef; @@ -9134,7 +9136,8 @@ sub main { } }; - if ( $slaves && scalar @$slaves ) { + my $table_is_replicated; + if ( $slaves && scalar @$slaves && $table_is_replicated) { foreach my $slave (@$slaves) { my ($pr, $pr_first_report); if ( $o->get('progress') ) { @@ -12843,7 +12846,7 @@ Default character set. =item * D -dsn: database; copy: yes +dsn: database; copy: no Database for the old and new table. diff --git a/t/pt-online-schema-change/pt-1455.t b/t/pt-online-schema-change/pt-1455.t index 8e3c6efc..7a961646 100644 --- a/t/pt-online-schema-change/pt-1455.t +++ b/t/pt-online-schema-change/pt-1455.t @@ -41,20 +41,15 @@ my @args = (qw(--set-vars innodb_lock_wait_timeout=3)); my $output; my $exit_status; -# $sb->load_file('master3', "t/pt-online-schema-change/samples/pt-244.sql"); -$slave1_dbh->do("STOP SLAVE"); -$slave1_dbh->do("CHANGE REPLICATION FILTER REPLICATE_IGNORE_DB = (ignored_db)"); -$slave1_dbh->do("START SLAVE"); - -$master_dbh->do("DROP DATABASE IF EXISTS ignored_db"); -$master_dbh->do("CREATE DATABASE ignored_db"); -$master_dbh->do("CREATE TABLE ignored_db.t1 (id int, f2 int) ENGINE=InnoDB"); +$sb->load_file('slave1', "t/pt-online-schema-change/samples/pt-1455_slave.sql"); +$sb->load_file('slave2', "t/pt-online-schema-change/samples/pt-1455_slave.sql"); +$sb->load_file('master', "t/pt-online-schema-change/samples/pt-1455_master.sql"); my $num_rows = 1000; my $master_port = $Sandbox::port_for{master}; diag("Loading $num_rows into the table. This might take some time."); -diag(`util/mysql_random_data_load_linux_amd64 --host=127.1 --port=$master_port --user=msandbox --password=msandbox test t3 $num_rows`); +diag(`util/mysql_random_data_load_linux_amd64 --host=127.1 --port=$master_port --user=msandbox --password=msandbox ignored_db t1 $num_rows`); diag("$num_rows rows loaded. Starting tests."); $master_dbh->do("FLUSH TABLES"); @@ -63,28 +58,25 @@ my $new_dir='/tmp/tdir'; diag(`rm -rf $new_dir`); diag(`mkdir $new_dir`); -diag("2"); ($output, $exit_status) = full_output( - sub { pt_online_schema_change::main(@args, "$master_dsn,D=test,t=t3", + sub { pt_online_schema_change::main(@args, "$master_dsn,D=ignored_db,t=t1", '--execute', '--alter', "engine=innodb", - '--data-dir', $new_dir, ), }, stderr => 1, ); -diag("3"); is( $exit_status, 0, - "PT-244 Successfully altered. Exit status = 0", + "PT-1455 Successfully altered. Exit status = 0", ); like( $output, qr/Successfully altered/s, - "PT-244 Got successfully altered message.", + "PT-1455 Got successfully altered message.", ); @@ -96,15 +88,14 @@ closedir $dh; is( scalar @files, 4, - "PT-224 Number of files is correct", + "PT-1455 Number of files is correct", ); -$dbh3->do("DROP DATABASE IF EXISTS test"); +$master_dbh->do("DROP DATABASE IF EXISTS ignored_db"); # ############################################################################# # Done. # ############################################################################# -$sb->wipe_clean($dbh3); -diag(`$trunk/sandbox/stop-sandbox $master3_port >/dev/null`); +$sb->wipe_clean($master_dbh); ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox"); done_testing; diff --git a/t/pt-online-schema-change/samples/pt-1455_master.sql b/t/pt-online-schema-change/samples/pt-1455_master.sql new file mode 100644 index 00000000..ca5967ac --- /dev/null +++ b/t/pt-online-schema-change/samples/pt-1455_master.sql @@ -0,0 +1,6 @@ +DROP DATABASE IF EXISTS employees; +CREATE DATABASE employees; +CREATE TABLE employees.t1 ( + id INT AUTO_INCREMENT PRIMARY KEY, + f2 INT +) ENGINE=InnoDB; diff --git a/t/pt-online-schema-change/samples/pt-1455_slave.sql b/t/pt-online-schema-change/samples/pt-1455_slave.sql new file mode 100644 index 00000000..fbb9b928 --- /dev/null +++ b/t/pt-online-schema-change/samples/pt-1455_slave.sql @@ -0,0 +1,4 @@ +STOP SLAVE; +CHANGE REPLICATION FILTER REPLICATE_WILD_IGNORE_TABLE = ('employees.%'); +RESET SLAVE; +START SLAVE; diff --git a/util/check-load-data b/util/check-load-data index 69f25577..23732ce5 100755 --- a/util/check-load-data +++ b/util/check-load-data @@ -44,7 +44,7 @@ $dbh->do("CREATE TABLE IF NOT EXISTS percona_test.load_data (i int)"); `echo 1 > /tmp/load_data_test.$$`; eval { - $dbh->do("LOAD DATA LOCAL INFILE '/tmp/load_data_test.$$' INTO TABLE percona_test.load_data"); + $dbh->do("LOAD DATA INFILE '/tmp/load_data_test.$$' INTO TABLE percona_test.load_data"); }; if ( $EVAL_ERROR ) { From 75ab0ba653b7c531dcd854792922111eb14592ce Mon Sep 17 00:00:00 2001 From: Carlos Salguero Date: Fri, 9 Feb 2018 16:46:16 -0300 Subject: [PATCH 08/17] PT-1256 pt-table-sync does not use the character set for the table it is synchronizing --- Changelog | 4 ++ bin/pt-table-sync | 29 ++++++++- sandbox/servers/5.7/my.sandbox.cnf | 1 + t/lib/samples/charset.sql | 15 +++++ t/pt-table-sync/pt-1256.t | 97 ++++++++++++++++++++++++++++++ util/check-load-data | 2 +- 6 files changed, 145 insertions(+), 3 deletions(-) create mode 100644 t/lib/samples/charset.sql create mode 100644 t/pt-table-sync/pt-1256.t diff --git a/Changelog b/Changelog index a1653c80..8ad59180 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,9 @@ Changelog for Percona Toolkit +v3.0.7 + + * Fixed bug PT-1256: pt-table-sync does not use the character set for the table it is synchronizing + v3.0.6 released 2017-12-20 * Fixed bug PT-234: Genaral log parser cannot handle timestamps with tz diff --git a/bin/pt-table-sync b/bin/pt-table-sync index 67d3d6dc..93c06865 100755 --- a/bin/pt-table-sync +++ b/bin/pt-table-sync @@ -55,7 +55,7 @@ BEGIN { { package Percona::Toolkit; -our $VERSION = '3.0.6'; +our $VERSION = '3.0.7'; use strict; use warnings FATAL => 'all'; @@ -2137,6 +2137,7 @@ sub parse { } } + $self->{dsn_props} = \%final_props; return \%final_props; } @@ -2319,6 +2320,20 @@ sub get_dbh { } } + if ($self->{dsn_props}->{D} && $self->{dsn_props}->{t}) { + PTDEBUG && _d("DSN has a schema and table: $self->{dsn_props}->{D}.$self->{dsn_props}->{t}"); + PTDEBUG && _d("Trying to set the default charset for the connection"); + my (undef, $create_table) = eval { $dbh->selectrow_array("SHOW CREATE TABLE $self->{dsn_props}->{D}.$self->{dsn_props}->{t}") }; + + if ($create_table && $create_table =~ m/DEFAULT CHARSET=(\S+)\s*/) { + PTDEBUG && _d("Detected table's character set: $1"); + PTDEBUG && _d("Executing: SET NAMES '$1'"); + $dbh->do("SET NAMES '$1'"); + } else { + PTDEBUG && _d("Cannot get the default character set for the table"); + } + } + PTDEBUG && _d('DBH info: ', $dbh, Dumper($dbh->selectrow_hashref( @@ -10644,6 +10659,16 @@ sub sync_a_table { : $tbl_struct->{engine} eq 'InnoDB' ? 1 : 0; + if ($tbl_struct->{charset}) { + PTDEBUG && _d("Detected table's character set: $tbl_struct->{charset}"); + PTDEBUG && _d("Executing: SET NAMES '$tbl_struct->{charset}'"); + $src->{dbh}->do("SET NAMES '$tbl_struct->{charset}'"); + $src->{misc_dbh}->do("SET NAMES '$tbl_struct->{charset}'"); + $dst->{dbh}->do("SET NAMES '$tbl_struct->{charset}'"); + $dst->{misc_dbh}->do("SET NAMES '$tbl_struct->{charset}'"); + } else { + PTDEBUG && _d("Cannot get the default character set for the table"); + } # Turn off AutoCommit if we're using transactions. $src->{dbh}->{AutoCommit} = !$use_txn; $src->{misc_dbh}->{AutoCommit} = !$use_txn; @@ -12977,6 +13002,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA. =head1 VERSION -pt-table-sync 3.0.6 +pt-table-sync 3.0.7 =cut diff --git a/sandbox/servers/5.7/my.sandbox.cnf b/sandbox/servers/5.7/my.sandbox.cnf index 881ea914..a3cf5c9b 100644 --- a/sandbox/servers/5.7/my.sandbox.cnf +++ b/sandbox/servers/5.7/my.sandbox.cnf @@ -27,6 +27,7 @@ innodb_lock_wait_timeout = 3 general_log general_log_file = genlog lower_case_table_names = 0 +#character-set-server = utf8 # fkc test binlog_format = STATEMENT diff --git a/t/lib/samples/charset.sql b/t/lib/samples/charset.sql new file mode 100644 index 00000000..a2a03af4 --- /dev/null +++ b/t/lib/samples/charset.sql @@ -0,0 +1,15 @@ +DROP DATABASE IF EXISTS `test`; +CREATE DATABASE `test`; + +CREATE TABLE `test`.`t1` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `f2` varchar(255) DEFAULT NULL, + PRIMARY KEY (`id`) +) COMMENT "test1" ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE `test`.`t2` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `f2` varchar(255) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + diff --git a/t/pt-table-sync/pt-1256.t b/t/pt-table-sync/pt-1256.t new file mode 100644 index 00000000..04c34f8c --- /dev/null +++ b/t/pt-table-sync/pt-1256.t @@ -0,0 +1,97 @@ +#!/usr/bin/env perl + +BEGIN { + die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n" + unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH}; + unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib"; +}; + +use strict; +use utf8; +use Encode qw(decode encode); +use warnings FATAL => 'all'; +use English qw(-no_match_vars); +use Test::More; + +use PerconaTest; +use Sandbox; +require "$trunk/bin/pt-table-sync"; + +binmode(STDIN, ':utf8') or die "Can't binmode(STDIN, ':utf8'): $OS_ERROR"; +binmode(STDOUT, ':utf8') or die "Can't binmode(STDOUT, ':utf8'): $OS_ERROR"; + +my $dp = new DSNParser(opts=>$dsn_opts); +my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp); +my $master_dbh = $sb->get_dbh_for('master'); +my $slave1_dbh = $sb->get_dbh_for('slave1'); +my $slave2_dbh = $sb->get_dbh_for('slave2'); + +if ( !$master_dbh ) { + plan skip_all => 'Cannot connect to sandbox master'; +} +elsif ( !$slave1_dbh ) { + plan skip_all => 'Cannot connect to sandbox slave1'; +} +elsif ( !$slave1_dbh ) { + plan skip_all => 'Cannot connect to sandbox slave2'; +} +else { + plan tests => 5; +} + +my ($output, $status); +my @args = ('--sync-to-master', 'h=127.1,P=12346,u=msandbox,p=msandbox', + qw(-t test.t1 --print --execute)); + +# use lib/samples dir since the main change is in DSNParser +$sb->load_file('master', "t/lib/samples/charset.sql"); + +my $want = encode('UTF-8','абвгд'); + +$master_dbh->do("SET NAMES 'utf8'"); +$slave1_dbh->do("SET NAMES 'utf8'"); +$slave1_dbh->do("SET NAMES 'utf8'"); + +$master_dbh->do("INSERT INTO test.t1 VALUES (NULL, '$want')"); +$sb->wait_for_slaves(); + +$slave1_dbh->do("DELETE FROM test.t1 WHERE id=1 LIMIT 1"); +$slave1_dbh->do("FLUSH TABLES"); + + +# 1 +($output, $status) = full_output( + sub { pt_table_sync::main(@args) }, +); + +like( + $output, + qr/REPLACE INTO `test`.`t1`/, + "PT-1256 Set the correct charset" +); + +# 2 +my $row = $slave1_dbh->selectrow_hashref("SELECT f2 FROM test.t1 WHERE id = 1"); +is( + $row->{f2}, + $want, + "Character set is correct", +); + +# 3 +$output = `$trunk/bin/pt-table-sync --execute --lock-and-rename h=127.1,P=12345,u=msandbox,p=msandbox,D=test,t=t1 t=t2 2>&1`; +$output = `/tmp/12345/use -e 'show create table test.t2'`; +like($output, qr/COMMENT='test1'/, '--lock-and-rename worked'); + +$row = $slave1_dbh->selectrow_hashref("SELECT f2 FROM test.t2 WHERE id = 1"); +is( + $row->{f2}, + $want, + "Character set is correct", +); +# ############################################################################# +# Done. +# ############################################################################# +$sb->wipe_clean($master_dbh); +ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox"); +exit; diff --git a/util/check-load-data b/util/check-load-data index 69f25577..23732ce5 100755 --- a/util/check-load-data +++ b/util/check-load-data @@ -44,7 +44,7 @@ $dbh->do("CREATE TABLE IF NOT EXISTS percona_test.load_data (i int)"); `echo 1 > /tmp/load_data_test.$$`; eval { - $dbh->do("LOAD DATA LOCAL INFILE '/tmp/load_data_test.$$' INTO TABLE percona_test.load_data"); + $dbh->do("LOAD DATA INFILE '/tmp/load_data_test.$$' INTO TABLE percona_test.load_data"); }; if ( $EVAL_ERROR ) { From 53ce571bf13eacd76b86e8182fe65c7141168dce Mon Sep 17 00:00:00 2001 From: Carlos Salguero Date: Mon, 12 Feb 2018 16:40:30 -0300 Subject: [PATCH 09/17] PT-633 Added --mysql-only option to pt-stalk --- Changelog | 1 + bin/pt-stalk | 134 +++++++++++++++++++++------------------ lib/bash/collect.sh | 150 +++++++++++++++++++++++--------------------- 3 files changed, 153 insertions(+), 132 deletions(-) diff --git a/Changelog b/Changelog index 8ad59180..c33079ee 100644 --- a/Changelog +++ b/Changelog @@ -2,6 +2,7 @@ Changelog for Percona Toolkit v3.0.7 + * Feature PT-644 : Added --mysql-only option to pt-stalk for RDS * Fixed bug PT-1256: pt-table-sync does not use the character set for the table it is synchronizing v3.0.6 released 2017-12-20 diff --git a/bin/pt-stalk b/bin/pt-stalk index 82a64df6..9bdf2ef0 100755 --- a/bin/pt-stalk +++ b/bin/pt-stalk @@ -128,6 +128,7 @@ OPT_ERRS=0 # How many command line option errors OPT_VERSION="" # If --version was specified OPT_HELP="" # If --help was specified OPT_ASK_PASS="" # If --ask-pass was specified +OPT_MYSQL_ONLY="" # If --mysql-only was specified PO_DIR="" # Directory with program option spec files usage() { @@ -795,7 +796,10 @@ collect() { local d="$1" # directory to save results in local p="$2" # prefix for each result file - local mysqld_pid=$(_pidof mysqld | awk '{print $1; exit;}') + local mysqld_pid="" + if [ ! "$OPT_MYSQL_ONLY" ]; then + mysqld_pid=$(_pidof mysqld | awk '{print $1; exit;}') + fi if [ "$CMD_PMAP" -a "$mysqld_pid" ]; then if $CMD_PMAP --help 2>&1 | grep -- -x >/dev/null 2>&1 ; then @@ -824,7 +828,7 @@ collect() { fi local tail_error_log_pid="" - if [ "$mysql_error_log" ]; then + if [ "$mysql_error_log" -a ! "$OPT_MYSQL_ONLY" ]; then log "The MySQL error log seems to be $mysql_error_log" tail -f "$mysql_error_log" >"$d/$p-log_error" & tail_error_log_pid=$! @@ -865,37 +869,39 @@ collect() { local strace_pid=$! fi - ps -eaF >> "$d/$p-ps" & - top -bn${OPT_RUN_TIME} >> "$d/$p-top" & + if [ ! "$OPT_MYSQL_ONLY" ]; then + ps -eaF >> "$d/$p-ps" & + top -bn${OPT_RUN_TIME} >> "$d/$p-top" & - [ "$mysqld_pid" ] && _lsof $mysqld_pid >> "$d/$p-lsof" & + [ "$mysqld_pid" ] && _lsof $mysqld_pid >> "$d/$p-lsof" & - if [ "$CMD_SYSCTL" ]; then - $CMD_SYSCTL -a >> "$d/$p-sysctl" & - fi + if [ "$CMD_SYSCTL" ]; then + $CMD_SYSCTL -a >> "$d/$p-sysctl" & + fi - if [ "$CMD_DMESG" ]; then - local UPTIME=`cat /proc/uptime | awk '{ print $1 }'` - local START_TIME=$(echo "$UPTIME 60" | awk '{print ($1 - $2)}') - $CMD_DMESG | perl -ne 'm/\[\s*(\d+)\./; if ($1 > '${START_TIME}') { print }' >> "$d/$p-dmesg" & - fi + if [ "$CMD_DMESG" ]; then + local UPTIME=`cat /proc/uptime | awk '{ print $1 }'` + local START_TIME=$(echo "$UPTIME 60" | awk '{print ($1 - $2)}') + $CMD_DMESG | perl -ne 'm/\[\s*(\d+)\./; if ($1 > '${START_TIME}') { print }' >> "$d/$p-dmesg" & + fi - local cnt=$(($OPT_RUN_TIME / $OPT_SLEEP_COLLECT)) - if [ "$CMD_VMSTAT" ]; then - $CMD_VMSTAT $OPT_SLEEP_COLLECT $cnt >> "$d/$p-vmstat" & - $CMD_VMSTAT $OPT_RUN_TIME 2 >> "$d/$p-vmstat-overall" & - fi - if [ "$CMD_IOSTAT" ]; then - $CMD_IOSTAT -dx $OPT_SLEEP_COLLECT $cnt >> "$d/$p-iostat" & - $CMD_IOSTAT -dx $OPT_RUN_TIME 2 >> "$d/$p-iostat-overall" & - fi - if [ "$CMD_MPSTAT" ]; then - $CMD_MPSTAT -P ALL $OPT_SLEEP_COLLECT $cnt >> "$d/$p-mpstat" & - $CMD_MPSTAT -P ALL $OPT_RUN_TIME 1 >> "$d/$p-mpstat-overall" & - fi + local cnt=$(($OPT_RUN_TIME / $OPT_SLEEP_COLLECT)) + if [ "$CMD_VMSTAT" ]; then + $CMD_VMSTAT $OPT_SLEEP_COLLECT $cnt >> "$d/$p-vmstat" & + $CMD_VMSTAT $OPT_RUN_TIME 2 >> "$d/$p-vmstat-overall" & + fi + if [ "$CMD_IOSTAT" ]; then + $CMD_IOSTAT -dx $OPT_SLEEP_COLLECT $cnt >> "$d/$p-iostat" & + $CMD_IOSTAT -dx $OPT_RUN_TIME 2 >> "$d/$p-iostat-overall" & + fi + if [ "$CMD_MPSTAT" ]; then + $CMD_MPSTAT -P ALL $OPT_SLEEP_COLLECT $cnt >> "$d/$p-mpstat" & + $CMD_MPSTAT -P ALL $OPT_RUN_TIME 1 >> "$d/$p-mpstat-overall" & + fi - $CMD_MYSQLADMIN $EXT_ARGV ext -i$OPT_SLEEP_COLLECT -c$cnt >>"$d/$p-mysqladmin" & - local mysqladmin_pid=$! + $CMD_MYSQLADMIN $EXT_ARGV ext -i$OPT_SLEEP_COLLECT -c$cnt >>"$d/$p-mysqladmin" & + local mysqladmin_pid=$! + fi local have_lock_waits_table="" $CMD_MYSQL $EXT_ARGV -e "SHOW TABLES FROM INFORMATION_SCHEMA" \ @@ -915,40 +921,41 @@ collect() { fi while [ $((curr_time - start_time)) -lt $OPT_RUN_TIME ]; do + if [ ! "$OPT_MYSQL_ONLY" ]; then + disk_space $d > $d/$p-disk-space + check_disk_space \ + $d/$p-disk-space \ + "$OPT_DISK_BYTES_FREE" \ + "$OPT_DISK_PCT_FREE" \ + || break - disk_space $d > $d/$p-disk-space - check_disk_space \ - $d/$p-disk-space \ - "$OPT_DISK_BYTES_FREE" \ - "$OPT_DISK_PCT_FREE" \ - || break + sleep $(date +'%s.%N' | awk "{print $OPT_SLEEP_COLLECT - (\$1 % $OPT_SLEEP_COLLECT)}") + local ts="$(date +"TS %s.%N %F %T")" - sleep $(date +'%s.%N' | awk "{print $OPT_SLEEP_COLLECT - (\$1 % $OPT_SLEEP_COLLECT)}") - local ts="$(date +"TS %s.%N %F %T")" - - if [ -d "/proc" ]; then - if [ -f "/proc/diskstats" ]; then - (echo $ts; cat /proc/diskstats) >> "$d/$p-diskstats" & - fi - if [ -f "/proc/stat" ]; then - (echo $ts; cat /proc/stat) >> "$d/$p-procstat" & - fi - if [ -f "/proc/vmstat" ]; then - (echo $ts; cat /proc/vmstat) >> "$d/$p-procvmstat" & - fi - if [ -f "/proc/meminfo" ]; then - (echo $ts; cat /proc/meminfo) >> "$d/$p-meminfo" & - fi - if [ -f "/proc/slabinfo" ]; then - (echo $ts; cat /proc/slabinfo) >> "$d/$p-slabinfo" & - fi - if [ -f "/proc/interrupts" ]; then - (echo $ts; cat /proc/interrupts) >> "$d/$p-interrupts" & + if [ -d "/proc" ]; then + if [ -f "/proc/diskstats" ]; then + (echo $ts; cat /proc/diskstats) >> "$d/$p-diskstats" & + fi + if [ -f "/proc/stat" ]; then + (echo $ts; cat /proc/stat) >> "$d/$p-procstat" & + fi + if [ -f "/proc/vmstat" ]; then + (echo $ts; cat /proc/vmstat) >> "$d/$p-procvmstat" & + fi + if [ -f "/proc/meminfo" ]; then + (echo $ts; cat /proc/meminfo) >> "$d/$p-meminfo" & + fi + if [ -f "/proc/slabinfo" ]; then + (echo $ts; cat /proc/slabinfo) >> "$d/$p-slabinfo" & + fi + if [ -f "/proc/interrupts" ]; then + (echo $ts; cat /proc/interrupts) >> "$d/$p-interrupts" & + fi fi + (echo $ts; df -k) >> "$d/$p-df" & + (echo $ts; netstat -antp) >> "$d/$p-netstat" & + (echo $ts; netstat -s) >> "$d/$p-netstat_s" & fi - (echo $ts; df -k) >> "$d/$p-df" & - (echo $ts; netstat -antp) >> "$d/$p-netstat" & - (echo $ts; netstat -s) >> "$d/$p-netstat_s" & (echo $ts; $CMD_MYSQL $EXT_ARGV -e "SHOW FULL PROCESSLIST\G") \ >> "$d/$p-processlist" & if [ "$have_lock_waits_table" ]; then @@ -1414,6 +1421,7 @@ stalk() { # Start collecting, maybe. # ################################################################## log "Collect $ITER triggered" + log "MYSQL_ONLY: $OPT_MYSQL_ONLY" # Send email to whomever that collect has been triggered. if [ "$OPT_NOTIFY_BY_EMAIL" ]; then @@ -1424,7 +1432,6 @@ stalk() { if [ "$OPT_COLLECT" ]; then local prefix="${OPT_PREFIX:-$(date +%F-%T | tr ':-' '_')}" - # Check if we'll have enough disk space to collect. Disk space # is also checked every interval while collecting. local margin="20971520" # default 20M margin, unless: @@ -2093,6 +2100,13 @@ Plugin writers should keep in mind that the file destination prefix currently in use should be accessed through the C<$prefix> variable, rather than C<$OPT_PREFIX>. +=item --mysql-only + +Trigger only MySQL related captures, ignoring all others. The only not MySQL related +value being collected is the disk space, because it is needed to calculate the +available free disk space to write the result files. +This option is useful for RDS instances. + =item --port short form: -P; type: int @@ -2362,7 +2376,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA. =head1 VERSION -pt-stalk 3.0.6 +pt-stalk 3.0.7 =cut diff --git a/lib/bash/collect.sh b/lib/bash/collect.sh index ba0ca6a3..92dedae2 100644 --- a/lib/bash/collect.sh +++ b/lib/bash/collect.sh @@ -49,8 +49,11 @@ collect() { local d="$1" # directory to save results in local p="$2" # prefix for each result file + local mysqld_pid="" # Get pidof mysqld. - local mysqld_pid=$(_pidof mysqld | awk '{print $1; exit;}') + if [ ! "$OPT_MYSQL_ONLY" ]; then + mysqld_pid=$(_pidof mysqld | awk '{print $1; exit;}') + fi # Get memory allocation info before anything else. if [ "$CMD_PMAP" -a "$mysqld_pid" ]; then @@ -90,7 +93,7 @@ collect() { fi local tail_error_log_pid="" - if [ "$mysql_error_log" ]; then + if [ "$mysql_error_log" -a ! "$OPT_MYSQL_ONLY" ]; then log "The MySQL error log seems to be $mysql_error_log" tail -f "$mysql_error_log" >"$d/$p-log_error" & tail_error_log_pid=$! @@ -141,44 +144,46 @@ collect() { # Grab a few general things first. Background all of these so we can start # them all up as quickly as possible. - ps -eaF >> "$d/$p-ps" & - top -bn${OPT_RUN_TIME} >> "$d/$p-top" & + if [ ! "$OPT_MYSQL_ONLY" ]; then + ps -eaF >> "$d/$p-ps" & + top -bn${OPT_RUN_TIME} >> "$d/$p-top" & - [ "$mysqld_pid" ] && _lsof $mysqld_pid >> "$d/$p-lsof" & + [ "$mysqld_pid" ] && _lsof $mysqld_pid >> "$d/$p-lsof" & - if [ "$CMD_SYSCTL" ]; then - $CMD_SYSCTL -a >> "$d/$p-sysctl" & - fi + if [ "$CMD_SYSCTL" ]; then + $CMD_SYSCTL -a >> "$d/$p-sysctl" & + fi - # collect dmesg events from 60 seconds ago until present - if [ "$CMD_DMESG" ]; then - local UPTIME=`cat /proc/uptime | awk '{ print $1 }'` - local START_TIME=$(echo "$UPTIME 60" | awk '{print ($1 - $2)}') - $CMD_DMESG | perl -ne 'm/\[\s*(\d+)\./; if ($1 > '${START_TIME}') { print }' >> "$d/$p-dmesg" & - fi + # collect dmesg events from 60 seconds ago until present + if [ "$CMD_DMESG" ]; then + local UPTIME=`cat /proc/uptime | awk '{ print $1 }'` + local START_TIME=$(echo "$UPTIME 60" | awk '{print ($1 - $2)}') + $CMD_DMESG | perl -ne 'm/\[\s*(\d+)\./; if ($1 > '${START_TIME}') { print }' >> "$d/$p-dmesg" & + fi - local cnt=$(($OPT_RUN_TIME / $OPT_SLEEP_COLLECT)) - if [ "$CMD_VMSTAT" ]; then - $CMD_VMSTAT $OPT_SLEEP_COLLECT $cnt >> "$d/$p-vmstat" & - $CMD_VMSTAT $OPT_RUN_TIME 2 >> "$d/$p-vmstat-overall" & - fi - if [ "$CMD_IOSTAT" ]; then - $CMD_IOSTAT -dx $OPT_SLEEP_COLLECT $cnt >> "$d/$p-iostat" & - $CMD_IOSTAT -dx $OPT_RUN_TIME 2 >> "$d/$p-iostat-overall" & - fi - if [ "$CMD_MPSTAT" ]; then - $CMD_MPSTAT -P ALL $OPT_SLEEP_COLLECT $cnt >> "$d/$p-mpstat" & - $CMD_MPSTAT -P ALL $OPT_RUN_TIME 1 >> "$d/$p-mpstat-overall" & - fi + local cnt=$(($OPT_RUN_TIME / $OPT_SLEEP_COLLECT)) + if [ "$CMD_VMSTAT" ]; then + $CMD_VMSTAT $OPT_SLEEP_COLLECT $cnt >> "$d/$p-vmstat" & + $CMD_VMSTAT $OPT_RUN_TIME 2 >> "$d/$p-vmstat-overall" & + fi + if [ "$CMD_IOSTAT" ]; then + $CMD_IOSTAT -dx $OPT_SLEEP_COLLECT $cnt >> "$d/$p-iostat" & + $CMD_IOSTAT -dx $OPT_RUN_TIME 2 >> "$d/$p-iostat-overall" & + fi + if [ "$CMD_MPSTAT" ]; then + $CMD_MPSTAT -P ALL $OPT_SLEEP_COLLECT $cnt >> "$d/$p-mpstat" & + $CMD_MPSTAT -P ALL $OPT_RUN_TIME 1 >> "$d/$p-mpstat-overall" & + fi - # Collect multiple snapshots of the status variables. We use - # mysqladmin -c even though it is buggy and won't stop on its - # own in 5.1 and newer, because there is a chance that we will - # get and keep a connection to the database; in troubled times - # the database tends to exceed max_connections, so reconnecting - # in the loop tends not to work very well. - $CMD_MYSQLADMIN $EXT_ARGV ext -i$OPT_SLEEP_COLLECT -c$cnt >>"$d/$p-mysqladmin" & - local mysqladmin_pid=$! + # Collect multiple snapshots of the status variables. We use + # mysqladmin -c even though it is buggy and won't stop on its + # own in 5.1 and newer, because there is a chance that we will + # get and keep a connection to the database; in troubled times + # the database tends to exceed max_connections, so reconnecting + # in the loop tends not to work very well. + $CMD_MYSQLADMIN $EXT_ARGV ext -i$OPT_SLEEP_COLLECT -c$cnt >>"$d/$p-mysqladmin" & + local mysqladmin_pid=$! + fi local have_lock_waits_table="" $CMD_MYSQL $EXT_ARGV -e "SHOW TABLES FROM INFORMATION_SCHEMA" \ @@ -200,47 +205,48 @@ collect() { fi while [ $((curr_time - start_time)) -lt $OPT_RUN_TIME ]; do + if [ ! "$OPT_MYSQL_ONLY" ]; then + # We check the disk, but don't exit, because we need to stop jobs if we + # need to exit. + disk_space $d > $d/$p-disk-space + check_disk_space \ + $d/$p-disk-space \ + "$OPT_DISK_BYTES_FREE" \ + "$OPT_DISK_PCT_FREE" \ + || break - # We check the disk, but don't exit, because we need to stop jobs if we - # need to exit. - disk_space $d > $d/$p-disk-space - check_disk_space \ - $d/$p-disk-space \ - "$OPT_DISK_BYTES_FREE" \ - "$OPT_DISK_PCT_FREE" \ - || break + # Sleep between collect cycles. + # Synchronize ourselves onto the clock tick, so the sleeps are 1-second + sleep $(date +'%s.%N' | awk "{print $OPT_SLEEP_COLLECT - (\$1 % $OPT_SLEEP_COLLECT)}") + local ts="$(date +"TS %s.%N %F %T")" - # Sleep between collect cycles. - # Synchronize ourselves onto the clock tick, so the sleeps are 1-second - sleep $(date +'%s.%N' | awk "{print $OPT_SLEEP_COLLECT - (\$1 % $OPT_SLEEP_COLLECT)}") - local ts="$(date +"TS %s.%N %F %T")" - - # ##################################################################### - # Collect data for this cycle. - # ##################################################################### - if [ -d "/proc" ]; then - if [ -f "/proc/diskstats" ]; then - (echo $ts; cat /proc/diskstats) >> "$d/$p-diskstats" & - fi - if [ -f "/proc/stat" ]; then - (echo $ts; cat /proc/stat) >> "$d/$p-procstat" & - fi - if [ -f "/proc/vmstat" ]; then - (echo $ts; cat /proc/vmstat) >> "$d/$p-procvmstat" & - fi - if [ -f "/proc/meminfo" ]; then - (echo $ts; cat /proc/meminfo) >> "$d/$p-meminfo" & - fi - if [ -f "/proc/slabinfo" ]; then - (echo $ts; cat /proc/slabinfo) >> "$d/$p-slabinfo" & - fi - if [ -f "/proc/interrupts" ]; then - (echo $ts; cat /proc/interrupts) >> "$d/$p-interrupts" & + # ##################################################################### + # Collect data for this cycle. + # ##################################################################### + if [ -d "/proc" ]; then + if [ -f "/proc/diskstats" ]; then + (echo $ts; cat /proc/diskstats) >> "$d/$p-diskstats" & + fi + if [ -f "/proc/stat" ]; then + (echo $ts; cat /proc/stat) >> "$d/$p-procstat" & + fi + if [ -f "/proc/vmstat" ]; then + (echo $ts; cat /proc/vmstat) >> "$d/$p-procvmstat" & + fi + if [ -f "/proc/meminfo" ]; then + (echo $ts; cat /proc/meminfo) >> "$d/$p-meminfo" & + fi + if [ -f "/proc/slabinfo" ]; then + (echo $ts; cat /proc/slabinfo) >> "$d/$p-slabinfo" & + fi + if [ -f "/proc/interrupts" ]; then + (echo $ts; cat /proc/interrupts) >> "$d/$p-interrupts" & + fi fi + (echo $ts; df -k) >> "$d/$p-df" & + (echo $ts; netstat -antp) >> "$d/$p-netstat" & + (echo $ts; netstat -s) >> "$d/$p-netstat_s" & fi - (echo $ts; df -k) >> "$d/$p-df" & - (echo $ts; netstat -antp) >> "$d/$p-netstat" & - (echo $ts; netstat -s) >> "$d/$p-netstat_s" & (echo $ts; $CMD_MYSQL $EXT_ARGV -e "SHOW FULL PROCESSLIST\G") \ >> "$d/$p-processlist" & if [ "$have_lock_waits_table" ]; then From b53d67f6ead42c7c0e27b21c4f89b1cd3f349aee Mon Sep 17 00:00:00 2001 From: Kamil Dziedzic Date: Mon, 12 Feb 2018 21:58:48 +0100 Subject: [PATCH 10/17] PMM-1905: fix "NToReturn value must be non-negative" issue. --- src/go/mongolib/explain/explain_test.go | 6 +- .../fingerprinter/fingerprinter_test.go | 117 +------- src/go/mongolib/proto/system.profile.go | 13 +- src/go/mongolib/stats/stats_test.go | 7 +- src/go/tests/doc/out/aggregate_2.6.12 | 12 +- src/go/tests/doc/out/aggregate_3.0.15 | 4 +- .../{aggregate_3.2.16 => aggregate_3.2.19} | 4 +- .../out/{aggregate_3.4.7 => aggregate_3.4.12} | 4 +- .../out/{aggregate_3.5.11 => aggregate_3.6.2} | 10 +- src/go/tests/doc/out/count_2.6.12 | 12 +- src/go/tests/doc/out/count_3.0.15 | 4 +- .../doc/out/{count_3.2.16 => count_3.2.19} | 4 +- .../doc/out/{count_3.4.7 => count_3.4.12} | 4 +- .../doc/out/{count_3.5.11 => count_3.6.2} | 4 +- src/go/tests/doc/out/count_with_query_2.6.12 | 12 +- src/go/tests/doc/out/count_with_query_3.0.15 | 4 +- ...h_query_3.2.16 => count_with_query_3.2.19} | 4 +- ...th_query_3.4.7 => count_with_query_3.4.12} | 4 +- ...th_query_3.5.11 => count_with_query_3.6.2} | 4 +- src/go/tests/doc/out/delete_2.6.12 | 12 +- src/go/tests/doc/out/delete_3.0.15 | 4 +- .../doc/out/{delete_3.2.16 => delete_3.2.19} | 4 +- .../doc/out/{delete_3.4.7 => delete_3.4.12} | 4 +- .../doc/out/{delete_3.5.11 => delete_3.6.2} | 4 +- src/go/tests/doc/out/delete_all_2.6.12 | 12 +- src/go/tests/doc/out/delete_all_3.0.15 | 4 +- .../{delete_all_3.2.16 => delete_all_3.2.19} | 4 +- .../{delete_all_3.4.7 => delete_all_3.4.12} | 4 +- .../{delete_all_3.5.11 => delete_all_3.6.2} | 6 +- src/go/tests/doc/out/distinct_2.6.12 | 12 +- src/go/tests/doc/out/distinct_3.0.15 | 4 +- .../out/{distinct_3.2.16 => distinct_3.2.19} | 4 +- .../out/{distinct_3.4.7 => distinct_3.4.12} | 4 +- .../out/{distinct_3.5.11 => distinct_3.6.2} | 4 +- src/go/tests/doc/out/eval_2.6.12 | 16 +- src/go/tests/doc/out/eval_3.0.15 | 4 +- .../doc/out/{eval_3.2.16 => eval_3.2.19} | 4 +- .../tests/doc/out/{eval_3.4.7 => eval_3.4.12} | 4 +- .../tests/doc/out/{eval_3.5.11 => eval_3.6.2} | 4 +- src/go/tests/doc/out/explain_2.6.12 | 12 +- src/go/tests/doc/out/explain_3.0.15 | 4 +- .../out/{explain_3.2.16 => explain_3.2.19} | 4 +- .../doc/out/{explain_3.4.7 => explain_3.4.12} | 6 +- .../doc/out/{explain_3.5.11 => explain_3.6.2} | 6 +- src/go/tests/doc/out/find_2.6.12 | 12 +- src/go/tests/doc/out/find_3.0.15 | 4 +- .../doc/out/{find_3.2.16 => find_3.2.19} | 4 +- .../tests/doc/out/{find_3.4.7 => find_3.4.12} | 4 +- .../tests/doc/out/{find_3.5.11 => find_3.6.2} | 4 +- src/go/tests/doc/out/find_andrii_2.6.12 | 12 +- src/go/tests/doc/out/find_andrii_3.0.15 | 4 +- ...{find_andrii_3.2.16 => find_andrii_3.2.19} | 4 +- .../{find_andrii_3.4.7 => find_andrii_3.4.12} | 4 +- .../{find_andrii_3.5.11 => find_andrii_3.6.2} | 4 +- src/go/tests/doc/out/find_empty_2.6.12 | 12 +- src/go/tests/doc/out/find_empty_3.0.15 | 4 +- .../{find_empty_3.2.16 => find_empty_3.2.19} | 4 +- .../{find_empty_3.4.7 => find_empty_3.4.12} | 4 +- .../{find_empty_3.5.11 => find_empty_3.6.2} | 4 +- src/go/tests/doc/out/find_with_sort_2.6.12 | 12 +- src/go/tests/doc/out/find_with_sort_3.0.15 | 4 +- ...with_sort_3.2.16 => find_with_sort_3.2.19} | 4 +- ..._with_sort_3.4.7 => find_with_sort_3.4.12} | 4 +- ..._with_sort_3.5.11 => find_with_sort_3.6.2} | 4 +- src/go/tests/doc/out/findandmodify_2.6.12 | 12 +- src/go/tests/doc/out/findandmodify_3.0.15 | 4 +- ...dandmodify_3.2.16 => findandmodify_3.2.19} | 4 +- ...ndandmodify_3.4.7 => findandmodify_3.4.12} | 4 +- ...ndandmodify_3.5.11 => findandmodify_3.6.2} | 4 +- src/go/tests/doc/out/geonear_2.6.12 | 12 +- src/go/tests/doc/out/geonear_3.0.15 | 4 +- .../out/{geonear_3.2.16 => geonear_3.2.19} | 4 +- .../doc/out/{geonear_3.4.7 => geonear_3.4.12} | 8 +- .../doc/out/{geonear_3.5.11 => geonear_3.6.2} | 8 +- src/go/tests/doc/out/getmore_2.6.12 | 18 +- src/go/tests/doc/out/getmore_3.0.15 | 6 +- .../out/{getmore_3.2.16 => getmore_3.2.19} | 8 +- .../doc/out/{getmore_3.4.7 => getmore_3.4.12} | 33 ++- .../doc/out/{getmore_3.5.11 => getmore_3.6.2} | 8 +- src/go/tests/doc/out/group_2.6.12 | 12 +- src/go/tests/doc/out/group_3.0.15 | 4 +- .../doc/out/{group_3.2.16 => group_3.2.19} | 4 +- .../doc/out/{group_3.4.7 => group_3.4.12} | 6 +- .../doc/out/{group_3.5.11 => group_3.6.2} | 6 +- src/go/tests/doc/out/insert_2.6.12 | 12 +- src/go/tests/doc/out/insert_3.0.15 | 4 +- .../doc/out/{insert_3.2.16 => insert_3.2.19} | 4 +- .../doc/out/{insert_3.4.7 => insert_3.4.12} | 4 +- .../doc/out/{insert_3.5.11 => insert_3.6.2} | 4 +- src/go/tests/doc/out/mapreduce_2.6.12 | 12 +- src/go/tests/doc/out/mapreduce_3.0.15 | 4 +- .../{mapreduce_3.2.16 => mapreduce_3.2.19} | 4 +- .../out/{mapreduce_3.4.7 => mapreduce_3.4.12} | 22 +- .../out/{mapreduce_3.5.11 => mapreduce_3.6.2} | 4 +- src/go/tests/doc/out/update_2.6.12 | 12 +- src/go/tests/doc/out/update_3.0.15 | 4 +- .../doc/out/{update_3.2.16 => update_3.2.19} | 4 +- .../doc/out/{update_3.4.7 => update_3.4.12} | 4 +- .../doc/out/{update_3.5.11 => update_3.6.2} | 4 +- src/go/tests/doc/run.sh | 21 +- src/go/tests/doc/script/func/db_version.func | 2 +- .../doc/script/func/get_single_profile.func | 33 ++- src/go/tests/doc/script/main.sh | 2 +- .../available_metrics/available_metrics | 276 +++++++++--------- .../tests/expect/available_metrics/cmd_metric | 46 +-- .../expect/available_metrics/cmd_metric.md | 20 +- .../expect/fingerprints/aggregate_2.6.12 | 8 + .../expect/fingerprints/aggregate_3.0.15 | 8 + .../expect/fingerprints/aggregate_3.2.19 | 8 + .../expect/fingerprints/aggregate_3.4.12 | 8 + .../tests/expect/fingerprints/aggregate_3.6.2 | 8 + src/go/tests/expect/fingerprints/count_2.6.12 | 8 + src/go/tests/expect/fingerprints/count_3.0.15 | 8 + src/go/tests/expect/fingerprints/count_3.2.19 | 8 + src/go/tests/expect/fingerprints/count_3.4.12 | 8 + src/go/tests/expect/fingerprints/count_3.6.2 | 8 + .../fingerprints/count_with_query_2.6.12 | 8 + .../fingerprints/count_with_query_3.0.15 | 8 + .../fingerprints/count_with_query_3.2.19 | 8 + .../fingerprints/count_with_query_3.4.12 | 8 + .../fingerprints/count_with_query_3.6.2 | 8 + .../tests/expect/fingerprints/delete_2.6.12 | 8 + .../tests/expect/fingerprints/delete_3.0.15 | 8 + .../tests/expect/fingerprints/delete_3.2.19 | 8 + .../tests/expect/fingerprints/delete_3.4.12 | 8 + src/go/tests/expect/fingerprints/delete_3.6.2 | 8 + .../expect/fingerprints/delete_all_2.6.12 | 8 + .../expect/fingerprints/delete_all_3.0.15 | 8 + .../expect/fingerprints/delete_all_3.2.19 | 8 + .../expect/fingerprints/delete_all_3.4.12 | 8 + .../expect/fingerprints/delete_all_3.6.2 | 8 + .../tests/expect/fingerprints/distinct_2.6.12 | 8 + .../tests/expect/fingerprints/distinct_3.0.15 | 8 + .../tests/expect/fingerprints/distinct_3.2.19 | 8 + .../tests/expect/fingerprints/distinct_3.4.12 | 8 + .../tests/expect/fingerprints/distinct_3.6.2 | 8 + src/go/tests/expect/fingerprints/eval_2.6.12 | 8 + src/go/tests/expect/fingerprints/eval_3.0.15 | 8 + src/go/tests/expect/fingerprints/eval_3.2.19 | 8 + src/go/tests/expect/fingerprints/eval_3.4.12 | 8 + src/go/tests/expect/fingerprints/eval_3.6.2 | 8 + .../tests/expect/fingerprints/explain_2.6.12 | 8 + .../tests/expect/fingerprints/explain_3.0.15 | 8 + .../tests/expect/fingerprints/explain_3.2.19 | 8 + .../tests/expect/fingerprints/explain_3.4.12 | 8 + .../tests/expect/fingerprints/explain_3.6.2 | 8 + src/go/tests/expect/fingerprints/find_2.6.12 | 8 + src/go/tests/expect/fingerprints/find_3.0.15 | 8 + src/go/tests/expect/fingerprints/find_3.2.19 | 8 + src/go/tests/expect/fingerprints/find_3.4.12 | 8 + src/go/tests/expect/fingerprints/find_3.6.2 | 8 + .../expect/fingerprints/find_andrii_2.6.12 | 8 + .../expect/fingerprints/find_andrii_3.0.15 | 8 + .../expect/fingerprints/find_andrii_3.2.19 | 8 + .../expect/fingerprints/find_andrii_3.4.12 | 8 + .../expect/fingerprints/find_andrii_3.6.2 | 8 + .../expect/fingerprints/find_empty_2.6.12 | 8 + .../expect/fingerprints/find_empty_3.0.15 | 8 + .../expect/fingerprints/find_empty_3.2.19 | 8 + .../expect/fingerprints/find_empty_3.4.12 | 8 + .../expect/fingerprints/find_empty_3.6.2 | 8 + .../expect/fingerprints/find_with_sort_2.6.12 | 8 + .../expect/fingerprints/find_with_sort_3.0.15 | 8 + .../expect/fingerprints/find_with_sort_3.2.19 | 8 + .../expect/fingerprints/find_with_sort_3.4.12 | 8 + .../expect/fingerprints/find_with_sort_3.6.2 | 8 + .../expect/fingerprints/findandmodify_2.6.12 | 8 + .../expect/fingerprints/findandmodify_3.0.15 | 8 + .../expect/fingerprints/findandmodify_3.2.19 | 8 + .../expect/fingerprints/findandmodify_3.4.12 | 8 + .../expect/fingerprints/findandmodify_3.6.2 | 8 + .../tests/expect/fingerprints/geonear_2.6.12 | 8 + .../tests/expect/fingerprints/geonear_3.0.15 | 8 + .../tests/expect/fingerprints/geonear_3.2.19 | 8 + .../tests/expect/fingerprints/geonear_3.4.12 | 8 + .../tests/expect/fingerprints/geonear_3.6.2 | 8 + .../tests/expect/fingerprints/getmore_2.6.12 | 8 + .../tests/expect/fingerprints/getmore_3.0.15 | 8 + .../tests/expect/fingerprints/getmore_3.2.19 | 8 + .../tests/expect/fingerprints/getmore_3.4.12 | 8 + .../tests/expect/fingerprints/getmore_3.6.2 | 8 + src/go/tests/expect/fingerprints/group_2.6.12 | 8 + src/go/tests/expect/fingerprints/group_3.0.15 | 8 + src/go/tests/expect/fingerprints/group_3.2.19 | 8 + src/go/tests/expect/fingerprints/group_3.4.12 | 8 + src/go/tests/expect/fingerprints/group_3.6.2 | 8 + .../tests/expect/fingerprints/insert_2.6.12 | 8 + .../tests/expect/fingerprints/insert_3.0.15 | 8 + .../tests/expect/fingerprints/insert_3.2.19 | 8 + .../tests/expect/fingerprints/insert_3.4.12 | 8 + src/go/tests/expect/fingerprints/insert_3.6.2 | 8 + .../expect/fingerprints/mapreduce_2.6.12 | 8 + .../expect/fingerprints/mapreduce_3.0.15 | 8 + .../expect/fingerprints/mapreduce_3.2.19 | 8 + .../expect/fingerprints/mapreduce_3.4.12 | 8 + .../tests/expect/fingerprints/mapreduce_3.6.2 | 8 + .../tests/expect/fingerprints/update_2.6.12 | 8 + .../tests/expect/fingerprints/update_3.0.15 | 8 + .../tests/expect/fingerprints/update_3.2.19 | 8 + .../tests/expect/fingerprints/update_3.4.12 | 8 + src/go/tests/expect/fingerprints/update_3.6.2 | 8 + src/go/tests/expect/stats_all/sum.json | 276 +++++++++--------- .../expect/stats_single/aggregate_2.6.12 | 6 +- .../expect/stats_single/aggregate_3.0.15 | 6 +- .../{aggregate_3.2.16 => aggregate_3.2.19} | 6 +- .../{aggregate_3.4.7 => aggregate_3.4.12} | 6 +- .../{aggregate_3.5.11 => aggregate_3.6.2} | 6 +- src/go/tests/expect/stats_single/count_2.6.12 | 6 +- src/go/tests/expect/stats_single/count_3.0.15 | 6 +- .../{count_3.2.16 => count_3.2.19} | 6 +- .../{count_3.4.7 => count_3.4.12} | 6 +- .../{count_3.5.11 => count_3.6.2} | 6 +- .../stats_single/count_with_query_2.6.12 | 6 +- .../stats_single/count_with_query_3.0.15 | 6 +- ...h_query_3.2.16 => count_with_query_3.2.19} | 6 +- ...th_query_3.4.7 => count_with_query_3.4.12} | 6 +- ...th_query_3.5.11 => count_with_query_3.6.2} | 6 +- .../tests/expect/stats_single/delete_2.6.12 | 6 +- .../tests/expect/stats_single/delete_3.0.15 | 6 +- .../{delete_3.2.16 => delete_3.2.19} | 6 +- .../{delete_all_3.4.7 => delete_3.4.12} | 8 +- .../{delete_3.5.11 => delete_3.6.2} | 6 +- .../expect/stats_single/delete_all_2.6.12 | 6 +- .../expect/stats_single/delete_all_3.0.15 | 6 +- .../{delete_3.4.7 => delete_all_3.2.19} | 8 +- .../{delete_all_3.2.16 => delete_all_3.4.12} | 8 +- .../{delete_all_3.5.11 => delete_all_3.6.2} | 6 +- .../tests/expect/stats_single/distinct_2.6.12 | 6 +- .../tests/expect/stats_single/distinct_3.0.15 | 6 +- .../{distinct_3.2.16 => distinct_3.2.19} | 6 +- .../{distinct_3.4.7 => distinct_3.4.12} | 6 +- .../{distinct_3.5.11 => distinct_3.6.2} | 6 +- src/go/tests/expect/stats_single/eval_2.6.12 | 6 +- src/go/tests/expect/stats_single/eval_3.0.15 | 6 +- .../stats_single/{eval_3.2.16 => eval_3.2.19} | 6 +- .../stats_single/{eval_3.4.7 => eval_3.4.12} | 6 +- .../stats_single/{eval_3.5.11 => eval_3.6.2} | 6 +- .../tests/expect/stats_single/explain_2.6.12 | 6 +- .../tests/expect/stats_single/explain_3.0.15 | 6 +- .../{explain_3.2.16 => explain_3.2.19} | 6 +- .../{explain_3.4.7 => explain_3.4.12} | 8 +- .../{explain_3.5.11 => explain_3.6.2} | 8 +- src/go/tests/expect/stats_single/find_2.6.12 | 6 +- src/go/tests/expect/stats_single/find_3.0.15 | 6 +- .../stats_single/{find_3.2.16 => find_3.2.19} | 6 +- .../stats_single/{find_3.4.7 => find_3.4.12} | 6 +- .../stats_single/{find_3.5.11 => find_3.6.2} | 6 +- .../expect/stats_single/find_andrii_2.6.12 | 6 +- .../expect/stats_single/find_andrii_3.0.15 | 6 +- ...{find_andrii_3.2.16 => find_andrii_3.2.19} | 6 +- .../{find_andrii_3.4.7 => find_andrii_3.4.12} | 6 +- .../{find_andrii_3.5.11 => find_andrii_3.6.2} | 6 +- .../expect/stats_single/find_empty_2.6.12 | 6 +- .../expect/stats_single/find_empty_3.0.15 | 6 +- .../{find_empty_3.2.16 => find_empty_3.2.19} | 6 +- .../{find_empty_3.4.7 => find_empty_3.4.12} | 6 +- .../{find_empty_3.5.11 => find_empty_3.6.2} | 6 +- .../expect/stats_single/find_with_sort_2.6.12 | 6 +- .../expect/stats_single/find_with_sort_3.0.15 | 6 +- ...with_sort_3.2.16 => find_with_sort_3.2.19} | 6 +- ..._with_sort_3.4.7 => find_with_sort_3.4.12} | 6 +- ..._with_sort_3.5.11 => find_with_sort_3.6.2} | 6 +- .../expect/stats_single/findandmodify_2.6.12 | 6 +- .../expect/stats_single/findandmodify_3.0.15 | 6 +- ...dandmodify_3.2.16 => findandmodify_3.2.19} | 6 +- ...ndandmodify_3.4.7 => findandmodify_3.4.12} | 6 +- ...ndandmodify_3.5.11 => findandmodify_3.6.2} | 6 +- .../tests/expect/stats_single/geonear_2.6.12 | 6 +- .../tests/expect/stats_single/geonear_3.0.15 | 6 +- .../{geonear_3.2.16 => geonear_3.2.19} | 6 +- .../{geonear_3.4.7 => geonear_3.4.12} | 6 +- .../{geonear_3.5.11 => geonear_3.6.2} | 6 +- .../tests/expect/stats_single/getmore_2.6.12 | 10 +- .../tests/expect/stats_single/getmore_3.0.15 | 6 +- .../{getmore_3.2.16 => getmore_3.2.19} | 8 +- .../{getmore_3.4.7 => getmore_3.4.12} | 20 +- .../{getmore_3.5.11 => getmore_3.6.2} | 8 +- src/go/tests/expect/stats_single/group_2.6.12 | 6 +- src/go/tests/expect/stats_single/group_3.0.15 | 6 +- .../{group_3.2.16 => group_3.2.19} | 6 +- .../{group_3.4.7 => group_3.4.12} | 6 +- .../{group_3.5.11 => group_3.6.2} | 6 +- .../tests/expect/stats_single/insert_2.6.12 | 6 +- .../tests/expect/stats_single/insert_3.0.15 | 6 +- .../{insert_3.2.16 => insert_3.2.19} | 6 +- .../{insert_3.4.7 => insert_3.4.12} | 6 +- .../{insert_3.5.11 => insert_3.6.2} | 6 +- .../expect/stats_single/mapreduce_2.6.12 | 6 +- .../expect/stats_single/mapreduce_3.0.15 | 6 +- .../{mapreduce_3.2.16 => mapreduce_3.2.19} | 6 +- .../{mapreduce_3.4.7 => mapreduce_3.4.12} | 6 +- .../{mapreduce_3.5.11 => mapreduce_3.6.2} | 6 +- .../tests/expect/stats_single/update_2.6.12 | 6 +- .../tests/expect/stats_single/update_3.0.15 | 6 +- .../{update_3.2.16 => update_3.2.19} | 6 +- .../{update_3.4.7 => update_3.4.12} | 6 +- .../{update_3.5.11 => update_3.6.2} | 6 +- 297 files changed, 1761 insertions(+), 1043 deletions(-) rename src/go/tests/doc/out/{aggregate_3.2.16 => aggregate_3.2.19} (91%) rename src/go/tests/doc/out/{aggregate_3.4.7 => aggregate_3.4.12} (92%) rename src/go/tests/doc/out/{aggregate_3.5.11 => aggregate_3.6.2} (83%) rename src/go/tests/doc/out/{count_3.2.16 => count_3.2.19} (90%) rename src/go/tests/doc/out/{count_3.4.7 => count_3.4.12} (93%) rename src/go/tests/doc/out/{count_3.5.11 => count_3.6.2} (93%) rename src/go/tests/doc/out/{count_with_query_3.2.16 => count_with_query_3.2.19} (90%) rename src/go/tests/doc/out/{count_with_query_3.4.7 => count_with_query_3.4.12} (95%) rename src/go/tests/doc/out/{count_with_query_3.5.11 => count_with_query_3.6.2} (95%) rename src/go/tests/doc/out/{delete_3.2.16 => delete_3.2.19} (89%) rename src/go/tests/doc/out/{delete_3.4.7 => delete_3.4.12} (97%) rename src/go/tests/doc/out/{delete_3.5.11 => delete_3.6.2} (97%) rename src/go/tests/doc/out/{delete_all_3.2.16 => delete_all_3.2.19} (89%) rename src/go/tests/doc/out/{delete_all_3.4.7 => delete_all_3.4.12} (97%) rename src/go/tests/doc/out/{delete_all_3.5.11 => delete_all_3.6.2} (95%) rename src/go/tests/doc/out/{distinct_3.2.16 => distinct_3.2.19} (90%) rename src/go/tests/doc/out/{distinct_3.4.7 => distinct_3.4.12} (96%) rename src/go/tests/doc/out/{distinct_3.5.11 => distinct_3.6.2} (96%) rename src/go/tests/doc/out/{eval_3.2.16 => eval_3.2.19} (89%) rename src/go/tests/doc/out/{eval_3.4.7 => eval_3.4.12} (88%) rename src/go/tests/doc/out/{eval_3.5.11 => eval_3.6.2} (89%) rename src/go/tests/doc/out/{explain_3.2.16 => explain_3.2.19} (90%) rename src/go/tests/doc/out/{explain_3.4.7 => explain_3.4.12} (86%) rename src/go/tests/doc/out/{explain_3.5.11 => explain_3.6.2} (86%) rename src/go/tests/doc/out/{find_3.2.16 => find_3.2.19} (96%) rename src/go/tests/doc/out/{find_3.4.7 => find_3.4.12} (96%) rename src/go/tests/doc/out/{find_3.5.11 => find_3.6.2} (96%) rename src/go/tests/doc/out/{find_andrii_3.2.16 => find_andrii_3.2.19} (95%) rename src/go/tests/doc/out/{find_andrii_3.4.7 => find_andrii_3.4.12} (95%) rename src/go/tests/doc/out/{find_andrii_3.5.11 => find_andrii_3.6.2} (95%) rename src/go/tests/doc/out/{find_empty_3.2.16 => find_empty_3.2.19} (93%) rename src/go/tests/doc/out/{find_empty_3.4.7 => find_empty_3.4.12} (93%) rename src/go/tests/doc/out/{find_empty_3.5.11 => find_empty_3.6.2} (93%) rename src/go/tests/doc/out/{find_with_sort_3.2.16 => find_with_sort_3.2.19} (97%) rename src/go/tests/doc/out/{find_with_sort_3.4.7 => find_with_sort_3.4.12} (97%) rename src/go/tests/doc/out/{find_with_sort_3.5.11 => find_with_sort_3.6.2} (97%) rename src/go/tests/doc/out/{findandmodify_3.2.16 => findandmodify_3.2.19} (92%) rename src/go/tests/doc/out/{findandmodify_3.4.7 => findandmodify_3.4.12} (96%) rename src/go/tests/doc/out/{findandmodify_3.5.11 => findandmodify_3.6.2} (96%) rename src/go/tests/doc/out/{geonear_3.2.16 => geonear_3.2.19} (90%) rename src/go/tests/doc/out/{geonear_3.4.7 => geonear_3.4.12} (99%) rename src/go/tests/doc/out/{geonear_3.5.11 => geonear_3.6.2} (99%) rename src/go/tests/doc/out/{getmore_3.2.16 => getmore_3.2.19} (82%) rename src/go/tests/doc/out/{getmore_3.4.7 => getmore_3.4.12} (79%) rename src/go/tests/doc/out/{getmore_3.5.11 => getmore_3.6.2} (93%) rename src/go/tests/doc/out/{group_3.2.16 => group_3.2.19} (91%) rename src/go/tests/doc/out/{group_3.4.7 => group_3.4.12} (95%) rename src/go/tests/doc/out/{group_3.5.11 => group_3.6.2} (95%) rename src/go/tests/doc/out/{insert_3.2.16 => insert_3.2.19} (91%) rename src/go/tests/doc/out/{insert_3.4.7 => insert_3.4.12} (91%) rename src/go/tests/doc/out/{insert_3.5.11 => insert_3.6.2} (90%) rename src/go/tests/doc/out/{mapreduce_3.2.16 => mapreduce_3.2.19} (93%) rename src/go/tests/doc/out/{mapreduce_3.4.7 => mapreduce_3.4.12} (85%) rename src/go/tests/doc/out/{mapreduce_3.5.11 => mapreduce_3.6.2} (96%) rename src/go/tests/doc/out/{update_3.2.16 => update_3.2.19} (91%) rename src/go/tests/doc/out/{update_3.4.7 => update_3.4.12} (97%) rename src/go/tests/doc/out/{update_3.5.11 => update_3.6.2} (97%) create mode 100755 src/go/tests/expect/fingerprints/aggregate_2.6.12 create mode 100755 src/go/tests/expect/fingerprints/aggregate_3.0.15 create mode 100755 src/go/tests/expect/fingerprints/aggregate_3.2.19 create mode 100755 src/go/tests/expect/fingerprints/aggregate_3.4.12 create mode 100755 src/go/tests/expect/fingerprints/aggregate_3.6.2 create mode 100755 src/go/tests/expect/fingerprints/count_2.6.12 create mode 100755 src/go/tests/expect/fingerprints/count_3.0.15 create mode 100755 src/go/tests/expect/fingerprints/count_3.2.19 create mode 100755 src/go/tests/expect/fingerprints/count_3.4.12 create mode 100755 src/go/tests/expect/fingerprints/count_3.6.2 create mode 100755 src/go/tests/expect/fingerprints/count_with_query_2.6.12 create mode 100755 src/go/tests/expect/fingerprints/count_with_query_3.0.15 create mode 100755 src/go/tests/expect/fingerprints/count_with_query_3.2.19 create mode 100755 src/go/tests/expect/fingerprints/count_with_query_3.4.12 create mode 100755 src/go/tests/expect/fingerprints/count_with_query_3.6.2 create mode 100755 src/go/tests/expect/fingerprints/delete_2.6.12 create mode 100755 src/go/tests/expect/fingerprints/delete_3.0.15 create mode 100755 src/go/tests/expect/fingerprints/delete_3.2.19 create mode 100755 src/go/tests/expect/fingerprints/delete_3.4.12 create mode 100755 src/go/tests/expect/fingerprints/delete_3.6.2 create mode 100755 src/go/tests/expect/fingerprints/delete_all_2.6.12 create mode 100755 src/go/tests/expect/fingerprints/delete_all_3.0.15 create mode 100755 src/go/tests/expect/fingerprints/delete_all_3.2.19 create mode 100755 src/go/tests/expect/fingerprints/delete_all_3.4.12 create mode 100755 src/go/tests/expect/fingerprints/delete_all_3.6.2 create mode 100755 src/go/tests/expect/fingerprints/distinct_2.6.12 create mode 100755 src/go/tests/expect/fingerprints/distinct_3.0.15 create mode 100755 src/go/tests/expect/fingerprints/distinct_3.2.19 create mode 100755 src/go/tests/expect/fingerprints/distinct_3.4.12 create mode 100755 src/go/tests/expect/fingerprints/distinct_3.6.2 create mode 100755 src/go/tests/expect/fingerprints/eval_2.6.12 create mode 100755 src/go/tests/expect/fingerprints/eval_3.0.15 create mode 100755 src/go/tests/expect/fingerprints/eval_3.2.19 create mode 100755 src/go/tests/expect/fingerprints/eval_3.4.12 create mode 100755 src/go/tests/expect/fingerprints/eval_3.6.2 create mode 100755 src/go/tests/expect/fingerprints/explain_2.6.12 create mode 100755 src/go/tests/expect/fingerprints/explain_3.0.15 create mode 100755 src/go/tests/expect/fingerprints/explain_3.2.19 create mode 100755 src/go/tests/expect/fingerprints/explain_3.4.12 create mode 100755 src/go/tests/expect/fingerprints/explain_3.6.2 create mode 100755 src/go/tests/expect/fingerprints/find_2.6.12 create mode 100755 src/go/tests/expect/fingerprints/find_3.0.15 create mode 100755 src/go/tests/expect/fingerprints/find_3.2.19 create mode 100755 src/go/tests/expect/fingerprints/find_3.4.12 create mode 100755 src/go/tests/expect/fingerprints/find_3.6.2 create mode 100755 src/go/tests/expect/fingerprints/find_andrii_2.6.12 create mode 100755 src/go/tests/expect/fingerprints/find_andrii_3.0.15 create mode 100755 src/go/tests/expect/fingerprints/find_andrii_3.2.19 create mode 100755 src/go/tests/expect/fingerprints/find_andrii_3.4.12 create mode 100755 src/go/tests/expect/fingerprints/find_andrii_3.6.2 create mode 100755 src/go/tests/expect/fingerprints/find_empty_2.6.12 create mode 100755 src/go/tests/expect/fingerprints/find_empty_3.0.15 create mode 100755 src/go/tests/expect/fingerprints/find_empty_3.2.19 create mode 100755 src/go/tests/expect/fingerprints/find_empty_3.4.12 create mode 100755 src/go/tests/expect/fingerprints/find_empty_3.6.2 create mode 100755 src/go/tests/expect/fingerprints/find_with_sort_2.6.12 create mode 100755 src/go/tests/expect/fingerprints/find_with_sort_3.0.15 create mode 100755 src/go/tests/expect/fingerprints/find_with_sort_3.2.19 create mode 100755 src/go/tests/expect/fingerprints/find_with_sort_3.4.12 create mode 100755 src/go/tests/expect/fingerprints/find_with_sort_3.6.2 create mode 100755 src/go/tests/expect/fingerprints/findandmodify_2.6.12 create mode 100755 src/go/tests/expect/fingerprints/findandmodify_3.0.15 create mode 100755 src/go/tests/expect/fingerprints/findandmodify_3.2.19 create mode 100755 src/go/tests/expect/fingerprints/findandmodify_3.4.12 create mode 100755 src/go/tests/expect/fingerprints/findandmodify_3.6.2 create mode 100755 src/go/tests/expect/fingerprints/geonear_2.6.12 create mode 100755 src/go/tests/expect/fingerprints/geonear_3.0.15 create mode 100755 src/go/tests/expect/fingerprints/geonear_3.2.19 create mode 100755 src/go/tests/expect/fingerprints/geonear_3.4.12 create mode 100755 src/go/tests/expect/fingerprints/geonear_3.6.2 create mode 100755 src/go/tests/expect/fingerprints/getmore_2.6.12 create mode 100755 src/go/tests/expect/fingerprints/getmore_3.0.15 create mode 100755 src/go/tests/expect/fingerprints/getmore_3.2.19 create mode 100755 src/go/tests/expect/fingerprints/getmore_3.4.12 create mode 100755 src/go/tests/expect/fingerprints/getmore_3.6.2 create mode 100755 src/go/tests/expect/fingerprints/group_2.6.12 create mode 100755 src/go/tests/expect/fingerprints/group_3.0.15 create mode 100755 src/go/tests/expect/fingerprints/group_3.2.19 create mode 100755 src/go/tests/expect/fingerprints/group_3.4.12 create mode 100755 src/go/tests/expect/fingerprints/group_3.6.2 create mode 100755 src/go/tests/expect/fingerprints/insert_2.6.12 create mode 100755 src/go/tests/expect/fingerprints/insert_3.0.15 create mode 100755 src/go/tests/expect/fingerprints/insert_3.2.19 create mode 100755 src/go/tests/expect/fingerprints/insert_3.4.12 create mode 100755 src/go/tests/expect/fingerprints/insert_3.6.2 create mode 100755 src/go/tests/expect/fingerprints/mapreduce_2.6.12 create mode 100755 src/go/tests/expect/fingerprints/mapreduce_3.0.15 create mode 100755 src/go/tests/expect/fingerprints/mapreduce_3.2.19 create mode 100755 src/go/tests/expect/fingerprints/mapreduce_3.4.12 create mode 100755 src/go/tests/expect/fingerprints/mapreduce_3.6.2 create mode 100755 src/go/tests/expect/fingerprints/update_2.6.12 create mode 100755 src/go/tests/expect/fingerprints/update_3.0.15 create mode 100755 src/go/tests/expect/fingerprints/update_3.2.19 create mode 100755 src/go/tests/expect/fingerprints/update_3.4.12 create mode 100755 src/go/tests/expect/fingerprints/update_3.6.2 rename src/go/tests/expect/stats_single/{aggregate_3.2.16 => aggregate_3.2.19} (84%) rename src/go/tests/expect/stats_single/{aggregate_3.4.7 => aggregate_3.4.12} (84%) rename src/go/tests/expect/stats_single/{aggregate_3.5.11 => aggregate_3.6.2} (85%) rename src/go/tests/expect/stats_single/{count_3.2.16 => count_3.2.19} (83%) rename src/go/tests/expect/stats_single/{count_3.4.7 => count_3.4.12} (83%) rename src/go/tests/expect/stats_single/{count_3.5.11 => count_3.6.2} (83%) rename src/go/tests/expect/stats_single/{count_with_query_3.2.16 => count_with_query_3.2.19} (83%) rename src/go/tests/expect/stats_single/{count_with_query_3.4.7 => count_with_query_3.4.12} (84%) rename src/go/tests/expect/stats_single/{count_with_query_3.5.11 => count_with_query_3.6.2} (84%) rename src/go/tests/expect/stats_single/{delete_3.2.16 => delete_3.2.19} (83%) rename src/go/tests/expect/stats_single/{delete_all_3.4.7 => delete_3.4.12} (83%) rename src/go/tests/expect/stats_single/{delete_3.5.11 => delete_3.6.2} (83%) rename src/go/tests/expect/stats_single/{delete_3.4.7 => delete_all_3.2.19} (83%) rename src/go/tests/expect/stats_single/{delete_all_3.2.16 => delete_all_3.4.12} (81%) rename src/go/tests/expect/stats_single/{delete_all_3.5.11 => delete_all_3.6.2} (83%) rename src/go/tests/expect/stats_single/{distinct_3.2.16 => distinct_3.2.19} (84%) rename src/go/tests/expect/stats_single/{distinct_3.4.7 => distinct_3.4.12} (84%) rename src/go/tests/expect/stats_single/{distinct_3.5.11 => distinct_3.6.2} (84%) rename src/go/tests/expect/stats_single/{eval_3.2.16 => eval_3.2.19} (81%) rename src/go/tests/expect/stats_single/{eval_3.4.7 => eval_3.4.12} (81%) rename src/go/tests/expect/stats_single/{eval_3.5.11 => eval_3.6.2} (82%) rename src/go/tests/expect/stats_single/{explain_3.2.16 => explain_3.2.19} (83%) rename src/go/tests/expect/stats_single/{explain_3.4.7 => explain_3.4.12} (82%) rename src/go/tests/expect/stats_single/{explain_3.5.11 => explain_3.6.2} (82%) rename src/go/tests/expect/stats_single/{find_3.2.16 => find_3.2.19} (83%) rename src/go/tests/expect/stats_single/{find_3.4.7 => find_3.4.12} (83%) rename src/go/tests/expect/stats_single/{find_3.5.11 => find_3.6.2} (83%) rename src/go/tests/expect/stats_single/{find_andrii_3.2.16 => find_andrii_3.2.19} (87%) rename src/go/tests/expect/stats_single/{find_andrii_3.4.7 => find_andrii_3.4.12} (87%) rename src/go/tests/expect/stats_single/{find_andrii_3.5.11 => find_andrii_3.6.2} (88%) rename src/go/tests/expect/stats_single/{find_empty_3.2.16 => find_empty_3.2.19} (83%) rename src/go/tests/expect/stats_single/{find_empty_3.4.7 => find_empty_3.4.12} (82%) rename src/go/tests/expect/stats_single/{find_empty_3.5.11 => find_empty_3.6.2} (83%) rename src/go/tests/expect/stats_single/{find_with_sort_3.2.16 => find_with_sort_3.2.19} (83%) rename src/go/tests/expect/stats_single/{find_with_sort_3.4.7 => find_with_sort_3.4.12} (83%) rename src/go/tests/expect/stats_single/{find_with_sort_3.5.11 => find_with_sort_3.6.2} (84%) rename src/go/tests/expect/stats_single/{findandmodify_3.2.16 => findandmodify_3.2.19} (85%) rename src/go/tests/expect/stats_single/{findandmodify_3.4.7 => findandmodify_3.4.12} (85%) rename src/go/tests/expect/stats_single/{findandmodify_3.5.11 => findandmodify_3.6.2} (85%) rename src/go/tests/expect/stats_single/{geonear_3.2.16 => geonear_3.2.19} (84%) rename src/go/tests/expect/stats_single/{geonear_3.4.7 => geonear_3.4.12} (84%) rename src/go/tests/expect/stats_single/{geonear_3.5.11 => geonear_3.6.2} (84%) rename src/go/tests/expect/stats_single/{getmore_3.2.16 => getmore_3.2.19} (73%) rename src/go/tests/expect/stats_single/{getmore_3.4.7 => getmore_3.4.12} (75%) rename src/go/tests/expect/stats_single/{getmore_3.5.11 => getmore_3.6.2} (78%) rename src/go/tests/expect/stats_single/{group_3.2.16 => group_3.2.19} (84%) rename src/go/tests/expect/stats_single/{group_3.4.7 => group_3.4.12} (85%) rename src/go/tests/expect/stats_single/{group_3.5.11 => group_3.6.2} (85%) rename src/go/tests/expect/stats_single/{insert_3.2.16 => insert_3.2.19} (83%) rename src/go/tests/expect/stats_single/{insert_3.4.7 => insert_3.4.12} (83%) rename src/go/tests/expect/stats_single/{insert_3.5.11 => insert_3.6.2} (83%) rename src/go/tests/expect/stats_single/{mapreduce_3.2.16 => mapreduce_3.2.19} (85%) rename src/go/tests/expect/stats_single/{mapreduce_3.4.7 => mapreduce_3.4.12} (87%) rename src/go/tests/expect/stats_single/{mapreduce_3.5.11 => mapreduce_3.6.2} (87%) rename src/go/tests/expect/stats_single/{update_3.2.16 => update_3.2.19} (84%) rename src/go/tests/expect/stats_single/{update_3.4.7 => update_3.4.12} (84%) rename src/go/tests/expect/stats_single/{update_3.5.11 => update_3.6.2} (84%) diff --git a/src/go/mongolib/explain/explain_test.go b/src/go/mongolib/explain/explain_test.go index 70ecfa92..8de53865 100644 --- a/src/go/mongolib/explain/explain_test.go +++ b/src/go/mongolib/explain/explain_test.go @@ -63,9 +63,9 @@ func TestExplain(t *testing.T) { versions := []string{ "2.6.12", "3.0.15", - "3.2.16", - "3.4.7", - "3.5.11", + "3.2.19", + "3.4.12", + "3.6.2", } samples := map[string]string{ diff --git a/src/go/mongolib/fingerprinter/fingerprinter_test.go b/src/go/mongolib/fingerprinter/fingerprinter_test.go index 004ceb1f..a42e477c 100644 --- a/src/go/mongolib/fingerprinter/fingerprinter_test.go +++ b/src/go/mongolib/fingerprinter/fingerprinter_test.go @@ -78,109 +78,12 @@ func TestFingerprints(t *testing.T) { t.Parallel() dir := vars.RootPath + samples + "/doc/out/" + dirExpect := vars.RootPath + samples + "/expect/fingerprints/" files, err := ioutil.ReadDir(dir) if err != nil { t.Fatalf("cannot list samples: %s", err) } - expects := map[string]string{ - "aggregate_2.6.12": "AGGREGATE coll a", - "aggregate_3.0.15": "AGGREGATE coll a", - "aggregate_3.2.16": "AGGREGATE coll a", - "aggregate_3.4.7": "AGGREGATE coll a", - "aggregate_3.5.11": "AGGREGATE coll a", - "count_2.6.12": "COUNT coll", - "count_3.0.15": "COUNT coll", - "count_3.2.16": "COUNT coll", - "count_3.4.7": "COUNT coll", - "count_3.5.11": "COUNT coll", - "count_with_query_2.6.12": "COUNT coll a", - "count_with_query_3.0.15": "COUNT coll a", - "count_with_query_3.2.16": "COUNT coll a", - "count_with_query_3.4.7": "COUNT coll a", - "count_with_query_3.5.11": "COUNT coll a", - "delete_2.6.12": "REMOVE coll a,b", - "delete_3.0.15": "REMOVE coll a,b", - "delete_3.2.16": "REMOVE coll a,b", - "delete_3.4.7": "REMOVE coll a,b", - "delete_3.5.11": "REMOVE coll a,b", - "delete_all_2.6.12": "REMOVE coll a,b", - "delete_all_3.0.15": "REMOVE coll a,b", - "delete_all_3.2.16": "REMOVE coll a,b", - "delete_all_3.4.7": "REMOVE coll a,b", - "delete_all_3.5.11": "REMOVE coll a,b", - "distinct_2.6.12": "DISTINCT coll a,b", - "distinct_3.0.15": "DISTINCT coll a,b", - "distinct_3.2.16": "DISTINCT coll a,b", - "distinct_3.4.7": "DISTINCT coll a,b", - "distinct_3.5.11": "DISTINCT coll a,b", - "explain_2.6.12": "EXPLAIN", - "explain_3.0.15": "EXPLAIN", - "explain_3.2.16": "EXPLAIN", - "explain_3.4.7": "EXPLAIN", - "explain_3.5.11": "EXPLAIN", - "eval_2.6.12": "EVAL", - "eval_3.0.15": "EVAL", - "eval_3.2.16": "EVAL", - "eval_3.4.7": "EVAL", - "eval_3.5.11": "EVAL", - "find_empty_2.6.12": "FIND coll", - "find_empty_3.0.15": "FIND coll", - "find_empty_3.2.16": "FIND coll", - "find_empty_3.4.7": "FIND coll", - "find_empty_3.5.11": "FIND coll", - "find_2.6.12": "FIND coll k", - "find_3.0.15": "FIND coll k", - "find_3.2.16": "FIND coll k", - "find_3.4.7": "FIND coll k", - "find_3.5.11": "FIND coll k", - "find_andrii_2.6.12": "FIND coll c,k,pad", - "find_andrii_3.0.15": "FIND coll c,k,pad", - "find_andrii_3.2.16": "FIND coll c,k,pad", - "find_andrii_3.4.7": "FIND coll c,k,pad", - "find_andrii_3.5.11": "FIND coll c,k,pad", - "find_with_sort_2.6.12": "FIND coll b,c", - "find_with_sort_3.0.15": "FIND coll b,c", - "find_with_sort_3.2.16": "FIND coll b,c", - "find_with_sort_3.4.7": "FIND coll b,c", - "find_with_sort_3.5.11": "FIND coll b,c", - "findandmodify_2.6.12": "FINDANDMODIFY coll a", - "findandmodify_3.0.15": "FINDANDMODIFY coll a", - "findandmodify_3.2.16": "FINDANDMODIFY coll a", - "findandmodify_3.4.7": "FINDANDMODIFY coll a", - "findandmodify_3.5.11": "FINDANDMODIFY coll a", - "geonear_2.6.12": "GEONEAR coll", - "geonear_3.0.15": "GEONEAR coll", - "geonear_3.2.16": "GEONEAR coll", - "geonear_3.4.7": "GEONEAR coll", - "geonear_3.5.11": "GEONEAR coll", - "getmore_2.6.12": "GETMORE coll", - "getmore_3.0.15": "GETMORE coll", - "getmore_3.2.16": "GETMORE coll", - "getmore_3.4.7": "GETMORE coll", - "getmore_3.5.11": "GETMORE coll", - "group_2.6.12": "GROUP coll a,b", - "group_3.0.15": "GROUP coll a,b", - "group_3.2.16": "GROUP coll a,b", - "group_3.4.7": "GROUP coll a,b", - "group_3.5.11": "GROUP coll a,b", - "insert_2.6.12": "INSERT coll", - "insert_3.0.15": "INSERT coll", - "insert_3.2.16": "INSERT coll", - "insert_3.4.7": "INSERT coll", - "insert_3.5.11": "INSERT coll", - "mapreduce_2.6.12": "MAPREDUCE coll a", - "mapreduce_3.0.15": "MAPREDUCE coll a", - "mapreduce_3.2.16": "MAPREDUCE coll a", - "mapreduce_3.4.7": "MAPREDUCE coll a", - "mapreduce_3.5.11": "MAPREDUCE coll a", - "update_2.6.12": "UPDATE coll a", - "update_3.0.15": "UPDATE coll a", - "update_3.2.16": "UPDATE coll a", - "update_3.4.7": "UPDATE coll a", - "update_3.5.11": "UPDATE coll a", - } - for _, file := range files { t.Run(file.Name(), func(t *testing.T) { doc := proto.SystemProfile{} @@ -193,9 +96,21 @@ func TestFingerprints(t *testing.T) { if err != nil { t.Errorf("cannot create fingerprint: %s", err) } - expect := expects[file.Name()] - if !reflect.DeepEqual(got.Fingerprint, expect) { - t.Errorf("fp.Fingerprint(doc) = %s, want %s", got.Fingerprint, expect) + fExpect := dirExpect + file.Name() + if tutil.ShouldUpdateSamples() { + err := tutil.WriteJson(fExpect, got) + if err != nil { + fmt.Printf("cannot update samples: %s", err.Error()) + } + } + var expect Fingerprint + err = tutil.LoadJson(fExpect, &expect) + if err != nil { + t.Fatalf("cannot load expected data %s: %s", fExpect, err) + } + + if !reflect.DeepEqual(got, expect) { + t.Errorf("fp.Fingerprint(doc) = %s, want %s", got, expect) } }) } diff --git a/src/go/mongolib/proto/system.profile.go b/src/go/mongolib/proto/system.profile.go index 979d7b43..cfd0e263 100644 --- a/src/go/mongolib/proto/system.profile.go +++ b/src/go/mongolib/proto/system.profile.go @@ -118,6 +118,7 @@ func (self ExampleQuery) Db() string { return "" } +// ExplainCmd returns bson.D ready to use in https://godoc.org/labix.org/v2/mgo#Database.Run func (self ExampleQuery) ExplainCmd() bson.D { cmd := self.Command @@ -162,8 +163,16 @@ func (self ExampleQuery) ExplainCmd() bson.D { } } else { for i := range cmd { - // drop $db param as it is not supported in MongoDB 3.0 - if cmd[i].Name == "$db" { + switch cmd[i].Name { + // PMM-1905: Drop "ntoreturn" if it's negative. + case "ntoreturn": + // If it's non-negative, then we are fine, continue to next param. + if cmd[i].Value.(int64) >= 0 { + continue + } + fallthrough + // Drop $db as it is not supported in MongoDB 3.0. + case "$db": if len(cmd)-1 == i { cmd = cmd[:i] } else { diff --git a/src/go/mongolib/stats/stats_test.go b/src/go/mongolib/stats/stats_test.go index f1249968..71512a47 100644 --- a/src/go/mongolib/stats/stats_test.go +++ b/src/go/mongolib/stats/stats_test.go @@ -275,9 +275,9 @@ func TestAvailableMetrics(t *testing.T) { versions := []string{ "2.6.12", "3.0.15", - "3.2.16", - "3.4.7", - "3.5.11", + "3.2.19", + "3.4.12", + "3.6.2", } samples := []string{ @@ -345,7 +345,6 @@ func TestAvailableMetrics(t *testing.T) { if !reflect.DeepEqual(got, expect) { t.Errorf("s.Queries() = %#v, want %#v", got, expect) } - }) t.Run("cmd_metric", func(t *testing.T) { diff --git a/src/go/tests/doc/out/aggregate_2.6.12 b/src/go/tests/doc/out/aggregate_2.6.12 index 037b4edf..05044f8c 100644 --- a/src/go/tests/doc/out/aggregate_2.6.12 +++ b/src/go/tests/doc/out/aggregate_2.6.12 @@ -20,20 +20,20 @@ "numYield" : 0, "lockStats" : { "timeLockedMicros" : { - "r" : NumberLong(222), - "w" : NumberLong(0) + "r" : NumberLong(1234), + "w" : NumberLong(4321) }, "timeAcquiringMicros" : { - "r" : NumberLong(15), - "w" : NumberLong(6) + "r" : NumberLong(9876), + "w" : NumberLong(6789) } }, "responseLength" : 385, - "millis" : 0, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:08.661Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/aggregate_3.0.15 b/src/go/tests/doc/out/aggregate_3.0.15 index 62ad4332..fd940729 100644 --- a/src/go/tests/doc/out/aggregate_3.0.15 +++ b/src/go/tests/doc/out/aggregate_3.0.15 @@ -42,11 +42,11 @@ } }, "responseLength" : 385, - "millis" : 0, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:18.509Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/aggregate_3.2.16 b/src/go/tests/doc/out/aggregate_3.2.19 similarity index 91% rename from src/go/tests/doc/out/aggregate_3.2.16 rename to src/go/tests/doc/out/aggregate_3.2.19 index adf0950b..047d372d 100644 --- a/src/go/tests/doc/out/aggregate_3.2.16 +++ b/src/go/tests/doc/out/aggregate_3.2.19 @@ -38,11 +38,11 @@ }, "responseLength" : 388, "protocol" : "op_command", - "millis" : 0, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:31.293Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/aggregate_3.4.7 b/src/go/tests/doc/out/aggregate_3.4.12 similarity index 92% rename from src/go/tests/doc/out/aggregate_3.4.7 rename to src/go/tests/doc/out/aggregate_3.4.12 index ce833012..5101bd9d 100644 --- a/src/go/tests/doc/out/aggregate_3.4.7 +++ b/src/go/tests/doc/out/aggregate_3.4.12 @@ -40,9 +40,9 @@ "nreturned" : 8, "responseLength" : 370, "protocol" : "op_command", - "millis" : 0, + "millis" : 42, "planSummary" : "IXSCAN { a: 1 }", - "ts" : ISODate("2017-10-15T01:54:41.948Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/aggregate_3.5.11 b/src/go/tests/doc/out/aggregate_3.6.2 similarity index 83% rename from src/go/tests/doc/out/aggregate_3.5.11 rename to src/go/tests/doc/out/aggregate_3.6.2 index 64b0f1ae..2b46524d 100644 --- a/src/go/tests/doc/out/aggregate_3.5.11 +++ b/src/go/tests/doc/out/aggregate_3.6.2 @@ -24,26 +24,26 @@ "locks" : { "Global" : { "acquireCount" : { - "r" : NumberLong(6) + "r" : NumberLong(4) } }, "Database" : { "acquireCount" : { - "r" : NumberLong(3) + "r" : NumberLong(2) } }, "Collection" : { "acquireCount" : { - "r" : NumberLong(3) + "r" : NumberLong(2) } } }, "nreturned" : 8, "responseLength" : 370, "protocol" : "op_msg", - "millis" : 2, + "millis" : 42, "planSummary" : "IXSCAN { a: 1 }", - "ts" : ISODate("2017-10-15T01:54:52.564Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/count_2.6.12 b/src/go/tests/doc/out/count_2.6.12 index 093b388e..4ad1956a 100644 --- a/src/go/tests/doc/out/count_2.6.12 +++ b/src/go/tests/doc/out/count_2.6.12 @@ -14,20 +14,20 @@ "numYield" : 0, "lockStats" : { "timeLockedMicros" : { - "r" : NumberLong(33), - "w" : NumberLong(0) + "r" : NumberLong(1234), + "w" : NumberLong(4321) }, "timeAcquiringMicros" : { - "r" : NumberLong(3), - "w" : NumberLong(5) + "r" : NumberLong(9876), + "w" : NumberLong(6789) } }, "responseLength" : 48, - "millis" : 0, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:08.889Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/count_3.0.15 b/src/go/tests/doc/out/count_3.0.15 index 1513d50e..789cdfbf 100644 --- a/src/go/tests/doc/out/count_3.0.15 +++ b/src/go/tests/doc/out/count_3.0.15 @@ -36,11 +36,11 @@ } }, "responseLength" : 44, - "millis" : 0, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:18.673Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/count_3.2.16 b/src/go/tests/doc/out/count_3.2.19 similarity index 90% rename from src/go/tests/doc/out/count_3.2.16 rename to src/go/tests/doc/out/count_3.2.19 index 101c99e2..ade3267c 100644 --- a/src/go/tests/doc/out/count_3.2.16 +++ b/src/go/tests/doc/out/count_3.2.19 @@ -32,11 +32,11 @@ }, "responseLength" : 47, "protocol" : "op_command", - "millis" : 0, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:31.529Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/count_3.4.7 b/src/go/tests/doc/out/count_3.4.12 similarity index 93% rename from src/go/tests/doc/out/count_3.4.7 rename to src/go/tests/doc/out/count_3.4.12 index 24567915..cb1c4f8f 100644 --- a/src/go/tests/doc/out/count_3.4.7 +++ b/src/go/tests/doc/out/count_3.4.12 @@ -32,7 +32,7 @@ }, "responseLength" : 29, "protocol" : "op_command", - "millis" : 0, + "millis" : 42, "planSummary" : "COUNT", "execStats" : { "stage" : "COUNT", @@ -49,7 +49,7 @@ "nCounted" : 10, "nSkipped" : 0 }, - "ts" : ISODate("2017-10-15T01:54:42.157Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/count_3.5.11 b/src/go/tests/doc/out/count_3.6.2 similarity index 93% rename from src/go/tests/doc/out/count_3.5.11 rename to src/go/tests/doc/out/count_3.6.2 index 6ea4499b..ea5d08cd 100644 --- a/src/go/tests/doc/out/count_3.5.11 +++ b/src/go/tests/doc/out/count_3.6.2 @@ -33,7 +33,7 @@ }, "responseLength" : 29, "protocol" : "op_msg", - "millis" : 0, + "millis" : 42, "planSummary" : "COUNT", "execStats" : { "stage" : "COUNT", @@ -50,7 +50,7 @@ "nCounted" : 10, "nSkipped" : 0 }, - "ts" : ISODate("2017-10-15T01:54:52.844Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/count_with_query_2.6.12 b/src/go/tests/doc/out/count_with_query_2.6.12 index 94f74603..44777e68 100644 --- a/src/go/tests/doc/out/count_with_query_2.6.12 +++ b/src/go/tests/doc/out/count_with_query_2.6.12 @@ -16,20 +16,20 @@ "numYield" : 0, "lockStats" : { "timeLockedMicros" : { - "r" : NumberLong(75), - "w" : NumberLong(0) + "r" : NumberLong(1234), + "w" : NumberLong(4321) }, "timeAcquiringMicros" : { - "r" : NumberLong(6), - "w" : NumberLong(6) + "r" : NumberLong(9876), + "w" : NumberLong(6789) } }, "responseLength" : 48, - "millis" : 0, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:09.039Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/count_with_query_3.0.15 b/src/go/tests/doc/out/count_with_query_3.0.15 index 9f4d4cc1..eaed5884 100644 --- a/src/go/tests/doc/out/count_with_query_3.0.15 +++ b/src/go/tests/doc/out/count_with_query_3.0.15 @@ -38,11 +38,11 @@ } }, "responseLength" : 44, - "millis" : 0, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:18.838Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/count_with_query_3.2.16 b/src/go/tests/doc/out/count_with_query_3.2.19 similarity index 90% rename from src/go/tests/doc/out/count_with_query_3.2.16 rename to src/go/tests/doc/out/count_with_query_3.2.19 index 4c71ff19..bb0f3ddc 100644 --- a/src/go/tests/doc/out/count_with_query_3.2.16 +++ b/src/go/tests/doc/out/count_with_query_3.2.19 @@ -34,11 +34,11 @@ }, "responseLength" : 47, "protocol" : "op_command", - "millis" : 0, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:31.756Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/count_with_query_3.4.7 b/src/go/tests/doc/out/count_with_query_3.4.12 similarity index 95% rename from src/go/tests/doc/out/count_with_query_3.4.7 rename to src/go/tests/doc/out/count_with_query_3.4.12 index 076352b6..08c57a90 100644 --- a/src/go/tests/doc/out/count_with_query_3.4.7 +++ b/src/go/tests/doc/out/count_with_query_3.4.12 @@ -34,7 +34,7 @@ }, "responseLength" : 29, "protocol" : "op_command", - "millis" : 0, + "millis" : 42, "planSummary" : "COLLSCAN", "execStats" : { "stage" : "COUNT", @@ -71,7 +71,7 @@ "docsExamined" : 10 } }, - "ts" : ISODate("2017-10-15T01:54:42.350Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/count_with_query_3.5.11 b/src/go/tests/doc/out/count_with_query_3.6.2 similarity index 95% rename from src/go/tests/doc/out/count_with_query_3.5.11 rename to src/go/tests/doc/out/count_with_query_3.6.2 index f7f27b5e..31e74308 100644 --- a/src/go/tests/doc/out/count_with_query_3.5.11 +++ b/src/go/tests/doc/out/count_with_query_3.6.2 @@ -35,7 +35,7 @@ }, "responseLength" : 29, "protocol" : "op_msg", - "millis" : 0, + "millis" : 42, "planSummary" : "COLLSCAN", "execStats" : { "stage" : "COUNT", @@ -72,7 +72,7 @@ "docsExamined" : 10 } }, - "ts" : ISODate("2017-10-15T01:54:53.078Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/delete_2.6.12 b/src/go/tests/doc/out/delete_2.6.12 index 223c26bd..591231b6 100644 --- a/src/go/tests/doc/out/delete_2.6.12 +++ b/src/go/tests/doc/out/delete_2.6.12 @@ -14,19 +14,19 @@ "numYield" : 0, "lockStats" : { "timeLockedMicros" : { - "r" : NumberLong(0), - "w" : NumberLong(144) + "r" : NumberLong(1234), + "w" : NumberLong(4321) }, "timeAcquiringMicros" : { - "r" : NumberLong(0), - "w" : NumberLong(11) + "r" : NumberLong(9876), + "w" : NumberLong(6789) } }, - "millis" : 0, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:09.246Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/delete_3.0.15 b/src/go/tests/doc/out/delete_3.0.15 index dc0b6b9b..1d1c5fa8 100644 --- a/src/go/tests/doc/out/delete_3.0.15 +++ b/src/go/tests/doc/out/delete_3.0.15 @@ -36,11 +36,11 @@ } } }, - "millis" : 0, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:19.034Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/delete_3.2.16 b/src/go/tests/doc/out/delete_3.2.19 similarity index 89% rename from src/go/tests/doc/out/delete_3.2.16 rename to src/go/tests/doc/out/delete_3.2.19 index 130dea8a..f63c9dce 100644 --- a/src/go/tests/doc/out/delete_3.2.16 +++ b/src/go/tests/doc/out/delete_3.2.19 @@ -31,11 +31,11 @@ } } }, - "millis" : 1, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:32.020Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/delete_3.4.7 b/src/go/tests/doc/out/delete_3.4.12 similarity index 97% rename from src/go/tests/doc/out/delete_3.4.7 rename to src/go/tests/doc/out/delete_3.4.12 index 33b766bd..8c1a0ba4 100644 --- a/src/go/tests/doc/out/delete_3.4.7 +++ b/src/go/tests/doc/out/delete_3.4.12 @@ -32,7 +32,7 @@ } } }, - "millis" : 0, + "millis" : 42, "planSummary" : "IXSCAN { a: 1 }", "execStats" : { "stage" : "DELETE", @@ -105,7 +105,7 @@ } } }, - "ts" : ISODate("2017-10-15T01:54:42.612Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/delete_3.5.11 b/src/go/tests/doc/out/delete_3.6.2 similarity index 97% rename from src/go/tests/doc/out/delete_3.5.11 rename to src/go/tests/doc/out/delete_3.6.2 index d8d3e438..6109b216 100644 --- a/src/go/tests/doc/out/delete_3.5.11 +++ b/src/go/tests/doc/out/delete_3.6.2 @@ -35,7 +35,7 @@ } } }, - "millis" : 1, + "millis" : 42, "planSummary" : "IXSCAN { a: 1 }", "execStats" : { "stage" : "DELETE", @@ -108,7 +108,7 @@ } } }, - "ts" : ISODate("2017-10-15T01:54:53.333Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/delete_all_2.6.12 b/src/go/tests/doc/out/delete_all_2.6.12 index 2b78e86a..85acbcea 100644 --- a/src/go/tests/doc/out/delete_all_2.6.12 +++ b/src/go/tests/doc/out/delete_all_2.6.12 @@ -14,19 +14,19 @@ "numYield" : 0, "lockStats" : { "timeLockedMicros" : { - "r" : NumberLong(0), - "w" : NumberLong(396) + "r" : NumberLong(1234), + "w" : NumberLong(4321) }, "timeAcquiringMicros" : { - "r" : NumberLong(0), - "w" : NumberLong(12) + "r" : NumberLong(9876), + "w" : NumberLong(6789) } }, - "millis" : 0, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:09.463Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/delete_all_3.0.15 b/src/go/tests/doc/out/delete_all_3.0.15 index 37e00f6e..c6296310 100644 --- a/src/go/tests/doc/out/delete_all_3.0.15 +++ b/src/go/tests/doc/out/delete_all_3.0.15 @@ -36,11 +36,11 @@ } } }, - "millis" : 0, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:19.206Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/delete_all_3.2.16 b/src/go/tests/doc/out/delete_all_3.2.19 similarity index 89% rename from src/go/tests/doc/out/delete_all_3.2.16 rename to src/go/tests/doc/out/delete_all_3.2.19 index 05b1c027..dace7994 100644 --- a/src/go/tests/doc/out/delete_all_3.2.16 +++ b/src/go/tests/doc/out/delete_all_3.2.19 @@ -31,11 +31,11 @@ } } }, - "millis" : 1, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:32.281Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/delete_all_3.4.7 b/src/go/tests/doc/out/delete_all_3.4.12 similarity index 97% rename from src/go/tests/doc/out/delete_all_3.4.7 rename to src/go/tests/doc/out/delete_all_3.4.12 index c9ef76b0..4a7b3f2d 100644 --- a/src/go/tests/doc/out/delete_all_3.4.7 +++ b/src/go/tests/doc/out/delete_all_3.4.12 @@ -32,7 +32,7 @@ } } }, - "millis" : 1, + "millis" : 42, "planSummary" : "IXSCAN { a: 1 }", "execStats" : { "stage" : "DELETE", @@ -105,7 +105,7 @@ } } }, - "ts" : ISODate("2017-10-15T01:54:42.820Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/delete_all_3.5.11 b/src/go/tests/doc/out/delete_all_3.6.2 similarity index 95% rename from src/go/tests/doc/out/delete_all_3.5.11 rename to src/go/tests/doc/out/delete_all_3.6.2 index 21b31346..d31805c8 100644 --- a/src/go/tests/doc/out/delete_all_3.5.11 +++ b/src/go/tests/doc/out/delete_all_3.6.2 @@ -35,12 +35,12 @@ } } }, - "millis" : 1, + "millis" : 42, "planSummary" : "IXSCAN { a: 1 }", "execStats" : { "stage" : "DELETE", "nReturned" : 0, - "executionTimeMillisEstimate" : 10, + "executionTimeMillisEstimate" : 0, "works" : 9, "advanced" : 0, "needTime" : 8, @@ -108,7 +108,7 @@ } } }, - "ts" : ISODate("2017-10-15T01:54:53.615Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/distinct_2.6.12 b/src/go/tests/doc/out/distinct_2.6.12 index 35e9c086..8041fbc5 100644 --- a/src/go/tests/doc/out/distinct_2.6.12 +++ b/src/go/tests/doc/out/distinct_2.6.12 @@ -14,20 +14,20 @@ "numYield" : 0, "lockStats" : { "timeLockedMicros" : { - "r" : NumberLong(362), - "w" : NumberLong(0) + "r" : NumberLong(1234), + "w" : NumberLong(4321) }, "timeAcquiringMicros" : { - "r" : NumberLong(6), - "w" : NumberLong(9341) + "r" : NumberLong(9876), + "w" : NumberLong(6789) } }, "responseLength" : 199, - "millis" : 0, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:09.687Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/distinct_3.0.15 b/src/go/tests/doc/out/distinct_3.0.15 index 21bf1c7d..4ef21bda 100644 --- a/src/go/tests/doc/out/distinct_3.0.15 +++ b/src/go/tests/doc/out/distinct_3.0.15 @@ -36,11 +36,11 @@ } }, "responseLength" : 206, - "millis" : 0, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:19.380Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/distinct_3.2.16 b/src/go/tests/doc/out/distinct_3.2.19 similarity index 90% rename from src/go/tests/doc/out/distinct_3.2.16 rename to src/go/tests/doc/out/distinct_3.2.19 index 4a702cc4..d293efd0 100644 --- a/src/go/tests/doc/out/distinct_3.2.16 +++ b/src/go/tests/doc/out/distinct_3.2.19 @@ -32,11 +32,11 @@ }, "responseLength" : 209, "protocol" : "op_command", - "millis" : 0, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:32.523Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/distinct_3.4.7 b/src/go/tests/doc/out/distinct_3.4.12 similarity index 96% rename from src/go/tests/doc/out/distinct_3.4.7 rename to src/go/tests/doc/out/distinct_3.4.12 index 0ced8f0a..90217c01 100644 --- a/src/go/tests/doc/out/distinct_3.4.7 +++ b/src/go/tests/doc/out/distinct_3.4.12 @@ -32,7 +32,7 @@ }, "responseLength" : 90, "protocol" : "op_command", - "millis" : 0, + "millis" : 42, "planSummary" : "IXSCAN { b: 1 }", "execStats" : { "stage" : "FETCH", @@ -85,7 +85,7 @@ "seenInvalidated" : 0 } }, - "ts" : ISODate("2017-10-15T01:54:43.048Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/distinct_3.5.11 b/src/go/tests/doc/out/distinct_3.6.2 similarity index 96% rename from src/go/tests/doc/out/distinct_3.5.11 rename to src/go/tests/doc/out/distinct_3.6.2 index 69c8442e..666acc87 100644 --- a/src/go/tests/doc/out/distinct_3.5.11 +++ b/src/go/tests/doc/out/distinct_3.6.2 @@ -33,7 +33,7 @@ }, "responseLength" : 90, "protocol" : "op_msg", - "millis" : 0, + "millis" : 42, "planSummary" : "IXSCAN { b: 1 }", "execStats" : { "stage" : "FETCH", @@ -86,7 +86,7 @@ "seenInvalidated" : 0 } }, - "ts" : ISODate("2017-10-15T01:54:53.874Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/eval_2.6.12 b/src/go/tests/doc/out/eval_2.6.12 index d8ba0b6f..4dde57bb 100644 --- a/src/go/tests/doc/out/eval_2.6.12 +++ b/src/go/tests/doc/out/eval_2.6.12 @@ -8,22 +8,22 @@ "numYield" : 0, "lockStats" : { "timeLockedMicros" : { - "R" : NumberLong(0), - "W" : NumberLong(42972) + "R" : NumberLong(1234), + "W" : NumberLong(4321) }, "timeAcquiringMicros" : { - "R" : NumberLong(0), - "W" : NumberLong(8), - "r" : NumberLong(0), - "w" : NumberLong(6) + "R" : NumberLong(9876), + "W" : NumberLong(6789), + "r" : NumberLong(9876), + "w" : NumberLong(6789) } }, "responseLength" : 53, - "millis" : 43, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:09.890Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/eval_3.0.15 b/src/go/tests/doc/out/eval_3.0.15 index f82cb588..537a76a1 100644 --- a/src/go/tests/doc/out/eval_3.0.15 +++ b/src/go/tests/doc/out/eval_3.0.15 @@ -31,11 +31,11 @@ } }, "responseLength" : 53, - "millis" : 37, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:19.572Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/eval_3.2.16 b/src/go/tests/doc/out/eval_3.2.19 similarity index 89% rename from src/go/tests/doc/out/eval_3.2.16 rename to src/go/tests/doc/out/eval_3.2.19 index 6d632f6f..45e283e5 100644 --- a/src/go/tests/doc/out/eval_3.2.16 +++ b/src/go/tests/doc/out/eval_3.2.19 @@ -27,11 +27,11 @@ }, "responseLength" : 38, "protocol" : "op_command", - "millis" : 56, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:32.759Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/eval_3.4.7 b/src/go/tests/doc/out/eval_3.4.12 similarity index 88% rename from src/go/tests/doc/out/eval_3.4.7 rename to src/go/tests/doc/out/eval_3.4.12 index ebfc7b7c..ee5338f5 100644 --- a/src/go/tests/doc/out/eval_3.4.7 +++ b/src/go/tests/doc/out/eval_3.4.12 @@ -25,8 +25,8 @@ }, "responseLength" : 38, "protocol" : "op_command", - "millis" : 48, - "ts" : ISODate("2017-10-15T01:54:43.273Z"), + "millis" : 42, + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/eval_3.5.11 b/src/go/tests/doc/out/eval_3.6.2 similarity index 89% rename from src/go/tests/doc/out/eval_3.5.11 rename to src/go/tests/doc/out/eval_3.6.2 index f2ff0ae7..bb225162 100644 --- a/src/go/tests/doc/out/eval_3.5.11 +++ b/src/go/tests/doc/out/eval_3.6.2 @@ -26,8 +26,8 @@ }, "responseLength" : 38, "protocol" : "op_msg", - "millis" : 40, - "ts" : ISODate("2017-10-15T01:54:54.085Z"), + "millis" : 42, + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/explain_2.6.12 b/src/go/tests/doc/out/explain_2.6.12 index 057bc3fa..418e5339 100644 --- a/src/go/tests/doc/out/explain_2.6.12 +++ b/src/go/tests/doc/out/explain_2.6.12 @@ -15,17 +15,17 @@ "numYield" : 0, "lockStats" : { "timeLockedMicros" : { - "r" : NumberLong(101), - "w" : NumberLong(0) + "r" : NumberLong(1234), + "w" : NumberLong(4321) }, "timeAcquiringMicros" : { - "r" : NumberLong(6), - "w" : NumberLong(11) + "r" : NumberLong(9876), + "w" : NumberLong(6789) } }, "nreturned" : 1, "responseLength" : 583, - "millis" : 0, + "millis" : 42, "execStats" : { "type" : "COLLSCAN", "works" : 12, @@ -39,7 +39,7 @@ "docsTested" : 10, "children" : [ ] }, - "ts" : ISODate("2017-10-15T01:54:10.058Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/explain_3.0.15 b/src/go/tests/doc/out/explain_3.0.15 index f65e97cd..33b9b0ce 100644 --- a/src/go/tests/doc/out/explain_3.0.15 +++ b/src/go/tests/doc/out/explain_3.0.15 @@ -39,11 +39,11 @@ } }, "responseLength" : 379, - "millis" : 0, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:19.722Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/explain_3.2.16 b/src/go/tests/doc/out/explain_3.2.19 similarity index 90% rename from src/go/tests/doc/out/explain_3.2.16 rename to src/go/tests/doc/out/explain_3.2.19 index 0d34e67c..0335da9a 100644 --- a/src/go/tests/doc/out/explain_3.2.16 +++ b/src/go/tests/doc/out/explain_3.2.19 @@ -32,11 +32,11 @@ }, "responseLength" : 364, "protocol" : "op_command", - "millis" : 0, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:32.931Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/explain_3.4.7 b/src/go/tests/doc/out/explain_3.4.12 similarity index 86% rename from src/go/tests/doc/out/explain_3.4.7 rename to src/go/tests/doc/out/explain_3.4.12 index 75e82c10..3632d66c 100644 --- a/src/go/tests/doc/out/explain_3.4.7 +++ b/src/go/tests/doc/out/explain_3.4.12 @@ -28,10 +28,10 @@ } } }, - "responseLength" : 328, + "responseLength" : 329, "protocol" : "op_command", - "millis" : 0, - "ts" : ISODate("2017-10-15T01:54:43.427Z"), + "millis" : 42, + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/explain_3.5.11 b/src/go/tests/doc/out/explain_3.6.2 similarity index 86% rename from src/go/tests/doc/out/explain_3.5.11 rename to src/go/tests/doc/out/explain_3.6.2 index aac05929..7e6ea69f 100644 --- a/src/go/tests/doc/out/explain_3.5.11 +++ b/src/go/tests/doc/out/explain_3.6.2 @@ -29,10 +29,10 @@ } } }, - "responseLength" : 329, + "responseLength" : 328, "protocol" : "op_msg", - "millis" : 0, - "ts" : ISODate("2017-10-15T01:54:54.257Z"), + "millis" : 42, + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/find_2.6.12 b/src/go/tests/doc/out/find_2.6.12 index 77a18f4e..83b31d1f 100644 --- a/src/go/tests/doc/out/find_2.6.12 +++ b/src/go/tests/doc/out/find_2.6.12 @@ -12,17 +12,17 @@ "numYield" : 0, "lockStats" : { "timeLockedMicros" : { - "r" : NumberLong(213), - "w" : NumberLong(0) + "r" : NumberLong(1234), + "w" : NumberLong(4321) }, "timeAcquiringMicros" : { - "r" : NumberLong(38), - "w" : NumberLong(3) + "r" : NumberLong(9876), + "w" : NumberLong(6789) } }, "nreturned" : 2, "responseLength" : 86, - "millis" : 0, + "millis" : 42, "execStats" : { "type" : "FETCH", "works" : 3, @@ -60,7 +60,7 @@ } ] }, - "ts" : ISODate("2017-10-15T01:54:10.277Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/find_3.0.15 b/src/go/tests/doc/out/find_3.0.15 index 17470b31..e1b74dba 100644 --- a/src/go/tests/doc/out/find_3.0.15 +++ b/src/go/tests/doc/out/find_3.0.15 @@ -35,7 +35,7 @@ }, "nreturned" : 2, "responseLength" : 86, - "millis" : 0, + "millis" : 42, "execStats" : { "stage" : "FETCH", "nReturned" : 2, @@ -80,7 +80,7 @@ "matchTested" : 0 } }, - "ts" : ISODate("2017-10-15T01:54:19.953Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/find_3.2.16 b/src/go/tests/doc/out/find_3.2.19 similarity index 96% rename from src/go/tests/doc/out/find_3.2.16 rename to src/go/tests/doc/out/find_3.2.19 index dd0ff3c6..6c330dbf 100644 --- a/src/go/tests/doc/out/find_3.2.16 +++ b/src/go/tests/doc/out/find_3.2.19 @@ -33,7 +33,7 @@ "nreturned" : 2, "responseLength" : 172, "protocol" : "op_command", - "millis" : 1, + "millis" : 42, "execStats" : { "stage" : "FETCH", "nReturned" : 2, @@ -81,7 +81,7 @@ "seenInvalidated" : 0 } }, - "ts" : ISODate("2017-10-15T01:54:33.179Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/find_3.4.7 b/src/go/tests/doc/out/find_3.4.12 similarity index 96% rename from src/go/tests/doc/out/find_3.4.7 rename to src/go/tests/doc/out/find_3.4.12 index 49d13b7c..2be9f9c9 100644 --- a/src/go/tests/doc/out/find_3.4.7 +++ b/src/go/tests/doc/out/find_3.4.12 @@ -31,7 +31,7 @@ "nreturned" : 2, "responseLength" : 154, "protocol" : "op_command", - "millis" : 0, + "millis" : 42, "planSummary" : "IXSCAN { k: 1 }", "execStats" : { "stage" : "FETCH", @@ -84,7 +84,7 @@ "seenInvalidated" : 0 } }, - "ts" : ISODate("2017-10-15T01:54:43.713Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/find_3.5.11 b/src/go/tests/doc/out/find_3.6.2 similarity index 96% rename from src/go/tests/doc/out/find_3.5.11 rename to src/go/tests/doc/out/find_3.6.2 index 05790ee6..804345c2 100644 --- a/src/go/tests/doc/out/find_3.5.11 +++ b/src/go/tests/doc/out/find_3.6.2 @@ -32,7 +32,7 @@ "nreturned" : 2, "responseLength" : 154, "protocol" : "op_msg", - "millis" : 0, + "millis" : 42, "planSummary" : "IXSCAN { k: 1 }", "execStats" : { "stage" : "FETCH", @@ -85,7 +85,7 @@ "seenInvalidated" : 0 } }, - "ts" : ISODate("2017-10-15T01:54:54.507Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/find_andrii_2.6.12 b/src/go/tests/doc/out/find_andrii_2.6.12 index f57c1f0e..f60c62ab 100644 --- a/src/go/tests/doc/out/find_andrii_2.6.12 +++ b/src/go/tests/doc/out/find_andrii_2.6.12 @@ -52,21 +52,21 @@ "numYield" : 0, "lockStats" : { "timeLockedMicros" : { - "r" : NumberLong(298), - "w" : NumberLong(0) + "r" : NumberLong(1234), + "w" : NumberLong(4321) }, "timeAcquiringMicros" : { - "r" : NumberLong(5), - "w" : NumberLong(50) + "r" : NumberLong(9876), + "w" : NumberLong(6789) } }, "nreturned" : 0, "responseLength" : 20, - "millis" : 0, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:10.474Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/find_andrii_3.0.15 b/src/go/tests/doc/out/find_andrii_3.0.15 index b4f9de3b..fd354d3d 100644 --- a/src/go/tests/doc/out/find_andrii_3.0.15 +++ b/src/go/tests/doc/out/find_andrii_3.0.15 @@ -75,7 +75,7 @@ }, "nreturned" : 0, "responseLength" : 20, - "millis" : 0, + "millis" : 42, "execStats" : { "stage" : "EOF", "nReturned" : 0, @@ -89,7 +89,7 @@ "isEOF" : 1, "invalidates" : 0 }, - "ts" : ISODate("2017-10-15T01:54:20.111Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/find_andrii_3.2.16 b/src/go/tests/doc/out/find_andrii_3.2.19 similarity index 95% rename from src/go/tests/doc/out/find_andrii_3.2.16 rename to src/go/tests/doc/out/find_andrii_3.2.19 index e567fa74..5f07febc 100644 --- a/src/go/tests/doc/out/find_andrii_3.2.16 +++ b/src/go/tests/doc/out/find_andrii_3.2.19 @@ -73,7 +73,7 @@ "nreturned" : 0, "responseLength" : 100, "protocol" : "op_command", - "millis" : 0, + "millis" : 42, "execStats" : { "stage" : "EOF", "nReturned" : 0, @@ -87,7 +87,7 @@ "isEOF" : 1, "invalidates" : 0 }, - "ts" : ISODate("2017-10-15T01:54:33.358Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/find_andrii_3.4.7 b/src/go/tests/doc/out/find_andrii_3.4.12 similarity index 95% rename from src/go/tests/doc/out/find_andrii_3.4.7 rename to src/go/tests/doc/out/find_andrii_3.4.12 index ff5b6654..50d84de4 100644 --- a/src/go/tests/doc/out/find_andrii_3.4.7 +++ b/src/go/tests/doc/out/find_andrii_3.4.12 @@ -71,7 +71,7 @@ "nreturned" : 0, "responseLength" : 82, "protocol" : "op_command", - "millis" : 0, + "millis" : 42, "planSummary" : "EOF", "execStats" : { "stage" : "EOF", @@ -86,7 +86,7 @@ "isEOF" : 1, "invalidates" : 0 }, - "ts" : ISODate("2017-10-15T01:54:43.922Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/find_andrii_3.5.11 b/src/go/tests/doc/out/find_andrii_3.6.2 similarity index 95% rename from src/go/tests/doc/out/find_andrii_3.5.11 rename to src/go/tests/doc/out/find_andrii_3.6.2 index d5d08a79..32e06a68 100644 --- a/src/go/tests/doc/out/find_andrii_3.5.11 +++ b/src/go/tests/doc/out/find_andrii_3.6.2 @@ -72,7 +72,7 @@ "nreturned" : 0, "responseLength" : 82, "protocol" : "op_msg", - "millis" : 0, + "millis" : 42, "planSummary" : "EOF", "execStats" : { "stage" : "EOF", @@ -87,7 +87,7 @@ "isEOF" : 1, "invalidates" : 0 }, - "ts" : ISODate("2017-10-15T01:54:54.693Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/find_empty_2.6.12 b/src/go/tests/doc/out/find_empty_2.6.12 index 06b76808..c4ec5408 100644 --- a/src/go/tests/doc/out/find_empty_2.6.12 +++ b/src/go/tests/doc/out/find_empty_2.6.12 @@ -12,21 +12,21 @@ "numYield" : 0, "lockStats" : { "timeLockedMicros" : { - "r" : NumberLong(189), - "w" : NumberLong(0) + "r" : NumberLong(1234), + "w" : NumberLong(4321) }, "timeAcquiringMicros" : { - "r" : NumberLong(14), - "w" : NumberLong(9) + "r" : NumberLong(9876), + "w" : NumberLong(6789) } }, "nreturned" : 0, "responseLength" : 20, - "millis" : 0, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:10.630Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/find_empty_3.0.15 b/src/go/tests/doc/out/find_empty_3.0.15 index 4a05a498..0c18bfa4 100644 --- a/src/go/tests/doc/out/find_empty_3.0.15 +++ b/src/go/tests/doc/out/find_empty_3.0.15 @@ -35,7 +35,7 @@ }, "nreturned" : 0, "responseLength" : 20, - "millis" : 0, + "millis" : 42, "execStats" : { "stage" : "EOF", "nReturned" : 0, @@ -49,7 +49,7 @@ "isEOF" : 1, "invalidates" : 0 }, - "ts" : ISODate("2017-10-15T01:54:20.246Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/find_empty_3.2.16 b/src/go/tests/doc/out/find_empty_3.2.19 similarity index 93% rename from src/go/tests/doc/out/find_empty_3.2.16 rename to src/go/tests/doc/out/find_empty_3.2.19 index 9e06bc47..88b33394 100644 --- a/src/go/tests/doc/out/find_empty_3.2.16 +++ b/src/go/tests/doc/out/find_empty_3.2.19 @@ -33,7 +33,7 @@ "nreturned" : 0, "responseLength" : 100, "protocol" : "op_command", - "millis" : 0, + "millis" : 42, "execStats" : { "stage" : "EOF", "nReturned" : 0, @@ -47,7 +47,7 @@ "isEOF" : 1, "invalidates" : 0 }, - "ts" : ISODate("2017-10-15T01:54:33.530Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/find_empty_3.4.7 b/src/go/tests/doc/out/find_empty_3.4.12 similarity index 93% rename from src/go/tests/doc/out/find_empty_3.4.7 rename to src/go/tests/doc/out/find_empty_3.4.12 index 770d2211..f84913eb 100644 --- a/src/go/tests/doc/out/find_empty_3.4.7 +++ b/src/go/tests/doc/out/find_empty_3.4.12 @@ -31,7 +31,7 @@ "nreturned" : 0, "responseLength" : 82, "protocol" : "op_command", - "millis" : 0, + "millis" : 42, "planSummary" : "EOF", "execStats" : { "stage" : "EOF", @@ -46,7 +46,7 @@ "isEOF" : 1, "invalidates" : 0 }, - "ts" : ISODate("2017-10-15T01:54:44.129Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/find_empty_3.5.11 b/src/go/tests/doc/out/find_empty_3.6.2 similarity index 93% rename from src/go/tests/doc/out/find_empty_3.5.11 rename to src/go/tests/doc/out/find_empty_3.6.2 index a7f5aa4e..ecf9919e 100644 --- a/src/go/tests/doc/out/find_empty_3.5.11 +++ b/src/go/tests/doc/out/find_empty_3.6.2 @@ -32,7 +32,7 @@ "nreturned" : 0, "responseLength" : 82, "protocol" : "op_msg", - "millis" : 0, + "millis" : 42, "planSummary" : "EOF", "execStats" : { "stage" : "EOF", @@ -47,7 +47,7 @@ "isEOF" : 1, "invalidates" : 0 }, - "ts" : ISODate("2017-10-15T01:54:54.870Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/find_with_sort_2.6.12 b/src/go/tests/doc/out/find_with_sort_2.6.12 index 241ed57f..67fd2d68 100644 --- a/src/go/tests/doc/out/find_with_sort_2.6.12 +++ b/src/go/tests/doc/out/find_with_sort_2.6.12 @@ -18,17 +18,17 @@ "numYield" : 0, "lockStats" : { "timeLockedMicros" : { - "r" : NumberLong(508), - "w" : NumberLong(0) + "r" : NumberLong(1234), + "w" : NumberLong(4321) }, "timeAcquiringMicros" : { - "r" : NumberLong(19), - "w" : NumberLong(38) + "r" : NumberLong(9876), + "w" : NumberLong(6789) } }, "nreturned" : 2, "responseLength" : 108, - "millis" : 0, + "millis" : 42, "execStats" : { "type" : "SORT", "works" : 7, @@ -95,7 +95,7 @@ } ] }, - "ts" : ISODate("2017-10-15T01:54:10.817Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/find_with_sort_3.0.15 b/src/go/tests/doc/out/find_with_sort_3.0.15 index 78dd4c31..d959754d 100644 --- a/src/go/tests/doc/out/find_with_sort_3.0.15 +++ b/src/go/tests/doc/out/find_with_sort_3.0.15 @@ -41,7 +41,7 @@ }, "nreturned" : 2, "responseLength" : 108, - "millis" : 0, + "millis" : 42, "execStats" : { "stage" : "SORT", "nReturned" : 2, @@ -117,7 +117,7 @@ } } }, - "ts" : ISODate("2017-10-15T01:54:20.410Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/find_with_sort_3.2.16 b/src/go/tests/doc/out/find_with_sort_3.2.19 similarity index 97% rename from src/go/tests/doc/out/find_with_sort_3.2.16 rename to src/go/tests/doc/out/find_with_sort_3.2.19 index 7f03c790..5525324f 100644 --- a/src/go/tests/doc/out/find_with_sort_3.2.16 +++ b/src/go/tests/doc/out/find_with_sort_3.2.19 @@ -37,7 +37,7 @@ "nreturned" : 2, "responseLength" : 194, "protocol" : "op_command", - "millis" : 0, + "millis" : 42, "execStats" : { "stage" : "SORT", "nReturned" : 2, @@ -116,7 +116,7 @@ } } }, - "ts" : ISODate("2017-10-15T01:54:33.762Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/find_with_sort_3.4.7 b/src/go/tests/doc/out/find_with_sort_3.4.12 similarity index 97% rename from src/go/tests/doc/out/find_with_sort_3.4.7 rename to src/go/tests/doc/out/find_with_sort_3.4.12 index 483ff0b2..0ccf7c2b 100644 --- a/src/go/tests/doc/out/find_with_sort_3.4.7 +++ b/src/go/tests/doc/out/find_with_sort_3.4.12 @@ -35,7 +35,7 @@ "nreturned" : 2, "responseLength" : 176, "protocol" : "op_command", - "millis" : 0, + "millis" : 42, "planSummary" : "IXSCAN { c: 1 }", "execStats" : { "stage" : "SORT", @@ -119,7 +119,7 @@ } } }, - "ts" : ISODate("2017-10-15T01:54:44.423Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/find_with_sort_3.5.11 b/src/go/tests/doc/out/find_with_sort_3.6.2 similarity index 97% rename from src/go/tests/doc/out/find_with_sort_3.5.11 rename to src/go/tests/doc/out/find_with_sort_3.6.2 index 4f9a85cc..45f9c143 100644 --- a/src/go/tests/doc/out/find_with_sort_3.5.11 +++ b/src/go/tests/doc/out/find_with_sort_3.6.2 @@ -36,7 +36,7 @@ "nreturned" : 2, "responseLength" : 176, "protocol" : "op_msg", - "millis" : 0, + "millis" : 42, "planSummary" : "IXSCAN { c: 1 }", "execStats" : { "stage" : "SORT", @@ -120,7 +120,7 @@ } } }, - "ts" : ISODate("2017-10-15T01:54:55.111Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/findandmodify_2.6.12 b/src/go/tests/doc/out/findandmodify_2.6.12 index 51329dd4..6cd8fe2f 100644 --- a/src/go/tests/doc/out/findandmodify_2.6.12 +++ b/src/go/tests/doc/out/findandmodify_2.6.12 @@ -25,20 +25,20 @@ "numYield" : 0, "lockStats" : { "timeLockedMicros" : { - "r" : NumberLong(0), - "w" : NumberLong(465) + "r" : NumberLong(1234), + "w" : NumberLong(4321) }, "timeAcquiringMicros" : { - "r" : NumberLong(0), - "w" : NumberLong(18) + "r" : NumberLong(9876), + "w" : NumberLong(6789) } }, "responseLength" : 131, - "millis" : 6, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:11.011Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/findandmodify_3.0.15 b/src/go/tests/doc/out/findandmodify_3.0.15 index 86d0d71f..d91cda0a 100644 --- a/src/go/tests/doc/out/findandmodify_3.0.15 +++ b/src/go/tests/doc/out/findandmodify_3.0.15 @@ -48,11 +48,11 @@ } }, "responseLength" : 131, - "millis" : 0, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:20.581Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/findandmodify_3.2.16 b/src/go/tests/doc/out/findandmodify_3.2.19 similarity index 92% rename from src/go/tests/doc/out/findandmodify_3.2.16 rename to src/go/tests/doc/out/findandmodify_3.2.19 index a418ac52..0192dfba 100644 --- a/src/go/tests/doc/out/findandmodify_3.2.16 +++ b/src/go/tests/doc/out/findandmodify_3.2.19 @@ -44,11 +44,11 @@ }, "responseLength" : 116, "protocol" : "op_command", - "millis" : 1, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:34.011Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/findandmodify_3.4.7 b/src/go/tests/doc/out/findandmodify_3.4.12 similarity index 96% rename from src/go/tests/doc/out/findandmodify_3.4.7 rename to src/go/tests/doc/out/findandmodify_3.4.12 index 6a75f883..fa22ba63 100644 --- a/src/go/tests/doc/out/findandmodify_3.4.7 +++ b/src/go/tests/doc/out/findandmodify_3.4.12 @@ -44,7 +44,7 @@ }, "responseLength" : 116, "protocol" : "op_command", - "millis" : 1, + "millis" : 42, "planSummary" : "COLLSCAN", "execStats" : { "stage" : "UPDATE", @@ -84,7 +84,7 @@ "docsExamined" : 3 } }, - "ts" : ISODate("2017-10-15T01:54:44.656Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/findandmodify_3.5.11 b/src/go/tests/doc/out/findandmodify_3.6.2 similarity index 96% rename from src/go/tests/doc/out/findandmodify_3.5.11 rename to src/go/tests/doc/out/findandmodify_3.6.2 index 728a8f43..f37bacc9 100644 --- a/src/go/tests/doc/out/findandmodify_3.5.11 +++ b/src/go/tests/doc/out/findandmodify_3.6.2 @@ -40,7 +40,7 @@ }, "responseLength" : 116, "protocol" : "op_msg", - "millis" : 1, + "millis" : 42, "planSummary" : "COLLSCAN", "execStats" : { "stage" : "UPDATE", @@ -80,7 +80,7 @@ "docsExamined" : 3 } }, - "ts" : ISODate("2017-10-15T01:54:55.391Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/geonear_2.6.12 b/src/go/tests/doc/out/geonear_2.6.12 index d87925c5..cef5b015 100644 --- a/src/go/tests/doc/out/geonear_2.6.12 +++ b/src/go/tests/doc/out/geonear_2.6.12 @@ -16,20 +16,20 @@ "numYield" : 0, "lockStats" : { "timeLockedMicros" : { - "r" : NumberLong(1945), - "w" : NumberLong(0) + "r" : NumberLong(1234), + "w" : NumberLong(4321) }, "timeAcquiringMicros" : { - "r" : NumberLong(10), - "w" : NumberLong(10) + "r" : NumberLong(9876), + "w" : NumberLong(6789) } }, "responseLength" : 1406, - "millis" : 1, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:11.181Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/geonear_3.0.15 b/src/go/tests/doc/out/geonear_3.0.15 index 234e7389..7b70194a 100644 --- a/src/go/tests/doc/out/geonear_3.0.15 +++ b/src/go/tests/doc/out/geonear_3.0.15 @@ -38,11 +38,11 @@ } }, "responseLength" : 1398, - "millis" : 2, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:20.751Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/geonear_3.2.16 b/src/go/tests/doc/out/geonear_3.2.19 similarity index 90% rename from src/go/tests/doc/out/geonear_3.2.16 rename to src/go/tests/doc/out/geonear_3.2.19 index 72c8f711..24f6bb49 100644 --- a/src/go/tests/doc/out/geonear_3.2.16 +++ b/src/go/tests/doc/out/geonear_3.2.19 @@ -34,11 +34,11 @@ }, "responseLength" : 1401, "protocol" : "op_command", - "millis" : 10, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:34.270Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/geonear_3.4.7 b/src/go/tests/doc/out/geonear_3.4.12 similarity index 99% rename from src/go/tests/doc/out/geonear_3.4.7 rename to src/go/tests/doc/out/geonear_3.4.12 index 7892287e..95b84e22 100644 --- a/src/go/tests/doc/out/geonear_3.4.7 +++ b/src/go/tests/doc/out/geonear_3.4.12 @@ -34,7 +34,7 @@ }, "responseLength" : 1383, "protocol" : "op_command", - "millis" : 13, + "millis" : 42, "planSummary" : "GEO_NEAR_2DSPHERE { loc: \"2dsphere\" }", "execStats" : { "stage" : "LIMIT", @@ -2088,7 +2088,7 @@ { "stage" : "FETCH", "nReturned" : 0, - "executionTimeMillisEstimate" : 0, + "executionTimeMillisEstimate" : 10, "works" : 5, "advanced" : 0, "needTime" : 4, @@ -2102,7 +2102,7 @@ "inputStage" : { "stage" : "IXSCAN", "nReturned" : 0, - "executionTimeMillisEstimate" : 0, + "executionTimeMillisEstimate" : 10, "works" : 5, "advanced" : 0, "needTime" : 4, @@ -3557,7 +3557,7 @@ } } }, - "ts" : ISODate("2017-10-15T01:54:44.873Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/geonear_3.5.11 b/src/go/tests/doc/out/geonear_3.6.2 similarity index 99% rename from src/go/tests/doc/out/geonear_3.5.11 rename to src/go/tests/doc/out/geonear_3.6.2 index 57fece10..e0440a16 100644 --- a/src/go/tests/doc/out/geonear_3.5.11 +++ b/src/go/tests/doc/out/geonear_3.6.2 @@ -35,12 +35,12 @@ }, "responseLength" : 1383, "protocol" : "op_msg", - "millis" : 11, + "millis" : 42, "planSummary" : "GEO_NEAR_2DSPHERE { loc: \"2dsphere\" }", "execStats" : { "stage" : "LIMIT", "nReturned" : 10, - "executionTimeMillisEstimate" : 10, + "executionTimeMillisEstimate" : 0, "works" : 139, "advanced" : 10, "needTime" : 128, @@ -53,7 +53,7 @@ "inputStage" : { "stage" : "PROJECTION", "nReturned" : 10, - "executionTimeMillisEstimate" : 10, + "executionTimeMillisEstimate" : 0, "works" : 139, "advanced" : 10, "needTime" : 128, @@ -3558,7 +3558,7 @@ } } }, - "ts" : ISODate("2017-10-15T01:54:55.701Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/getmore_2.6.12 b/src/go/tests/doc/out/getmore_2.6.12 index d50c6fdc..ff8eb10a 100644 --- a/src/go/tests/doc/out/getmore_2.6.12 +++ b/src/go/tests/doc/out/getmore_2.6.12 @@ -6,27 +6,27 @@ "$gt" : 0 } }, - "cursorid" : 73529665157, + "cursorid" : 74634673672, "ntoreturn" : 2, "keyUpdates" : 0, "numYield" : 0, "lockStats" : { "timeLockedMicros" : { - "r" : NumberLong(29), - "w" : NumberLong(0) + "r" : NumberLong(1234), + "w" : NumberLong(4321) }, "timeAcquiringMicros" : { - "r" : NumberLong(5), - "w" : NumberLong(4) + "r" : NumberLong(9876), + "w" : NumberLong(6789) } }, - "nreturned" : 2, - "responseLength" : 86, - "millis" : 0, + "nreturned" : 0, + "responseLength" : 20, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:11.360Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/getmore_3.0.15 b/src/go/tests/doc/out/getmore_3.0.15 index 59da152c..d38ffec5 100644 --- a/src/go/tests/doc/out/getmore_3.0.15 +++ b/src/go/tests/doc/out/getmore_3.0.15 @@ -6,7 +6,7 @@ "$gt" : 0 } }, - "cursorid" : 77879406118, + "cursorid" : 77823806376, "ntoreturn" : 2, "keyUpdates" : 0, "writeConflicts" : 0, @@ -35,11 +35,11 @@ }, "nreturned" : 0, "responseLength" : 20, - "millis" : 0, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:20.995Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/getmore_3.2.16 b/src/go/tests/doc/out/getmore_3.2.19 similarity index 82% rename from src/go/tests/doc/out/getmore_3.2.16 rename to src/go/tests/doc/out/getmore_3.2.19 index b73ff90c..f3ecf789 100644 --- a/src/go/tests/doc/out/getmore_3.2.16 +++ b/src/go/tests/doc/out/getmore_3.2.19 @@ -2,11 +2,11 @@ "op" : "getmore", "ns" : "test.coll", "query" : { - "getMore" : NumberLong("62137702161"), + "getMore" : NumberLong("62858772934"), "collection" : "coll", "batchSize" : 2 }, - "cursorid" : 62137702161, + "cursorid" : 62858772934, "keysExamined" : 0, "docsExamined" : 0, "cursorExhausted" : true, @@ -33,11 +33,11 @@ "nreturned" : 0, "responseLength" : 81, "protocol" : "op_command", - "millis" : 0, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:34.569Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/getmore_3.4.7 b/src/go/tests/doc/out/getmore_3.4.12 similarity index 79% rename from src/go/tests/doc/out/getmore_3.4.7 rename to src/go/tests/doc/out/getmore_3.4.12 index b76612a8..56adf2a8 100644 --- a/src/go/tests/doc/out/getmore_3.4.7 +++ b/src/go/tests/doc/out/getmore_3.4.12 @@ -2,7 +2,7 @@ "op" : "getmore", "ns" : "test.coll", "query" : { - "getMore" : NumberLong("66029137874"), + "getMore" : NumberLong("67665905999"), "collection" : "coll", "batchSize" : 2 }, @@ -18,9 +18,10 @@ "a" : 1 } }, - "cursorid" : 66029137874, - "keysExamined" : 2, - "docsExamined" : 2, + "cursorid" : 67665905999, + "keysExamined" : 0, + "docsExamined" : 0, + "cursorExhausted" : true, "numYield" : 0, "locks" : { "Global" : { @@ -39,22 +40,22 @@ } } }, - "nreturned" : 2, - "responseLength" : 153, + "nreturned" : 0, + "responseLength" : 81, "protocol" : "op_command", - "millis" : 0, + "millis" : 42, "planSummary" : "IXSCAN { a: 1 }", "execStats" : { "stage" : "FETCH", "nReturned" : 8, "executionTimeMillisEstimate" : 0, - "works" : 8, + "works" : 9, "advanced" : 8, "needTime" : 0, "needYield" : 0, - "saveState" : 3, - "restoreState" : 3, - "isEOF" : 0, + "saveState" : 4, + "restoreState" : 4, + "isEOF" : 1, "invalidates" : 0, "docsExamined" : 8, "alreadyHasObj" : 0, @@ -62,13 +63,13 @@ "stage" : "IXSCAN", "nReturned" : 8, "executionTimeMillisEstimate" : 0, - "works" : 8, + "works" : 9, "advanced" : 8, "needTime" : 0, "needYield" : 0, - "saveState" : 3, - "restoreState" : 3, - "isEOF" : 0, + "saveState" : 4, + "restoreState" : 4, + "isEOF" : 1, "invalidates" : 0, "keyPattern" : { "a" : 1 @@ -95,7 +96,7 @@ "seenInvalidated" : 0 } }, - "ts" : ISODate("2017-10-15T01:54:45.251Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/getmore_3.5.11 b/src/go/tests/doc/out/getmore_3.6.2 similarity index 93% rename from src/go/tests/doc/out/getmore_3.5.11 rename to src/go/tests/doc/out/getmore_3.6.2 index 6b9e77c8..99391d18 100644 --- a/src/go/tests/doc/out/getmore_3.5.11 +++ b/src/go/tests/doc/out/getmore_3.6.2 @@ -2,7 +2,7 @@ "op" : "getmore", "ns" : "test.coll", "command" : { - "getMore" : NumberLong("62495713089"), + "getMore" : NumberLong("62414596685"), "collection" : "coll", "batchSize" : 2, "$db" : "test" @@ -20,7 +20,7 @@ }, "$db" : "test" }, - "cursorid" : 62495713089, + "cursorid" : 62414596685, "keysExamined" : 0, "docsExamined" : 0, "cursorExhausted" : true, @@ -45,7 +45,7 @@ "nreturned" : 0, "responseLength" : 81, "protocol" : "op_msg", - "millis" : 0, + "millis" : 42, "planSummary" : "IXSCAN { a: 1 }", "execStats" : { "stage" : "FETCH", @@ -98,7 +98,7 @@ "seenInvalidated" : 0 } }, - "ts" : ISODate("2017-10-15T01:54:56.186Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/group_2.6.12 b/src/go/tests/doc/out/group_2.6.12 index ccc88964..c00a86ee 100644 --- a/src/go/tests/doc/out/group_2.6.12 +++ b/src/go/tests/doc/out/group_2.6.12 @@ -21,20 +21,20 @@ "numYield" : 0, "lockStats" : { "timeLockedMicros" : { - "r" : NumberLong(36629), - "w" : NumberLong(0) + "r" : NumberLong(1234), + "w" : NumberLong(4321) }, "timeAcquiringMicros" : { - "r" : NumberLong(6), - "w" : NumberLong(6) + "r" : NumberLong(9876), + "w" : NumberLong(6789) } }, "responseLength" : 135, - "millis" : 36, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:11.599Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/group_3.0.15 b/src/go/tests/doc/out/group_3.0.15 index 3f90e354..a60808b0 100644 --- a/src/go/tests/doc/out/group_3.0.15 +++ b/src/go/tests/doc/out/group_3.0.15 @@ -43,11 +43,11 @@ } }, "responseLength" : 139, - "millis" : 26, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:21.188Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/group_3.2.16 b/src/go/tests/doc/out/group_3.2.19 similarity index 91% rename from src/go/tests/doc/out/group_3.2.16 rename to src/go/tests/doc/out/group_3.2.19 index 4275f00f..7831e0e0 100644 --- a/src/go/tests/doc/out/group_3.2.16 +++ b/src/go/tests/doc/out/group_3.2.19 @@ -39,11 +39,11 @@ }, "responseLength" : 142, "protocol" : "op_command", - "millis" : 31, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:34.867Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/group_3.4.7 b/src/go/tests/doc/out/group_3.4.12 similarity index 95% rename from src/go/tests/doc/out/group_3.4.7 rename to src/go/tests/doc/out/group_3.4.12 index 2604d078..02a524f2 100644 --- a/src/go/tests/doc/out/group_3.4.7 +++ b/src/go/tests/doc/out/group_3.4.12 @@ -41,12 +41,12 @@ }, "responseLength" : 124, "protocol" : "op_command", - "millis" : 31, + "millis" : 42, "planSummary" : "IXSCAN { b: -1 }", "execStats" : { "stage" : "GROUP", "nReturned" : 1, - "executionTimeMillisEstimate" : 31, + "executionTimeMillisEstimate" : 33, "works" : 4, "advanced" : 1, "needTime" : 3, @@ -108,7 +108,7 @@ } } }, - "ts" : ISODate("2017-10-15T01:54:45.500Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/group_3.5.11 b/src/go/tests/doc/out/group_3.6.2 similarity index 95% rename from src/go/tests/doc/out/group_3.5.11 rename to src/go/tests/doc/out/group_3.6.2 index b79d3224..aa81c6c6 100644 --- a/src/go/tests/doc/out/group_3.5.11 +++ b/src/go/tests/doc/out/group_3.6.2 @@ -42,12 +42,12 @@ }, "responseLength" : 124, "protocol" : "op_msg", - "millis" : 24, + "millis" : 42, "planSummary" : "IXSCAN { b: -1 }", "execStats" : { "stage" : "GROUP", "nReturned" : 1, - "executionTimeMillisEstimate" : 25, + "executionTimeMillisEstimate" : 41, "works" : 4, "advanced" : 1, "needTime" : 3, @@ -109,7 +109,7 @@ } } }, - "ts" : ISODate("2017-10-15T01:54:56.478Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/insert_2.6.12 b/src/go/tests/doc/out/insert_2.6.12 index 4073f84c..174af2cd 100644 --- a/src/go/tests/doc/out/insert_2.6.12 +++ b/src/go/tests/doc/out/insert_2.6.12 @@ -9,19 +9,19 @@ "numYield" : 0, "lockStats" : { "timeLockedMicros" : { - "r" : NumberLong(0), - "w" : NumberLong(362) + "r" : NumberLong(1234), + "w" : NumberLong(4321) }, "timeAcquiringMicros" : { - "r" : NumberLong(0), - "w" : NumberLong(11) + "r" : NumberLong(9876), + "w" : NumberLong(6789) } }, - "millis" : 0, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:11.737Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/insert_3.0.15 b/src/go/tests/doc/out/insert_3.0.15 index 94e5434d..7005495a 100644 --- a/src/go/tests/doc/out/insert_3.0.15 +++ b/src/go/tests/doc/out/insert_3.0.15 @@ -37,11 +37,11 @@ } } }, - "millis" : 4, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:21.346Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/insert_3.2.16 b/src/go/tests/doc/out/insert_3.2.19 similarity index 91% rename from src/go/tests/doc/out/insert_3.2.16 rename to src/go/tests/doc/out/insert_3.2.19 index e033c994..06dcb022 100644 --- a/src/go/tests/doc/out/insert_3.2.16 +++ b/src/go/tests/doc/out/insert_3.2.19 @@ -36,11 +36,11 @@ }, "responseLength" : 25, "protocol" : "op_command", - "millis" : 11, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:35.088Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/insert_3.4.7 b/src/go/tests/doc/out/insert_3.4.12 similarity index 91% rename from src/go/tests/doc/out/insert_3.4.7 rename to src/go/tests/doc/out/insert_3.4.12 index 22d2dfb9..eb4b899f 100644 --- a/src/go/tests/doc/out/insert_3.4.7 +++ b/src/go/tests/doc/out/insert_3.4.12 @@ -34,8 +34,8 @@ }, "responseLength" : 29, "protocol" : "op_command", - "millis" : 11, - "ts" : ISODate("2017-10-15T01:54:45.681Z"), + "millis" : 42, + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/insert_3.5.11 b/src/go/tests/doc/out/insert_3.6.2 similarity index 90% rename from src/go/tests/doc/out/insert_3.5.11 rename to src/go/tests/doc/out/insert_3.6.2 index dc1b8872..d5ea2ff1 100644 --- a/src/go/tests/doc/out/insert_3.5.11 +++ b/src/go/tests/doc/out/insert_3.6.2 @@ -30,8 +30,8 @@ }, "responseLength" : 29, "protocol" : "op_msg", - "millis" : 11, - "ts" : ISODate("2017-10-15T01:54:56.693Z"), + "millis" : 42, + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/mapreduce_2.6.12 b/src/go/tests/doc/out/mapreduce_2.6.12 index 41e8a772..3be5958f 100644 --- a/src/go/tests/doc/out/mapreduce_2.6.12 +++ b/src/go/tests/doc/out/mapreduce_2.6.12 @@ -22,20 +22,20 @@ "numYield" : 0, "lockStats" : { "timeLockedMicros" : { - "r" : NumberLong(650), - "w" : NumberLong(0) + "r" : NumberLong(1234), + "w" : NumberLong(4321) }, "timeAcquiringMicros" : { - "r" : NumberLong(17), - "w" : NumberLong(15) + "r" : NumberLong(9876), + "w" : NumberLong(6789) } }, "responseLength" : 233, - "millis" : 29, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:11.959Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/mapreduce_3.0.15 b/src/go/tests/doc/out/mapreduce_3.0.15 index bfd14a96..0d30f2ad 100644 --- a/src/go/tests/doc/out/mapreduce_3.0.15 +++ b/src/go/tests/doc/out/mapreduce_3.0.15 @@ -49,11 +49,11 @@ } }, "responseLength" : 233, - "millis" : 21, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:21.559Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/mapreduce_3.2.16 b/src/go/tests/doc/out/mapreduce_3.2.19 similarity index 93% rename from src/go/tests/doc/out/mapreduce_3.2.16 rename to src/go/tests/doc/out/mapreduce_3.2.19 index b60d4849..2d3cf436 100644 --- a/src/go/tests/doc/out/mapreduce_3.2.16 +++ b/src/go/tests/doc/out/mapreduce_3.2.19 @@ -49,11 +49,11 @@ }, "responseLength" : 218, "protocol" : "op_command", - "millis" : 41, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:35.348Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/mapreduce_3.4.7 b/src/go/tests/doc/out/mapreduce_3.4.12 similarity index 85% rename from src/go/tests/doc/out/mapreduce_3.4.7 rename to src/go/tests/doc/out/mapreduce_3.4.12 index 8e355963..7675d9f2 100644 --- a/src/go/tests/doc/out/mapreduce_3.4.7 +++ b/src/go/tests/doc/out/mapreduce_3.4.12 @@ -20,11 +20,11 @@ }, "keysExamined" : 3, "docsExamined" : 3, - "numYield" : 1, + "numYield" : 0, "locks" : { "Global" : { "acquireCount" : { - "r" : NumberLong(13), + "r" : NumberLong(11), "w" : NumberLong(1) } }, @@ -32,7 +32,7 @@ "acquireCount" : { "r" : NumberLong(3), "w" : NumberLong(1), - "R" : NumberLong(3) + "R" : NumberLong(2) } }, "Collection" : { @@ -49,18 +49,18 @@ }, "responseLength" : 218, "protocol" : "op_command", - "millis" : 21, + "millis" : 42, "planSummary" : "IXSCAN { a: 1 }", "execStats" : { "stage" : "FETCH", "nReturned" : 3, - "executionTimeMillisEstimate" : 11, + "executionTimeMillisEstimate" : 0, "works" : 4, "advanced" : 3, "needTime" : 0, "needYield" : 0, - "saveState" : 1, - "restoreState" : 1, + "saveState" : 0, + "restoreState" : 0, "isEOF" : 1, "invalidates" : 0, "docsExamined" : 3, @@ -68,13 +68,13 @@ "inputStage" : { "stage" : "IXSCAN", "nReturned" : 3, - "executionTimeMillisEstimate" : 11, + "executionTimeMillisEstimate" : 0, "works" : 4, "advanced" : 3, "needTime" : 0, "needYield" : 0, - "saveState" : 1, - "restoreState" : 1, + "saveState" : 0, + "restoreState" : 0, "isEOF" : 1, "invalidates" : 0, "keyPattern" : { @@ -102,7 +102,7 @@ "seenInvalidated" : 0 } }, - "ts" : ISODate("2017-10-15T01:54:45.925Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/mapreduce_3.5.11 b/src/go/tests/doc/out/mapreduce_3.6.2 similarity index 96% rename from src/go/tests/doc/out/mapreduce_3.5.11 rename to src/go/tests/doc/out/mapreduce_3.6.2 index 89063fd7..d22db423 100644 --- a/src/go/tests/doc/out/mapreduce_3.5.11 +++ b/src/go/tests/doc/out/mapreduce_3.6.2 @@ -50,7 +50,7 @@ }, "responseLength" : 218, "protocol" : "op_msg", - "millis" : 26, + "millis" : 42, "planSummary" : "IXSCAN { a: 1 }", "execStats" : { "stage" : "FETCH", @@ -103,7 +103,7 @@ "seenInvalidated" : 0 } }, - "ts" : ISODate("2017-10-15T01:54:56.951Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/update_2.6.12 b/src/go/tests/doc/out/update_2.6.12 index ce5d69c7..d339fc5f 100644 --- a/src/go/tests/doc/out/update_2.6.12 +++ b/src/go/tests/doc/out/update_2.6.12 @@ -22,19 +22,19 @@ "numYield" : 0, "lockStats" : { "timeLockedMicros" : { - "r" : NumberLong(0), - "w" : NumberLong(241) + "r" : NumberLong(1234), + "w" : NumberLong(4321) }, "timeAcquiringMicros" : { - "r" : NumberLong(0), - "w" : NumberLong(16) + "r" : NumberLong(9876), + "w" : NumberLong(6789) } }, - "millis" : 0, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:12.161Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/update_3.0.15 b/src/go/tests/doc/out/update_3.0.15 index a20162f7..7ec6c9b4 100644 --- a/src/go/tests/doc/out/update_3.0.15 +++ b/src/go/tests/doc/out/update_3.0.15 @@ -44,11 +44,11 @@ } } }, - "millis" : 0, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:21.803Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/update_3.2.16 b/src/go/tests/doc/out/update_3.2.19 similarity index 91% rename from src/go/tests/doc/out/update_3.2.16 rename to src/go/tests/doc/out/update_3.2.19 index 6837faf8..be84745c 100644 --- a/src/go/tests/doc/out/update_3.2.16 +++ b/src/go/tests/doc/out/update_3.2.19 @@ -39,11 +39,11 @@ } } }, - "millis" : 2, + "millis" : 42, "execStats" : { }, - "ts" : ISODate("2017-10-15T01:54:35.583Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "allUsers" : [ ], "user" : "" diff --git a/src/go/tests/doc/out/update_3.4.7 b/src/go/tests/doc/out/update_3.4.12 similarity index 97% rename from src/go/tests/doc/out/update_3.4.7 rename to src/go/tests/doc/out/update_3.4.12 index 67a1b06b..1f2253a7 100644 --- a/src/go/tests/doc/out/update_3.4.7 +++ b/src/go/tests/doc/out/update_3.4.12 @@ -39,7 +39,7 @@ } } }, - "millis" : 0, + "millis" : 42, "planSummary" : "IXSCAN { a: 1 }", "execStats" : { "stage" : "UPDATE", @@ -110,7 +110,7 @@ } } }, - "ts" : ISODate("2017-10-15T01:54:46.168Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/out/update_3.5.11 b/src/go/tests/doc/out/update_3.6.2 similarity index 97% rename from src/go/tests/doc/out/update_3.5.11 rename to src/go/tests/doc/out/update_3.6.2 index e30d0689..f57e004e 100644 --- a/src/go/tests/doc/out/update_3.5.11 +++ b/src/go/tests/doc/out/update_3.6.2 @@ -43,7 +43,7 @@ } } }, - "millis" : 0, + "millis" : 42, "planSummary" : "IXSCAN { a: 1 }", "execStats" : { "stage" : "UPDATE", @@ -114,7 +114,7 @@ } } }, - "ts" : ISODate("2017-10-15T01:54:57.231Z"), + "ts" : ISODate("2020-01-01T00:00:00Z"), "client" : "127.0.0.1", "appName" : "MongoDB Shell", "allUsers" : [ ], diff --git a/src/go/tests/doc/run.sh b/src/go/tests/doc/run.sh index cfa56dcb..213abc26 100755 --- a/src/go/tests/doc/run.sh +++ b/src/go/tests/doc/run.sh @@ -3,20 +3,23 @@ set -e set -x -## declare an array of images +## Declare an array of images. declare -a images=( - "mongo:2.6" - "mongo:3.0" - "mongo:3.2" - "mongo:3.4" - "mongo:3.5" + "mongo:2.6.12" + "mongo:3.0.15" + "mongo:3.2.19" + "mongo:3.4.12" + "mongo:3.6.2" ) -## now loop through the above array of images +## Run docker-compose from the location of the script. +cd $(dirname $0) + +## Now loop through the above array of images. for image in "${images[@]}" do - export MONGO_IMAGE=$image - # clean up old instance if it got left running e.g. after ctrl+c + export MONGO_IMAGE=${image} + # Clean up old instance if it got left running e.g. after ctrl+c. docker-compose down -v docker-compose up -d docker-compose exec mongo sh /script/main.sh diff --git a/src/go/tests/doc/script/func/db_version.func b/src/go/tests/doc/script/func/db_version.func index b79cadd5..8b72c6b7 100644 --- a/src/go/tests/doc/script/func/db_version.func +++ b/src/go/tests/doc/script/func/db_version.func @@ -1,5 +1,5 @@ #!/bin/sh db_version() { - mongo --quiet --eval 'db.version()' + mongo --quiet --eval 'db.serverBuildInfo().versionArray.slice(0,3).join(".")' } diff --git a/src/go/tests/doc/script/func/get_single_profile.func b/src/go/tests/doc/script/func/get_single_profile.func index bb5c8b21..28cc1ef4 100644 --- a/src/go/tests/doc/script/func/get_single_profile.func +++ b/src/go/tests/doc/script/func/get_single_profile.func @@ -2,6 +2,37 @@ get_single_profile() { mongo --quiet <<'EOF' - db.system.profile.find().limit(1).sort( { ts : -1 } ).pretty() + { + var sp = db.system.profile.find().sort( { ts : -1 } ).limit(1).toArray() + if ("ts" in sp[0]) { + sp[0].ts = ISODate("2020-01-01T00:00:00.000Z") + } + if ("millis" in sp[0]) { + sp[0].millis = 42 + } + if ("lockStats" in sp[0]) { + if ("timeLockedMicros" in sp[0].lockStats) { + if ("r" in sp[0].lockStats.timeLockedMicros) { + sp[0].lockStats.timeLockedMicros.r = NumberLong(1234) + sp[0].lockStats.timeLockedMicros.w = NumberLong(4321) + } + if ("R" in sp[0].lockStats.timeLockedMicros) { + sp[0].lockStats.timeLockedMicros.R = NumberLong(1234) + sp[0].lockStats.timeLockedMicros.W = NumberLong(4321) + } + } + if ("timeAcquiringMicros" in sp[0].lockStats) { + if ("r" in sp[0].lockStats.timeAcquiringMicros) { + sp[0].lockStats.timeAcquiringMicros.r = NumberLong(9876) + sp[0].lockStats.timeAcquiringMicros.w = NumberLong(6789) + } + if ("R" in sp[0].lockStats.timeAcquiringMicros) { + sp[0].lockStats.timeAcquiringMicros.R = NumberLong(9876) + sp[0].lockStats.timeAcquiringMicros.W = NumberLong(6789) + } + } + } + printjson(sp[0]) + } EOF } diff --git a/src/go/tests/doc/script/main.sh b/src/go/tests/doc/script/main.sh index c33613a7..e3829c87 100755 --- a/src/go/tests/doc/script/main.sh +++ b/src/go/tests/doc/script/main.sh @@ -20,7 +20,7 @@ done # declare list of profile funcs to run profiles=$(ls $DIR/profile) -MONGO_VERSION=$(db_version) +MONGO_VERSION="$(db_version)" RESULT_DIR=${RESULT_DIR:-/out} # turn on profiling diff --git a/src/go/tests/expect/available_metrics/available_metrics b/src/go/tests/expect/available_metrics/available_metrics index db9bf2fc..9720c4fe 100755 --- a/src/go/tests/expect/available_metrics/available_metrics +++ b/src/go/tests/expect/available_metrics/available_metrics @@ -1,214 +1,214 @@ { "aggregate": { "2.6.12": { - "Millis": 0, + "Millis": 42, "ResponseLength": 385 }, "3.0.15": { - "Millis": 0, + "Millis": 42, "ResponseLength": 385 }, - "3.2.16": { - "Millis": 0, + "3.2.19": { + "Millis": 42, "ResponseLength": 388 }, - "3.4.7": { + "3.4.12": { "DocsExamined": 8, - "Millis": 0, + "Millis": 42, "Nreturned": 8, "ResponseLength": 370 }, - "3.5.11": { + "3.6.2": { "DocsExamined": 8, - "Millis": 2, + "Millis": 42, "Nreturned": 8, "ResponseLength": 370 } }, "count": { "2.6.12": { - "Millis": 0, + "Millis": 42, "ResponseLength": 48 }, "3.0.15": { - "Millis": 0, + "Millis": 42, "ResponseLength": 44 }, - "3.2.16": { - "Millis": 0, + "3.2.19": { + "Millis": 42, "ResponseLength": 47 }, - "3.4.7": { + "3.4.12": { "DocsExamined": 0, - "Millis": 0, + "Millis": 42, "ResponseLength": 29 }, - "3.5.11": { + "3.6.2": { "DocsExamined": 0, - "Millis": 0, + "Millis": 42, "ResponseLength": 29 } }, "count_with_query": { "2.6.12": { - "Millis": 0, + "Millis": 42, "ResponseLength": 48 }, "3.0.15": { - "Millis": 0, + "Millis": 42, "ResponseLength": 44 }, - "3.2.16": { - "Millis": 0, + "3.2.19": { + "Millis": 42, "ResponseLength": 47 }, - "3.4.7": { + "3.4.12": { "DocsExamined": 10, - "Millis": 0, + "Millis": 42, "ResponseLength": 29 }, - "3.5.11": { + "3.6.2": { "DocsExamined": 10, - "Millis": 0, + "Millis": 42, "ResponseLength": 29 } }, "delete": { "2.6.12": { - "Millis": 0 + "Millis": 42 }, "3.0.15": { - "Millis": 0 + "Millis": 42 }, - "3.2.16": { - "Millis": 1 + "3.2.19": { + "Millis": 42 }, - "3.4.7": { + "3.4.12": { "DocsExamined": 1, - "Millis": 0 + "Millis": 42 }, - "3.5.11": { + "3.6.2": { "DocsExamined": 1, - "Millis": 1 + "Millis": 42 } }, "delete_all": { "2.6.12": { - "Millis": 0 + "Millis": 42 }, "3.0.15": { - "Millis": 0 + "Millis": 42 }, - "3.2.16": { - "Millis": 1 + "3.2.19": { + "Millis": 42 }, - "3.4.7": { + "3.4.12": { "DocsExamined": 8, - "Millis": 1 + "Millis": 42 }, - "3.5.11": { + "3.6.2": { "DocsExamined": 8, - "Millis": 1 + "Millis": 42 } }, "distinct": { "2.6.12": { - "Millis": 0, + "Millis": 42, "ResponseLength": 199 }, "3.0.15": { - "Millis": 0, + "Millis": 42, "ResponseLength": 206 }, - "3.2.16": { - "Millis": 0, + "3.2.19": { + "Millis": 42, "ResponseLength": 209 }, - "3.4.7": { + "3.4.12": { "DocsExamined": 5, - "Millis": 0, + "Millis": 42, "ResponseLength": 90 }, - "3.5.11": { + "3.6.2": { "DocsExamined": 5, - "Millis": 0, + "Millis": 42, "ResponseLength": 90 } }, "eval": { "2.6.12": { - "Millis": 43, + "Millis": 42, "ResponseLength": 53 }, "3.0.15": { - "Millis": 37, + "Millis": 42, "ResponseLength": 53 }, - "3.2.16": { - "Millis": 56, + "3.2.19": { + "Millis": 42, "ResponseLength": 38 }, - "3.4.7": { - "Millis": 48, + "3.4.12": { + "Millis": 42, "ResponseLength": 38 }, - "3.5.11": { - "Millis": 40, + "3.6.2": { + "Millis": 42, "ResponseLength": 38 } }, "explain": { "2.6.12": { "NscannedObjects": 10, - "Millis": 0, + "Millis": 42, "Nreturned": 1, "ResponseLength": 583 }, "3.0.15": { - "Millis": 0, + "Millis": 42, "ResponseLength": 379 }, - "3.2.16": { - "Millis": 0, + "3.2.19": { + "Millis": 42, "ResponseLength": 364 }, - "3.4.7": { - "Millis": 0, - "ResponseLength": 328 - }, - "3.5.11": { - "Millis": 0, + "3.4.12": { + "Millis": 42, "ResponseLength": 329 + }, + "3.6.2": { + "Millis": 42, + "ResponseLength": 328 } }, "find": { "2.6.12": { "NscannedObjects": 2, - "Millis": 0, + "Millis": 42, "Nreturned": 2, "ResponseLength": 86 }, "3.0.15": { "NscannedObjects": 2, - "Millis": 0, + "Millis": 42, "Nreturned": 2, "ResponseLength": 86 }, - "3.2.16": { + "3.2.19": { "DocsExamined": 2, - "Millis": 1, + "Millis": 42, "Nreturned": 2, "ResponseLength": 172 }, - "3.4.7": { + "3.4.12": { "DocsExamined": 2, - "Millis": 0, + "Millis": 42, "Nreturned": 2, "ResponseLength": 154 }, - "3.5.11": { + "3.6.2": { "DocsExamined": 2, - "Millis": 0, + "Millis": 42, "Nreturned": 2, "ResponseLength": 154 } @@ -216,31 +216,31 @@ "find_andrii": { "2.6.12": { "NscannedObjects": 0, - "Millis": 0, + "Millis": 42, "Nreturned": 0, "ResponseLength": 20 }, "3.0.15": { "NscannedObjects": 0, - "Millis": 0, + "Millis": 42, "Nreturned": 0, "ResponseLength": 20 }, - "3.2.16": { + "3.2.19": { "DocsExamined": 0, - "Millis": 0, + "Millis": 42, "Nreturned": 0, "ResponseLength": 100 }, - "3.4.7": { + "3.4.12": { "DocsExamined": 0, - "Millis": 0, + "Millis": 42, "Nreturned": 0, "ResponseLength": 82 }, - "3.5.11": { + "3.6.2": { "DocsExamined": 0, - "Millis": 0, + "Millis": 42, "Nreturned": 0, "ResponseLength": 82 } @@ -248,31 +248,31 @@ "find_empty": { "2.6.12": { "NscannedObjects": 0, - "Millis": 0, + "Millis": 42, "Nreturned": 0, "ResponseLength": 20 }, "3.0.15": { "NscannedObjects": 0, - "Millis": 0, + "Millis": 42, "Nreturned": 0, "ResponseLength": 20 }, - "3.2.16": { + "3.2.19": { "DocsExamined": 0, - "Millis": 0, + "Millis": 42, "Nreturned": 0, "ResponseLength": 100 }, - "3.4.7": { + "3.4.12": { "DocsExamined": 0, - "Millis": 0, + "Millis": 42, "Nreturned": 0, "ResponseLength": 82 }, - "3.5.11": { + "3.6.2": { "DocsExamined": 0, - "Millis": 0, + "Millis": 42, "Nreturned": 0, "ResponseLength": 82 } @@ -280,142 +280,142 @@ "findandmodify": { "2.6.12": { "NscannedObjects": 1, - "Millis": 6, + "Millis": 42, "ResponseLength": 131 }, "3.0.15": { "NscannedObjects": 1, - "Millis": 0, + "Millis": 42, "ResponseLength": 131 }, - "3.2.16": { + "3.2.19": { "DocsExamined": 3, - "Millis": 1, + "Millis": 42, "ResponseLength": 116 }, - "3.4.7": { + "3.4.12": { "DocsExamined": 3, - "Millis": 1, + "Millis": 42, "ResponseLength": 116 }, - "3.5.11": { + "3.6.2": { "DocsExamined": 3, - "Millis": 1, + "Millis": 42, "ResponseLength": 116 } }, "geonear": { "2.6.12": { - "Millis": 1, + "Millis": 42, "ResponseLength": 1406 }, "3.0.15": { - "Millis": 2, + "Millis": 42, "ResponseLength": 1398 }, - "3.2.16": { - "Millis": 10, + "3.2.19": { + "Millis": 42, "ResponseLength": 1401 }, - "3.4.7": { + "3.4.12": { "DocsExamined": 10, - "Millis": 13, + "Millis": 42, "ResponseLength": 1383 }, - "3.5.11": { + "3.6.2": { "DocsExamined": 10, - "Millis": 11, + "Millis": 42, "ResponseLength": 1383 } }, "group": { "2.6.12": { - "Millis": 36, + "Millis": 42, "ResponseLength": 135 }, "3.0.15": { - "Millis": 26, + "Millis": 42, "ResponseLength": 139 }, - "3.2.16": { - "Millis": 31, + "3.2.19": { + "Millis": 42, "ResponseLength": 142 }, - "3.4.7": { + "3.4.12": { "DocsExamined": 2, - "Millis": 31, + "Millis": 42, "ResponseLength": 124 }, - "3.5.11": { + "3.6.2": { "DocsExamined": 2, - "Millis": 24, + "Millis": 42, "ResponseLength": 124 } }, "insert": { "2.6.12": { - "Millis": 0 + "Millis": 42 }, "3.0.15": { - "Millis": 4 + "Millis": 42 }, - "3.2.16": { - "Millis": 11, + "3.2.19": { + "Millis": 42, "ResponseLength": 25 }, - "3.4.7": { - "Millis": 11, + "3.4.12": { + "Millis": 42, "ResponseLength": 29 }, - "3.5.11": { - "Millis": 11, + "3.6.2": { + "Millis": 42, "ResponseLength": 29 } }, "mapreduce": { "2.6.12": { - "Millis": 29, + "Millis": 42, "ResponseLength": 233 }, "3.0.15": { - "Millis": 21, + "Millis": 42, "ResponseLength": 233 }, - "3.2.16": { - "Millis": 41, + "3.2.19": { + "Millis": 42, "ResponseLength": 218 }, - "3.4.7": { + "3.4.12": { "DocsExamined": 3, - "Millis": 21, + "Millis": 42, "ResponseLength": 218 }, - "3.5.11": { + "3.6.2": { "DocsExamined": 3, - "Millis": 26, + "Millis": 42, "ResponseLength": 218 } }, "update": { "2.6.12": { "NscannedObjects": 1, - "Millis": 0 + "Millis": 42 }, "3.0.15": { "NscannedObjects": 1, - "Millis": 0 + "Millis": 42 }, - "3.2.16": { + "3.2.19": { "DocsExamined": 1, - "Millis": 2 + "Millis": 42 }, - "3.4.7": { + "3.4.12": { "DocsExamined": 1, - "Millis": 0 + "Millis": 42 }, - "3.5.11": { + "3.6.2": { "DocsExamined": 1, - "Millis": 0 + "Millis": 42 } } } \ No newline at end of file diff --git a/src/go/tests/expect/available_metrics/cmd_metric b/src/go/tests/expect/available_metrics/cmd_metric index 31ee3e8a..caffa720 100755 --- a/src/go/tests/expect/available_metrics/cmd_metric +++ b/src/go/tests/expect/available_metrics/cmd_metric @@ -4,12 +4,12 @@ "yes" ], "Docs Returned": [ - "3.4.7", - "3.5.11" + "3.4.12", + "3.6.2" ], "Docs Scanned": [ - "3.4.7", - "3.5.11" + "3.4.12", + "3.6.2" ], "Query Time": [ "yes" @@ -23,8 +23,8 @@ "no" ], "Docs Scanned": [ - "3.4.7", - "3.5.11" + "3.4.12", + "3.6.2" ], "Query Time": [ "yes" @@ -38,8 +38,8 @@ "no" ], "Docs Scanned": [ - "3.4.7", - "3.5.11" + "3.4.12", + "3.6.2" ], "Query Time": [ "yes" @@ -53,8 +53,8 @@ "no" ], "Docs Scanned": [ - "3.4.7", - "3.5.11" + "3.4.12", + "3.6.2" ], "Query Time": [ "yes" @@ -68,8 +68,8 @@ "no" ], "Docs Scanned": [ - "3.4.7", - "3.5.11" + "3.4.12", + "3.6.2" ], "Query Time": [ "yes" @@ -83,8 +83,8 @@ "no" ], "Docs Scanned": [ - "3.4.7", - "3.5.11" + "3.4.12", + "3.6.2" ], "Query Time": [ "yes" @@ -182,8 +182,8 @@ "no" ], "Docs Scanned": [ - "3.4.7", - "3.5.11" + "3.4.12", + "3.6.2" ], "Query Time": [ "yes" @@ -197,8 +197,8 @@ "no" ], "Docs Scanned": [ - "3.4.7", - "3.5.11" + "3.4.12", + "3.6.2" ], "Query Time": [ "yes" @@ -206,9 +206,9 @@ }, "insert": { "Bytes Sent": [ - "3.2.16", - "3.4.7", - "3.5.11" + "3.2.19", + "3.4.12", + "3.6.2" ], "Docs Returned": [ "no" @@ -228,8 +228,8 @@ "no" ], "Docs Scanned": [ - "3.4.7", - "3.5.11" + "3.4.12", + "3.6.2" ], "Query Time": [ "yes" diff --git a/src/go/tests/expect/available_metrics/cmd_metric.md b/src/go/tests/expect/available_metrics/cmd_metric.md index ab6f000b..1c00dde7 100755 --- a/src/go/tests/expect/available_metrics/cmd_metric.md +++ b/src/go/tests/expect/available_metrics/cmd_metric.md @@ -1,19 +1,19 @@ | | Bytes Sent | Docs Returned | Docs Scanned | Query Time | | - | - | - | - | - | -| aggregate | yes | 3.4.7, 3.5.11 | 3.4.7, 3.5.11 | yes | -| count | yes | no | 3.4.7, 3.5.11 | yes | -| count_with_query | yes | no | 3.4.7, 3.5.11 | yes | -| delete | no | no | 3.4.7, 3.5.11 | yes | -| delete_all | no | no | 3.4.7, 3.5.11 | yes | -| distinct | yes | no | 3.4.7, 3.5.11 | yes | +| aggregate | yes | 3.4.12, 3.6.2 | 3.4.12, 3.6.2 | yes | +| count | yes | no | 3.4.12, 3.6.2 | yes | +| count_with_query | yes | no | 3.4.12, 3.6.2 | yes | +| delete | no | no | 3.4.12, 3.6.2 | yes | +| delete_all | no | no | 3.4.12, 3.6.2 | yes | +| distinct | yes | no | 3.4.12, 3.6.2 | yes | | eval | yes | no | no | yes | | explain | yes | 2.6.12 | 2.6.12 | yes | | find | yes | yes | yes | yes | | find_andrii | yes | yes | yes | yes | | find_empty | yes | yes | yes | yes | | findandmodify | yes | no | yes | yes | -| geonear | yes | no | 3.4.7, 3.5.11 | yes | -| group | yes | no | 3.4.7, 3.5.11 | yes | -| insert | 3.2.16, 3.4.7, 3.5.11 | no | no | yes | -| mapreduce | yes | no | 3.4.7, 3.5.11 | yes | +| geonear | yes | no | 3.4.12, 3.6.2 | yes | +| group | yes | no | 3.4.12, 3.6.2 | yes | +| insert | 3.2.19, 3.4.12, 3.6.2 | no | no | yes | +| mapreduce | yes | no | 3.4.12, 3.6.2 | yes | | update | no | no | yes | yes | \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/aggregate_2.6.12 b/src/go/tests/expect/fingerprints/aggregate_2.6.12 new file mode 100755 index 00000000..df2c01b1 --- /dev/null +++ b/src/go/tests/expect/fingerprints/aggregate_2.6.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "AGGREGATE", + "Collection": "coll", + "Database": "test", + "Keys": "a", + "Fingerprint": "AGGREGATE coll a" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/aggregate_3.0.15 b/src/go/tests/expect/fingerprints/aggregate_3.0.15 new file mode 100755 index 00000000..df2c01b1 --- /dev/null +++ b/src/go/tests/expect/fingerprints/aggregate_3.0.15 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "AGGREGATE", + "Collection": "coll", + "Database": "test", + "Keys": "a", + "Fingerprint": "AGGREGATE coll a" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/aggregate_3.2.19 b/src/go/tests/expect/fingerprints/aggregate_3.2.19 new file mode 100755 index 00000000..df2c01b1 --- /dev/null +++ b/src/go/tests/expect/fingerprints/aggregate_3.2.19 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "AGGREGATE", + "Collection": "coll", + "Database": "test", + "Keys": "a", + "Fingerprint": "AGGREGATE coll a" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/aggregate_3.4.12 b/src/go/tests/expect/fingerprints/aggregate_3.4.12 new file mode 100755 index 00000000..df2c01b1 --- /dev/null +++ b/src/go/tests/expect/fingerprints/aggregate_3.4.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "AGGREGATE", + "Collection": "coll", + "Database": "test", + "Keys": "a", + "Fingerprint": "AGGREGATE coll a" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/aggregate_3.6.2 b/src/go/tests/expect/fingerprints/aggregate_3.6.2 new file mode 100755 index 00000000..df2c01b1 --- /dev/null +++ b/src/go/tests/expect/fingerprints/aggregate_3.6.2 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "AGGREGATE", + "Collection": "coll", + "Database": "test", + "Keys": "a", + "Fingerprint": "AGGREGATE coll a" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/count_2.6.12 b/src/go/tests/expect/fingerprints/count_2.6.12 new file mode 100755 index 00000000..187a8b7f --- /dev/null +++ b/src/go/tests/expect/fingerprints/count_2.6.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "COUNT", + "Collection": "coll", + "Database": "test", + "Keys": "", + "Fingerprint": "COUNT coll" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/count_3.0.15 b/src/go/tests/expect/fingerprints/count_3.0.15 new file mode 100755 index 00000000..187a8b7f --- /dev/null +++ b/src/go/tests/expect/fingerprints/count_3.0.15 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "COUNT", + "Collection": "coll", + "Database": "test", + "Keys": "", + "Fingerprint": "COUNT coll" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/count_3.2.19 b/src/go/tests/expect/fingerprints/count_3.2.19 new file mode 100755 index 00000000..187a8b7f --- /dev/null +++ b/src/go/tests/expect/fingerprints/count_3.2.19 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "COUNT", + "Collection": "coll", + "Database": "test", + "Keys": "", + "Fingerprint": "COUNT coll" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/count_3.4.12 b/src/go/tests/expect/fingerprints/count_3.4.12 new file mode 100755 index 00000000..187a8b7f --- /dev/null +++ b/src/go/tests/expect/fingerprints/count_3.4.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "COUNT", + "Collection": "coll", + "Database": "test", + "Keys": "", + "Fingerprint": "COUNT coll" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/count_3.6.2 b/src/go/tests/expect/fingerprints/count_3.6.2 new file mode 100755 index 00000000..187a8b7f --- /dev/null +++ b/src/go/tests/expect/fingerprints/count_3.6.2 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "COUNT", + "Collection": "coll", + "Database": "test", + "Keys": "", + "Fingerprint": "COUNT coll" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/count_with_query_2.6.12 b/src/go/tests/expect/fingerprints/count_with_query_2.6.12 new file mode 100755 index 00000000..4b4cd435 --- /dev/null +++ b/src/go/tests/expect/fingerprints/count_with_query_2.6.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "COUNT", + "Collection": "coll", + "Database": "test", + "Keys": "a", + "Fingerprint": "COUNT coll a" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/count_with_query_3.0.15 b/src/go/tests/expect/fingerprints/count_with_query_3.0.15 new file mode 100755 index 00000000..4b4cd435 --- /dev/null +++ b/src/go/tests/expect/fingerprints/count_with_query_3.0.15 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "COUNT", + "Collection": "coll", + "Database": "test", + "Keys": "a", + "Fingerprint": "COUNT coll a" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/count_with_query_3.2.19 b/src/go/tests/expect/fingerprints/count_with_query_3.2.19 new file mode 100755 index 00000000..4b4cd435 --- /dev/null +++ b/src/go/tests/expect/fingerprints/count_with_query_3.2.19 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "COUNT", + "Collection": "coll", + "Database": "test", + "Keys": "a", + "Fingerprint": "COUNT coll a" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/count_with_query_3.4.12 b/src/go/tests/expect/fingerprints/count_with_query_3.4.12 new file mode 100755 index 00000000..4b4cd435 --- /dev/null +++ b/src/go/tests/expect/fingerprints/count_with_query_3.4.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "COUNT", + "Collection": "coll", + "Database": "test", + "Keys": "a", + "Fingerprint": "COUNT coll a" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/count_with_query_3.6.2 b/src/go/tests/expect/fingerprints/count_with_query_3.6.2 new file mode 100755 index 00000000..4b4cd435 --- /dev/null +++ b/src/go/tests/expect/fingerprints/count_with_query_3.6.2 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "COUNT", + "Collection": "coll", + "Database": "test", + "Keys": "a", + "Fingerprint": "COUNT coll a" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/delete_2.6.12 b/src/go/tests/expect/fingerprints/delete_2.6.12 new file mode 100755 index 00000000..509c8dac --- /dev/null +++ b/src/go/tests/expect/fingerprints/delete_2.6.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "REMOVE", + "Collection": "coll", + "Database": "test", + "Keys": "a,b", + "Fingerprint": "REMOVE coll a,b" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/delete_3.0.15 b/src/go/tests/expect/fingerprints/delete_3.0.15 new file mode 100755 index 00000000..509c8dac --- /dev/null +++ b/src/go/tests/expect/fingerprints/delete_3.0.15 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "REMOVE", + "Collection": "coll", + "Database": "test", + "Keys": "a,b", + "Fingerprint": "REMOVE coll a,b" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/delete_3.2.19 b/src/go/tests/expect/fingerprints/delete_3.2.19 new file mode 100755 index 00000000..509c8dac --- /dev/null +++ b/src/go/tests/expect/fingerprints/delete_3.2.19 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "REMOVE", + "Collection": "coll", + "Database": "test", + "Keys": "a,b", + "Fingerprint": "REMOVE coll a,b" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/delete_3.4.12 b/src/go/tests/expect/fingerprints/delete_3.4.12 new file mode 100755 index 00000000..509c8dac --- /dev/null +++ b/src/go/tests/expect/fingerprints/delete_3.4.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "REMOVE", + "Collection": "coll", + "Database": "test", + "Keys": "a,b", + "Fingerprint": "REMOVE coll a,b" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/delete_3.6.2 b/src/go/tests/expect/fingerprints/delete_3.6.2 new file mode 100755 index 00000000..509c8dac --- /dev/null +++ b/src/go/tests/expect/fingerprints/delete_3.6.2 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "REMOVE", + "Collection": "coll", + "Database": "test", + "Keys": "a,b", + "Fingerprint": "REMOVE coll a,b" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/delete_all_2.6.12 b/src/go/tests/expect/fingerprints/delete_all_2.6.12 new file mode 100755 index 00000000..509c8dac --- /dev/null +++ b/src/go/tests/expect/fingerprints/delete_all_2.6.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "REMOVE", + "Collection": "coll", + "Database": "test", + "Keys": "a,b", + "Fingerprint": "REMOVE coll a,b" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/delete_all_3.0.15 b/src/go/tests/expect/fingerprints/delete_all_3.0.15 new file mode 100755 index 00000000..509c8dac --- /dev/null +++ b/src/go/tests/expect/fingerprints/delete_all_3.0.15 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "REMOVE", + "Collection": "coll", + "Database": "test", + "Keys": "a,b", + "Fingerprint": "REMOVE coll a,b" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/delete_all_3.2.19 b/src/go/tests/expect/fingerprints/delete_all_3.2.19 new file mode 100755 index 00000000..509c8dac --- /dev/null +++ b/src/go/tests/expect/fingerprints/delete_all_3.2.19 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "REMOVE", + "Collection": "coll", + "Database": "test", + "Keys": "a,b", + "Fingerprint": "REMOVE coll a,b" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/delete_all_3.4.12 b/src/go/tests/expect/fingerprints/delete_all_3.4.12 new file mode 100755 index 00000000..509c8dac --- /dev/null +++ b/src/go/tests/expect/fingerprints/delete_all_3.4.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "REMOVE", + "Collection": "coll", + "Database": "test", + "Keys": "a,b", + "Fingerprint": "REMOVE coll a,b" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/delete_all_3.6.2 b/src/go/tests/expect/fingerprints/delete_all_3.6.2 new file mode 100755 index 00000000..509c8dac --- /dev/null +++ b/src/go/tests/expect/fingerprints/delete_all_3.6.2 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "REMOVE", + "Collection": "coll", + "Database": "test", + "Keys": "a,b", + "Fingerprint": "REMOVE coll a,b" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/distinct_2.6.12 b/src/go/tests/expect/fingerprints/distinct_2.6.12 new file mode 100755 index 00000000..f9e00589 --- /dev/null +++ b/src/go/tests/expect/fingerprints/distinct_2.6.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "DISTINCT", + "Collection": "coll", + "Database": "test", + "Keys": "a,b", + "Fingerprint": "DISTINCT coll a,b" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/distinct_3.0.15 b/src/go/tests/expect/fingerprints/distinct_3.0.15 new file mode 100755 index 00000000..f9e00589 --- /dev/null +++ b/src/go/tests/expect/fingerprints/distinct_3.0.15 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "DISTINCT", + "Collection": "coll", + "Database": "test", + "Keys": "a,b", + "Fingerprint": "DISTINCT coll a,b" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/distinct_3.2.19 b/src/go/tests/expect/fingerprints/distinct_3.2.19 new file mode 100755 index 00000000..f9e00589 --- /dev/null +++ b/src/go/tests/expect/fingerprints/distinct_3.2.19 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "DISTINCT", + "Collection": "coll", + "Database": "test", + "Keys": "a,b", + "Fingerprint": "DISTINCT coll a,b" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/distinct_3.4.12 b/src/go/tests/expect/fingerprints/distinct_3.4.12 new file mode 100755 index 00000000..f9e00589 --- /dev/null +++ b/src/go/tests/expect/fingerprints/distinct_3.4.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "DISTINCT", + "Collection": "coll", + "Database": "test", + "Keys": "a,b", + "Fingerprint": "DISTINCT coll a,b" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/distinct_3.6.2 b/src/go/tests/expect/fingerprints/distinct_3.6.2 new file mode 100755 index 00000000..f9e00589 --- /dev/null +++ b/src/go/tests/expect/fingerprints/distinct_3.6.2 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "DISTINCT", + "Collection": "coll", + "Database": "test", + "Keys": "a,b", + "Fingerprint": "DISTINCT coll a,b" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/eval_2.6.12 b/src/go/tests/expect/fingerprints/eval_2.6.12 new file mode 100755 index 00000000..ce0e6193 --- /dev/null +++ b/src/go/tests/expect/fingerprints/eval_2.6.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test", + "Operation": "EVAL", + "Collection": "", + "Database": "test", + "Keys": "", + "Fingerprint": "EVAL" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/eval_3.0.15 b/src/go/tests/expect/fingerprints/eval_3.0.15 new file mode 100755 index 00000000..ce0e6193 --- /dev/null +++ b/src/go/tests/expect/fingerprints/eval_3.0.15 @@ -0,0 +1,8 @@ +{ + "Namespace": "test", + "Operation": "EVAL", + "Collection": "", + "Database": "test", + "Keys": "", + "Fingerprint": "EVAL" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/eval_3.2.19 b/src/go/tests/expect/fingerprints/eval_3.2.19 new file mode 100755 index 00000000..ce0e6193 --- /dev/null +++ b/src/go/tests/expect/fingerprints/eval_3.2.19 @@ -0,0 +1,8 @@ +{ + "Namespace": "test", + "Operation": "EVAL", + "Collection": "", + "Database": "test", + "Keys": "", + "Fingerprint": "EVAL" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/eval_3.4.12 b/src/go/tests/expect/fingerprints/eval_3.4.12 new file mode 100755 index 00000000..ce0e6193 --- /dev/null +++ b/src/go/tests/expect/fingerprints/eval_3.4.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test", + "Operation": "EVAL", + "Collection": "", + "Database": "test", + "Keys": "", + "Fingerprint": "EVAL" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/eval_3.6.2 b/src/go/tests/expect/fingerprints/eval_3.6.2 new file mode 100755 index 00000000..ce0e6193 --- /dev/null +++ b/src/go/tests/expect/fingerprints/eval_3.6.2 @@ -0,0 +1,8 @@ +{ + "Namespace": "test", + "Operation": "EVAL", + "Collection": "", + "Database": "test", + "Keys": "", + "Fingerprint": "EVAL" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/explain_2.6.12 b/src/go/tests/expect/fingerprints/explain_2.6.12 new file mode 100755 index 00000000..86af9e4e --- /dev/null +++ b/src/go/tests/expect/fingerprints/explain_2.6.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "", + "Operation": "EXPLAIN", + "Collection": "", + "Database": "", + "Keys": "", + "Fingerprint": "EXPLAIN" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/explain_3.0.15 b/src/go/tests/expect/fingerprints/explain_3.0.15 new file mode 100755 index 00000000..86af9e4e --- /dev/null +++ b/src/go/tests/expect/fingerprints/explain_3.0.15 @@ -0,0 +1,8 @@ +{ + "Namespace": "", + "Operation": "EXPLAIN", + "Collection": "", + "Database": "", + "Keys": "", + "Fingerprint": "EXPLAIN" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/explain_3.2.19 b/src/go/tests/expect/fingerprints/explain_3.2.19 new file mode 100755 index 00000000..86af9e4e --- /dev/null +++ b/src/go/tests/expect/fingerprints/explain_3.2.19 @@ -0,0 +1,8 @@ +{ + "Namespace": "", + "Operation": "EXPLAIN", + "Collection": "", + "Database": "", + "Keys": "", + "Fingerprint": "EXPLAIN" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/explain_3.4.12 b/src/go/tests/expect/fingerprints/explain_3.4.12 new file mode 100755 index 00000000..86af9e4e --- /dev/null +++ b/src/go/tests/expect/fingerprints/explain_3.4.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "", + "Operation": "EXPLAIN", + "Collection": "", + "Database": "", + "Keys": "", + "Fingerprint": "EXPLAIN" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/explain_3.6.2 b/src/go/tests/expect/fingerprints/explain_3.6.2 new file mode 100755 index 00000000..86af9e4e --- /dev/null +++ b/src/go/tests/expect/fingerprints/explain_3.6.2 @@ -0,0 +1,8 @@ +{ + "Namespace": "", + "Operation": "EXPLAIN", + "Collection": "", + "Database": "", + "Keys": "", + "Fingerprint": "EXPLAIN" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/find_2.6.12 b/src/go/tests/expect/fingerprints/find_2.6.12 new file mode 100755 index 00000000..dd9b7814 --- /dev/null +++ b/src/go/tests/expect/fingerprints/find_2.6.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "FIND", + "Collection": "coll", + "Database": "test", + "Keys": "k", + "Fingerprint": "FIND coll k" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/find_3.0.15 b/src/go/tests/expect/fingerprints/find_3.0.15 new file mode 100755 index 00000000..dd9b7814 --- /dev/null +++ b/src/go/tests/expect/fingerprints/find_3.0.15 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "FIND", + "Collection": "coll", + "Database": "test", + "Keys": "k", + "Fingerprint": "FIND coll k" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/find_3.2.19 b/src/go/tests/expect/fingerprints/find_3.2.19 new file mode 100755 index 00000000..dd9b7814 --- /dev/null +++ b/src/go/tests/expect/fingerprints/find_3.2.19 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "FIND", + "Collection": "coll", + "Database": "test", + "Keys": "k", + "Fingerprint": "FIND coll k" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/find_3.4.12 b/src/go/tests/expect/fingerprints/find_3.4.12 new file mode 100755 index 00000000..dd9b7814 --- /dev/null +++ b/src/go/tests/expect/fingerprints/find_3.4.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "FIND", + "Collection": "coll", + "Database": "test", + "Keys": "k", + "Fingerprint": "FIND coll k" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/find_3.6.2 b/src/go/tests/expect/fingerprints/find_3.6.2 new file mode 100755 index 00000000..dd9b7814 --- /dev/null +++ b/src/go/tests/expect/fingerprints/find_3.6.2 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "FIND", + "Collection": "coll", + "Database": "test", + "Keys": "k", + "Fingerprint": "FIND coll k" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/find_andrii_2.6.12 b/src/go/tests/expect/fingerprints/find_andrii_2.6.12 new file mode 100755 index 00000000..2c68bcfa --- /dev/null +++ b/src/go/tests/expect/fingerprints/find_andrii_2.6.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "FIND", + "Collection": "coll", + "Database": "test", + "Keys": "c,k,pad", + "Fingerprint": "FIND coll c,k,pad" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/find_andrii_3.0.15 b/src/go/tests/expect/fingerprints/find_andrii_3.0.15 new file mode 100755 index 00000000..2c68bcfa --- /dev/null +++ b/src/go/tests/expect/fingerprints/find_andrii_3.0.15 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "FIND", + "Collection": "coll", + "Database": "test", + "Keys": "c,k,pad", + "Fingerprint": "FIND coll c,k,pad" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/find_andrii_3.2.19 b/src/go/tests/expect/fingerprints/find_andrii_3.2.19 new file mode 100755 index 00000000..2c68bcfa --- /dev/null +++ b/src/go/tests/expect/fingerprints/find_andrii_3.2.19 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "FIND", + "Collection": "coll", + "Database": "test", + "Keys": "c,k,pad", + "Fingerprint": "FIND coll c,k,pad" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/find_andrii_3.4.12 b/src/go/tests/expect/fingerprints/find_andrii_3.4.12 new file mode 100755 index 00000000..2c68bcfa --- /dev/null +++ b/src/go/tests/expect/fingerprints/find_andrii_3.4.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "FIND", + "Collection": "coll", + "Database": "test", + "Keys": "c,k,pad", + "Fingerprint": "FIND coll c,k,pad" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/find_andrii_3.6.2 b/src/go/tests/expect/fingerprints/find_andrii_3.6.2 new file mode 100755 index 00000000..2c68bcfa --- /dev/null +++ b/src/go/tests/expect/fingerprints/find_andrii_3.6.2 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "FIND", + "Collection": "coll", + "Database": "test", + "Keys": "c,k,pad", + "Fingerprint": "FIND coll c,k,pad" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/find_empty_2.6.12 b/src/go/tests/expect/fingerprints/find_empty_2.6.12 new file mode 100755 index 00000000..ca58e6ad --- /dev/null +++ b/src/go/tests/expect/fingerprints/find_empty_2.6.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "FIND", + "Collection": "coll", + "Database": "test", + "Keys": "", + "Fingerprint": "FIND coll" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/find_empty_3.0.15 b/src/go/tests/expect/fingerprints/find_empty_3.0.15 new file mode 100755 index 00000000..ca58e6ad --- /dev/null +++ b/src/go/tests/expect/fingerprints/find_empty_3.0.15 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "FIND", + "Collection": "coll", + "Database": "test", + "Keys": "", + "Fingerprint": "FIND coll" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/find_empty_3.2.19 b/src/go/tests/expect/fingerprints/find_empty_3.2.19 new file mode 100755 index 00000000..ca58e6ad --- /dev/null +++ b/src/go/tests/expect/fingerprints/find_empty_3.2.19 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "FIND", + "Collection": "coll", + "Database": "test", + "Keys": "", + "Fingerprint": "FIND coll" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/find_empty_3.4.12 b/src/go/tests/expect/fingerprints/find_empty_3.4.12 new file mode 100755 index 00000000..ca58e6ad --- /dev/null +++ b/src/go/tests/expect/fingerprints/find_empty_3.4.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "FIND", + "Collection": "coll", + "Database": "test", + "Keys": "", + "Fingerprint": "FIND coll" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/find_empty_3.6.2 b/src/go/tests/expect/fingerprints/find_empty_3.6.2 new file mode 100755 index 00000000..ca58e6ad --- /dev/null +++ b/src/go/tests/expect/fingerprints/find_empty_3.6.2 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "FIND", + "Collection": "coll", + "Database": "test", + "Keys": "", + "Fingerprint": "FIND coll" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/find_with_sort_2.6.12 b/src/go/tests/expect/fingerprints/find_with_sort_2.6.12 new file mode 100755 index 00000000..c257c256 --- /dev/null +++ b/src/go/tests/expect/fingerprints/find_with_sort_2.6.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "FIND", + "Collection": "coll", + "Database": "test", + "Keys": "b,c", + "Fingerprint": "FIND coll b,c" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/find_with_sort_3.0.15 b/src/go/tests/expect/fingerprints/find_with_sort_3.0.15 new file mode 100755 index 00000000..c257c256 --- /dev/null +++ b/src/go/tests/expect/fingerprints/find_with_sort_3.0.15 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "FIND", + "Collection": "coll", + "Database": "test", + "Keys": "b,c", + "Fingerprint": "FIND coll b,c" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/find_with_sort_3.2.19 b/src/go/tests/expect/fingerprints/find_with_sort_3.2.19 new file mode 100755 index 00000000..c257c256 --- /dev/null +++ b/src/go/tests/expect/fingerprints/find_with_sort_3.2.19 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "FIND", + "Collection": "coll", + "Database": "test", + "Keys": "b,c", + "Fingerprint": "FIND coll b,c" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/find_with_sort_3.4.12 b/src/go/tests/expect/fingerprints/find_with_sort_3.4.12 new file mode 100755 index 00000000..c257c256 --- /dev/null +++ b/src/go/tests/expect/fingerprints/find_with_sort_3.4.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "FIND", + "Collection": "coll", + "Database": "test", + "Keys": "b,c", + "Fingerprint": "FIND coll b,c" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/find_with_sort_3.6.2 b/src/go/tests/expect/fingerprints/find_with_sort_3.6.2 new file mode 100755 index 00000000..c257c256 --- /dev/null +++ b/src/go/tests/expect/fingerprints/find_with_sort_3.6.2 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "FIND", + "Collection": "coll", + "Database": "test", + "Keys": "b,c", + "Fingerprint": "FIND coll b,c" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/findandmodify_2.6.12 b/src/go/tests/expect/fingerprints/findandmodify_2.6.12 new file mode 100755 index 00000000..911afc8a --- /dev/null +++ b/src/go/tests/expect/fingerprints/findandmodify_2.6.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "FINDANDMODIFY", + "Collection": "coll", + "Database": "test", + "Keys": "a", + "Fingerprint": "FINDANDMODIFY coll a" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/findandmodify_3.0.15 b/src/go/tests/expect/fingerprints/findandmodify_3.0.15 new file mode 100755 index 00000000..911afc8a --- /dev/null +++ b/src/go/tests/expect/fingerprints/findandmodify_3.0.15 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "FINDANDMODIFY", + "Collection": "coll", + "Database": "test", + "Keys": "a", + "Fingerprint": "FINDANDMODIFY coll a" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/findandmodify_3.2.19 b/src/go/tests/expect/fingerprints/findandmodify_3.2.19 new file mode 100755 index 00000000..911afc8a --- /dev/null +++ b/src/go/tests/expect/fingerprints/findandmodify_3.2.19 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "FINDANDMODIFY", + "Collection": "coll", + "Database": "test", + "Keys": "a", + "Fingerprint": "FINDANDMODIFY coll a" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/findandmodify_3.4.12 b/src/go/tests/expect/fingerprints/findandmodify_3.4.12 new file mode 100755 index 00000000..911afc8a --- /dev/null +++ b/src/go/tests/expect/fingerprints/findandmodify_3.4.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "FINDANDMODIFY", + "Collection": "coll", + "Database": "test", + "Keys": "a", + "Fingerprint": "FINDANDMODIFY coll a" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/findandmodify_3.6.2 b/src/go/tests/expect/fingerprints/findandmodify_3.6.2 new file mode 100755 index 00000000..911afc8a --- /dev/null +++ b/src/go/tests/expect/fingerprints/findandmodify_3.6.2 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "FINDANDMODIFY", + "Collection": "coll", + "Database": "test", + "Keys": "a", + "Fingerprint": "FINDANDMODIFY coll a" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/geonear_2.6.12 b/src/go/tests/expect/fingerprints/geonear_2.6.12 new file mode 100755 index 00000000..5cc7fdbd --- /dev/null +++ b/src/go/tests/expect/fingerprints/geonear_2.6.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "GEONEAR", + "Collection": "coll", + "Database": "test", + "Keys": "", + "Fingerprint": "GEONEAR coll" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/geonear_3.0.15 b/src/go/tests/expect/fingerprints/geonear_3.0.15 new file mode 100755 index 00000000..5cc7fdbd --- /dev/null +++ b/src/go/tests/expect/fingerprints/geonear_3.0.15 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "GEONEAR", + "Collection": "coll", + "Database": "test", + "Keys": "", + "Fingerprint": "GEONEAR coll" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/geonear_3.2.19 b/src/go/tests/expect/fingerprints/geonear_3.2.19 new file mode 100755 index 00000000..5cc7fdbd --- /dev/null +++ b/src/go/tests/expect/fingerprints/geonear_3.2.19 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "GEONEAR", + "Collection": "coll", + "Database": "test", + "Keys": "", + "Fingerprint": "GEONEAR coll" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/geonear_3.4.12 b/src/go/tests/expect/fingerprints/geonear_3.4.12 new file mode 100755 index 00000000..5cc7fdbd --- /dev/null +++ b/src/go/tests/expect/fingerprints/geonear_3.4.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "GEONEAR", + "Collection": "coll", + "Database": "test", + "Keys": "", + "Fingerprint": "GEONEAR coll" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/geonear_3.6.2 b/src/go/tests/expect/fingerprints/geonear_3.6.2 new file mode 100755 index 00000000..5cc7fdbd --- /dev/null +++ b/src/go/tests/expect/fingerprints/geonear_3.6.2 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "GEONEAR", + "Collection": "coll", + "Database": "test", + "Keys": "", + "Fingerprint": "GEONEAR coll" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/getmore_2.6.12 b/src/go/tests/expect/fingerprints/getmore_2.6.12 new file mode 100755 index 00000000..24f4a68d --- /dev/null +++ b/src/go/tests/expect/fingerprints/getmore_2.6.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "GETMORE", + "Collection": "coll", + "Database": "test", + "Keys": "", + "Fingerprint": "GETMORE coll" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/getmore_3.0.15 b/src/go/tests/expect/fingerprints/getmore_3.0.15 new file mode 100755 index 00000000..24f4a68d --- /dev/null +++ b/src/go/tests/expect/fingerprints/getmore_3.0.15 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "GETMORE", + "Collection": "coll", + "Database": "test", + "Keys": "", + "Fingerprint": "GETMORE coll" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/getmore_3.2.19 b/src/go/tests/expect/fingerprints/getmore_3.2.19 new file mode 100755 index 00000000..24f4a68d --- /dev/null +++ b/src/go/tests/expect/fingerprints/getmore_3.2.19 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "GETMORE", + "Collection": "coll", + "Database": "test", + "Keys": "", + "Fingerprint": "GETMORE coll" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/getmore_3.4.12 b/src/go/tests/expect/fingerprints/getmore_3.4.12 new file mode 100755 index 00000000..24f4a68d --- /dev/null +++ b/src/go/tests/expect/fingerprints/getmore_3.4.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "GETMORE", + "Collection": "coll", + "Database": "test", + "Keys": "", + "Fingerprint": "GETMORE coll" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/getmore_3.6.2 b/src/go/tests/expect/fingerprints/getmore_3.6.2 new file mode 100755 index 00000000..24f4a68d --- /dev/null +++ b/src/go/tests/expect/fingerprints/getmore_3.6.2 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "GETMORE", + "Collection": "coll", + "Database": "test", + "Keys": "", + "Fingerprint": "GETMORE coll" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/group_2.6.12 b/src/go/tests/expect/fingerprints/group_2.6.12 new file mode 100755 index 00000000..f4821e24 --- /dev/null +++ b/src/go/tests/expect/fingerprints/group_2.6.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "GROUP", + "Collection": "coll", + "Database": "test", + "Keys": "a,b", + "Fingerprint": "GROUP coll a,b" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/group_3.0.15 b/src/go/tests/expect/fingerprints/group_3.0.15 new file mode 100755 index 00000000..f4821e24 --- /dev/null +++ b/src/go/tests/expect/fingerprints/group_3.0.15 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "GROUP", + "Collection": "coll", + "Database": "test", + "Keys": "a,b", + "Fingerprint": "GROUP coll a,b" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/group_3.2.19 b/src/go/tests/expect/fingerprints/group_3.2.19 new file mode 100755 index 00000000..f4821e24 --- /dev/null +++ b/src/go/tests/expect/fingerprints/group_3.2.19 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "GROUP", + "Collection": "coll", + "Database": "test", + "Keys": "a,b", + "Fingerprint": "GROUP coll a,b" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/group_3.4.12 b/src/go/tests/expect/fingerprints/group_3.4.12 new file mode 100755 index 00000000..f4821e24 --- /dev/null +++ b/src/go/tests/expect/fingerprints/group_3.4.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "GROUP", + "Collection": "coll", + "Database": "test", + "Keys": "a,b", + "Fingerprint": "GROUP coll a,b" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/group_3.6.2 b/src/go/tests/expect/fingerprints/group_3.6.2 new file mode 100755 index 00000000..f4821e24 --- /dev/null +++ b/src/go/tests/expect/fingerprints/group_3.6.2 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "GROUP", + "Collection": "coll", + "Database": "test", + "Keys": "a,b", + "Fingerprint": "GROUP coll a,b" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/insert_2.6.12 b/src/go/tests/expect/fingerprints/insert_2.6.12 new file mode 100755 index 00000000..0adbc5c7 --- /dev/null +++ b/src/go/tests/expect/fingerprints/insert_2.6.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "INSERT", + "Collection": "coll", + "Database": "test", + "Keys": "", + "Fingerprint": "INSERT coll" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/insert_3.0.15 b/src/go/tests/expect/fingerprints/insert_3.0.15 new file mode 100755 index 00000000..0adbc5c7 --- /dev/null +++ b/src/go/tests/expect/fingerprints/insert_3.0.15 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "INSERT", + "Collection": "coll", + "Database": "test", + "Keys": "", + "Fingerprint": "INSERT coll" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/insert_3.2.19 b/src/go/tests/expect/fingerprints/insert_3.2.19 new file mode 100755 index 00000000..0adbc5c7 --- /dev/null +++ b/src/go/tests/expect/fingerprints/insert_3.2.19 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "INSERT", + "Collection": "coll", + "Database": "test", + "Keys": "", + "Fingerprint": "INSERT coll" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/insert_3.4.12 b/src/go/tests/expect/fingerprints/insert_3.4.12 new file mode 100755 index 00000000..0adbc5c7 --- /dev/null +++ b/src/go/tests/expect/fingerprints/insert_3.4.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "INSERT", + "Collection": "coll", + "Database": "test", + "Keys": "", + "Fingerprint": "INSERT coll" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/insert_3.6.2 b/src/go/tests/expect/fingerprints/insert_3.6.2 new file mode 100755 index 00000000..0adbc5c7 --- /dev/null +++ b/src/go/tests/expect/fingerprints/insert_3.6.2 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "INSERT", + "Collection": "coll", + "Database": "test", + "Keys": "", + "Fingerprint": "INSERT coll" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/mapreduce_2.6.12 b/src/go/tests/expect/fingerprints/mapreduce_2.6.12 new file mode 100755 index 00000000..c74e206c --- /dev/null +++ b/src/go/tests/expect/fingerprints/mapreduce_2.6.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "MAPREDUCE", + "Collection": "coll", + "Database": "test", + "Keys": "a", + "Fingerprint": "MAPREDUCE coll a" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/mapreduce_3.0.15 b/src/go/tests/expect/fingerprints/mapreduce_3.0.15 new file mode 100755 index 00000000..c74e206c --- /dev/null +++ b/src/go/tests/expect/fingerprints/mapreduce_3.0.15 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "MAPREDUCE", + "Collection": "coll", + "Database": "test", + "Keys": "a", + "Fingerprint": "MAPREDUCE coll a" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/mapreduce_3.2.19 b/src/go/tests/expect/fingerprints/mapreduce_3.2.19 new file mode 100755 index 00000000..c74e206c --- /dev/null +++ b/src/go/tests/expect/fingerprints/mapreduce_3.2.19 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "MAPREDUCE", + "Collection": "coll", + "Database": "test", + "Keys": "a", + "Fingerprint": "MAPREDUCE coll a" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/mapreduce_3.4.12 b/src/go/tests/expect/fingerprints/mapreduce_3.4.12 new file mode 100755 index 00000000..c74e206c --- /dev/null +++ b/src/go/tests/expect/fingerprints/mapreduce_3.4.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "MAPREDUCE", + "Collection": "coll", + "Database": "test", + "Keys": "a", + "Fingerprint": "MAPREDUCE coll a" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/mapreduce_3.6.2 b/src/go/tests/expect/fingerprints/mapreduce_3.6.2 new file mode 100755 index 00000000..c74e206c --- /dev/null +++ b/src/go/tests/expect/fingerprints/mapreduce_3.6.2 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "MAPREDUCE", + "Collection": "coll", + "Database": "test", + "Keys": "a", + "Fingerprint": "MAPREDUCE coll a" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/update_2.6.12 b/src/go/tests/expect/fingerprints/update_2.6.12 new file mode 100755 index 00000000..54dc59b7 --- /dev/null +++ b/src/go/tests/expect/fingerprints/update_2.6.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "UPDATE", + "Collection": "coll", + "Database": "test", + "Keys": "a", + "Fingerprint": "UPDATE coll a" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/update_3.0.15 b/src/go/tests/expect/fingerprints/update_3.0.15 new file mode 100755 index 00000000..54dc59b7 --- /dev/null +++ b/src/go/tests/expect/fingerprints/update_3.0.15 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "UPDATE", + "Collection": "coll", + "Database": "test", + "Keys": "a", + "Fingerprint": "UPDATE coll a" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/update_3.2.19 b/src/go/tests/expect/fingerprints/update_3.2.19 new file mode 100755 index 00000000..54dc59b7 --- /dev/null +++ b/src/go/tests/expect/fingerprints/update_3.2.19 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "UPDATE", + "Collection": "coll", + "Database": "test", + "Keys": "a", + "Fingerprint": "UPDATE coll a" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/update_3.4.12 b/src/go/tests/expect/fingerprints/update_3.4.12 new file mode 100755 index 00000000..54dc59b7 --- /dev/null +++ b/src/go/tests/expect/fingerprints/update_3.4.12 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "UPDATE", + "Collection": "coll", + "Database": "test", + "Keys": "a", + "Fingerprint": "UPDATE coll a" +} \ No newline at end of file diff --git a/src/go/tests/expect/fingerprints/update_3.6.2 b/src/go/tests/expect/fingerprints/update_3.6.2 new file mode 100755 index 00000000..54dc59b7 --- /dev/null +++ b/src/go/tests/expect/fingerprints/update_3.6.2 @@ -0,0 +1,8 @@ +{ + "Namespace": "test.coll", + "Operation": "UPDATE", + "Collection": "coll", + "Database": "test", + "Keys": "a", + "Fingerprint": "UPDATE coll a" +} \ No newline at end of file diff --git a/src/go/tests/expect/stats_all/sum.json b/src/go/tests/expect/stats_all/sum.json index 86d17d30..3a2fd33d 100755 --- a/src/go/tests/expect/stats_all/sum.json +++ b/src/go/tests/expect/stats_all/sum.json @@ -5,8 +5,8 @@ "Operation": "AGGREGATE", "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"aggregate\":\"coll\",\"pipeline\":[{\"$match\":{\"a\":{\"$gte\":2}}}],\"cursor\":{}}}\n", "Fingerprint": "AGGREGATE coll a", - "FirstSeen": "2017-10-15T01:54:08.661Z", - "LastSeen": "2017-10-15T01:54:52.564Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 5, "BlockedTime": null, @@ -26,11 +26,11 @@ 8 ], "QueryTime": [ - 0, - 0, - 0, - 0, - 2 + 42, + 42, + 42, + 42, + 42 ], "ResponseLength": [ 385, @@ -46,8 +46,8 @@ "Operation": "COUNT", "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"count\":\"coll\",\"query\":{},\"fields\":{}}}\n", "Fingerprint": "COUNT coll", - "FirstSeen": "2017-10-15T01:54:08.889Z", - "LastSeen": "2017-10-15T01:54:52.844Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 5, "BlockedTime": null, @@ -67,11 +67,11 @@ 0 ], "QueryTime": [ - 0, - 0, - 0, - 0, - 0 + 42, + 42, + 42, + 42, + 42 ], "ResponseLength": [ 48, @@ -87,8 +87,8 @@ "Operation": "COUNT", "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"count\":\"coll\",\"query\":{\"a\":{\"$gt\":5}},\"fields\":{}}}\n", "Fingerprint": "COUNT coll a", - "FirstSeen": "2017-10-15T01:54:09.039Z", - "LastSeen": "2017-10-15T01:54:53.078Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 5, "BlockedTime": null, @@ -108,11 +108,11 @@ 10 ], "QueryTime": [ - 0, - 0, - 0, - 0, - 0 + 42, + 42, + 42, + 42, + 42 ], "ResponseLength": [ 48, @@ -128,8 +128,8 @@ "Operation": "DISTINCT", "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"distinct\":\"coll\",\"key\":\"a\",\"query\":{\"b\":{\"$gte\":5}}}}\n", "Fingerprint": "DISTINCT coll a,b", - "FirstSeen": "2017-10-15T01:54:09.687Z", - "LastSeen": "2017-10-15T01:54:53.874Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 5, "BlockedTime": null, @@ -149,11 +149,11 @@ 5 ], "QueryTime": [ - 0, - 0, - 0, - 0, - 0 + 42, + 42, + 42, + 42, + 42 ], "ResponseLength": [ 199, @@ -169,8 +169,8 @@ "Operation": "EVAL", "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"$eval\":\"1\"}}\n", "Fingerprint": "EVAL", - "FirstSeen": "2017-10-15T01:54:09.89Z", - "LastSeen": "2017-10-15T01:54:54.085Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 5, "BlockedTime": null, @@ -190,11 +190,11 @@ 0 ], "QueryTime": [ - 43, - 37, - 56, - 48, - 40 + 42, + 42, + 42, + 42, + 42 ], "ResponseLength": [ 53, @@ -210,8 +210,8 @@ "Operation": "EXPLAIN", "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"query\":{\"query\":{},\"$explain\":true}}\n", "Fingerprint": "EXPLAIN", - "FirstSeen": "2017-10-15T01:54:10.058Z", - "LastSeen": "2017-10-15T01:54:54.257Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 5, "BlockedTime": null, @@ -231,18 +231,18 @@ 0 ], "QueryTime": [ - 0, - 0, - 0, - 0, - 0 + 42, + 42, + 42, + 42, + 42 ], "ResponseLength": [ 583, 379, 364, - 328, - 329 + 329, + 328 ] }, { @@ -251,8 +251,8 @@ "Operation": "FINDANDMODIFY", "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"findandmodify\":\"coll\",\"query\":{\"a\":2},\"update\":{\"$inc\":{\"b\":1}}},\"updateobj\":{\"$inc\":{\"b\":1}}}\n", "Fingerprint": "FINDANDMODIFY coll a", - "FirstSeen": "2017-10-15T01:54:11.011Z", - "LastSeen": "2017-10-15T01:54:55.391Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 5, "BlockedTime": null, @@ -272,11 +272,11 @@ 3 ], "QueryTime": [ - 6, - 0, - 1, - 1, - 1 + 42, + 42, + 42, + 42, + 42 ], "ResponseLength": [ 131, @@ -292,8 +292,8 @@ "Operation": "FIND", "Query": "{\"ns\":\"test.coll\",\"op\":\"query\"}\n", "Fingerprint": "FIND coll", - "FirstSeen": "2017-10-15T01:54:10.63Z", - "LastSeen": "2017-10-15T01:54:54.87Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 5, "BlockedTime": null, @@ -313,11 +313,11 @@ 0 ], "QueryTime": [ - 0, - 0, - 0, - 0, - 0 + 42, + 42, + 42, + 42, + 42 ], "ResponseLength": [ 20, @@ -333,8 +333,8 @@ "Operation": "FIND", "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"query\":{\"query\":{\"c\":1},\"orderby\":{\"b\":-1}}}\n", "Fingerprint": "FIND coll b,c", - "FirstSeen": "2017-10-15T01:54:10.817Z", - "LastSeen": "2017-10-15T01:54:55.111Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 5, "BlockedTime": null, @@ -354,11 +354,11 @@ 2 ], "QueryTime": [ - 0, - 0, - 0, - 0, - 0 + 42, + 42, + 42, + 42, + 42 ], "ResponseLength": [ 108, @@ -374,8 +374,8 @@ "Operation": "FIND", "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"query\":{\"query\":{\"$and\":[{\"k\":{\"$gt\":1}},{\"k\":{\"$lt\":2}},{\"$or\":[{\"c\":{\"$in\":[\"/^0/\",\"/^2/\",\"/^4/\",\"/^6/\"]}},{\"pad\":{\"$in\":[\"/9$/\",\"/7$/\",\"/5$/\",\"/3$/\"]}}]}]},\"orderby\":{\"k\":-1}}}\n", "Fingerprint": "FIND coll c,k,pad", - "FirstSeen": "2017-10-15T01:54:10.474Z", - "LastSeen": "2017-10-15T01:54:54.693Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 5, "BlockedTime": null, @@ -395,11 +395,11 @@ 0 ], "QueryTime": [ - 0, - 0, - 0, - 0, - 0 + 42, + 42, + 42, + 42, + 42 ], "ResponseLength": [ 20, @@ -415,8 +415,8 @@ "Operation": "FIND", "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"query\":{\"k\":1}}\n", "Fingerprint": "FIND coll k", - "FirstSeen": "2017-10-15T01:54:10.277Z", - "LastSeen": "2017-10-15T01:54:54.507Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 5, "BlockedTime": null, @@ -436,11 +436,11 @@ 2 ], "QueryTime": [ - 0, - 0, - 1, - 0, - 0 + 42, + 42, + 42, + 42, + 42 ], "ResponseLength": [ 86, @@ -456,8 +456,8 @@ "Operation": "GEONEAR", "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"geoNear\":\"coll\",\"near\":{\"type\":\"Point\",\"coordinates\":[1,1]},\"spherical\":true}}\n", "Fingerprint": "GEONEAR coll", - "FirstSeen": "2017-10-15T01:54:11.181Z", - "LastSeen": "2017-10-15T01:54:55.701Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 5, "BlockedTime": null, @@ -477,11 +477,11 @@ 10 ], "QueryTime": [ - 1, - 2, - 10, - 13, - 11 + 42, + 42, + 42, + 42, + 42 ], "ResponseLength": [ 1406, @@ -497,38 +497,38 @@ "Operation": "GETMORE", "Query": "{\"ns\":\"test.coll\",\"op\":\"getmore\",\"query\":{\"a\":{\"$gt\":0}}}\n", "Fingerprint": "GETMORE coll", - "FirstSeen": "2017-10-15T01:54:11.36Z", - "LastSeen": "2017-10-15T01:54:56.186Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 5, "BlockedTime": null, "LockTime": null, "NReturned": [ - 2, 0, 0, - 2, + 0, + 0, 0 ], "NScanned": [ 0, 0, 0, - 2, + 0, 0 ], "QueryTime": [ - 0, - 0, - 0, - 0, - 0 + 42, + 42, + 42, + 42, + 42 ], "ResponseLength": [ - 86, + 20, 20, 81, - 153, + 81, 81 ] }, @@ -538,8 +538,8 @@ "Operation": "GROUP", "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"group\":{\"key\":{\"a\":1,\"b\":1},\"cond\":{\"b\":3},\"initial\":{},\"ns\":\"coll\",\"$reduce\":\"\"}}}\n", "Fingerprint": "GROUP coll a,b", - "FirstSeen": "2017-10-15T01:54:11.599Z", - "LastSeen": "2017-10-15T01:54:56.478Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 5, "BlockedTime": null, @@ -559,11 +559,11 @@ 2 ], "QueryTime": [ - 36, - 26, - 31, - 31, - 24 + 42, + 42, + 42, + 42, + 42 ], "ResponseLength": [ 135, @@ -579,8 +579,8 @@ "Operation": "INSERT", "Query": "{\"ns\":\"test.coll\",\"op\":\"insert\",\"query\":{\"_id\":1}}\n", "Fingerprint": "INSERT coll", - "FirstSeen": "2017-10-15T01:54:11.737Z", - "LastSeen": "2017-10-15T01:54:56.693Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 5, "BlockedTime": null, @@ -600,11 +600,11 @@ 0 ], "QueryTime": [ - 0, - 4, - 11, - 11, - 11 + 42, + 42, + 42, + 42, + 42 ], "ResponseLength": [ 0, @@ -620,8 +620,8 @@ "Operation": "MAPREDUCE", "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"mapreduce\":\"coll\",\"map\":\"\",\"reduce\":\"\",\"query\":{\"a\":{\"$gte\":0}},\"out\":{\"inline\":1}}}\n", "Fingerprint": "MAPREDUCE coll a", - "FirstSeen": "2017-10-15T01:54:11.959Z", - "LastSeen": "2017-10-15T01:54:56.951Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 5, "BlockedTime": null, @@ -641,11 +641,11 @@ 3 ], "QueryTime": [ - 29, - 21, - 41, - 21, - 26 + 42, + 42, + 42, + 42, + 42 ], "ResponseLength": [ 233, @@ -661,8 +661,8 @@ "Operation": "REMOVE", "Query": "{\"ns\":\"test.coll\",\"op\":\"remove\",\"query\":{\"a\":{\"$gte\":2},\"b\":{\"$gte\":2}}}\n", "Fingerprint": "REMOVE coll a,b", - "FirstSeen": "2017-10-15T01:54:09.246Z", - "LastSeen": "2017-10-15T01:54:53.615Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 10, "BlockedTime": null, @@ -692,16 +692,16 @@ 8 ], "QueryTime": [ - 0, - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 1, - 1 + 42, + 42, + 42, + 42, + 42, + 42, + 42, + 42, + 42, + 42 ], "ResponseLength": [ 0, @@ -722,8 +722,8 @@ "Operation": "UPDATE", "Query": "{\"ns\":\"test.coll\",\"op\":\"update\",\"query\":{\"a\":{\"$gte\":2}},\"updateobj\":{\"$set\":{\"c\":1},\"$inc\":{\"a\":-10}}}\n", "Fingerprint": "UPDATE coll a", - "FirstSeen": "2017-10-15T01:54:12.161Z", - "LastSeen": "2017-10-15T01:54:57.231Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 5, "BlockedTime": null, @@ -743,11 +743,11 @@ 1 ], "QueryTime": [ - 0, - 0, - 2, - 0, - 0 + 42, + 42, + 42, + 42, + 42 ], "ResponseLength": [ 0, diff --git a/src/go/tests/expect/stats_single/aggregate_2.6.12 b/src/go/tests/expect/stats_single/aggregate_2.6.12 index d64f3360..e5e91bd3 100755 --- a/src/go/tests/expect/stats_single/aggregate_2.6.12 +++ b/src/go/tests/expect/stats_single/aggregate_2.6.12 @@ -5,8 +5,8 @@ "Operation": "AGGREGATE", "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"aggregate\":\"coll\",\"pipeline\":[{\"$match\":{\"a\":{\"$gte\":2}}}],\"cursor\":{}}}\n", "Fingerprint": "AGGREGATE coll a", - "FirstSeen": "2017-10-15T01:54:08.661Z", - "LastSeen": "2017-10-15T01:54:08.661Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 385 diff --git a/src/go/tests/expect/stats_single/aggregate_3.0.15 b/src/go/tests/expect/stats_single/aggregate_3.0.15 index bd727fed..e5e91bd3 100755 --- a/src/go/tests/expect/stats_single/aggregate_3.0.15 +++ b/src/go/tests/expect/stats_single/aggregate_3.0.15 @@ -5,8 +5,8 @@ "Operation": "AGGREGATE", "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"aggregate\":\"coll\",\"pipeline\":[{\"$match\":{\"a\":{\"$gte\":2}}}],\"cursor\":{}}}\n", "Fingerprint": "AGGREGATE coll a", - "FirstSeen": "2017-10-15T01:54:18.509Z", - "LastSeen": "2017-10-15T01:54:18.509Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 385 diff --git a/src/go/tests/expect/stats_single/aggregate_3.2.16 b/src/go/tests/expect/stats_single/aggregate_3.2.19 similarity index 84% rename from src/go/tests/expect/stats_single/aggregate_3.2.16 rename to src/go/tests/expect/stats_single/aggregate_3.2.19 index 7e85bb5c..03bc7e0d 100755 --- a/src/go/tests/expect/stats_single/aggregate_3.2.16 +++ b/src/go/tests/expect/stats_single/aggregate_3.2.19 @@ -5,8 +5,8 @@ "Operation": "AGGREGATE", "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"aggregate\":\"coll\",\"pipeline\":[{\"$match\":{\"a\":{\"$gte\":2}}}],\"cursor\":{}}}\n", "Fingerprint": "AGGREGATE coll a", - "FirstSeen": "2017-10-15T01:54:31.293Z", - "LastSeen": "2017-10-15T01:54:31.293Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 388 diff --git a/src/go/tests/expect/stats_single/aggregate_3.4.7 b/src/go/tests/expect/stats_single/aggregate_3.4.12 similarity index 84% rename from src/go/tests/expect/stats_single/aggregate_3.4.7 rename to src/go/tests/expect/stats_single/aggregate_3.4.12 index f71f3dfb..9a93e6b5 100755 --- a/src/go/tests/expect/stats_single/aggregate_3.4.7 +++ b/src/go/tests/expect/stats_single/aggregate_3.4.12 @@ -5,8 +5,8 @@ "Operation": "AGGREGATE", "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"aggregate\":\"coll\",\"pipeline\":[{\"$match\":{\"a\":{\"$gte\":2}}}],\"cursor\":{}}}\n", "Fingerprint": "AGGREGATE coll a", - "FirstSeen": "2017-10-15T01:54:41.948Z", - "LastSeen": "2017-10-15T01:54:41.948Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 8 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 370 diff --git a/src/go/tests/expect/stats_single/aggregate_3.5.11 b/src/go/tests/expect/stats_single/aggregate_3.6.2 similarity index 85% rename from src/go/tests/expect/stats_single/aggregate_3.5.11 rename to src/go/tests/expect/stats_single/aggregate_3.6.2 index 45275f1e..111c8c5a 100755 --- a/src/go/tests/expect/stats_single/aggregate_3.5.11 +++ b/src/go/tests/expect/stats_single/aggregate_3.6.2 @@ -5,8 +5,8 @@ "Operation": "AGGREGATE", "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"aggregate\":\"coll\",\"pipeline\":[{\"$match\":{\"a\":{\"$gte\":2}}}],\"cursor\":{},\"$db\":\"test\"}}\n", "Fingerprint": "AGGREGATE coll a", - "FirstSeen": "2017-10-15T01:54:52.564Z", - "LastSeen": "2017-10-15T01:54:52.564Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 8 ], "QueryTime": [ - 2 + 42 ], "ResponseLength": [ 370 diff --git a/src/go/tests/expect/stats_single/count_2.6.12 b/src/go/tests/expect/stats_single/count_2.6.12 index 12a31dcb..6fa60989 100755 --- a/src/go/tests/expect/stats_single/count_2.6.12 +++ b/src/go/tests/expect/stats_single/count_2.6.12 @@ -5,8 +5,8 @@ "Operation": "COUNT", "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"count\":\"coll\",\"query\":{},\"fields\":{}}}\n", "Fingerprint": "COUNT coll", - "FirstSeen": "2017-10-15T01:54:08.889Z", - "LastSeen": "2017-10-15T01:54:08.889Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 48 diff --git a/src/go/tests/expect/stats_single/count_3.0.15 b/src/go/tests/expect/stats_single/count_3.0.15 index 3c772bd5..003d8c09 100755 --- a/src/go/tests/expect/stats_single/count_3.0.15 +++ b/src/go/tests/expect/stats_single/count_3.0.15 @@ -5,8 +5,8 @@ "Operation": "COUNT", "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"count\":\"coll\",\"query\":{},\"fields\":{}}}\n", "Fingerprint": "COUNT coll", - "FirstSeen": "2017-10-15T01:54:18.673Z", - "LastSeen": "2017-10-15T01:54:18.673Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 44 diff --git a/src/go/tests/expect/stats_single/count_3.2.16 b/src/go/tests/expect/stats_single/count_3.2.19 similarity index 83% rename from src/go/tests/expect/stats_single/count_3.2.16 rename to src/go/tests/expect/stats_single/count_3.2.19 index f4cf1838..e821abcd 100755 --- a/src/go/tests/expect/stats_single/count_3.2.16 +++ b/src/go/tests/expect/stats_single/count_3.2.19 @@ -5,8 +5,8 @@ "Operation": "COUNT", "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"count\":\"coll\",\"query\":{},\"fields\":{}}}\n", "Fingerprint": "COUNT coll", - "FirstSeen": "2017-10-15T01:54:31.529Z", - "LastSeen": "2017-10-15T01:54:31.529Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 47 diff --git a/src/go/tests/expect/stats_single/count_3.4.7 b/src/go/tests/expect/stats_single/count_3.4.12 similarity index 83% rename from src/go/tests/expect/stats_single/count_3.4.7 rename to src/go/tests/expect/stats_single/count_3.4.12 index 867ddd21..28af8b78 100755 --- a/src/go/tests/expect/stats_single/count_3.4.7 +++ b/src/go/tests/expect/stats_single/count_3.4.12 @@ -5,8 +5,8 @@ "Operation": "COUNT", "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"count\":\"coll\",\"query\":{},\"fields\":{}}}\n", "Fingerprint": "COUNT coll", - "FirstSeen": "2017-10-15T01:54:42.157Z", - "LastSeen": "2017-10-15T01:54:42.157Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 29 diff --git a/src/go/tests/expect/stats_single/count_3.5.11 b/src/go/tests/expect/stats_single/count_3.6.2 similarity index 83% rename from src/go/tests/expect/stats_single/count_3.5.11 rename to src/go/tests/expect/stats_single/count_3.6.2 index a12b11fa..97e22456 100755 --- a/src/go/tests/expect/stats_single/count_3.5.11 +++ b/src/go/tests/expect/stats_single/count_3.6.2 @@ -5,8 +5,8 @@ "Operation": "COUNT", "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"count\":\"coll\",\"query\":{},\"fields\":{},\"$db\":\"test\"}}\n", "Fingerprint": "COUNT coll", - "FirstSeen": "2017-10-15T01:54:52.844Z", - "LastSeen": "2017-10-15T01:54:52.844Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 29 diff --git a/src/go/tests/expect/stats_single/count_with_query_2.6.12 b/src/go/tests/expect/stats_single/count_with_query_2.6.12 index 54e52d62..2e5aa659 100755 --- a/src/go/tests/expect/stats_single/count_with_query_2.6.12 +++ b/src/go/tests/expect/stats_single/count_with_query_2.6.12 @@ -5,8 +5,8 @@ "Operation": "COUNT", "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"count\":\"coll\",\"query\":{\"a\":{\"$gt\":5}},\"fields\":{}}}\n", "Fingerprint": "COUNT coll a", - "FirstSeen": "2017-10-15T01:54:09.039Z", - "LastSeen": "2017-10-15T01:54:09.039Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 48 diff --git a/src/go/tests/expect/stats_single/count_with_query_3.0.15 b/src/go/tests/expect/stats_single/count_with_query_3.0.15 index 7d1e1d81..6eb18aeb 100755 --- a/src/go/tests/expect/stats_single/count_with_query_3.0.15 +++ b/src/go/tests/expect/stats_single/count_with_query_3.0.15 @@ -5,8 +5,8 @@ "Operation": "COUNT", "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"count\":\"coll\",\"query\":{\"a\":{\"$gt\":5}},\"fields\":{}}}\n", "Fingerprint": "COUNT coll a", - "FirstSeen": "2017-10-15T01:54:18.838Z", - "LastSeen": "2017-10-15T01:54:18.838Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 44 diff --git a/src/go/tests/expect/stats_single/count_with_query_3.2.16 b/src/go/tests/expect/stats_single/count_with_query_3.2.19 similarity index 83% rename from src/go/tests/expect/stats_single/count_with_query_3.2.16 rename to src/go/tests/expect/stats_single/count_with_query_3.2.19 index e6cbb692..38ce0c08 100755 --- a/src/go/tests/expect/stats_single/count_with_query_3.2.16 +++ b/src/go/tests/expect/stats_single/count_with_query_3.2.19 @@ -5,8 +5,8 @@ "Operation": "COUNT", "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"count\":\"coll\",\"query\":{\"a\":{\"$gt\":5}},\"fields\":{}}}\n", "Fingerprint": "COUNT coll a", - "FirstSeen": "2017-10-15T01:54:31.756Z", - "LastSeen": "2017-10-15T01:54:31.756Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 47 diff --git a/src/go/tests/expect/stats_single/count_with_query_3.4.7 b/src/go/tests/expect/stats_single/count_with_query_3.4.12 similarity index 84% rename from src/go/tests/expect/stats_single/count_with_query_3.4.7 rename to src/go/tests/expect/stats_single/count_with_query_3.4.12 index 5c8ced90..2b9a32e3 100755 --- a/src/go/tests/expect/stats_single/count_with_query_3.4.7 +++ b/src/go/tests/expect/stats_single/count_with_query_3.4.12 @@ -5,8 +5,8 @@ "Operation": "COUNT", "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"count\":\"coll\",\"query\":{\"a\":{\"$gt\":5}},\"fields\":{}}}\n", "Fingerprint": "COUNT coll a", - "FirstSeen": "2017-10-15T01:54:42.35Z", - "LastSeen": "2017-10-15T01:54:42.35Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 10 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 29 diff --git a/src/go/tests/expect/stats_single/count_with_query_3.5.11 b/src/go/tests/expect/stats_single/count_with_query_3.6.2 similarity index 84% rename from src/go/tests/expect/stats_single/count_with_query_3.5.11 rename to src/go/tests/expect/stats_single/count_with_query_3.6.2 index 8a9523a4..58002f31 100755 --- a/src/go/tests/expect/stats_single/count_with_query_3.5.11 +++ b/src/go/tests/expect/stats_single/count_with_query_3.6.2 @@ -5,8 +5,8 @@ "Operation": "COUNT", "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"count\":\"coll\",\"query\":{\"a\":{\"$gt\":5}},\"fields\":{},\"$db\":\"test\"}}\n", "Fingerprint": "COUNT coll a", - "FirstSeen": "2017-10-15T01:54:53.078Z", - "LastSeen": "2017-10-15T01:54:53.078Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 10 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 29 diff --git a/src/go/tests/expect/stats_single/delete_2.6.12 b/src/go/tests/expect/stats_single/delete_2.6.12 index d4cf7929..f64f978e 100755 --- a/src/go/tests/expect/stats_single/delete_2.6.12 +++ b/src/go/tests/expect/stats_single/delete_2.6.12 @@ -5,8 +5,8 @@ "Operation": "REMOVE", "Query": "{\"ns\":\"test.coll\",\"op\":\"remove\",\"query\":{\"a\":{\"$gte\":2},\"b\":{\"$gte\":2}}}\n", "Fingerprint": "REMOVE coll a,b", - "FirstSeen": "2017-10-15T01:54:09.246Z", - "LastSeen": "2017-10-15T01:54:09.246Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 0 diff --git a/src/go/tests/expect/stats_single/delete_3.0.15 b/src/go/tests/expect/stats_single/delete_3.0.15 index 58f2cbf9..f64f978e 100755 --- a/src/go/tests/expect/stats_single/delete_3.0.15 +++ b/src/go/tests/expect/stats_single/delete_3.0.15 @@ -5,8 +5,8 @@ "Operation": "REMOVE", "Query": "{\"ns\":\"test.coll\",\"op\":\"remove\",\"query\":{\"a\":{\"$gte\":2},\"b\":{\"$gte\":2}}}\n", "Fingerprint": "REMOVE coll a,b", - "FirstSeen": "2017-10-15T01:54:19.034Z", - "LastSeen": "2017-10-15T01:54:19.034Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 0 diff --git a/src/go/tests/expect/stats_single/delete_3.2.16 b/src/go/tests/expect/stats_single/delete_3.2.19 similarity index 83% rename from src/go/tests/expect/stats_single/delete_3.2.16 rename to src/go/tests/expect/stats_single/delete_3.2.19 index adcfc5c1..f64f978e 100755 --- a/src/go/tests/expect/stats_single/delete_3.2.16 +++ b/src/go/tests/expect/stats_single/delete_3.2.19 @@ -5,8 +5,8 @@ "Operation": "REMOVE", "Query": "{\"ns\":\"test.coll\",\"op\":\"remove\",\"query\":{\"a\":{\"$gte\":2},\"b\":{\"$gte\":2}}}\n", "Fingerprint": "REMOVE coll a,b", - "FirstSeen": "2017-10-15T01:54:32.02Z", - "LastSeen": "2017-10-15T01:54:32.02Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 1 + 42 ], "ResponseLength": [ 0 diff --git a/src/go/tests/expect/stats_single/delete_all_3.4.7 b/src/go/tests/expect/stats_single/delete_3.4.12 similarity index 83% rename from src/go/tests/expect/stats_single/delete_all_3.4.7 rename to src/go/tests/expect/stats_single/delete_3.4.12 index 86ca7924..1317ea69 100755 --- a/src/go/tests/expect/stats_single/delete_all_3.4.7 +++ b/src/go/tests/expect/stats_single/delete_3.4.12 @@ -5,8 +5,8 @@ "Operation": "REMOVE", "Query": "{\"ns\":\"test.coll\",\"op\":\"remove\",\"query\":{\"a\":{\"$gte\":2},\"b\":{\"$gte\":2}}}\n", "Fingerprint": "REMOVE coll a,b", - "FirstSeen": "2017-10-15T01:54:42.82Z", - "LastSeen": "2017-10-15T01:54:42.82Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -15,10 +15,10 @@ 0 ], "NScanned": [ - 8 + 1 ], "QueryTime": [ - 1 + 42 ], "ResponseLength": [ 0 diff --git a/src/go/tests/expect/stats_single/delete_3.5.11 b/src/go/tests/expect/stats_single/delete_3.6.2 similarity index 83% rename from src/go/tests/expect/stats_single/delete_3.5.11 rename to src/go/tests/expect/stats_single/delete_3.6.2 index fb21b711..71e8f7aa 100755 --- a/src/go/tests/expect/stats_single/delete_3.5.11 +++ b/src/go/tests/expect/stats_single/delete_3.6.2 @@ -5,8 +5,8 @@ "Operation": "REMOVE", "Query": "{\"ns\":\"test.coll\",\"op\":\"remove\",\"command\":{\"q\":{\"a\":{\"$gte\":2},\"b\":{\"$gte\":2}},\"limit\":1}}\n", "Fingerprint": "REMOVE coll a,b", - "FirstSeen": "2017-10-15T01:54:53.333Z", - "LastSeen": "2017-10-15T01:54:53.333Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 1 ], "QueryTime": [ - 1 + 42 ], "ResponseLength": [ 0 diff --git a/src/go/tests/expect/stats_single/delete_all_2.6.12 b/src/go/tests/expect/stats_single/delete_all_2.6.12 index 2d739353..f64f978e 100755 --- a/src/go/tests/expect/stats_single/delete_all_2.6.12 +++ b/src/go/tests/expect/stats_single/delete_all_2.6.12 @@ -5,8 +5,8 @@ "Operation": "REMOVE", "Query": "{\"ns\":\"test.coll\",\"op\":\"remove\",\"query\":{\"a\":{\"$gte\":2},\"b\":{\"$gte\":2}}}\n", "Fingerprint": "REMOVE coll a,b", - "FirstSeen": "2017-10-15T01:54:09.463Z", - "LastSeen": "2017-10-15T01:54:09.463Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 0 diff --git a/src/go/tests/expect/stats_single/delete_all_3.0.15 b/src/go/tests/expect/stats_single/delete_all_3.0.15 index 53995300..f64f978e 100755 --- a/src/go/tests/expect/stats_single/delete_all_3.0.15 +++ b/src/go/tests/expect/stats_single/delete_all_3.0.15 @@ -5,8 +5,8 @@ "Operation": "REMOVE", "Query": "{\"ns\":\"test.coll\",\"op\":\"remove\",\"query\":{\"a\":{\"$gte\":2},\"b\":{\"$gte\":2}}}\n", "Fingerprint": "REMOVE coll a,b", - "FirstSeen": "2017-10-15T01:54:19.206Z", - "LastSeen": "2017-10-15T01:54:19.206Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 0 diff --git a/src/go/tests/expect/stats_single/delete_3.4.7 b/src/go/tests/expect/stats_single/delete_all_3.2.19 similarity index 83% rename from src/go/tests/expect/stats_single/delete_3.4.7 rename to src/go/tests/expect/stats_single/delete_all_3.2.19 index 35449aa5..f64f978e 100755 --- a/src/go/tests/expect/stats_single/delete_3.4.7 +++ b/src/go/tests/expect/stats_single/delete_all_3.2.19 @@ -5,8 +5,8 @@ "Operation": "REMOVE", "Query": "{\"ns\":\"test.coll\",\"op\":\"remove\",\"query\":{\"a\":{\"$gte\":2},\"b\":{\"$gte\":2}}}\n", "Fingerprint": "REMOVE coll a,b", - "FirstSeen": "2017-10-15T01:54:42.612Z", - "LastSeen": "2017-10-15T01:54:42.612Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -15,10 +15,10 @@ 0 ], "NScanned": [ - 1 + 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 0 diff --git a/src/go/tests/expect/stats_single/delete_all_3.2.16 b/src/go/tests/expect/stats_single/delete_all_3.4.12 similarity index 81% rename from src/go/tests/expect/stats_single/delete_all_3.2.16 rename to src/go/tests/expect/stats_single/delete_all_3.4.12 index 52b42285..c2d360be 100755 --- a/src/go/tests/expect/stats_single/delete_all_3.2.16 +++ b/src/go/tests/expect/stats_single/delete_all_3.4.12 @@ -5,8 +5,8 @@ "Operation": "REMOVE", "Query": "{\"ns\":\"test.coll\",\"op\":\"remove\",\"query\":{\"a\":{\"$gte\":2},\"b\":{\"$gte\":2}}}\n", "Fingerprint": "REMOVE coll a,b", - "FirstSeen": "2017-10-15T01:54:32.281Z", - "LastSeen": "2017-10-15T01:54:32.281Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -15,10 +15,10 @@ 0 ], "NScanned": [ - 0 + 8 ], "QueryTime": [ - 1 + 42 ], "ResponseLength": [ 0 diff --git a/src/go/tests/expect/stats_single/delete_all_3.5.11 b/src/go/tests/expect/stats_single/delete_all_3.6.2 similarity index 83% rename from src/go/tests/expect/stats_single/delete_all_3.5.11 rename to src/go/tests/expect/stats_single/delete_all_3.6.2 index ee49d55d..0e1b2afa 100755 --- a/src/go/tests/expect/stats_single/delete_all_3.5.11 +++ b/src/go/tests/expect/stats_single/delete_all_3.6.2 @@ -5,8 +5,8 @@ "Operation": "REMOVE", "Query": "{\"ns\":\"test.coll\",\"op\":\"remove\",\"command\":{\"q\":{\"a\":{\"$gte\":2},\"b\":{\"$gte\":2}},\"limit\":0}}\n", "Fingerprint": "REMOVE coll a,b", - "FirstSeen": "2017-10-15T01:54:53.615Z", - "LastSeen": "2017-10-15T01:54:53.615Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 8 ], "QueryTime": [ - 1 + 42 ], "ResponseLength": [ 0 diff --git a/src/go/tests/expect/stats_single/distinct_2.6.12 b/src/go/tests/expect/stats_single/distinct_2.6.12 index f2e3106b..b0c1566f 100755 --- a/src/go/tests/expect/stats_single/distinct_2.6.12 +++ b/src/go/tests/expect/stats_single/distinct_2.6.12 @@ -5,8 +5,8 @@ "Operation": "DISTINCT", "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"distinct\":\"coll\",\"key\":\"a\",\"query\":{\"b\":{\"$gte\":5}}}}\n", "Fingerprint": "DISTINCT coll a,b", - "FirstSeen": "2017-10-15T01:54:09.687Z", - "LastSeen": "2017-10-15T01:54:09.687Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 199 diff --git a/src/go/tests/expect/stats_single/distinct_3.0.15 b/src/go/tests/expect/stats_single/distinct_3.0.15 index 281541e3..b895efae 100755 --- a/src/go/tests/expect/stats_single/distinct_3.0.15 +++ b/src/go/tests/expect/stats_single/distinct_3.0.15 @@ -5,8 +5,8 @@ "Operation": "DISTINCT", "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"distinct\":\"coll\",\"key\":\"a\",\"query\":{\"b\":{\"$gte\":5}}}}\n", "Fingerprint": "DISTINCT coll a,b", - "FirstSeen": "2017-10-15T01:54:19.38Z", - "LastSeen": "2017-10-15T01:54:19.38Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 206 diff --git a/src/go/tests/expect/stats_single/distinct_3.2.16 b/src/go/tests/expect/stats_single/distinct_3.2.19 similarity index 84% rename from src/go/tests/expect/stats_single/distinct_3.2.16 rename to src/go/tests/expect/stats_single/distinct_3.2.19 index 9ea9a80d..eb030e64 100755 --- a/src/go/tests/expect/stats_single/distinct_3.2.16 +++ b/src/go/tests/expect/stats_single/distinct_3.2.19 @@ -5,8 +5,8 @@ "Operation": "DISTINCT", "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"distinct\":\"coll\",\"key\":\"a\",\"query\":{\"b\":{\"$gte\":5}}}}\n", "Fingerprint": "DISTINCT coll a,b", - "FirstSeen": "2017-10-15T01:54:32.523Z", - "LastSeen": "2017-10-15T01:54:32.523Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 209 diff --git a/src/go/tests/expect/stats_single/distinct_3.4.7 b/src/go/tests/expect/stats_single/distinct_3.4.12 similarity index 84% rename from src/go/tests/expect/stats_single/distinct_3.4.7 rename to src/go/tests/expect/stats_single/distinct_3.4.12 index 92c16a2a..84ccdaf2 100755 --- a/src/go/tests/expect/stats_single/distinct_3.4.7 +++ b/src/go/tests/expect/stats_single/distinct_3.4.12 @@ -5,8 +5,8 @@ "Operation": "DISTINCT", "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"distinct\":\"coll\",\"key\":\"a\",\"query\":{\"b\":{\"$gte\":5}}}}\n", "Fingerprint": "DISTINCT coll a,b", - "FirstSeen": "2017-10-15T01:54:43.048Z", - "LastSeen": "2017-10-15T01:54:43.048Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 5 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 90 diff --git a/src/go/tests/expect/stats_single/distinct_3.5.11 b/src/go/tests/expect/stats_single/distinct_3.6.2 similarity index 84% rename from src/go/tests/expect/stats_single/distinct_3.5.11 rename to src/go/tests/expect/stats_single/distinct_3.6.2 index f8d9e57b..7361e563 100755 --- a/src/go/tests/expect/stats_single/distinct_3.5.11 +++ b/src/go/tests/expect/stats_single/distinct_3.6.2 @@ -5,8 +5,8 @@ "Operation": "DISTINCT", "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"distinct\":\"coll\",\"key\":\"a\",\"query\":{\"b\":{\"$gte\":5}},\"$db\":\"test\"}}\n", "Fingerprint": "DISTINCT coll a,b", - "FirstSeen": "2017-10-15T01:54:53.874Z", - "LastSeen": "2017-10-15T01:54:53.874Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 5 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 90 diff --git a/src/go/tests/expect/stats_single/eval_2.6.12 b/src/go/tests/expect/stats_single/eval_2.6.12 index af410ea5..ef589681 100755 --- a/src/go/tests/expect/stats_single/eval_2.6.12 +++ b/src/go/tests/expect/stats_single/eval_2.6.12 @@ -5,8 +5,8 @@ "Operation": "EVAL", "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"$eval\":\"1\"}}\n", "Fingerprint": "EVAL", - "FirstSeen": "2017-10-15T01:54:09.89Z", - "LastSeen": "2017-10-15T01:54:09.89Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 43 + 42 ], "ResponseLength": [ 53 diff --git a/src/go/tests/expect/stats_single/eval_3.0.15 b/src/go/tests/expect/stats_single/eval_3.0.15 index 93735c33..ef589681 100755 --- a/src/go/tests/expect/stats_single/eval_3.0.15 +++ b/src/go/tests/expect/stats_single/eval_3.0.15 @@ -5,8 +5,8 @@ "Operation": "EVAL", "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"$eval\":\"1\"}}\n", "Fingerprint": "EVAL", - "FirstSeen": "2017-10-15T01:54:19.572Z", - "LastSeen": "2017-10-15T01:54:19.572Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 37 + 42 ], "ResponseLength": [ 53 diff --git a/src/go/tests/expect/stats_single/eval_3.2.16 b/src/go/tests/expect/stats_single/eval_3.2.19 similarity index 81% rename from src/go/tests/expect/stats_single/eval_3.2.16 rename to src/go/tests/expect/stats_single/eval_3.2.19 index 7564171f..baeb7405 100755 --- a/src/go/tests/expect/stats_single/eval_3.2.16 +++ b/src/go/tests/expect/stats_single/eval_3.2.19 @@ -5,8 +5,8 @@ "Operation": "EVAL", "Query": "{\"ns\":\"test\",\"op\":\"command\",\"command\":{\"$eval\":\"1\"}}\n", "Fingerprint": "EVAL", - "FirstSeen": "2017-10-15T01:54:32.759Z", - "LastSeen": "2017-10-15T01:54:32.759Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 56 + 42 ], "ResponseLength": [ 38 diff --git a/src/go/tests/expect/stats_single/eval_3.4.7 b/src/go/tests/expect/stats_single/eval_3.4.12 similarity index 81% rename from src/go/tests/expect/stats_single/eval_3.4.7 rename to src/go/tests/expect/stats_single/eval_3.4.12 index da0361ef..baeb7405 100755 --- a/src/go/tests/expect/stats_single/eval_3.4.7 +++ b/src/go/tests/expect/stats_single/eval_3.4.12 @@ -5,8 +5,8 @@ "Operation": "EVAL", "Query": "{\"ns\":\"test\",\"op\":\"command\",\"command\":{\"$eval\":\"1\"}}\n", "Fingerprint": "EVAL", - "FirstSeen": "2017-10-15T01:54:43.273Z", - "LastSeen": "2017-10-15T01:54:43.273Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 48 + 42 ], "ResponseLength": [ 38 diff --git a/src/go/tests/expect/stats_single/eval_3.5.11 b/src/go/tests/expect/stats_single/eval_3.6.2 similarity index 82% rename from src/go/tests/expect/stats_single/eval_3.5.11 rename to src/go/tests/expect/stats_single/eval_3.6.2 index b0e5e433..9df7bd1f 100755 --- a/src/go/tests/expect/stats_single/eval_3.5.11 +++ b/src/go/tests/expect/stats_single/eval_3.6.2 @@ -5,8 +5,8 @@ "Operation": "EVAL", "Query": "{\"ns\":\"test\",\"op\":\"command\",\"command\":{\"$eval\":\"1\",\"$db\":\"test\"}}\n", "Fingerprint": "EVAL", - "FirstSeen": "2017-10-15T01:54:54.085Z", - "LastSeen": "2017-10-15T01:54:54.085Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 40 + 42 ], "ResponseLength": [ 38 diff --git a/src/go/tests/expect/stats_single/explain_2.6.12 b/src/go/tests/expect/stats_single/explain_2.6.12 index bbd5d938..be2ba425 100755 --- a/src/go/tests/expect/stats_single/explain_2.6.12 +++ b/src/go/tests/expect/stats_single/explain_2.6.12 @@ -5,8 +5,8 @@ "Operation": "EXPLAIN", "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"query\":{\"query\":{},\"$explain\":true}}\n", "Fingerprint": "EXPLAIN", - "FirstSeen": "2017-10-15T01:54:10.058Z", - "LastSeen": "2017-10-15T01:54:10.058Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 10 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 583 diff --git a/src/go/tests/expect/stats_single/explain_3.0.15 b/src/go/tests/expect/stats_single/explain_3.0.15 index 48bc0d34..8dbcf942 100755 --- a/src/go/tests/expect/stats_single/explain_3.0.15 +++ b/src/go/tests/expect/stats_single/explain_3.0.15 @@ -5,8 +5,8 @@ "Operation": "EXPLAIN", "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"explain\":{\"find\":\"coll\",\"filter\":{},\"options\":{}},\"verbosity\":\"queryPlanner\"}}\n", "Fingerprint": "EXPLAIN", - "FirstSeen": "2017-10-15T01:54:19.722Z", - "LastSeen": "2017-10-15T01:54:19.722Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 379 diff --git a/src/go/tests/expect/stats_single/explain_3.2.16 b/src/go/tests/expect/stats_single/explain_3.2.19 similarity index 83% rename from src/go/tests/expect/stats_single/explain_3.2.16 rename to src/go/tests/expect/stats_single/explain_3.2.19 index a271a1e6..34488197 100755 --- a/src/go/tests/expect/stats_single/explain_3.2.16 +++ b/src/go/tests/expect/stats_single/explain_3.2.19 @@ -5,8 +5,8 @@ "Operation": "EXPLAIN", "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"explain\":{\"find\":\"coll\",\"filter\":{}},\"verbosity\":\"queryPlanner\"}}\n", "Fingerprint": "EXPLAIN", - "FirstSeen": "2017-10-15T01:54:32.931Z", - "LastSeen": "2017-10-15T01:54:32.931Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 364 diff --git a/src/go/tests/expect/stats_single/explain_3.4.7 b/src/go/tests/expect/stats_single/explain_3.4.12 similarity index 82% rename from src/go/tests/expect/stats_single/explain_3.4.7 rename to src/go/tests/expect/stats_single/explain_3.4.12 index 518b15fa..6567b436 100755 --- a/src/go/tests/expect/stats_single/explain_3.4.7 +++ b/src/go/tests/expect/stats_single/explain_3.4.12 @@ -5,8 +5,8 @@ "Operation": "EXPLAIN", "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"explain\":{\"find\":\"coll\",\"filter\":{}},\"verbosity\":\"queryPlanner\"}}\n", "Fingerprint": "EXPLAIN", - "FirstSeen": "2017-10-15T01:54:43.427Z", - "LastSeen": "2017-10-15T01:54:43.427Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,10 +18,10 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ - 328 + 329 ] } ] \ No newline at end of file diff --git a/src/go/tests/expect/stats_single/explain_3.5.11 b/src/go/tests/expect/stats_single/explain_3.6.2 similarity index 82% rename from src/go/tests/expect/stats_single/explain_3.5.11 rename to src/go/tests/expect/stats_single/explain_3.6.2 index 9d80c538..38eff462 100755 --- a/src/go/tests/expect/stats_single/explain_3.5.11 +++ b/src/go/tests/expect/stats_single/explain_3.6.2 @@ -5,8 +5,8 @@ "Operation": "EXPLAIN", "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"explain\":{\"find\":\"coll\",\"filter\":{}},\"verbosity\":\"queryPlanner\",\"$db\":\"test\"}}\n", "Fingerprint": "EXPLAIN", - "FirstSeen": "2017-10-15T01:54:54.257Z", - "LastSeen": "2017-10-15T01:54:54.257Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,10 +18,10 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ - 329 + 328 ] } ] \ No newline at end of file diff --git a/src/go/tests/expect/stats_single/find_2.6.12 b/src/go/tests/expect/stats_single/find_2.6.12 index 63f5f9ed..47aad4c9 100755 --- a/src/go/tests/expect/stats_single/find_2.6.12 +++ b/src/go/tests/expect/stats_single/find_2.6.12 @@ -5,8 +5,8 @@ "Operation": "FIND", "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"query\":{\"k\":1}}\n", "Fingerprint": "FIND coll k", - "FirstSeen": "2017-10-15T01:54:10.277Z", - "LastSeen": "2017-10-15T01:54:10.277Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 2 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 86 diff --git a/src/go/tests/expect/stats_single/find_3.0.15 b/src/go/tests/expect/stats_single/find_3.0.15 index 7e7b4507..47aad4c9 100755 --- a/src/go/tests/expect/stats_single/find_3.0.15 +++ b/src/go/tests/expect/stats_single/find_3.0.15 @@ -5,8 +5,8 @@ "Operation": "FIND", "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"query\":{\"k\":1}}\n", "Fingerprint": "FIND coll k", - "FirstSeen": "2017-10-15T01:54:19.953Z", - "LastSeen": "2017-10-15T01:54:19.953Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 2 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 86 diff --git a/src/go/tests/expect/stats_single/find_3.2.16 b/src/go/tests/expect/stats_single/find_3.2.19 similarity index 83% rename from src/go/tests/expect/stats_single/find_3.2.16 rename to src/go/tests/expect/stats_single/find_3.2.19 index df47999c..ddfa1a91 100755 --- a/src/go/tests/expect/stats_single/find_3.2.16 +++ b/src/go/tests/expect/stats_single/find_3.2.19 @@ -5,8 +5,8 @@ "Operation": "FIND", "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"query\":{\"find\":\"coll\",\"filter\":{\"k\":1}}}\n", "Fingerprint": "FIND coll k", - "FirstSeen": "2017-10-15T01:54:33.179Z", - "LastSeen": "2017-10-15T01:54:33.179Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 2 ], "QueryTime": [ - 1 + 42 ], "ResponseLength": [ 172 diff --git a/src/go/tests/expect/stats_single/find_3.4.7 b/src/go/tests/expect/stats_single/find_3.4.12 similarity index 83% rename from src/go/tests/expect/stats_single/find_3.4.7 rename to src/go/tests/expect/stats_single/find_3.4.12 index d641eb93..b91b030d 100755 --- a/src/go/tests/expect/stats_single/find_3.4.7 +++ b/src/go/tests/expect/stats_single/find_3.4.12 @@ -5,8 +5,8 @@ "Operation": "FIND", "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"query\":{\"find\":\"coll\",\"filter\":{\"k\":1}}}\n", "Fingerprint": "FIND coll k", - "FirstSeen": "2017-10-15T01:54:43.713Z", - "LastSeen": "2017-10-15T01:54:43.713Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 2 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 154 diff --git a/src/go/tests/expect/stats_single/find_3.5.11 b/src/go/tests/expect/stats_single/find_3.6.2 similarity index 83% rename from src/go/tests/expect/stats_single/find_3.5.11 rename to src/go/tests/expect/stats_single/find_3.6.2 index 2a1a004e..c19160b8 100755 --- a/src/go/tests/expect/stats_single/find_3.5.11 +++ b/src/go/tests/expect/stats_single/find_3.6.2 @@ -5,8 +5,8 @@ "Operation": "FIND", "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"command\":{\"find\":\"coll\",\"filter\":{\"k\":1},\"$db\":\"test\"}}\n", "Fingerprint": "FIND coll k", - "FirstSeen": "2017-10-15T01:54:54.507Z", - "LastSeen": "2017-10-15T01:54:54.507Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 2 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 154 diff --git a/src/go/tests/expect/stats_single/find_andrii_2.6.12 b/src/go/tests/expect/stats_single/find_andrii_2.6.12 index aeda265e..b652452d 100755 --- a/src/go/tests/expect/stats_single/find_andrii_2.6.12 +++ b/src/go/tests/expect/stats_single/find_andrii_2.6.12 @@ -5,8 +5,8 @@ "Operation": "FIND", "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"query\":{\"query\":{\"$and\":[{\"k\":{\"$gt\":1}},{\"k\":{\"$lt\":2}},{\"$or\":[{\"c\":{\"$in\":[\"/^0/\",\"/^2/\",\"/^4/\",\"/^6/\"]}},{\"pad\":{\"$in\":[\"/9$/\",\"/7$/\",\"/5$/\",\"/3$/\"]}}]}]},\"orderby\":{\"k\":-1}}}\n", "Fingerprint": "FIND coll c,k,pad", - "FirstSeen": "2017-10-15T01:54:10.474Z", - "LastSeen": "2017-10-15T01:54:10.474Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 20 diff --git a/src/go/tests/expect/stats_single/find_andrii_3.0.15 b/src/go/tests/expect/stats_single/find_andrii_3.0.15 index f7cba294..b652452d 100755 --- a/src/go/tests/expect/stats_single/find_andrii_3.0.15 +++ b/src/go/tests/expect/stats_single/find_andrii_3.0.15 @@ -5,8 +5,8 @@ "Operation": "FIND", "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"query\":{\"query\":{\"$and\":[{\"k\":{\"$gt\":1}},{\"k\":{\"$lt\":2}},{\"$or\":[{\"c\":{\"$in\":[\"/^0/\",\"/^2/\",\"/^4/\",\"/^6/\"]}},{\"pad\":{\"$in\":[\"/9$/\",\"/7$/\",\"/5$/\",\"/3$/\"]}}]}]},\"orderby\":{\"k\":-1}}}\n", "Fingerprint": "FIND coll c,k,pad", - "FirstSeen": "2017-10-15T01:54:20.111Z", - "LastSeen": "2017-10-15T01:54:20.111Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 20 diff --git a/src/go/tests/expect/stats_single/find_andrii_3.2.16 b/src/go/tests/expect/stats_single/find_andrii_3.2.19 similarity index 87% rename from src/go/tests/expect/stats_single/find_andrii_3.2.16 rename to src/go/tests/expect/stats_single/find_andrii_3.2.19 index 00826af3..a80cefce 100755 --- a/src/go/tests/expect/stats_single/find_andrii_3.2.16 +++ b/src/go/tests/expect/stats_single/find_andrii_3.2.19 @@ -5,8 +5,8 @@ "Operation": "FIND", "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"query\":{\"find\":\"coll\",\"filter\":{\"$and\":[{\"k\":{\"$gt\":1}},{\"k\":{\"$lt\":2}},{\"$or\":[{\"c\":{\"$in\":[\"/^0/\",\"/^2/\",\"/^4/\",\"/^6/\"]}},{\"pad\":{\"$in\":[\"/9$/\",\"/7$/\",\"/5$/\",\"/3$/\"]}}]}]},\"limit\":100,\"singleBatch\":false,\"sort\":{\"k\":-1}}}\n", "Fingerprint": "FIND coll c,k,pad", - "FirstSeen": "2017-10-15T01:54:33.358Z", - "LastSeen": "2017-10-15T01:54:33.358Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 100 diff --git a/src/go/tests/expect/stats_single/find_andrii_3.4.7 b/src/go/tests/expect/stats_single/find_andrii_3.4.12 similarity index 87% rename from src/go/tests/expect/stats_single/find_andrii_3.4.7 rename to src/go/tests/expect/stats_single/find_andrii_3.4.12 index d109b603..d2640f7b 100755 --- a/src/go/tests/expect/stats_single/find_andrii_3.4.7 +++ b/src/go/tests/expect/stats_single/find_andrii_3.4.12 @@ -5,8 +5,8 @@ "Operation": "FIND", "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"query\":{\"find\":\"coll\",\"filter\":{\"$and\":[{\"k\":{\"$gt\":1}},{\"k\":{\"$lt\":2}},{\"$or\":[{\"c\":{\"$in\":[\"/^0/\",\"/^2/\",\"/^4/\",\"/^6/\"]}},{\"pad\":{\"$in\":[\"/9$/\",\"/7$/\",\"/5$/\",\"/3$/\"]}}]}]},\"limit\":100,\"singleBatch\":false,\"sort\":{\"k\":-1}}}\n", "Fingerprint": "FIND coll c,k,pad", - "FirstSeen": "2017-10-15T01:54:43.922Z", - "LastSeen": "2017-10-15T01:54:43.922Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 82 diff --git a/src/go/tests/expect/stats_single/find_andrii_3.5.11 b/src/go/tests/expect/stats_single/find_andrii_3.6.2 similarity index 88% rename from src/go/tests/expect/stats_single/find_andrii_3.5.11 rename to src/go/tests/expect/stats_single/find_andrii_3.6.2 index 57a9d35a..537cb8d2 100755 --- a/src/go/tests/expect/stats_single/find_andrii_3.5.11 +++ b/src/go/tests/expect/stats_single/find_andrii_3.6.2 @@ -5,8 +5,8 @@ "Operation": "FIND", "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"command\":{\"find\":\"coll\",\"filter\":{\"$and\":[{\"k\":{\"$gt\":1}},{\"k\":{\"$lt\":2}},{\"$or\":[{\"c\":{\"$in\":[\"/^0/\",\"/^2/\",\"/^4/\",\"/^6/\"]}},{\"pad\":{\"$in\":[\"/9$/\",\"/7$/\",\"/5$/\",\"/3$/\"]}}]}]},\"limit\":100,\"singleBatch\":false,\"sort\":{\"k\":-1},\"$db\":\"test\"}}\n", "Fingerprint": "FIND coll c,k,pad", - "FirstSeen": "2017-10-15T01:54:54.693Z", - "LastSeen": "2017-10-15T01:54:54.693Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 82 diff --git a/src/go/tests/expect/stats_single/find_empty_2.6.12 b/src/go/tests/expect/stats_single/find_empty_2.6.12 index 8d2f5c99..331e44b9 100755 --- a/src/go/tests/expect/stats_single/find_empty_2.6.12 +++ b/src/go/tests/expect/stats_single/find_empty_2.6.12 @@ -5,8 +5,8 @@ "Operation": "FIND", "Query": "{\"ns\":\"test.coll\",\"op\":\"query\"}\n", "Fingerprint": "FIND coll", - "FirstSeen": "2017-10-15T01:54:10.63Z", - "LastSeen": "2017-10-15T01:54:10.63Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 20 diff --git a/src/go/tests/expect/stats_single/find_empty_3.0.15 b/src/go/tests/expect/stats_single/find_empty_3.0.15 index adad3b50..331e44b9 100755 --- a/src/go/tests/expect/stats_single/find_empty_3.0.15 +++ b/src/go/tests/expect/stats_single/find_empty_3.0.15 @@ -5,8 +5,8 @@ "Operation": "FIND", "Query": "{\"ns\":\"test.coll\",\"op\":\"query\"}\n", "Fingerprint": "FIND coll", - "FirstSeen": "2017-10-15T01:54:20.246Z", - "LastSeen": "2017-10-15T01:54:20.246Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 20 diff --git a/src/go/tests/expect/stats_single/find_empty_3.2.16 b/src/go/tests/expect/stats_single/find_empty_3.2.19 similarity index 83% rename from src/go/tests/expect/stats_single/find_empty_3.2.16 rename to src/go/tests/expect/stats_single/find_empty_3.2.19 index f4308c9b..28508fc0 100755 --- a/src/go/tests/expect/stats_single/find_empty_3.2.16 +++ b/src/go/tests/expect/stats_single/find_empty_3.2.19 @@ -5,8 +5,8 @@ "Operation": "FIND", "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"query\":{\"find\":\"coll\",\"filter\":{}}}\n", "Fingerprint": "FIND coll", - "FirstSeen": "2017-10-15T01:54:33.53Z", - "LastSeen": "2017-10-15T01:54:33.53Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 100 diff --git a/src/go/tests/expect/stats_single/find_empty_3.4.7 b/src/go/tests/expect/stats_single/find_empty_3.4.12 similarity index 82% rename from src/go/tests/expect/stats_single/find_empty_3.4.7 rename to src/go/tests/expect/stats_single/find_empty_3.4.12 index 6c9a2caf..47bdf84b 100755 --- a/src/go/tests/expect/stats_single/find_empty_3.4.7 +++ b/src/go/tests/expect/stats_single/find_empty_3.4.12 @@ -5,8 +5,8 @@ "Operation": "FIND", "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"query\":{\"find\":\"coll\",\"filter\":{}}}\n", "Fingerprint": "FIND coll", - "FirstSeen": "2017-10-15T01:54:44.129Z", - "LastSeen": "2017-10-15T01:54:44.129Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 82 diff --git a/src/go/tests/expect/stats_single/find_empty_3.5.11 b/src/go/tests/expect/stats_single/find_empty_3.6.2 similarity index 83% rename from src/go/tests/expect/stats_single/find_empty_3.5.11 rename to src/go/tests/expect/stats_single/find_empty_3.6.2 index 937152ea..31a2b371 100755 --- a/src/go/tests/expect/stats_single/find_empty_3.5.11 +++ b/src/go/tests/expect/stats_single/find_empty_3.6.2 @@ -5,8 +5,8 @@ "Operation": "FIND", "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"command\":{\"find\":\"coll\",\"filter\":{},\"$db\":\"test\"}}\n", "Fingerprint": "FIND coll", - "FirstSeen": "2017-10-15T01:54:54.87Z", - "LastSeen": "2017-10-15T01:54:54.87Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 82 diff --git a/src/go/tests/expect/stats_single/find_with_sort_2.6.12 b/src/go/tests/expect/stats_single/find_with_sort_2.6.12 index 71dbb104..d0cb6fda 100755 --- a/src/go/tests/expect/stats_single/find_with_sort_2.6.12 +++ b/src/go/tests/expect/stats_single/find_with_sort_2.6.12 @@ -5,8 +5,8 @@ "Operation": "FIND", "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"query\":{\"query\":{\"c\":1},\"orderby\":{\"b\":-1}}}\n", "Fingerprint": "FIND coll b,c", - "FirstSeen": "2017-10-15T01:54:10.817Z", - "LastSeen": "2017-10-15T01:54:10.817Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 2 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 108 diff --git a/src/go/tests/expect/stats_single/find_with_sort_3.0.15 b/src/go/tests/expect/stats_single/find_with_sort_3.0.15 index 47318d5e..d0cb6fda 100755 --- a/src/go/tests/expect/stats_single/find_with_sort_3.0.15 +++ b/src/go/tests/expect/stats_single/find_with_sort_3.0.15 @@ -5,8 +5,8 @@ "Operation": "FIND", "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"query\":{\"query\":{\"c\":1},\"orderby\":{\"b\":-1}}}\n", "Fingerprint": "FIND coll b,c", - "FirstSeen": "2017-10-15T01:54:20.41Z", - "LastSeen": "2017-10-15T01:54:20.41Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 2 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 108 diff --git a/src/go/tests/expect/stats_single/find_with_sort_3.2.16 b/src/go/tests/expect/stats_single/find_with_sort_3.2.19 similarity index 83% rename from src/go/tests/expect/stats_single/find_with_sort_3.2.16 rename to src/go/tests/expect/stats_single/find_with_sort_3.2.19 index c1df885f..e3b478dd 100755 --- a/src/go/tests/expect/stats_single/find_with_sort_3.2.16 +++ b/src/go/tests/expect/stats_single/find_with_sort_3.2.19 @@ -5,8 +5,8 @@ "Operation": "FIND", "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"query\":{\"find\":\"coll\",\"filter\":{\"c\":1},\"sort\":{\"b\":-1}}}\n", "Fingerprint": "FIND coll b,c", - "FirstSeen": "2017-10-15T01:54:33.762Z", - "LastSeen": "2017-10-15T01:54:33.762Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 2 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 194 diff --git a/src/go/tests/expect/stats_single/find_with_sort_3.4.7 b/src/go/tests/expect/stats_single/find_with_sort_3.4.12 similarity index 83% rename from src/go/tests/expect/stats_single/find_with_sort_3.4.7 rename to src/go/tests/expect/stats_single/find_with_sort_3.4.12 index 36fb38f9..39b4ed25 100755 --- a/src/go/tests/expect/stats_single/find_with_sort_3.4.7 +++ b/src/go/tests/expect/stats_single/find_with_sort_3.4.12 @@ -5,8 +5,8 @@ "Operation": "FIND", "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"query\":{\"find\":\"coll\",\"filter\":{\"c\":1},\"sort\":{\"b\":-1}}}\n", "Fingerprint": "FIND coll b,c", - "FirstSeen": "2017-10-15T01:54:44.423Z", - "LastSeen": "2017-10-15T01:54:44.423Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 2 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 176 diff --git a/src/go/tests/expect/stats_single/find_with_sort_3.5.11 b/src/go/tests/expect/stats_single/find_with_sort_3.6.2 similarity index 84% rename from src/go/tests/expect/stats_single/find_with_sort_3.5.11 rename to src/go/tests/expect/stats_single/find_with_sort_3.6.2 index 736491a6..c5a3f58d 100755 --- a/src/go/tests/expect/stats_single/find_with_sort_3.5.11 +++ b/src/go/tests/expect/stats_single/find_with_sort_3.6.2 @@ -5,8 +5,8 @@ "Operation": "FIND", "Query": "{\"ns\":\"test.coll\",\"op\":\"query\",\"command\":{\"find\":\"coll\",\"filter\":{\"c\":1},\"sort\":{\"b\":-1},\"$db\":\"test\"}}\n", "Fingerprint": "FIND coll b,c", - "FirstSeen": "2017-10-15T01:54:55.111Z", - "LastSeen": "2017-10-15T01:54:55.111Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 2 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 176 diff --git a/src/go/tests/expect/stats_single/findandmodify_2.6.12 b/src/go/tests/expect/stats_single/findandmodify_2.6.12 index 595cbc6c..cc0628dc 100755 --- a/src/go/tests/expect/stats_single/findandmodify_2.6.12 +++ b/src/go/tests/expect/stats_single/findandmodify_2.6.12 @@ -5,8 +5,8 @@ "Operation": "FINDANDMODIFY", "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"findandmodify\":\"coll\",\"query\":{\"a\":2},\"update\":{\"$inc\":{\"b\":1}}},\"updateobj\":{\"$inc\":{\"b\":1}}}\n", "Fingerprint": "FINDANDMODIFY coll a", - "FirstSeen": "2017-10-15T01:54:11.011Z", - "LastSeen": "2017-10-15T01:54:11.011Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 1 ], "QueryTime": [ - 6 + 42 ], "ResponseLength": [ 131 diff --git a/src/go/tests/expect/stats_single/findandmodify_3.0.15 b/src/go/tests/expect/stats_single/findandmodify_3.0.15 index c8b17bf8..cc0628dc 100755 --- a/src/go/tests/expect/stats_single/findandmodify_3.0.15 +++ b/src/go/tests/expect/stats_single/findandmodify_3.0.15 @@ -5,8 +5,8 @@ "Operation": "FINDANDMODIFY", "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"findandmodify\":\"coll\",\"query\":{\"a\":2},\"update\":{\"$inc\":{\"b\":1}}},\"updateobj\":{\"$inc\":{\"b\":1}}}\n", "Fingerprint": "FINDANDMODIFY coll a", - "FirstSeen": "2017-10-15T01:54:20.581Z", - "LastSeen": "2017-10-15T01:54:20.581Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 1 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 131 diff --git a/src/go/tests/expect/stats_single/findandmodify_3.2.16 b/src/go/tests/expect/stats_single/findandmodify_3.2.19 similarity index 85% rename from src/go/tests/expect/stats_single/findandmodify_3.2.16 rename to src/go/tests/expect/stats_single/findandmodify_3.2.19 index ca6e28c0..d9fec542 100755 --- a/src/go/tests/expect/stats_single/findandmodify_3.2.16 +++ b/src/go/tests/expect/stats_single/findandmodify_3.2.19 @@ -5,8 +5,8 @@ "Operation": "FINDANDMODIFY", "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"findandmodify\":\"coll\",\"query\":{\"a\":2},\"update\":{\"$inc\":{\"b\":1}}},\"updateobj\":{\"$inc\":{\"b\":1}}}\n", "Fingerprint": "FINDANDMODIFY coll a", - "FirstSeen": "2017-10-15T01:54:34.011Z", - "LastSeen": "2017-10-15T01:54:34.011Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 3 ], "QueryTime": [ - 1 + 42 ], "ResponseLength": [ 116 diff --git a/src/go/tests/expect/stats_single/findandmodify_3.4.7 b/src/go/tests/expect/stats_single/findandmodify_3.4.12 similarity index 85% rename from src/go/tests/expect/stats_single/findandmodify_3.4.7 rename to src/go/tests/expect/stats_single/findandmodify_3.4.12 index d81c37a1..d9fec542 100755 --- a/src/go/tests/expect/stats_single/findandmodify_3.4.7 +++ b/src/go/tests/expect/stats_single/findandmodify_3.4.12 @@ -5,8 +5,8 @@ "Operation": "FINDANDMODIFY", "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"findandmodify\":\"coll\",\"query\":{\"a\":2},\"update\":{\"$inc\":{\"b\":1}}},\"updateobj\":{\"$inc\":{\"b\":1}}}\n", "Fingerprint": "FINDANDMODIFY coll a", - "FirstSeen": "2017-10-15T01:54:44.656Z", - "LastSeen": "2017-10-15T01:54:44.656Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 3 ], "QueryTime": [ - 1 + 42 ], "ResponseLength": [ 116 diff --git a/src/go/tests/expect/stats_single/findandmodify_3.5.11 b/src/go/tests/expect/stats_single/findandmodify_3.6.2 similarity index 85% rename from src/go/tests/expect/stats_single/findandmodify_3.5.11 rename to src/go/tests/expect/stats_single/findandmodify_3.6.2 index 12858348..ccb52fd1 100755 --- a/src/go/tests/expect/stats_single/findandmodify_3.5.11 +++ b/src/go/tests/expect/stats_single/findandmodify_3.6.2 @@ -5,8 +5,8 @@ "Operation": "FINDANDMODIFY", "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"findandmodify\":\"coll\",\"query\":{\"a\":2},\"update\":{\"$inc\":{\"b\":1}},\"$db\":\"test\"}}\n", "Fingerprint": "FINDANDMODIFY coll a", - "FirstSeen": "2017-10-15T01:54:55.391Z", - "LastSeen": "2017-10-15T01:54:55.391Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 3 ], "QueryTime": [ - 1 + 42 ], "ResponseLength": [ 116 diff --git a/src/go/tests/expect/stats_single/geonear_2.6.12 b/src/go/tests/expect/stats_single/geonear_2.6.12 index cc9e30be..90436890 100755 --- a/src/go/tests/expect/stats_single/geonear_2.6.12 +++ b/src/go/tests/expect/stats_single/geonear_2.6.12 @@ -5,8 +5,8 @@ "Operation": "GEONEAR", "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"geoNear\":\"coll\",\"near\":{\"type\":\"Point\",\"coordinates\":[1,1]},\"spherical\":true}}\n", "Fingerprint": "GEONEAR coll", - "FirstSeen": "2017-10-15T01:54:11.181Z", - "LastSeen": "2017-10-15T01:54:11.181Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 1 + 42 ], "ResponseLength": [ 1406 diff --git a/src/go/tests/expect/stats_single/geonear_3.0.15 b/src/go/tests/expect/stats_single/geonear_3.0.15 index d9c6f994..53aec1e6 100755 --- a/src/go/tests/expect/stats_single/geonear_3.0.15 +++ b/src/go/tests/expect/stats_single/geonear_3.0.15 @@ -5,8 +5,8 @@ "Operation": "GEONEAR", "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"geoNear\":\"coll\",\"near\":{\"type\":\"Point\",\"coordinates\":[1,1]},\"spherical\":true}}\n", "Fingerprint": "GEONEAR coll", - "FirstSeen": "2017-10-15T01:54:20.751Z", - "LastSeen": "2017-10-15T01:54:20.751Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 2 + 42 ], "ResponseLength": [ 1398 diff --git a/src/go/tests/expect/stats_single/geonear_3.2.16 b/src/go/tests/expect/stats_single/geonear_3.2.19 similarity index 84% rename from src/go/tests/expect/stats_single/geonear_3.2.16 rename to src/go/tests/expect/stats_single/geonear_3.2.19 index f312b472..a2c7b0bc 100755 --- a/src/go/tests/expect/stats_single/geonear_3.2.16 +++ b/src/go/tests/expect/stats_single/geonear_3.2.19 @@ -5,8 +5,8 @@ "Operation": "GEONEAR", "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"geoNear\":\"coll\",\"near\":{\"type\":\"Point\",\"coordinates\":[1,1]},\"spherical\":true}}\n", "Fingerprint": "GEONEAR coll", - "FirstSeen": "2017-10-15T01:54:34.27Z", - "LastSeen": "2017-10-15T01:54:34.27Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 10 + 42 ], "ResponseLength": [ 1401 diff --git a/src/go/tests/expect/stats_single/geonear_3.4.7 b/src/go/tests/expect/stats_single/geonear_3.4.12 similarity index 84% rename from src/go/tests/expect/stats_single/geonear_3.4.7 rename to src/go/tests/expect/stats_single/geonear_3.4.12 index 6e1dd370..48971647 100755 --- a/src/go/tests/expect/stats_single/geonear_3.4.7 +++ b/src/go/tests/expect/stats_single/geonear_3.4.12 @@ -5,8 +5,8 @@ "Operation": "GEONEAR", "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"geoNear\":\"coll\",\"near\":{\"type\":\"Point\",\"coordinates\":[1,1]},\"spherical\":true}}\n", "Fingerprint": "GEONEAR coll", - "FirstSeen": "2017-10-15T01:54:44.873Z", - "LastSeen": "2017-10-15T01:54:44.873Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 10 ], "QueryTime": [ - 13 + 42 ], "ResponseLength": [ 1383 diff --git a/src/go/tests/expect/stats_single/geonear_3.5.11 b/src/go/tests/expect/stats_single/geonear_3.6.2 similarity index 84% rename from src/go/tests/expect/stats_single/geonear_3.5.11 rename to src/go/tests/expect/stats_single/geonear_3.6.2 index 0798c825..d894ca27 100755 --- a/src/go/tests/expect/stats_single/geonear_3.5.11 +++ b/src/go/tests/expect/stats_single/geonear_3.6.2 @@ -5,8 +5,8 @@ "Operation": "GEONEAR", "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"geoNear\":\"coll\",\"near\":{\"type\":\"Point\",\"coordinates\":[1,1]},\"spherical\":true,\"$db\":\"test\"}}\n", "Fingerprint": "GEONEAR coll", - "FirstSeen": "2017-10-15T01:54:55.701Z", - "LastSeen": "2017-10-15T01:54:55.701Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 10 ], "QueryTime": [ - 11 + 42 ], "ResponseLength": [ 1383 diff --git a/src/go/tests/expect/stats_single/getmore_2.6.12 b/src/go/tests/expect/stats_single/getmore_2.6.12 index 317b24ab..30a77342 100755 --- a/src/go/tests/expect/stats_single/getmore_2.6.12 +++ b/src/go/tests/expect/stats_single/getmore_2.6.12 @@ -5,23 +5,23 @@ "Operation": "GETMORE", "Query": "{\"ns\":\"test.coll\",\"op\":\"getmore\",\"query\":{\"a\":{\"$gt\":0}}}\n", "Fingerprint": "GETMORE coll", - "FirstSeen": "2017-10-15T01:54:11.36Z", - "LastSeen": "2017-10-15T01:54:11.36Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, "LockTime": null, "NReturned": [ - 2 + 0 ], "NScanned": [ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ - 86 + 20 ] } ] \ No newline at end of file diff --git a/src/go/tests/expect/stats_single/getmore_3.0.15 b/src/go/tests/expect/stats_single/getmore_3.0.15 index 58571ebe..30a77342 100755 --- a/src/go/tests/expect/stats_single/getmore_3.0.15 +++ b/src/go/tests/expect/stats_single/getmore_3.0.15 @@ -5,8 +5,8 @@ "Operation": "GETMORE", "Query": "{\"ns\":\"test.coll\",\"op\":\"getmore\",\"query\":{\"a\":{\"$gt\":0}}}\n", "Fingerprint": "GETMORE coll", - "FirstSeen": "2017-10-15T01:54:20.995Z", - "LastSeen": "2017-10-15T01:54:20.995Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 20 diff --git a/src/go/tests/expect/stats_single/getmore_3.2.16 b/src/go/tests/expect/stats_single/getmore_3.2.19 similarity index 73% rename from src/go/tests/expect/stats_single/getmore_3.2.16 rename to src/go/tests/expect/stats_single/getmore_3.2.19 index 0524524a..43c6d45d 100755 --- a/src/go/tests/expect/stats_single/getmore_3.2.16 +++ b/src/go/tests/expect/stats_single/getmore_3.2.19 @@ -3,10 +3,10 @@ "ID": "db759bfd83441deecc71382323041ce6", "Namespace": "test.coll", "Operation": "GETMORE", - "Query": "{\"ns\":\"test.coll\",\"op\":\"getmore\",\"query\":{\"getMore\":\"62137702161\",\"collection\":\"coll\",\"batchSize\":2}}\n", + "Query": "{\"ns\":\"test.coll\",\"op\":\"getmore\",\"query\":{\"getMore\":\"62858772934\",\"collection\":\"coll\",\"batchSize\":2}}\n", "Fingerprint": "GETMORE coll", - "FirstSeen": "2017-10-15T01:54:34.569Z", - "LastSeen": "2017-10-15T01:54:34.569Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 81 diff --git a/src/go/tests/expect/stats_single/getmore_3.4.7 b/src/go/tests/expect/stats_single/getmore_3.4.12 similarity index 75% rename from src/go/tests/expect/stats_single/getmore_3.4.7 rename to src/go/tests/expect/stats_single/getmore_3.4.12 index 3c572e12..4e3405fc 100755 --- a/src/go/tests/expect/stats_single/getmore_3.4.7 +++ b/src/go/tests/expect/stats_single/getmore_3.4.12 @@ -3,25 +3,25 @@ "ID": "db759bfd83441deecc71382323041ce6", "Namespace": "test.coll", "Operation": "GETMORE", - "Query": "{\"ns\":\"test.coll\",\"op\":\"getmore\",\"query\":{\"getMore\":\"66029137874\",\"collection\":\"coll\",\"batchSize\":2},\"originatingCommand\":{\"find\":\"coll\",\"filter\":{\"a\":{\"$gt\":0}},\"batchSize\":2,\"sort\":{\"a\":1}}}\n", + "Query": "{\"ns\":\"test.coll\",\"op\":\"getmore\",\"query\":{\"getMore\":\"67665905999\",\"collection\":\"coll\",\"batchSize\":2},\"originatingCommand\":{\"find\":\"coll\",\"filter\":{\"a\":{\"$gt\":0}},\"batchSize\":2,\"sort\":{\"a\":1}}}\n", "Fingerprint": "GETMORE coll", - "FirstSeen": "2017-10-15T01:54:45.251Z", - "LastSeen": "2017-10-15T01:54:45.251Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, "LockTime": null, "NReturned": [ - 2 - ], - "NScanned": [ - 2 - ], - "QueryTime": [ 0 ], + "NScanned": [ + 0 + ], + "QueryTime": [ + 42 + ], "ResponseLength": [ - 153 + 81 ] } ] \ No newline at end of file diff --git a/src/go/tests/expect/stats_single/getmore_3.5.11 b/src/go/tests/expect/stats_single/getmore_3.6.2 similarity index 78% rename from src/go/tests/expect/stats_single/getmore_3.5.11 rename to src/go/tests/expect/stats_single/getmore_3.6.2 index 66551a8a..70fb0809 100755 --- a/src/go/tests/expect/stats_single/getmore_3.5.11 +++ b/src/go/tests/expect/stats_single/getmore_3.6.2 @@ -3,10 +3,10 @@ "ID": "db759bfd83441deecc71382323041ce6", "Namespace": "test.coll", "Operation": "GETMORE", - "Query": "{\"ns\":\"test.coll\",\"op\":\"getmore\",\"command\":{\"getMore\":\"62495713089\",\"collection\":\"coll\",\"batchSize\":2,\"$db\":\"test\"},\"originatingCommand\":{\"find\":\"coll\",\"filter\":{\"a\":{\"$gt\":0}},\"batchSize\":2,\"sort\":{\"a\":1},\"$db\":\"test\"}}\n", + "Query": "{\"ns\":\"test.coll\",\"op\":\"getmore\",\"command\":{\"getMore\":\"62414596685\",\"collection\":\"coll\",\"batchSize\":2,\"$db\":\"test\"},\"originatingCommand\":{\"find\":\"coll\",\"filter\":{\"a\":{\"$gt\":0}},\"batchSize\":2,\"sort\":{\"a\":1},\"$db\":\"test\"}}\n", "Fingerprint": "GETMORE coll", - "FirstSeen": "2017-10-15T01:54:56.186Z", - "LastSeen": "2017-10-15T01:54:56.186Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 81 diff --git a/src/go/tests/expect/stats_single/group_2.6.12 b/src/go/tests/expect/stats_single/group_2.6.12 index 03e19b99..5ee7823b 100755 --- a/src/go/tests/expect/stats_single/group_2.6.12 +++ b/src/go/tests/expect/stats_single/group_2.6.12 @@ -5,8 +5,8 @@ "Operation": "GROUP", "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"group\":{\"key\":{\"a\":1,\"b\":1},\"cond\":{\"b\":3},\"initial\":{},\"ns\":\"coll\",\"$reduce\":\"\"}}}\n", "Fingerprint": "GROUP coll a,b", - "FirstSeen": "2017-10-15T01:54:11.599Z", - "LastSeen": "2017-10-15T01:54:11.599Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 36 + 42 ], "ResponseLength": [ 135 diff --git a/src/go/tests/expect/stats_single/group_3.0.15 b/src/go/tests/expect/stats_single/group_3.0.15 index 60387fad..fcef62db 100755 --- a/src/go/tests/expect/stats_single/group_3.0.15 +++ b/src/go/tests/expect/stats_single/group_3.0.15 @@ -5,8 +5,8 @@ "Operation": "GROUP", "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"group\":{\"key\":{\"a\":1,\"b\":1},\"cond\":{\"b\":3},\"initial\":{},\"ns\":\"coll\",\"$reduce\":\"\"}}}\n", "Fingerprint": "GROUP coll a,b", - "FirstSeen": "2017-10-15T01:54:21.188Z", - "LastSeen": "2017-10-15T01:54:21.188Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 26 + 42 ], "ResponseLength": [ 139 diff --git a/src/go/tests/expect/stats_single/group_3.2.16 b/src/go/tests/expect/stats_single/group_3.2.19 similarity index 84% rename from src/go/tests/expect/stats_single/group_3.2.16 rename to src/go/tests/expect/stats_single/group_3.2.19 index 4a813772..dbd00e12 100755 --- a/src/go/tests/expect/stats_single/group_3.2.16 +++ b/src/go/tests/expect/stats_single/group_3.2.19 @@ -5,8 +5,8 @@ "Operation": "GROUP", "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"group\":{\"key\":{\"a\":1,\"b\":1},\"cond\":{\"b\":3},\"initial\":{},\"ns\":\"coll\",\"$reduce\":\"\"}}}\n", "Fingerprint": "GROUP coll a,b", - "FirstSeen": "2017-10-15T01:54:34.867Z", - "LastSeen": "2017-10-15T01:54:34.867Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 31 + 42 ], "ResponseLength": [ 142 diff --git a/src/go/tests/expect/stats_single/group_3.4.7 b/src/go/tests/expect/stats_single/group_3.4.12 similarity index 85% rename from src/go/tests/expect/stats_single/group_3.4.7 rename to src/go/tests/expect/stats_single/group_3.4.12 index 00408d13..2aa3eced 100755 --- a/src/go/tests/expect/stats_single/group_3.4.7 +++ b/src/go/tests/expect/stats_single/group_3.4.12 @@ -5,8 +5,8 @@ "Operation": "GROUP", "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"group\":{\"key\":{\"a\":1,\"b\":1},\"cond\":{\"b\":3},\"initial\":{},\"ns\":\"coll\",\"$reduce\":{\"code\":\"function () {}\"}}}}\n", "Fingerprint": "GROUP coll a,b", - "FirstSeen": "2017-10-15T01:54:45.5Z", - "LastSeen": "2017-10-15T01:54:45.5Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 2 ], "QueryTime": [ - 31 + 42 ], "ResponseLength": [ 124 diff --git a/src/go/tests/expect/stats_single/group_3.5.11 b/src/go/tests/expect/stats_single/group_3.6.2 similarity index 85% rename from src/go/tests/expect/stats_single/group_3.5.11 rename to src/go/tests/expect/stats_single/group_3.6.2 index 48c2970e..9d795073 100755 --- a/src/go/tests/expect/stats_single/group_3.5.11 +++ b/src/go/tests/expect/stats_single/group_3.6.2 @@ -5,8 +5,8 @@ "Operation": "GROUP", "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"group\":{\"key\":{\"a\":1,\"b\":1},\"cond\":{\"b\":3},\"initial\":{},\"ns\":\"coll\",\"$reduce\":{\"code\":\"function () {}\"}},\"$db\":\"test\"}}\n", "Fingerprint": "GROUP coll a,b", - "FirstSeen": "2017-10-15T01:54:56.478Z", - "LastSeen": "2017-10-15T01:54:56.478Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 2 ], "QueryTime": [ - 24 + 42 ], "ResponseLength": [ 124 diff --git a/src/go/tests/expect/stats_single/insert_2.6.12 b/src/go/tests/expect/stats_single/insert_2.6.12 index 821f4847..a3d30421 100755 --- a/src/go/tests/expect/stats_single/insert_2.6.12 +++ b/src/go/tests/expect/stats_single/insert_2.6.12 @@ -5,8 +5,8 @@ "Operation": "INSERT", "Query": "{\"ns\":\"test.coll\",\"op\":\"insert\",\"query\":{\"_id\":1}}\n", "Fingerprint": "INSERT coll", - "FirstSeen": "2017-10-15T01:54:11.737Z", - "LastSeen": "2017-10-15T01:54:11.737Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 0 diff --git a/src/go/tests/expect/stats_single/insert_3.0.15 b/src/go/tests/expect/stats_single/insert_3.0.15 index 23cda336..a3d30421 100755 --- a/src/go/tests/expect/stats_single/insert_3.0.15 +++ b/src/go/tests/expect/stats_single/insert_3.0.15 @@ -5,8 +5,8 @@ "Operation": "INSERT", "Query": "{\"ns\":\"test.coll\",\"op\":\"insert\",\"query\":{\"_id\":1}}\n", "Fingerprint": "INSERT coll", - "FirstSeen": "2017-10-15T01:54:21.346Z", - "LastSeen": "2017-10-15T01:54:21.346Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 4 + 42 ], "ResponseLength": [ 0 diff --git a/src/go/tests/expect/stats_single/insert_3.2.16 b/src/go/tests/expect/stats_single/insert_3.2.19 similarity index 83% rename from src/go/tests/expect/stats_single/insert_3.2.16 rename to src/go/tests/expect/stats_single/insert_3.2.19 index 296b8be2..4ab1f350 100755 --- a/src/go/tests/expect/stats_single/insert_3.2.16 +++ b/src/go/tests/expect/stats_single/insert_3.2.19 @@ -5,8 +5,8 @@ "Operation": "INSERT", "Query": "{\"ns\":\"test.coll\",\"op\":\"insert\",\"query\":{\"insert\":\"coll\",\"documents\":[{\"_id\":1}],\"ordered\":true}}\n", "Fingerprint": "INSERT coll", - "FirstSeen": "2017-10-15T01:54:35.088Z", - "LastSeen": "2017-10-15T01:54:35.088Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 11 + 42 ], "ResponseLength": [ 25 diff --git a/src/go/tests/expect/stats_single/insert_3.4.7 b/src/go/tests/expect/stats_single/insert_3.4.12 similarity index 83% rename from src/go/tests/expect/stats_single/insert_3.4.7 rename to src/go/tests/expect/stats_single/insert_3.4.12 index 4049f3d3..2d2fcc59 100755 --- a/src/go/tests/expect/stats_single/insert_3.4.7 +++ b/src/go/tests/expect/stats_single/insert_3.4.12 @@ -5,8 +5,8 @@ "Operation": "INSERT", "Query": "{\"ns\":\"test.coll\",\"op\":\"insert\",\"query\":{\"insert\":\"coll\",\"documents\":[{\"_id\":1}],\"ordered\":true}}\n", "Fingerprint": "INSERT coll", - "FirstSeen": "2017-10-15T01:54:45.681Z", - "LastSeen": "2017-10-15T01:54:45.681Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 11 + 42 ], "ResponseLength": [ 29 diff --git a/src/go/tests/expect/stats_single/insert_3.5.11 b/src/go/tests/expect/stats_single/insert_3.6.2 similarity index 83% rename from src/go/tests/expect/stats_single/insert_3.5.11 rename to src/go/tests/expect/stats_single/insert_3.6.2 index 3e856227..b84b9b82 100755 --- a/src/go/tests/expect/stats_single/insert_3.5.11 +++ b/src/go/tests/expect/stats_single/insert_3.6.2 @@ -5,8 +5,8 @@ "Operation": "INSERT", "Query": "{\"ns\":\"test.coll\",\"op\":\"insert\",\"command\":{\"insert\":\"coll\",\"ordered\":true,\"$db\":\"test\"}}\n", "Fingerprint": "INSERT coll", - "FirstSeen": "2017-10-15T01:54:56.693Z", - "LastSeen": "2017-10-15T01:54:56.693Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 11 + 42 ], "ResponseLength": [ 29 diff --git a/src/go/tests/expect/stats_single/mapreduce_2.6.12 b/src/go/tests/expect/stats_single/mapreduce_2.6.12 index aa6e82a1..872ec63a 100755 --- a/src/go/tests/expect/stats_single/mapreduce_2.6.12 +++ b/src/go/tests/expect/stats_single/mapreduce_2.6.12 @@ -5,8 +5,8 @@ "Operation": "MAPREDUCE", "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"mapreduce\":\"coll\",\"map\":\"\",\"reduce\":\"\",\"query\":{\"a\":{\"$gte\":0}},\"out\":{\"inline\":1}}}\n", "Fingerprint": "MAPREDUCE coll a", - "FirstSeen": "2017-10-15T01:54:11.959Z", - "LastSeen": "2017-10-15T01:54:11.959Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 29 + 42 ], "ResponseLength": [ 233 diff --git a/src/go/tests/expect/stats_single/mapreduce_3.0.15 b/src/go/tests/expect/stats_single/mapreduce_3.0.15 index 808098d4..872ec63a 100755 --- a/src/go/tests/expect/stats_single/mapreduce_3.0.15 +++ b/src/go/tests/expect/stats_single/mapreduce_3.0.15 @@ -5,8 +5,8 @@ "Operation": "MAPREDUCE", "Query": "{\"ns\":\"test.$cmd\",\"op\":\"command\",\"command\":{\"mapreduce\":\"coll\",\"map\":\"\",\"reduce\":\"\",\"query\":{\"a\":{\"$gte\":0}},\"out\":{\"inline\":1}}}\n", "Fingerprint": "MAPREDUCE coll a", - "FirstSeen": "2017-10-15T01:54:21.559Z", - "LastSeen": "2017-10-15T01:54:21.559Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 21 + 42 ], "ResponseLength": [ 233 diff --git a/src/go/tests/expect/stats_single/mapreduce_3.2.16 b/src/go/tests/expect/stats_single/mapreduce_3.2.19 similarity index 85% rename from src/go/tests/expect/stats_single/mapreduce_3.2.16 rename to src/go/tests/expect/stats_single/mapreduce_3.2.19 index ed6c0364..f13d490b 100755 --- a/src/go/tests/expect/stats_single/mapreduce_3.2.16 +++ b/src/go/tests/expect/stats_single/mapreduce_3.2.19 @@ -5,8 +5,8 @@ "Operation": "MAPREDUCE", "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"mapreduce\":\"coll\",\"map\":\"\",\"reduce\":\"\",\"query\":{\"a\":{\"$gte\":0}},\"out\":{\"inline\":1}}}\n", "Fingerprint": "MAPREDUCE coll a", - "FirstSeen": "2017-10-15T01:54:35.348Z", - "LastSeen": "2017-10-15T01:54:35.348Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 0 ], "QueryTime": [ - 41 + 42 ], "ResponseLength": [ 218 diff --git a/src/go/tests/expect/stats_single/mapreduce_3.4.7 b/src/go/tests/expect/stats_single/mapreduce_3.4.12 similarity index 87% rename from src/go/tests/expect/stats_single/mapreduce_3.4.7 rename to src/go/tests/expect/stats_single/mapreduce_3.4.12 index 5a80d7ba..48cedde1 100755 --- a/src/go/tests/expect/stats_single/mapreduce_3.4.7 +++ b/src/go/tests/expect/stats_single/mapreduce_3.4.12 @@ -5,8 +5,8 @@ "Operation": "MAPREDUCE", "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"mapreduce\":\"coll\",\"map\":{\"code\":\"function () {\\n emit(this.a, this.b);\\n}\"},\"reduce\":{\"code\":\"function (a, b) {\\n return Array.sum(b);\\n}\"},\"query\":{\"a\":{\"$gte\":0}},\"out\":{\"inline\":1}}}\n", "Fingerprint": "MAPREDUCE coll a", - "FirstSeen": "2017-10-15T01:54:45.925Z", - "LastSeen": "2017-10-15T01:54:45.925Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 3 ], "QueryTime": [ - 21 + 42 ], "ResponseLength": [ 218 diff --git a/src/go/tests/expect/stats_single/mapreduce_3.5.11 b/src/go/tests/expect/stats_single/mapreduce_3.6.2 similarity index 87% rename from src/go/tests/expect/stats_single/mapreduce_3.5.11 rename to src/go/tests/expect/stats_single/mapreduce_3.6.2 index a682b8f0..81b4b59b 100755 --- a/src/go/tests/expect/stats_single/mapreduce_3.5.11 +++ b/src/go/tests/expect/stats_single/mapreduce_3.6.2 @@ -5,8 +5,8 @@ "Operation": "MAPREDUCE", "Query": "{\"ns\":\"test.coll\",\"op\":\"command\",\"command\":{\"mapreduce\":\"coll\",\"map\":{\"code\":\"function () {\\n emit(this.a, this.b);\\n}\"},\"reduce\":{\"code\":\"function (a, b) {\\n return Array.sum(b);\\n}\"},\"query\":{\"a\":{\"$gte\":0}},\"out\":{\"inline\":1},\"$db\":\"test\"}}\n", "Fingerprint": "MAPREDUCE coll a", - "FirstSeen": "2017-10-15T01:54:56.951Z", - "LastSeen": "2017-10-15T01:54:56.951Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 3 ], "QueryTime": [ - 26 + 42 ], "ResponseLength": [ 218 diff --git a/src/go/tests/expect/stats_single/update_2.6.12 b/src/go/tests/expect/stats_single/update_2.6.12 index 4611f1e0..aa4a7d21 100755 --- a/src/go/tests/expect/stats_single/update_2.6.12 +++ b/src/go/tests/expect/stats_single/update_2.6.12 @@ -5,8 +5,8 @@ "Operation": "UPDATE", "Query": "{\"ns\":\"test.coll\",\"op\":\"update\",\"query\":{\"a\":{\"$gte\":2}},\"updateobj\":{\"$set\":{\"c\":1},\"$inc\":{\"a\":-10}}}\n", "Fingerprint": "UPDATE coll a", - "FirstSeen": "2017-10-15T01:54:12.161Z", - "LastSeen": "2017-10-15T01:54:12.161Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 1 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 0 diff --git a/src/go/tests/expect/stats_single/update_3.0.15 b/src/go/tests/expect/stats_single/update_3.0.15 index 65af65f5..aa4a7d21 100755 --- a/src/go/tests/expect/stats_single/update_3.0.15 +++ b/src/go/tests/expect/stats_single/update_3.0.15 @@ -5,8 +5,8 @@ "Operation": "UPDATE", "Query": "{\"ns\":\"test.coll\",\"op\":\"update\",\"query\":{\"a\":{\"$gte\":2}},\"updateobj\":{\"$set\":{\"c\":1},\"$inc\":{\"a\":-10}}}\n", "Fingerprint": "UPDATE coll a", - "FirstSeen": "2017-10-15T01:54:21.803Z", - "LastSeen": "2017-10-15T01:54:21.803Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 1 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 0 diff --git a/src/go/tests/expect/stats_single/update_3.2.16 b/src/go/tests/expect/stats_single/update_3.2.19 similarity index 84% rename from src/go/tests/expect/stats_single/update_3.2.16 rename to src/go/tests/expect/stats_single/update_3.2.19 index f92d8e95..aa4a7d21 100755 --- a/src/go/tests/expect/stats_single/update_3.2.16 +++ b/src/go/tests/expect/stats_single/update_3.2.19 @@ -5,8 +5,8 @@ "Operation": "UPDATE", "Query": "{\"ns\":\"test.coll\",\"op\":\"update\",\"query\":{\"a\":{\"$gte\":2}},\"updateobj\":{\"$set\":{\"c\":1},\"$inc\":{\"a\":-10}}}\n", "Fingerprint": "UPDATE coll a", - "FirstSeen": "2017-10-15T01:54:35.583Z", - "LastSeen": "2017-10-15T01:54:35.583Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 1 ], "QueryTime": [ - 2 + 42 ], "ResponseLength": [ 0 diff --git a/src/go/tests/expect/stats_single/update_3.4.7 b/src/go/tests/expect/stats_single/update_3.4.12 similarity index 84% rename from src/go/tests/expect/stats_single/update_3.4.7 rename to src/go/tests/expect/stats_single/update_3.4.12 index 1a144d52..aa4a7d21 100755 --- a/src/go/tests/expect/stats_single/update_3.4.7 +++ b/src/go/tests/expect/stats_single/update_3.4.12 @@ -5,8 +5,8 @@ "Operation": "UPDATE", "Query": "{\"ns\":\"test.coll\",\"op\":\"update\",\"query\":{\"a\":{\"$gte\":2}},\"updateobj\":{\"$set\":{\"c\":1},\"$inc\":{\"a\":-10}}}\n", "Fingerprint": "UPDATE coll a", - "FirstSeen": "2017-10-15T01:54:46.168Z", - "LastSeen": "2017-10-15T01:54:46.168Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 1 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 0 diff --git a/src/go/tests/expect/stats_single/update_3.5.11 b/src/go/tests/expect/stats_single/update_3.6.2 similarity index 84% rename from src/go/tests/expect/stats_single/update_3.5.11 rename to src/go/tests/expect/stats_single/update_3.6.2 index 43387e92..60dc845d 100755 --- a/src/go/tests/expect/stats_single/update_3.5.11 +++ b/src/go/tests/expect/stats_single/update_3.6.2 @@ -5,8 +5,8 @@ "Operation": "UPDATE", "Query": "{\"ns\":\"test.coll\",\"op\":\"update\",\"command\":{\"q\":{\"a\":{\"$gte\":2}},\"u\":{\"$set\":{\"c\":1},\"$inc\":{\"a\":-10}},\"multi\":false,\"upsert\":false}}\n", "Fingerprint": "UPDATE coll a", - "FirstSeen": "2017-10-15T01:54:57.231Z", - "LastSeen": "2017-10-15T01:54:57.231Z", + "FirstSeen": "2020-01-01T00:00:00Z", + "LastSeen": "2020-01-01T00:00:00Z", "TableScan": false, "Count": 1, "BlockedTime": null, @@ -18,7 +18,7 @@ 1 ], "QueryTime": [ - 0 + 42 ], "ResponseLength": [ 0 From e503df9431ff423cb395bcd4848585a4fafb419d Mon Sep 17 00:00:00 2001 From: Kamil Dziedzic Date: Tue, 13 Feb 2018 20:14:22 +0100 Subject: [PATCH 11/17] Add PMM-1905 to Changelog --- Changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog b/Changelog index c33079ee..d1e62d90 100644 --- a/Changelog +++ b/Changelog @@ -4,6 +4,7 @@ v3.0.7 * Feature PT-644 : Added --mysql-only option to pt-stalk for RDS * Fixed bug PT-1256: pt-table-sync does not use the character set for the table it is synchronizing + * Fixed bug PMM-1905: Explain fails if encounters negative "ntoreturn" v3.0.6 released 2017-12-20 From 0d1193c201cfc3284b8d2b642cd6af0c6092854a Mon Sep 17 00:00:00 2001 From: Evgeniy Patlan Date: Wed, 14 Feb 2018 17:04:35 +0200 Subject: [PATCH 12/17] [BLD-948] write uuid to file during toolkit installation --- config/deb/postinst | 8 ++++++++ config/rpm/percona-toolkit.spec | 5 +++++ 2 files changed, 13 insertions(+) create mode 100644 config/deb/postinst diff --git a/config/deb/postinst b/config/deb/postinst new file mode 100644 index 00000000..836c6c91 --- /dev/null +++ b/config/deb/postinst @@ -0,0 +1,8 @@ +#!/bin/bash + +if [ ! -e /etc/percona-toolkit/.percona.toolkit.uuid ]; then + mkdir -p /etc/percona-toolkit + perl -e 'printf+($}="%04x")."$}-$}-$}-$}-".$}x3,map rand 65537,0..7;' > /etc/percona-toolkit/.percona.toolkit.uuid +fi + +#DEBHELPER# diff --git a/config/rpm/percona-toolkit.spec b/config/rpm/percona-toolkit.spec index b2bddfc9..e19a673c 100644 --- a/config/rpm/percona-toolkit.spec +++ b/config/rpm/percona-toolkit.spec @@ -42,6 +42,11 @@ find $RPM_BUILD_ROOT -type f -name 'percona-toolkit.pod' -exec rm -f {} ';' rm -rf $RPM_BUILD_ROOT/usr/share/perl5 chmod -R u+w $RPM_BUILD_ROOT/* +%post +if [ ! -e /etc/percona-toolkit/.percona.toolkit.uuid ]; then + mkdir -p /etc/percona-toolkit + perl -e 'printf+($}="%04x")."$}-$}-$}-$}-".$}x3,map rand 65537,0..7;' > /etc/percona-toolkit/.percona.toolkit.uuid +fi %clean rm -rf $RPM_BUILD_ROOT From cdec55dc8417f0e221d8edd61c2e45f410a2992b Mon Sep 17 00:00:00 2001 From: Carlos Salguero Date: Wed, 14 Feb 2018 12:54:02 -0300 Subject: [PATCH 13/17] PMM-1479 Switched to UUID for version check In order to be able to count individual users for the usage stats, we need to implement UUID instead of just using MD5(hostname) since most servers are just 'localhost' or 'db1'. Using UUID we would be able to count unique users. --- lib/VersionCheck.pm | 60 ++++++++++++++++++++++++++++++++++++++------ t/lib/VersionCheck.t | 18 ++++++++++++- 2 files changed, 69 insertions(+), 9 deletions(-) diff --git a/lib/VersionCheck.pm b/lib/VersionCheck.pm index 0c126d11..b612dd04 100644 --- a/lib/VersionCheck.pm +++ b/lib/VersionCheck.pm @@ -48,6 +48,14 @@ eval { require HTTP::Micro; }; +my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; +my @vc_dirs = ( + '/etc/percona', + '/etc/percona-toolkit', + '/tmp', + "$home", +); + # Return the version check file used to keep track of # MySQL instance that have been checked and when. Some # systems use random tmp dirs; we don't want that else @@ -55,13 +63,6 @@ eval { # per system is the goal, so prefer global sys dirs first. { my $file = 'percona-version-check'; - my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; - my @vc_dirs = ( - '/etc/percona', - '/etc/percona-toolkit', - '/tmp', - "$home", - ); sub version_check_file { foreach my $dir ( @vc_dirs ) { @@ -326,6 +327,49 @@ sub get_instance_id { return $name, $id; } + +# This function has been implemented solely to be able to count individual +# Toolkit users for statistics. It uses a random UUID, no client info is +# being gathered nor stored +sub get_uuid { + my $uuid_file = '/.percona-toolkit.uuid'; + foreach my $dir (@vc_dirs) { + my $filename = $dir.$uuid_file; + my $uuid=_read_uuid($filename); + return $uuid if $uuid; + } + + my $filename = $ENV{"HOME"} . $uuid_file; + my $uuid = _generate_uuid(); + + open(my $fh, '>', $filename) or die "Could not open file '$filename' $!"; + print $fh $uuid; + close $fh; + + return $uuid; +} + +sub _generate_uuid { + return sprintf+($}="%04x")."$}-$}-$}-$}-".$}x3,map rand 65537,0..7; +} + +sub _read_uuid { + my $filename = shift; + my $fh; + + eval { + open($fh, '<:encoding(UTF-8)', $filename); + }; + return if ($EVAL_ERROR); + + my $uuid; + eval { $uuid = <$fh>; }; + return if ($EVAL_ERROR); + + chomp $uuid; + return $uuid; +} + # ############################################################################# # Protocol handlers # ############################################################################# @@ -387,7 +431,7 @@ sub pingback { my $client_content = encode_client_response( items => $items, versions => $versions, - general_id => md5_hex( hostname() ), + general_id => get_uuid(), ); my $client_response = { diff --git a/t/lib/VersionCheck.t b/t/lib/VersionCheck.t index ba9881a5..30436a68 100644 --- a/t/lib/VersionCheck.t +++ b/t/lib/VersionCheck.t @@ -201,7 +201,7 @@ is_deeply( # Former Pingback tests # ############################################################################# -my $general_id = md5_hex( hostname() ); +my $general_id = VersionCheck::get_uuid(); my $master_id; # the instance ID, _not_ 12345 etc. my $slave1_id; # the instance ID, _not_ 12346 etc. my ($mysql_ver, $mysql_distro); @@ -679,6 +679,22 @@ foreach my $tool ( @vc_tools ) { ); } +my $should_remove_uuid_file; +my $home_uuid_file = $ENV{"HOME"} . "/.percona-toolkit.uuid"; + +if ( ! -e $home_uuid_file ) { + $should_remove_uuid_file = 1; +} + +my $uuid = VersionCheck::get_uuid(); +is ( + length($uuid), + 36, + "Have a valid UUID4", +); + +unlink $home_uuid_file if $should_remove_uuid_file; + # ############################################################################# # Done. # ############################################################################# From a8d85f1cd58e9ba9a5481ec035aae7e60d0c27c4 Mon Sep 17 00:00:00 2001 From: Carlos Salguero Date: Wed, 14 Feb 2018 13:02:24 -0300 Subject: [PATCH 14/17] PMM-1479 Updated all files using VersionCheck pkg --- bin/pt-archiver | 57 +++++++++++++++++++++++++++++++----- bin/pt-config-diff | 57 +++++++++++++++++++++++++++++++----- bin/pt-deadlock-logger | 57 +++++++++++++++++++++++++++++++----- bin/pt-diskstats | 57 +++++++++++++++++++++++++++++++----- bin/pt-duplicate-key-checker | 57 +++++++++++++++++++++++++++++++----- bin/pt-find | 57 +++++++++++++++++++++++++++++++----- bin/pt-fk-error-logger | 57 +++++++++++++++++++++++++++++++----- bin/pt-heartbeat | 57 +++++++++++++++++++++++++++++++----- bin/pt-index-usage | 57 +++++++++++++++++++++++++++++++----- bin/pt-kill | 57 +++++++++++++++++++++++++++++++----- bin/pt-online-schema-change | 57 +++++++++++++++++++++++++++++++----- bin/pt-query-digest | 57 +++++++++++++++++++++++++++++++----- bin/pt-slave-delay | 57 +++++++++++++++++++++++++++++++----- bin/pt-slave-restart | 57 +++++++++++++++++++++++++++++++----- bin/pt-table-checksum | 57 +++++++++++++++++++++++++++++++----- bin/pt-table-sync | 57 +++++++++++++++++++++++++++++++----- bin/pt-upgrade | 57 +++++++++++++++++++++++++++++++----- bin/pt-variable-advisor | 57 +++++++++++++++++++++++++++++++----- 18 files changed, 882 insertions(+), 144 deletions(-) diff --git a/bin/pt-archiver b/bin/pt-archiver index d08e95ed..b297def3 100755 --- a/bin/pt-archiver +++ b/bin/pt-archiver @@ -5373,15 +5373,16 @@ eval { require HTTP::Micro; }; +my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; +my @vc_dirs = ( + '/etc/percona', + '/etc/percona-toolkit', + '/tmp', + "$home", +); + { my $file = 'percona-version-check'; - my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; - my @vc_dirs = ( - '/etc/percona', - '/etc/percona-toolkit', - '/tmp', - "$home", - ); sub version_check_file { foreach my $dir ( @vc_dirs ) { @@ -5598,6 +5599,46 @@ sub get_instance_id { } +sub get_uuid { + my $uuid_file = '/.percona-toolkit.uuid'; + foreach my $dir (@vc_dirs) { + my $filename = $dir.$uuid_file; + my $uuid=_read_uuid($filename); + return $uuid if $uuid; + } + + my $filename = $ENV{"HOME"} . $uuid_file; + my $uuid = _generate_uuid(); + + open(my $fh, '>', $filename) or die "Could not open file '$filename' $!"; + print $fh $uuid; + close $fh; + + return $uuid; +} + +sub _generate_uuid { + return sprintf+($}="%04x")."$}-$}-$}-$}-".$}x3,map rand 65537,0..7; +} + +sub _read_uuid { + my $filename = shift; + my $fh; + + eval { + open($fh, '<:encoding(UTF-8)', $filename); + }; + return if ($EVAL_ERROR); + + my $uuid; + eval { $uuid = <$fh>; }; + return if ($EVAL_ERROR); + + chomp $uuid; + return $uuid; +} + + sub pingback { my (%args) = @_; my @required_args = qw(url instances); @@ -5634,7 +5675,7 @@ sub pingback { my $client_content = encode_client_response( items => $items, versions => $versions, - general_id => md5_hex( hostname() ), + general_id => get_uuid(), ); my $client_response = { diff --git a/bin/pt-config-diff b/bin/pt-config-diff index 7a340806..35b0134f 100755 --- a/bin/pt-config-diff +++ b/bin/pt-config-diff @@ -4711,15 +4711,16 @@ eval { require HTTP::Micro; }; +my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; +my @vc_dirs = ( + '/etc/percona', + '/etc/percona-toolkit', + '/tmp', + "$home", +); + { my $file = 'percona-version-check'; - my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; - my @vc_dirs = ( - '/etc/percona', - '/etc/percona-toolkit', - '/tmp', - "$home", - ); sub version_check_file { foreach my $dir ( @vc_dirs ) { @@ -4936,6 +4937,46 @@ sub get_instance_id { } +sub get_uuid { + my $uuid_file = '/.percona-toolkit.uuid'; + foreach my $dir (@vc_dirs) { + my $filename = $dir.$uuid_file; + my $uuid=_read_uuid($filename); + return $uuid if $uuid; + } + + my $filename = $ENV{"HOME"} . $uuid_file; + my $uuid = _generate_uuid(); + + open(my $fh, '>', $filename) or die "Could not open file '$filename' $!"; + print $fh $uuid; + close $fh; + + return $uuid; +} + +sub _generate_uuid { + return sprintf+($}="%04x")."$}-$}-$}-$}-".$}x3,map rand 65537,0..7; +} + +sub _read_uuid { + my $filename = shift; + my $fh; + + eval { + open($fh, '<:encoding(UTF-8)', $filename); + }; + return if ($EVAL_ERROR); + + my $uuid; + eval { $uuid = <$fh>; }; + return if ($EVAL_ERROR); + + chomp $uuid; + return $uuid; +} + + sub pingback { my (%args) = @_; my @required_args = qw(url instances); @@ -4972,7 +5013,7 @@ sub pingback { my $client_content = encode_client_response( items => $items, versions => $versions, - general_id => md5_hex( hostname() ), + general_id => get_uuid(), ); my $client_response = { diff --git a/bin/pt-deadlock-logger b/bin/pt-deadlock-logger index d2b09b78..4ed24bb3 100755 --- a/bin/pt-deadlock-logger +++ b/bin/pt-deadlock-logger @@ -3775,15 +3775,16 @@ eval { require HTTP::Micro; }; +my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; +my @vc_dirs = ( + '/etc/percona', + '/etc/percona-toolkit', + '/tmp', + "$home", +); + { my $file = 'percona-version-check'; - my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; - my @vc_dirs = ( - '/etc/percona', - '/etc/percona-toolkit', - '/tmp', - "$home", - ); sub version_check_file { foreach my $dir ( @vc_dirs ) { @@ -4000,6 +4001,46 @@ sub get_instance_id { } +sub get_uuid { + my $uuid_file = '/.percona-toolkit.uuid'; + foreach my $dir (@vc_dirs) { + my $filename = $dir.$uuid_file; + my $uuid=_read_uuid($filename); + return $uuid if $uuid; + } + + my $filename = $ENV{"HOME"} . $uuid_file; + my $uuid = _generate_uuid(); + + open(my $fh, '>', $filename) or die "Could not open file '$filename' $!"; + print $fh $uuid; + close $fh; + + return $uuid; +} + +sub _generate_uuid { + return sprintf+($}="%04x")."$}-$}-$}-$}-".$}x3,map rand 65537,0..7; +} + +sub _read_uuid { + my $filename = shift; + my $fh; + + eval { + open($fh, '<:encoding(UTF-8)', $filename); + }; + return if ($EVAL_ERROR); + + my $uuid; + eval { $uuid = <$fh>; }; + return if ($EVAL_ERROR); + + chomp $uuid; + return $uuid; +} + + sub pingback { my (%args) = @_; my @required_args = qw(url instances); @@ -4036,7 +4077,7 @@ sub pingback { my $client_content = encode_client_response( items => $items, versions => $versions, - general_id => md5_hex( hostname() ), + general_id => get_uuid(), ); my $client_response = { diff --git a/bin/pt-diskstats b/bin/pt-diskstats index 9773fd84..a1bb8252 100755 --- a/bin/pt-diskstats +++ b/bin/pt-diskstats @@ -4328,15 +4328,16 @@ eval { require HTTP::Micro; }; +my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; +my @vc_dirs = ( + '/etc/percona', + '/etc/percona-toolkit', + '/tmp', + "$home", +); + { my $file = 'percona-version-check'; - my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; - my @vc_dirs = ( - '/etc/percona', - '/etc/percona-toolkit', - '/tmp', - "$home", - ); sub version_check_file { foreach my $dir ( @vc_dirs ) { @@ -4553,6 +4554,46 @@ sub get_instance_id { } +sub get_uuid { + my $uuid_file = '/.percona-toolkit.uuid'; + foreach my $dir (@vc_dirs) { + my $filename = $dir.$uuid_file; + my $uuid=_read_uuid($filename); + return $uuid if $uuid; + } + + my $filename = $ENV{"HOME"} . $uuid_file; + my $uuid = _generate_uuid(); + + open(my $fh, '>', $filename) or die "Could not open file '$filename' $!"; + print $fh $uuid; + close $fh; + + return $uuid; +} + +sub _generate_uuid { + return sprintf+($}="%04x")."$}-$}-$}-$}-".$}x3,map rand 65537,0..7; +} + +sub _read_uuid { + my $filename = shift; + my $fh; + + eval { + open($fh, '<:encoding(UTF-8)', $filename); + }; + return if ($EVAL_ERROR); + + my $uuid; + eval { $uuid = <$fh>; }; + return if ($EVAL_ERROR); + + chomp $uuid; + return $uuid; +} + + sub pingback { my (%args) = @_; my @required_args = qw(url instances); @@ -4589,7 +4630,7 @@ sub pingback { my $client_content = encode_client_response( items => $items, versions => $versions, - general_id => md5_hex( hostname() ), + general_id => get_uuid(), ); my $client_response = { diff --git a/bin/pt-duplicate-key-checker b/bin/pt-duplicate-key-checker index d6586855..9cca3223 100755 --- a/bin/pt-duplicate-key-checker +++ b/bin/pt-duplicate-key-checker @@ -4379,15 +4379,16 @@ eval { require HTTP::Micro; }; +my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; +my @vc_dirs = ( + '/etc/percona', + '/etc/percona-toolkit', + '/tmp', + "$home", +); + { my $file = 'percona-version-check'; - my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; - my @vc_dirs = ( - '/etc/percona', - '/etc/percona-toolkit', - '/tmp', - "$home", - ); sub version_check_file { foreach my $dir ( @vc_dirs ) { @@ -4604,6 +4605,46 @@ sub get_instance_id { } +sub get_uuid { + my $uuid_file = '/.percona-toolkit.uuid'; + foreach my $dir (@vc_dirs) { + my $filename = $dir.$uuid_file; + my $uuid=_read_uuid($filename); + return $uuid if $uuid; + } + + my $filename = $ENV{"HOME"} . $uuid_file; + my $uuid = _generate_uuid(); + + open(my $fh, '>', $filename) or die "Could not open file '$filename' $!"; + print $fh $uuid; + close $fh; + + return $uuid; +} + +sub _generate_uuid { + return sprintf+($}="%04x")."$}-$}-$}-$}-".$}x3,map rand 65537,0..7; +} + +sub _read_uuid { + my $filename = shift; + my $fh; + + eval { + open($fh, '<:encoding(UTF-8)', $filename); + }; + return if ($EVAL_ERROR); + + my $uuid; + eval { $uuid = <$fh>; }; + return if ($EVAL_ERROR); + + chomp $uuid; + return $uuid; +} + + sub pingback { my (%args) = @_; my @required_args = qw(url instances); @@ -4640,7 +4681,7 @@ sub pingback { my $client_content = encode_client_response( items => $items, versions => $versions, - general_id => md5_hex( hostname() ), + general_id => get_uuid(), ); my $client_response = { diff --git a/bin/pt-find b/bin/pt-find index c1e4a940..e63870c9 100755 --- a/bin/pt-find +++ b/bin/pt-find @@ -3093,15 +3093,16 @@ eval { require HTTP::Micro; }; +my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; +my @vc_dirs = ( + '/etc/percona', + '/etc/percona-toolkit', + '/tmp', + "$home", +); + { my $file = 'percona-version-check'; - my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; - my @vc_dirs = ( - '/etc/percona', - '/etc/percona-toolkit', - '/tmp', - "$home", - ); sub version_check_file { foreach my $dir ( @vc_dirs ) { @@ -3318,6 +3319,46 @@ sub get_instance_id { } +sub get_uuid { + my $uuid_file = '/.percona-toolkit.uuid'; + foreach my $dir (@vc_dirs) { + my $filename = $dir.$uuid_file; + my $uuid=_read_uuid($filename); + return $uuid if $uuid; + } + + my $filename = $ENV{"HOME"} . $uuid_file; + my $uuid = _generate_uuid(); + + open(my $fh, '>', $filename) or die "Could not open file '$filename' $!"; + print $fh $uuid; + close $fh; + + return $uuid; +} + +sub _generate_uuid { + return sprintf+($}="%04x")."$}-$}-$}-$}-".$}x3,map rand 65537,0..7; +} + +sub _read_uuid { + my $filename = shift; + my $fh; + + eval { + open($fh, '<:encoding(UTF-8)', $filename); + }; + return if ($EVAL_ERROR); + + my $uuid; + eval { $uuid = <$fh>; }; + return if ($EVAL_ERROR); + + chomp $uuid; + return $uuid; +} + + sub pingback { my (%args) = @_; my @required_args = qw(url instances); @@ -3354,7 +3395,7 @@ sub pingback { my $client_content = encode_client_response( items => $items, versions => $versions, - general_id => md5_hex( hostname() ), + general_id => get_uuid(), ); my $client_response = { diff --git a/bin/pt-fk-error-logger b/bin/pt-fk-error-logger index 8ce7b713..e99aae70 100755 --- a/bin/pt-fk-error-logger +++ b/bin/pt-fk-error-logger @@ -3280,15 +3280,16 @@ eval { require HTTP::Micro; }; +my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; +my @vc_dirs = ( + '/etc/percona', + '/etc/percona-toolkit', + '/tmp', + "$home", +); + { my $file = 'percona-version-check'; - my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; - my @vc_dirs = ( - '/etc/percona', - '/etc/percona-toolkit', - '/tmp', - "$home", - ); sub version_check_file { foreach my $dir ( @vc_dirs ) { @@ -3505,6 +3506,46 @@ sub get_instance_id { } +sub get_uuid { + my $uuid_file = '/.percona-toolkit.uuid'; + foreach my $dir (@vc_dirs) { + my $filename = $dir.$uuid_file; + my $uuid=_read_uuid($filename); + return $uuid if $uuid; + } + + my $filename = $ENV{"HOME"} . $uuid_file; + my $uuid = _generate_uuid(); + + open(my $fh, '>', $filename) or die "Could not open file '$filename' $!"; + print $fh $uuid; + close $fh; + + return $uuid; +} + +sub _generate_uuid { + return sprintf+($}="%04x")."$}-$}-$}-$}-".$}x3,map rand 65537,0..7; +} + +sub _read_uuid { + my $filename = shift; + my $fh; + + eval { + open($fh, '<:encoding(UTF-8)', $filename); + }; + return if ($EVAL_ERROR); + + my $uuid; + eval { $uuid = <$fh>; }; + return if ($EVAL_ERROR); + + chomp $uuid; + return $uuid; +} + + sub pingback { my (%args) = @_; my @required_args = qw(url instances); @@ -3541,7 +3582,7 @@ sub pingback { my $client_content = encode_client_response( items => $items, versions => $versions, - general_id => md5_hex( hostname() ), + general_id => get_uuid(), ); my $client_response = { diff --git a/bin/pt-heartbeat b/bin/pt-heartbeat index b3be48c7..f0566be2 100755 --- a/bin/pt-heartbeat +++ b/bin/pt-heartbeat @@ -4980,15 +4980,16 @@ eval { require HTTP::Micro; }; +my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; +my @vc_dirs = ( + '/etc/percona', + '/etc/percona-toolkit', + '/tmp', + "$home", +); + { my $file = 'percona-version-check'; - my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; - my @vc_dirs = ( - '/etc/percona', - '/etc/percona-toolkit', - '/tmp', - "$home", - ); sub version_check_file { foreach my $dir ( @vc_dirs ) { @@ -5205,6 +5206,46 @@ sub get_instance_id { } +sub get_uuid { + my $uuid_file = '/.percona-toolkit.uuid'; + foreach my $dir (@vc_dirs) { + my $filename = $dir.$uuid_file; + my $uuid=_read_uuid($filename); + return $uuid if $uuid; + } + + my $filename = $ENV{"HOME"} . $uuid_file; + my $uuid = _generate_uuid(); + + open(my $fh, '>', $filename) or die "Could not open file '$filename' $!"; + print $fh $uuid; + close $fh; + + return $uuid; +} + +sub _generate_uuid { + return sprintf+($}="%04x")."$}-$}-$}-$}-".$}x3,map rand 65537,0..7; +} + +sub _read_uuid { + my $filename = shift; + my $fh; + + eval { + open($fh, '<:encoding(UTF-8)', $filename); + }; + return if ($EVAL_ERROR); + + my $uuid; + eval { $uuid = <$fh>; }; + return if ($EVAL_ERROR); + + chomp $uuid; + return $uuid; +} + + sub pingback { my (%args) = @_; my @required_args = qw(url instances); @@ -5241,7 +5282,7 @@ sub pingback { my $client_content = encode_client_response( items => $items, versions => $versions, - general_id => md5_hex( hostname() ), + general_id => get_uuid(), ); my $client_response = { diff --git a/bin/pt-index-usage b/bin/pt-index-usage index 75239c1f..d34f34a4 100755 --- a/bin/pt-index-usage +++ b/bin/pt-index-usage @@ -5777,15 +5777,16 @@ eval { require HTTP::Micro; }; +my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; +my @vc_dirs = ( + '/etc/percona', + '/etc/percona-toolkit', + '/tmp', + "$home", +); + { my $file = 'percona-version-check'; - my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; - my @vc_dirs = ( - '/etc/percona', - '/etc/percona-toolkit', - '/tmp', - "$home", - ); sub version_check_file { foreach my $dir ( @vc_dirs ) { @@ -6002,6 +6003,46 @@ sub get_instance_id { } +sub get_uuid { + my $uuid_file = '/.percona-toolkit.uuid'; + foreach my $dir (@vc_dirs) { + my $filename = $dir.$uuid_file; + my $uuid=_read_uuid($filename); + return $uuid if $uuid; + } + + my $filename = $ENV{"HOME"} . $uuid_file; + my $uuid = _generate_uuid(); + + open(my $fh, '>', $filename) or die "Could not open file '$filename' $!"; + print $fh $uuid; + close $fh; + + return $uuid; +} + +sub _generate_uuid { + return sprintf+($}="%04x")."$}-$}-$}-$}-".$}x3,map rand 65537,0..7; +} + +sub _read_uuid { + my $filename = shift; + my $fh; + + eval { + open($fh, '<:encoding(UTF-8)', $filename); + }; + return if ($EVAL_ERROR); + + my $uuid; + eval { $uuid = <$fh>; }; + return if ($EVAL_ERROR); + + chomp $uuid; + return $uuid; +} + + sub pingback { my (%args) = @_; my @required_args = qw(url instances); @@ -6038,7 +6079,7 @@ sub pingback { my $client_content = encode_client_response( items => $items, versions => $versions, - general_id => md5_hex( hostname() ), + general_id => get_uuid(), ); my $client_response = { diff --git a/bin/pt-kill b/bin/pt-kill index 01154183..5e1fd437 100755 --- a/bin/pt-kill +++ b/bin/pt-kill @@ -6185,15 +6185,16 @@ eval { require HTTP::Micro; }; +my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; +my @vc_dirs = ( + '/etc/percona', + '/etc/percona-toolkit', + '/tmp', + "$home", +); + { my $file = 'percona-version-check'; - my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; - my @vc_dirs = ( - '/etc/percona', - '/etc/percona-toolkit', - '/tmp', - "$home", - ); sub version_check_file { foreach my $dir ( @vc_dirs ) { @@ -6410,6 +6411,46 @@ sub get_instance_id { } +sub get_uuid { + my $uuid_file = '/.percona-toolkit.uuid'; + foreach my $dir (@vc_dirs) { + my $filename = $dir.$uuid_file; + my $uuid=_read_uuid($filename); + return $uuid if $uuid; + } + + my $filename = $ENV{"HOME"} . $uuid_file; + my $uuid = _generate_uuid(); + + open(my $fh, '>', $filename) or die "Could not open file '$filename' $!"; + print $fh $uuid; + close $fh; + + return $uuid; +} + +sub _generate_uuid { + return sprintf+($}="%04x")."$}-$}-$}-$}-".$}x3,map rand 65537,0..7; +} + +sub _read_uuid { + my $filename = shift; + my $fh; + + eval { + open($fh, '<:encoding(UTF-8)', $filename); + }; + return if ($EVAL_ERROR); + + my $uuid; + eval { $uuid = <$fh>; }; + return if ($EVAL_ERROR); + + chomp $uuid; + return $uuid; +} + + sub pingback { my (%args) = @_; my @required_args = qw(url instances); @@ -6446,7 +6487,7 @@ sub pingback { my $client_content = encode_client_response( items => $items, versions => $versions, - general_id => md5_hex( hostname() ), + general_id => get_uuid(), ); my $client_response = { diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change index 91184b0d..bbba173f 100755 --- a/bin/pt-online-schema-change +++ b/bin/pt-online-schema-change @@ -7413,15 +7413,16 @@ eval { require HTTP::Micro; }; +my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; +my @vc_dirs = ( + '/etc/percona', + '/etc/percona-toolkit', + '/tmp', + "$home", +); + { my $file = 'percona-version-check'; - my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; - my @vc_dirs = ( - '/etc/percona', - '/etc/percona-toolkit', - '/tmp', - "$home", - ); sub version_check_file { foreach my $dir ( @vc_dirs ) { @@ -7638,6 +7639,46 @@ sub get_instance_id { } +sub get_uuid { + my $uuid_file = '/.percona-toolkit.uuid'; + foreach my $dir (@vc_dirs) { + my $filename = $dir.$uuid_file; + my $uuid=_read_uuid($filename); + return $uuid if $uuid; + } + + my $filename = $ENV{"HOME"} . $uuid_file; + my $uuid = _generate_uuid(); + + open(my $fh, '>', $filename) or die "Could not open file '$filename' $!"; + print $fh $uuid; + close $fh; + + return $uuid; +} + +sub _generate_uuid { + return sprintf+($}="%04x")."$}-$}-$}-$}-".$}x3,map rand 65537,0..7; +} + +sub _read_uuid { + my $filename = shift; + my $fh; + + eval { + open($fh, '<:encoding(UTF-8)', $filename); + }; + return if ($EVAL_ERROR); + + my $uuid; + eval { $uuid = <$fh>; }; + return if ($EVAL_ERROR); + + chomp $uuid; + return $uuid; +} + + sub pingback { my (%args) = @_; my @required_args = qw(url instances); @@ -7674,7 +7715,7 @@ sub pingback { my $client_content = encode_client_response( items => $items, versions => $versions, - general_id => md5_hex( hostname() ), + general_id => get_uuid(), ); my $client_response = { diff --git a/bin/pt-query-digest b/bin/pt-query-digest index ba90a55f..4923c3cb 100755 --- a/bin/pt-query-digest +++ b/bin/pt-query-digest @@ -12446,15 +12446,16 @@ eval { require HTTP::Micro; }; +my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; +my @vc_dirs = ( + '/etc/percona', + '/etc/percona-toolkit', + '/tmp', + "$home", +); + { my $file = 'percona-version-check'; - my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; - my @vc_dirs = ( - '/etc/percona', - '/etc/percona-toolkit', - '/tmp', - "$home", - ); sub version_check_file { foreach my $dir ( @vc_dirs ) { @@ -12671,6 +12672,46 @@ sub get_instance_id { } +sub get_uuid { + my $uuid_file = '/.percona-toolkit.uuid'; + foreach my $dir (@vc_dirs) { + my $filename = $dir.$uuid_file; + my $uuid=_read_uuid($filename); + return $uuid if $uuid; + } + + my $filename = $ENV{"HOME"} . $uuid_file; + my $uuid = _generate_uuid(); + + open(my $fh, '>', $filename) or die "Could not open file '$filename' $!"; + print $fh $uuid; + close $fh; + + return $uuid; +} + +sub _generate_uuid { + return sprintf+($}="%04x")."$}-$}-$}-$}-".$}x3,map rand 65537,0..7; +} + +sub _read_uuid { + my $filename = shift; + my $fh; + + eval { + open($fh, '<:encoding(UTF-8)', $filename); + }; + return if ($EVAL_ERROR); + + my $uuid; + eval { $uuid = <$fh>; }; + return if ($EVAL_ERROR); + + chomp $uuid; + return $uuid; +} + + sub pingback { my (%args) = @_; my @required_args = qw(url instances); @@ -12707,7 +12748,7 @@ sub pingback { my $client_content = encode_client_response( items => $items, versions => $versions, - general_id => md5_hex( hostname() ), + general_id => get_uuid(), ); my $client_response = { diff --git a/bin/pt-slave-delay b/bin/pt-slave-delay index e79bd633..0ff73c59 100755 --- a/bin/pt-slave-delay +++ b/bin/pt-slave-delay @@ -3597,15 +3597,16 @@ eval { require HTTP::Micro; }; +my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; +my @vc_dirs = ( + '/etc/percona', + '/etc/percona-toolkit', + '/tmp', + "$home", +); + { my $file = 'percona-version-check'; - my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; - my @vc_dirs = ( - '/etc/percona', - '/etc/percona-toolkit', - '/tmp', - "$home", - ); sub version_check_file { foreach my $dir ( @vc_dirs ) { @@ -3822,6 +3823,46 @@ sub get_instance_id { } +sub get_uuid { + my $uuid_file = '/.percona-toolkit.uuid'; + foreach my $dir (@vc_dirs) { + my $filename = $dir.$uuid_file; + my $uuid=_read_uuid($filename); + return $uuid if $uuid; + } + + my $filename = $ENV{"HOME"} . $uuid_file; + my $uuid = _generate_uuid(); + + open(my $fh, '>', $filename) or die "Could not open file '$filename' $!"; + print $fh $uuid; + close $fh; + + return $uuid; +} + +sub _generate_uuid { + return sprintf+($}="%04x")."$}-$}-$}-$}-".$}x3,map rand 65537,0..7; +} + +sub _read_uuid { + my $filename = shift; + my $fh; + + eval { + open($fh, '<:encoding(UTF-8)', $filename); + }; + return if ($EVAL_ERROR); + + my $uuid; + eval { $uuid = <$fh>; }; + return if ($EVAL_ERROR); + + chomp $uuid; + return $uuid; +} + + sub pingback { my (%args) = @_; my @required_args = qw(url instances); @@ -3858,7 +3899,7 @@ sub pingback { my $client_content = encode_client_response( items => $items, versions => $versions, - general_id => md5_hex( hostname() ), + general_id => get_uuid(), ); my $client_response = { diff --git a/bin/pt-slave-restart b/bin/pt-slave-restart index f202ff2a..59cd6315 100755 --- a/bin/pt-slave-restart +++ b/bin/pt-slave-restart @@ -4306,15 +4306,16 @@ eval { require HTTP::Micro; }; +my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; +my @vc_dirs = ( + '/etc/percona', + '/etc/percona-toolkit', + '/tmp', + "$home", +); + { my $file = 'percona-version-check'; - my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; - my @vc_dirs = ( - '/etc/percona', - '/etc/percona-toolkit', - '/tmp', - "$home", - ); sub version_check_file { foreach my $dir ( @vc_dirs ) { @@ -4531,6 +4532,46 @@ sub get_instance_id { } +sub get_uuid { + my $uuid_file = '/.percona-toolkit.uuid'; + foreach my $dir (@vc_dirs) { + my $filename = $dir.$uuid_file; + my $uuid=_read_uuid($filename); + return $uuid if $uuid; + } + + my $filename = $ENV{"HOME"} . $uuid_file; + my $uuid = _generate_uuid(); + + open(my $fh, '>', $filename) or die "Could not open file '$filename' $!"; + print $fh $uuid; + close $fh; + + return $uuid; +} + +sub _generate_uuid { + return sprintf+($}="%04x")."$}-$}-$}-$}-".$}x3,map rand 65537,0..7; +} + +sub _read_uuid { + my $filename = shift; + my $fh; + + eval { + open($fh, '<:encoding(UTF-8)', $filename); + }; + return if ($EVAL_ERROR); + + my $uuid; + eval { $uuid = <$fh>; }; + return if ($EVAL_ERROR); + + chomp $uuid; + return $uuid; +} + + sub pingback { my (%args) = @_; my @required_args = qw(url instances); @@ -4567,7 +4608,7 @@ sub pingback { my $client_content = encode_client_response( items => $items, versions => $versions, - general_id => md5_hex( hostname() ), + general_id => get_uuid(), ); my $client_response = { diff --git a/bin/pt-table-checksum b/bin/pt-table-checksum index c1f14786..67d4fccc 100755 --- a/bin/pt-table-checksum +++ b/bin/pt-table-checksum @@ -797,15 +797,16 @@ eval { require HTTP::Micro; }; +my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; +my @vc_dirs = ( + '/etc/percona', + '/etc/percona-toolkit', + '/tmp', + "$home", +); + { my $file = 'percona-version-check'; - my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; - my @vc_dirs = ( - '/etc/percona', - '/etc/percona-toolkit', - '/tmp', - "$home", - ); sub version_check_file { foreach my $dir ( @vc_dirs ) { @@ -1022,6 +1023,46 @@ sub get_instance_id { } +sub get_uuid { + my $uuid_file = '/.percona-toolkit.uuid'; + foreach my $dir (@vc_dirs) { + my $filename = $dir.$uuid_file; + my $uuid=_read_uuid($filename); + return $uuid if $uuid; + } + + my $filename = $ENV{"HOME"} . $uuid_file; + my $uuid = _generate_uuid(); + + open(my $fh, '>', $filename) or die "Could not open file '$filename' $!"; + print $fh $uuid; + close $fh; + + return $uuid; +} + +sub _generate_uuid { + return sprintf+($}="%04x")."$}-$}-$}-$}-".$}x3,map rand 65537,0..7; +} + +sub _read_uuid { + my $filename = shift; + my $fh; + + eval { + open($fh, '<:encoding(UTF-8)', $filename); + }; + return if ($EVAL_ERROR); + + my $uuid; + eval { $uuid = <$fh>; }; + return if ($EVAL_ERROR); + + chomp $uuid; + return $uuid; +} + + sub pingback { my (%args) = @_; my @required_args = qw(url instances); @@ -1058,7 +1099,7 @@ sub pingback { my $client_content = encode_client_response( items => $items, versions => $versions, - general_id => md5_hex( hostname() ), + general_id => get_uuid(), ); my $client_response = { diff --git a/bin/pt-table-sync b/bin/pt-table-sync index 93c06865..0817e384 100755 --- a/bin/pt-table-sync +++ b/bin/pt-table-sync @@ -9215,15 +9215,16 @@ eval { require HTTP::Micro; }; +my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; +my @vc_dirs = ( + '/etc/percona', + '/etc/percona-toolkit', + '/tmp', + "$home", +); + { my $file = 'percona-version-check'; - my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; - my @vc_dirs = ( - '/etc/percona', - '/etc/percona-toolkit', - '/tmp', - "$home", - ); sub version_check_file { foreach my $dir ( @vc_dirs ) { @@ -9440,6 +9441,46 @@ sub get_instance_id { } +sub get_uuid { + my $uuid_file = '/.percona-toolkit.uuid'; + foreach my $dir (@vc_dirs) { + my $filename = $dir.$uuid_file; + my $uuid=_read_uuid($filename); + return $uuid if $uuid; + } + + my $filename = $ENV{"HOME"} . $uuid_file; + my $uuid = _generate_uuid(); + + open(my $fh, '>', $filename) or die "Could not open file '$filename' $!"; + print $fh $uuid; + close $fh; + + return $uuid; +} + +sub _generate_uuid { + return sprintf+($}="%04x")."$}-$}-$}-$}-".$}x3,map rand 65537,0..7; +} + +sub _read_uuid { + my $filename = shift; + my $fh; + + eval { + open($fh, '<:encoding(UTF-8)', $filename); + }; + return if ($EVAL_ERROR); + + my $uuid; + eval { $uuid = <$fh>; }; + return if ($EVAL_ERROR); + + chomp $uuid; + return $uuid; +} + + sub pingback { my (%args) = @_; my @required_args = qw(url instances); @@ -9476,7 +9517,7 @@ sub pingback { my $client_content = encode_client_response( items => $items, versions => $versions, - general_id => md5_hex( hostname() ), + general_id => get_uuid(), ); my $client_response = { diff --git a/bin/pt-upgrade b/bin/pt-upgrade index c4753636..4e671878 100755 --- a/bin/pt-upgrade +++ b/bin/pt-upgrade @@ -4086,15 +4086,16 @@ eval { require HTTP::Micro; }; +my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; +my @vc_dirs = ( + '/etc/percona', + '/etc/percona-toolkit', + '/tmp', + "$home", +); + { my $file = 'percona-version-check'; - my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; - my @vc_dirs = ( - '/etc/percona', - '/etc/percona-toolkit', - '/tmp', - "$home", - ); sub version_check_file { foreach my $dir ( @vc_dirs ) { @@ -4311,6 +4312,46 @@ sub get_instance_id { } +sub get_uuid { + my $uuid_file = '/.percona-toolkit.uuid'; + foreach my $dir (@vc_dirs) { + my $filename = $dir.$uuid_file; + my $uuid=_read_uuid($filename); + return $uuid if $uuid; + } + + my $filename = $ENV{"HOME"} . $uuid_file; + my $uuid = _generate_uuid(); + + open(my $fh, '>', $filename) or die "Could not open file '$filename' $!"; + print $fh $uuid; + close $fh; + + return $uuid; +} + +sub _generate_uuid { + return sprintf+($}="%04x")."$}-$}-$}-$}-".$}x3,map rand 65537,0..7; +} + +sub _read_uuid { + my $filename = shift; + my $fh; + + eval { + open($fh, '<:encoding(UTF-8)', $filename); + }; + return if ($EVAL_ERROR); + + my $uuid; + eval { $uuid = <$fh>; }; + return if ($EVAL_ERROR); + + chomp $uuid; + return $uuid; +} + + sub pingback { my (%args) = @_; my @required_args = qw(url instances); @@ -4347,7 +4388,7 @@ sub pingback { my $client_content = encode_client_response( items => $items, versions => $versions, - general_id => md5_hex( hostname() ), + general_id => get_uuid(), ); my $client_response = { diff --git a/bin/pt-variable-advisor b/bin/pt-variable-advisor index ce80e9f2..e3aeb29e 100755 --- a/bin/pt-variable-advisor +++ b/bin/pt-variable-advisor @@ -4504,15 +4504,16 @@ eval { require HTTP::Micro; }; +my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; +my @vc_dirs = ( + '/etc/percona', + '/etc/percona-toolkit', + '/tmp', + "$home", +); + { my $file = 'percona-version-check'; - my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; - my @vc_dirs = ( - '/etc/percona', - '/etc/percona-toolkit', - '/tmp', - "$home", - ); sub version_check_file { foreach my $dir ( @vc_dirs ) { @@ -4729,6 +4730,46 @@ sub get_instance_id { } +sub get_uuid { + my $uuid_file = '/.percona-toolkit.uuid'; + foreach my $dir (@vc_dirs) { + my $filename = $dir.$uuid_file; + my $uuid=_read_uuid($filename); + return $uuid if $uuid; + } + + my $filename = $ENV{"HOME"} . $uuid_file; + my $uuid = _generate_uuid(); + + open(my $fh, '>', $filename) or die "Could not open file '$filename' $!"; + print $fh $uuid; + close $fh; + + return $uuid; +} + +sub _generate_uuid { + return sprintf+($}="%04x")."$}-$}-$}-$}-".$}x3,map rand 65537,0..7; +} + +sub _read_uuid { + my $filename = shift; + my $fh; + + eval { + open($fh, '<:encoding(UTF-8)', $filename); + }; + return if ($EVAL_ERROR); + + my $uuid; + eval { $uuid = <$fh>; }; + return if ($EVAL_ERROR); + + chomp $uuid; + return $uuid; +} + + sub pingback { my (%args) = @_; my @required_args = qw(url instances); @@ -4765,7 +4806,7 @@ sub pingback { my $client_content = encode_client_response( items => $items, versions => $versions, - general_id => md5_hex( hostname() ), + general_id => get_uuid(), ); my $client_response = { From d8ec16f2132bca970d348a157cc33fc1825668a9 Mon Sep 17 00:00:00 2001 From: Carlos Salguero Date: Fri, 16 Feb 2018 14:27:16 -0300 Subject: [PATCH 15/17] PMM-1455 pt-osc is stuck when the table that is being altered is filtered out in the slave --- bin/pt-online-schema-change | 2 +- .../alter_active_table.t | 4 +- t/pt-online-schema-change/issue-1646713.t | 14 +++++- t/pt-online-schema-change/pt-1455.t | 39 +++++++--------- .../samples/issue-1646713.sql | 44 +------------------ .../samples/pt-1455_master.sql | 2 + .../samples/pt-1455_reset_slave.sql | 6 +++ .../samples/pt-1455_slave.sql | 4 +- 8 files changed, 44 insertions(+), 71 deletions(-) create mode 100644 t/pt-online-schema-change/samples/pt-1455_reset_slave.sql diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change index 3d6cfccd..0804bb84 100755 --- a/bin/pt-online-schema-change +++ b/bin/pt-online-schema-change @@ -5002,7 +5002,7 @@ sub wait { my $lag = $get_lag->($lagged_slaves[$i]->{cxn}); PTDEBUG && _d($lagged_slaves[$i]->{cxn}->name(), 'slave lag:', $lag); - if ( !defined $lag || $lag > $max_lag ) { + if ( defined $lag && $lag > $max_lag ) { $lagged_slaves[$i]->{lag} = $lag; } else { diff --git a/t/pt-online-schema-change/alter_active_table.t b/t/pt-online-schema-change/alter_active_table.t index b3c42a20..f5fe7e43 100644 --- a/t/pt-online-schema-change/alter_active_table.t +++ b/t/pt-online-schema-change/alter_active_table.t @@ -165,7 +165,7 @@ else { } $master_dbh->do("USE pt_osc"); $master_dbh->do("TRUNCATE TABLE t"); -$master_dbh->do("LOAD DATA LOCAL INFILE '$trunk/t/pt-online-schema-change/samples/basic_no_fks.data' INTO TABLE t"); +$master_dbh->do("LOAD DATA INFILE '$trunk/t/pt-online-schema-change/samples/basic_no_fks.data' INTO TABLE t"); $master_dbh->do("ANALYZE TABLE t"); $sb->wait_for_slaves(); @@ -215,7 +215,7 @@ is( $master_dbh->do("USE pt_osc"); $master_dbh->do("TRUNCATE TABLE t"); -$master_dbh->do("LOAD DATA LOCAL INFILE '$trunk/t/pt-online-schema-change/samples/basic_no_fks.data' INTO TABLE t"); +$master_dbh->do("LOAD DATA INFILE '$trunk/t/pt-online-schema-change/samples/basic_no_fks.data' INTO TABLE t"); $master_dbh->do("ANALYZE TABLE t"); $sb->wait_for_slaves(); diff --git a/t/pt-online-schema-change/issue-1646713.t b/t/pt-online-schema-change/issue-1646713.t index 3d716db8..10e529f5 100644 --- a/t/pt-online-schema-change/issue-1646713.t +++ b/t/pt-online-schema-change/issue-1646713.t @@ -46,6 +46,11 @@ my $exit_status; my $sample = "t/pt-online-schema-change/samples/"; $sb->load_file('master', "$sample/issue-1646713.sql"); +my $num_rows = 1000; +my $master_port = 12345; + +$master_dbh->do("FLUSH TABLES"); +$sb->wait_for_slaves(); sub start_thread { my ($dsn_opts, $sleep_time) = @_; @@ -53,14 +58,18 @@ sub start_thread { my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp); my $dbh = $sb->get_dbh_for('master'); diag("Thread started: Sleeping $sleep_time seconds before updating the PK field for row with id=1 in test.sbtest"); - sleep($sleep_time); + # We need to lock the tables to prevent osc to really start before we are able to write the row to the table + $dbh->do("LOCK TABLES `test`.`o1` WRITE"); + select(undef, undef, undef, $sleep_time); $dbh->do("UPDATE `test`.`o1` SET id=0 WHERE id=1"); + $dbh->do("UNLOCK TABLES"); diag("Row updated"); } -my $thr = threads->create('start_thread', $dsn_opts, 1); +my $thr = threads->create('start_thread', $dsn_opts, 0.50); $thr->detach(); threads->yield(); + diag("Starting osc. A row will be updated in a different thread."); my $dir = tempdir( CLEANUP => 1 ); $output = output( @@ -71,6 +80,7 @@ $output = output( ), }, ); +diag($output); like( $output, diff --git a/t/pt-online-schema-change/pt-1455.t b/t/pt-online-schema-change/pt-1455.t index 7a961646..3861019d 100644 --- a/t/pt-online-schema-change/pt-1455.t +++ b/t/pt-online-schema-change/pt-1455.t @@ -21,7 +21,7 @@ use Sandbox; use SqlModes; use File::Temp qw/ tempdir /; -plan tests => 4; +plan tests => 3; require "$trunk/bin/pt-online-schema-change"; @@ -41,26 +41,26 @@ my @args = (qw(--set-vars innodb_lock_wait_timeout=3)); my $output; my $exit_status; -$sb->load_file('slave1', "t/pt-online-schema-change/samples/pt-1455_slave.sql"); +diag("Setting replication filters on slave 2"); $sb->load_file('slave2', "t/pt-online-schema-change/samples/pt-1455_slave.sql"); -$sb->load_file('master', "t/pt-online-schema-change/samples/pt-1455_master.sql"); +diag("Setting replication filters on slave 1"); +$sb->load_file('slave1', "t/pt-online-schema-change/samples/pt-1455_slave.sql"); +diag("Setting replication filters on master"); +$sb->load_file('master', "t/pt-online-schema-change/samples/pt-1455_master.sql",undef, no_wait => 1); +diag("replication filters set"); my $num_rows = 1000; -my $master_port = $Sandbox::port_for{master}; +my $master_port = 12345; diag("Loading $num_rows into the table. This might take some time."); -diag(`util/mysql_random_data_load_linux_amd64 --host=127.1 --port=$master_port --user=msandbox --password=msandbox ignored_db t1 $num_rows`); +diag(`util/mysql_random_data_load_linux_amd64 --host=127.1 --port=$master_port --user=msandbox --password=msandbox employees t1 $num_rows`); diag("$num_rows rows loaded. Starting tests."); $master_dbh->do("FLUSH TABLES"); -my $new_dir='/tmp/tdir'; -diag(`rm -rf $new_dir`); -diag(`mkdir $new_dir`); - ($output, $exit_status) = full_output( - sub { pt_online_schema_change::main(@args, "$master_dsn,D=ignored_db,t=t1", - '--execute', + sub { pt_online_schema_change::main(@args, "$master_dsn,D=employees,t=t1", + '--execute', '--no-check-replication-filters', '--alter', "engine=innodb", ), }, @@ -79,19 +79,12 @@ like( "PT-1455 Got successfully altered message.", ); +$master_dbh->do("DROP DATABASE IF EXISTS employees"); -my $db_dir="$new_dir/test/"; -opendir(my $dh, $db_dir) || die "Can't opendir $db_dir: $!"; -my @files = grep { /^t3#P#p/ } readdir($dh); -closedir $dh; - -is( - scalar @files, - 4, - "PT-1455 Number of files is correct", -); - -$master_dbh->do("DROP DATABASE IF EXISTS ignored_db"); +diag("Resetting replication filters on slave 2"); +$sb->load_file('slave2', "t/pt-online-schema-change/samples/pt-1455_reset_slave.sql"); +diag("Resetting replication filters on slave 1"); +$sb->load_file('slave1', "t/pt-online-schema-change/samples/pt-1455_reset_slave.sql"); # ############################################################################# # Done. diff --git a/t/pt-online-schema-change/samples/issue-1646713.sql b/t/pt-online-schema-change/samples/issue-1646713.sql index e4ac06e0..5f44e4e7 100644 --- a/t/pt-online-schema-change/samples/issue-1646713.sql +++ b/t/pt-online-schema-change/samples/issue-1646713.sql @@ -2,40 +2,12 @@ DROP DATABASE IF EXISTS `test`; CREATE DATABASE IF NOT EXISTS `test`; USE test; --- MySQL dump 10.13 Distrib 5.7.14-8, for debian-linux-gnu (x86_64) --- --- Host: localhost Database: test --- ------------------------------------------------------ --- Server version 5.7.14-8-log - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `sbtest` --- - DROP TABLE IF EXISTS `o1`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `o1` ( - `id` int -(10) unsigned NOT NULL AUTO_INCREMENT, + `id` int (10) unsigned NOT NULL AUTO_INCREMENT, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=1100001 DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1; --- --- Dumping data for table `sbtest` --- LOCK TABLES `o1` WRITE; /*!40000 ALTER TABLE `o1` DISABLE KEYS */; @@ -140,16 +112,4 @@ INSERT INTO `o1` VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9), (980),(981),(982),(983),(984),(985),(986),(987),(988),(989), (990),(991),(992),(993),(994),(995),(996),(997),(998),(999), (10000); -/*!40000 ALTER TABLE `o1` ENABLE KEYS */; UNLOCK TABLES; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2017-03-14 15:19:26 diff --git a/t/pt-online-schema-change/samples/pt-1455_master.sql b/t/pt-online-schema-change/samples/pt-1455_master.sql index ca5967ac..fd6bed3a 100644 --- a/t/pt-online-schema-change/samples/pt-1455_master.sql +++ b/t/pt-online-schema-change/samples/pt-1455_master.sql @@ -1,6 +1,8 @@ DROP DATABASE IF EXISTS employees; CREATE DATABASE employees; +-- This table should be replicated CREATE TABLE employees.t1 ( id INT AUTO_INCREMENT PRIMARY KEY, f2 INT ) ENGINE=InnoDB; + diff --git a/t/pt-online-schema-change/samples/pt-1455_reset_slave.sql b/t/pt-online-schema-change/samples/pt-1455_reset_slave.sql new file mode 100644 index 00000000..59c207b0 --- /dev/null +++ b/t/pt-online-schema-change/samples/pt-1455_reset_slave.sql @@ -0,0 +1,6 @@ +STOP SLAVE; +CHANGE REPLICATION FILTER REPLICATE_IGNORE_DB = (); +CHANGE REPLICATION FILTER REPLICATE_IGNORE_TABLE = (); +CHANGE REPLICATION FILTER REPLICATE_WILD_IGNORE_TABLE = (); +RESET SLAVE; +START SLAVE; diff --git a/t/pt-online-schema-change/samples/pt-1455_slave.sql b/t/pt-online-schema-change/samples/pt-1455_slave.sql index fbb9b928..86ee176a 100644 --- a/t/pt-online-schema-change/samples/pt-1455_slave.sql +++ b/t/pt-online-schema-change/samples/pt-1455_slave.sql @@ -1,4 +1,6 @@ STOP SLAVE; -CHANGE REPLICATION FILTER REPLICATE_WILD_IGNORE_TABLE = ('employees.%'); +CHANGE REPLICATION FILTER REPLICATE_IGNORE_DB = (`ignored_db`); +CHANGE REPLICATION FILTER REPLICATE_IGNORE_TABLE = (`idb1`.`it1`, `idb1`.`it2`); +CHANGE REPLICATION FILTER REPLICATE_WILD_IGNORE_TABLE = ('employees.eit%'); RESET SLAVE; START SLAVE; From 99479b0480bc5bd918eb779a6cb5f792b9fa65d0 Mon Sep 17 00:00:00 2001 From: Carlos Salguero Date: Fri, 16 Feb 2018 14:35:46 -0300 Subject: [PATCH 16/17] PT-1455 Updated version number --- bin/pt-online-schema-change | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change index 89505e66..b7c7c64b 100755 --- a/bin/pt-online-schema-change +++ b/bin/pt-online-schema-change @@ -13038,6 +13038,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA. =head1 VERSION -pt-online-schema-change 3.0.6 +pt-online-schema-change 3.0.7 =cut From f3ce0cc87e98f5966558ae90c38f9064e8eb980e Mon Sep 17 00:00:00 2001 From: Carlos Salguero Date: Fri, 16 Feb 2018 14:55:29 -0300 Subject: [PATCH 17/17] Updated changelog for 3.0.7 --- Changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index c33079ee..2f1a1256 100644 --- a/Changelog +++ b/Changelog @@ -2,8 +2,10 @@ Changelog for Percona Toolkit v3.0.7 - * Feature PT-644 : Added --mysql-only option to pt-stalk for RDS + * Fixed Bug PT-244 : pt-online-schema-change --data-dir option broken for partitioned table + * Feature PT-633 : Added --mysql-only option to pt-stalk for RDS * Fixed bug PT-1256: pt-table-sync does not use the character set for the table it is synchronizing + * Fixed bug PT-1455: pt-osc is stuck when the table that is being altered is filtered out in the slave v3.0.6 released 2017-12-20