diff options
| author | Antonin Kral <a.kral@bobek.cz> | 2011-06-18 21:24:41 +0200 |
|---|---|---|
| committer | Antonin Kral <a.kral@bobek.cz> | 2011-06-18 21:24:41 +0200 |
| commit | 64b33ee522375a8dc15be2875dfb7db4502259b0 (patch) | |
| tree | 44979e0aaf6bb576f4a737a93e071e28809b6779 /dbtests | |
| parent | 4d87ff4aa74d7ae975268ac43eee152dc3f5b7e9 (diff) | |
| download | mongodb-64b33ee522375a8dc15be2875dfb7db4502259b0.tar.gz | |
Imported Upstream version 1.8.2
Diffstat (limited to 'dbtests')
| -rw-r--r-- | dbtests/queryoptimizertests.cpp | 2 | ||||
| -rw-r--r-- | dbtests/spin_lock_test.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/dbtests/queryoptimizertests.cpp b/dbtests/queryoptimizertests.cpp index acf9217..2d6f752 100644 --- a/dbtests/queryoptimizertests.cpp +++ b/dbtests/queryoptimizertests.cpp @@ -1558,7 +1558,6 @@ namespace QueryOptimizerTests { theDataFileMgr.insertWithObjMod( ns(), temp ); } BSONObj hint = fromjson( "{$hint:{a:1,b:1}}" ); - BSONElement hintElt = hint.firstElement(); auto_ptr< FieldRangeSet > frs( new FieldRangeSet( ns(), fromjson( "{a:5,b:{$in:[2,3,6,9,11]}}" ) ) ); QueryPlan qp( nsd(), 1, *frs, *frs, fromjson( "{a:5,b:{$in:[2,3,6,9,11]}}" ), BSONObj() ); boost::shared_ptr<Cursor> c = qp.newCursor(); @@ -1581,7 +1580,6 @@ namespace QueryOptimizerTests { theDataFileMgr.insertWithObjMod( ns(), temp ); } BSONObj hint = fromjson( "{$hint:{a:1,b:1}}" ); - BSONElement hintElt = hint.firstElement(); auto_ptr< FieldRangeSet > frs( new FieldRangeSet( ns(), fromjson( "{a:{$gte:5},b:{$in:[2,3,6,9,11]}}" ) ) ); QueryPlan qp( nsd(), 1, *frs, *frs, fromjson( "{a:{$gte:5},b:{$in:[2,3,6,9,11]}}" ), BSONObj() ); boost::shared_ptr<Cursor> c = qp.newCursor(); diff --git a/dbtests/spin_lock_test.cpp b/dbtests/spin_lock_test.cpp index 01eb7b3..4b24aba 100644 --- a/dbtests/spin_lock_test.cpp +++ b/dbtests/spin_lock_test.cpp @@ -70,7 +70,7 @@ namespace { public: void run() { -#if defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) +#if defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) || defined(_WIN32) SpinLock spin; int counter = 0; @@ -93,10 +93,12 @@ namespace { ASSERT_EQUALS( counter, threads*incs ); #else - - // WARNING "TODO Missing spin lock in this platform." - ASSERT( true ); - + warning() << "spin lock slow on this platform" << endl; + +#if defined(__linux__) + // we don't want to have linux binaries without a fast spinlock + //ASSERT( false ); TODO SERVER-3075 +#endif #endif |