BUMP 1.4.0

buildscripts/bb.py

@@ -16,7 +16,7 @@ def checkOk():
     print( "excpted version [" + m + "]" )
 
     from subprocess import Popen, PIPE
-    diff = Popen( [ "git", "diff", "origin/v1.2" ], stdout=PIPE ).communicate()[ 0 ]
+    diff = Popen( [ "git", "diff", "origin/v1.4" ], stdout=PIPE ).communicate()[ 0 ]
     if len(diff) > 0:
         print( diff )
         raise Exception( "build bot broken?" )

db/index_geo2d.cpp

@@ -1201,11 +1201,13 @@ namespace mongo {
             if ( ! _cur.isEmpty() || _stack.size() )
                 return true;
 
-            if ( ! moreToDo() )
-                return false;
+            while ( moreToDo() ){
+                fillStack();
+                if ( ! _cur.isEmpty() )
+                    return true;
+            }
             
-            fillStack();
-            return ! _cur.isEmpty();
+            return false;
         }
         
         virtual bool advance(){ 
@@ -1296,12 +1298,13 @@ namespace mongo {
                 while ( _max.hasPrefix( _prefix ) && _max.advance( 1 , _found , this ) );
                 
                 if ( ! _prefix.constrains() ){
-                    // we've exhausted the btree
+                    GEODEBUG( "\t exhausted the btree" );
                     _state = DONE;
                     return;
                 }
                 
                 if ( _g->distance( _prefix , _start ) > _maxDistance ){
+                    GEODEBUG( "\tpast circle bounds" );
                     GeoHash tr = _prefix;
                     tr.move( 1 , 1 );
                     if ( _g->distance( tr , _start ) > _maxDistance )
@@ -1322,6 +1325,7 @@ namespace mongo {
         
         virtual bool checkDistance( const GeoHash& h , double& d ){
             d = _g->distance( _start , h );
+            GEODEBUG( "\t " << h << "\t" << d );
             return d <= ( _maxDistance + .01 );
         }
 

debian/changelog

@@ -1,3 +1,9 @@
+mongodb (1.4.0) unstable; urgency=low
+
+  * stable release
+
+ -- Richard Kreuter <richard@10gen.com>  Wed, 22 Mar 2010 16:56:28 -0500
+
 mongodb (1.3.5) unstable; urgency=low
 
   * bug fixes

doxygenConfig

@@ -3,7 +3,7 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = MongoDB
-PROJECT_NUMBER         = 1.3.5
+PROJECT_NUMBER         = 1.4.0
 OUTPUT_DIRECTORY       = docs
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English

rpm/mongo.spec

@@ -1,5 +1,5 @@
 Name: mongo
-Version: 1.3.5
+Version: 1.4.0
 Release: mongodb_1%{?dist}
 Summary: mongo client shell and tools
 License: AGPL 3.0

stdafx.cpp

@@ -32,6 +32,6 @@
 
 namespace mongo {
 
-    const char versionString[] = "1.3.6-pre-";
+    const char versionString[] = "1.4.0";
 
 } // namespace mongo