Permalink
Browse files

Merge branch 'master' of github.com:mongodb/mongo

  • Loading branch information...
dwight committed Oct 16, 2012
2 parents 3f55adc + fac1f12 commit 6cacecacdb9870cbb3013ce6cc87c6f39b19335b
Showing with 5,975 additions and 771 deletions.
  1. +12 −2 SConstruct
  2. +0 −23 buildscripts/bb.py
  3. +3,361 −0 buildscripts/cpplint.py
  4. +106 −0 buildscripts/lint.py
  5. +2 −0 buildscripts/smoke.py
  6. +7 −1 buildscripts/utils.py
  7. +1 −0 jstests/multiVersion/multi_version_sharding_passthrough.js
  8. +24 −0 jstests/rename6.js
  9. +3 −1 jstests/replsets/stepdown.js
  10. +13 −8 jstests/replsets/stepdown2.js
  11. +6 −1 src/mongo/SConscript
  12. +1 −1 src/mongo/base/global_initializer.cpp
  13. +1 −1 src/mongo/base/global_initializer_registerer.cpp
  14. +3 −3 src/mongo/base/initializer_dependency_graph.h
  15. +1 −1 src/mongo/base/make_string_vector.cpp
  16. +10 −9 src/mongo/bson/bson_db.h
  17. +14 −13 src/mongo/bson/bsondemo/bsondemo.cpp
  18. +1 −1 src/mongo/client/authentication_table.h
  19. +15 −0 src/mongo/client/clientOnly-private.h
  20. +1 −1 src/mongo/client/clientOnly.cpp
  21. +1 −1 src/mongo/client/connpool.h
  22. +16 −1 src/mongo/client/constants.h
  23. +1 −1 src/mongo/client/dbclient_rs.cpp
  24. +1 −1 src/mongo/client/dbclient_rs.h
  25. +1 −1 src/mongo/client/dbclientinterface.h
  26. +1 −1 src/mongo/client/distlock.h
  27. +15 −0 src/mongo/client/examples/insert_demo.cpp
  28. +15 −0 src/mongo/client/examples/mongoperf.cpp
  29. +18 −16 src/mongo/client/mongo_client_lib.cpp
  30. +4 −4 src/mongo/client/parallel.cpp
  31. +1 −1 src/mongo/client/parallel.h
  32. +15 −0 src/mongo/client/simple_client_demo.cpp
  33. +2 −2 src/mongo/db/btree.h
  34. +16 −0 src/mongo/db/btreebuilder.h
  35. +3 −3 src/mongo/db/cap.cpp
  36. +1 −11 src/mongo/db/client.cpp
  37. +10 −0 src/mongo/db/clientcursor.cpp
  38. +9 −1 src/mongo/db/clientcursor.h
  39. +26 −5 src/mongo/db/cloner.cpp
  40. +106 −49 src/mongo/db/cmdline.cpp
  41. +7 −1 src/mongo/db/cmdline.h
  42. +224 −0 src/mongo/db/cmdline_test.cpp
  43. +16 −0 src/mongo/db/collection.h
  44. +17 −1 src/mongo/db/commands/cpuprofile.cpp
  45. +1 −0 src/mongo/db/commands/distinct.cpp
  46. +1 −0 src/mongo/db/commands/find_and_modify.cpp
  47. +16 −0 src/mongo/db/commands/fsync.cpp
  48. +14 −13 src/mongo/db/commands/fsync.h
  49. +1 −0 src/mongo/db/commands/group.cpp
  50. +6 −5 src/mongo/db/commands/hashcmd.cpp
  51. +16 −0 src/mongo/db/commands/isself.cpp
  52. +1 −0 src/mongo/db/commands/mr.cpp
  53. +1 −0 src/mongo/db/commands/mr.h
  54. +16 −0 src/mongo/db/curop-inl.h
  55. +16 −0 src/mongo/db/d_globals.cpp
  56. +17 −0 src/mongo/db/d_globals.h
  57. +16 −0 src/mongo/db/databaseholder.h
  58. +63 −61 src/mongo/db/db.cpp
  59. +11 −1 src/mongo/db/dbcommands.cpp
  60. +1 −0 src/mongo/db/dbcommands_admin.cpp
  61. +17 −0 src/mongo/db/dbcommands_generic.cpp
  62. +2 −3 src/mongo/db/dbeval.cpp
  63. +1 −1 src/mongo/db/diskloc.h
  64. +14 −13 src/mongo/db/driverHelpers.cpp
  65. +17 −1 src/mongo/db/dur.h
  66. +1 −1 src/mongo/db/dur_preplogbuffer.cpp
  67. +2 −2 src/mongo/db/dur_recover.cpp
  68. +16 −0 src/mongo/db/dur_recover.h
  69. +16 −0 src/mongo/db/dur_stats.h
  70. +0 −54 src/mongo/db/globals.h
  71. +7 −0 src/mongo/db/hasher.h
  72. +3 −5 src/mongo/db/hashindex.cpp
  73. +2 −1 src/mongo/db/hashindex.h
  74. +2 −2 src/mongo/db/index_update.cpp
  75. +1 −1 src/mongo/db/instance.cpp
  76. +1 −1 src/mongo/db/json.cpp
  77. +188 −0 src/mongo/db/keypattern.cpp
  78. +156 −0 src/mongo/db/keypattern.h
  79. +17 −1 src/mongo/db/memconcept.cpp
  80. +19 −2 src/mongo/db/memconcept.h
  81. +2 −0 src/mongo/db/mongod.vcxproj
  82. +6 −0 src/mongo/db/mongod.vcxproj.filters
  83. +31 −29 src/mongo/db/namespace_details.cpp
  84. +33 −15 src/mongo/db/namespace_details.h
  85. +65 −0 src/mongo/db/namespacestring.h
  86. +76 −0 src/mongo/db/namespacestring_test.cpp
  87. +1 −1 src/mongo/db/nonce.cpp
  88. +15 −9 src/mongo/db/oplog.cpp
  89. +17 −0 src/mongo/db/oplogreader.h
  90. +36 −10 src/mongo/db/ops/update.cpp
  91. +19 −1 src/mongo/db/ops/update.h
  92. +35 −15 src/mongo/db/ops/update_internal.cpp
  93. +11 −4 src/mongo/db/ops/update_internal.h
  94. +17 −0 src/mongo/db/pagefault.cpp
  95. +17 −0 src/mongo/db/pagefault.h
  96. +5 −2 src/mongo/db/pdfile.cpp
  97. +4 −0 src/mongo/db/pdfile.h
  98. +1 −1 src/mongo/db/pipeline/document.h
  99. +1 −1 src/mongo/db/pipeline/document_source.cpp
  100. +1 −1 src/mongo/db/pipeline/document_source_limit.cpp
  101. +1 −1 src/mongo/db/pipeline/document_source_match.cpp
  102. +1 −1 src/mongo/db/pipeline/document_source_unwind.cpp
  103. +1 −1 src/mongo/db/pipeline/expression.h
  104. +2 −2 src/mongo/db/pipeline/pipeline.cpp
  105. +1 −1 src/mongo/db/projection.cpp
  106. +1 −68 src/mongo/db/queryutil.cpp
  107. +7 −26 src/mongo/db/queryutil.h
  108. +82 −5 src/mongo/db/record.cpp
  109. +1 −1 src/mongo/db/repl.cpp
  110. +1 −1 src/mongo/db/repl/bgsync.cpp
  111. +1 −1 src/mongo/db/repl/rs.cpp
  112. +13 −0 src/mongo/db/repl/rs_config.cpp
  113. +6 −0 src/mongo/db/repl/rs_config.h
  114. +16 −0 src/mongo/db/repl/rs_exception.h
  115. +1 −1 src/mongo/db/repl/rs_initialsync.cpp
  116. +1 −1 src/mongo/db/repl/rs_initiate.cpp
  117. +3 −3 src/mongo/db/repl/rs_rollback.cpp
  118. +1 −1 src/mongo/db/repl/rs_sync.h
  119. +16 −0 src/mongo/db/resource.h
  120. +1 −1 src/mongo/dbtests/accumulatortests.cpp
  121. +0 −15 src/mongo/dbtests/basictests.cpp
  122. +3 −3 src/mongo/dbtests/btreetests.cpp
  123. +2 −2 src/mongo/dbtests/documentsourcetests.cpp
  124. +1 −1 src/mongo/dbtests/documenttests.cpp
  125. +1 −1 src/mongo/dbtests/expressiontests.cpp
  126. +1 −1 src/mongo/dbtests/jsobjtests.cpp
  127. +2 −2 src/mongo/dbtests/perf/btreeperf.cpp
  128. +3 −3 src/mongo/dbtests/queryoptimizercursortests.cpp
  129. +47 −0 src/mongo/dbtests/repltests.cpp
  130. +1 −1 src/mongo/dbtests/spin_lock_test.cpp
  131. +16 −0 src/mongo/dbtests/stacktests.cpp
  132. +2 −0 src/mongo/dbtests/test.vcxproj
  133. +6 −0 src/mongo/dbtests/test.vcxproj.filters
  134. +1 −3 src/mongo/dbtests/updatetests.cpp
  135. +16 −0 src/mongo/platform/basic.h
  136. +31 −0 src/mongo/platform/bits.h
  137. +13 −0 src/mongo/platform/bits_test.cpp
  138. +2 −1 src/mongo/platform/random.h
  139. +16 −0 src/mongo/platform/windows_basic.h
  140. +1 −1 src/mongo/s/balancer_policy.h
  141. +3 −3 src/mongo/s/chunk.cpp
  142. +9 −7 src/mongo/s/d_chunk_manager.cpp
  143. +7 −6 src/mongo/s/d_chunk_manager.h
  144. +2 −2 src/mongo/s/d_logic.h
  145. +33 −16 src/mongo/s/d_migrate.cpp
  146. +4 −4 src/mongo/s/d_writeback.h
  147. +2 −2 src/mongo/s/grid.h
  148. +4 −0 src/mongo/s/mongos.vcxproj
  149. +12 −0 src/mongo/s/mongos.vcxproj.filters
  150. +0 −5 src/mongo/s/s_only.cpp
  151. +7 −1 src/mongo/s/server.cpp
  152. +1 −1 src/mongo/s/shard_version.h
  153. +7 −17 src/mongo/s/shardkey.cpp
  154. +21 −20 src/mongo/s/shardkey.h
  155. +1 −1 src/mongo/scripting/bson_template_evaluator.cpp
  156. +1 −1 src/mongo/scripting/engine_spidermonkey.cpp
  157. +18 −1 src/mongo/server.h
  158. +1 −1 src/mongo/shell/db.js
  159. +10 −9 src/mongo/shell/linenoise.cpp
  160. +2 −0 src/mongo/shell/mk_wcwidth.cpp
  161. +2 −0 src/mongo/shell/mk_wcwidth.h
  162. +1 −1 src/mongo/shell/shardingtest.js
  163. +1 −1 src/mongo/shell/shell_utils_extended.cpp
  164. +1 −1 src/mongo/shell/utils_sh.js
  165. +2 −7 src/mongo/tools/restore.cpp
  166. +2 −2 src/mongo/tools/sniffer.cpp
  167. +4 −2 src/mongo/tools/tool.cpp
  168. +15 −0 src/mongo/unittest/unittest_main.cpp
  169. +2 −2 src/mongo/util/admin_access.h
  170. +2 −2 src/mongo/util/alignedbuilder.cpp
  171. +4 −4 src/mongo/util/background.h
  172. +18 −0 src/mongo/util/checksum.h
  173. +16 −0 src/mongo/util/compress.cpp
  174. +16 −0 src/mongo/util/compress.h
  175. +1 −1 src/mongo/util/concurrency/list.h
  176. +16 −0 src/mongo/util/concurrency/mapsf.h
  177. +17 −1 src/mongo/util/concurrency/mutexdebugger.h
  178. +16 −0 src/mongo/util/concurrency/qlock.h
  179. +16 −0 src/mongo/util/concurrency/race.h
  180. +17 −0 src/mongo/util/concurrency/rwlockimpl.cpp
  181. +16 −0 src/mongo/util/concurrency/rwlockimpl.h
  182. +16 −0 src/mongo/util/concurrency/simplerwlock.h
  183. +1 −1 src/mongo/util/file_allocator.h
  184. +1 −4 src/mongo/util/hashtab.h
  185. +4 −4 src/mongo/util/map_util.h
  186. +6 −6 src/mongo/util/md5main.cpp
  187. +14 −4 src/mongo/util/mmap.cpp
  188. +5 −13 src/mongo/util/mmap.h
  189. +16 −15 src/mongo/util/mongoutils/html.h
  190. +1 −1 src/mongo/util/net/message.h
  191. +1 −1 src/mongo/util/net/message_port.h
  192. +11 −11 src/mongo/util/net/sock.cpp
  193. +1 −1 src/mongo/util/queue.h
  194. +1 −1 src/mongo/util/ramlog.h
  195. +16 −0 src/mongo/util/stack_introspect.cpp
  196. +15 −0 src/mongo/util/stack_introspect.h
  197. +16 −0 src/mongo/util/startup_test.cpp
  198. +1 −15 src/mongo/util/text.h
  199. +16 −0 src/mongo/util/version.h
  200. +1 −1 src/third_party/boost/boost/functional/hash/detail/float_functions.hpp
View
@@ -14,7 +14,6 @@
# several, subordinate SConscript files, which describe specific build rules.
import buildscripts
-import buildscripts.bb
import datetime
import imp
import os
@@ -39,7 +38,6 @@ SConsignFile( scons_data_dir + "/sconsign" )
DEFAULT_INSTALL_DIR = "/usr/local"
-buildscripts.bb.checkOk()
def findSettingsSetup():
sys.path.append( "." )
@@ -916,6 +914,18 @@ def doStyling( env , target , source ):
env.Alias( "style" , [] , [ doStyling ] )
env.AlwaysBuild( "style" )
+# --- lint ----
+
+
+
+def doLint( env , target , source ):
+ import buildscripts.lint
+ if not buildscripts.lint.run_lint( [ "src/mongo/" ] ):
+ raise Exception( "lint errors" )
+
+env.Alias( "lint" , [] , [ doLint ] )
+env.AlwaysBuild( "lint" )
+
# ---- INSTALL -------
View
@@ -1,23 +0,0 @@
-# bb tools
-
-import os
-import re
-
-def checkOk():
- dir = os.getcwd()
- m = re.compile( ".*/.*_V(\d+\.\d+)/mongo" ).findall( dir )
- if len(m) == 0:
- return
- if len(m) > 1:
- raise Exception( "unexpected: " + str(m) )
-
- m = "v" + m[0]
- print( m )
- print( "expected version [" + m + "]" )
-
- from subprocess import Popen, PIPE
- diff = Popen( [ "git", "diff", "origin/v1.2" ], stdout=PIPE ).communicate()[ 0 ]
- if len(diff) > 0:
- print( diff )
- raise Exception( "build bot broken?" )
-
Oops, something went wrong.

0 comments on commit 6caceca

Please sign in to comment.