Skip to content

Commit 1a09d3a

Browse files
committed
fix windows groupcmd - assert is often overriden - be careful
1 parent 8ff9529 commit 1a09d3a

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

db/dbcommands.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1164,7 +1164,7 @@ namespace mongo {
11641164

11651165
s->setObject( "obj" , obj , true );
11661166
s->setNumber( "n" , n - 1 );
1167-
assert( s->invoke( f , BSONObj() , 0 , true ) == 0 );
1167+
uassert( "reduce invoke failed" , s->invoke( f , BSONObj() , 0 , true ) == 0 );
11681168
}
11691169

11701170
result.appendArray( "retval" , s->getObject( "$arr" ) );

jstests/group1.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ assert( res[0].count == 2 , "C" );
2020
assert( res[1].a == 2 , "D" );
2121
assert( res[1].count == 3 , "E" );
2222

23-
// TEMP DEBUGGING
24-
p.ns = t._shortName;
25-
printjson( db.runCommand( { "group" : db._groupFixParms( p ) } ) );
26-
// ----
27-
2823
assert.eq( res , t.groupcmd( p ) , "ZZ" );
2924

3025
ret = t.groupcmd( { key : {} , reduce : p.reduce , initial : p.initial } );

0 commit comments

Comments
 (0)