housekeeping (abi/api)

hanumantmk · hanumantmk · commit 9a11d6edb58f · 2014-12-01T18:24:41.000-05:00
int64_t cursor_ids and adding some new functions to the external abi
diff --git a/build/autotools/versions.ldscript b/build/autotools/versions.ldscript
@@ -230,3 +230,11 @@ LIBMONGOC_1.1 {
         mongoc_uri_get_credentials;
         mongoc_uri_get_mechanism_properties;
 } LIBMONGOC_1.0;
+
+LIBMONGOC_1.2 {
+    global:
+        mongoc_client_kill_cursor;
+        mongoc_cursor_get_batch_size;
+        mongoc_cursor_get_id;
+        mongoc_cursor_set_batch_size;
+} LIBMONGOC_1.1;
diff --git a/build/cmake/libmongoc-ssl.def b/build/cmake/libmongoc-ssl.def
@@ -29,6 +29,7 @@ mongoc_client_get_read_prefs
 mongoc_client_get_server_status
 mongoc_client_get_uri
 mongoc_client_get_write_concern
+mongoc_client_kill_cursor
 mongoc_client_new
 mongoc_client_new_from_uri
 mongoc_client_pool_destroy
@@ -75,11 +76,14 @@ mongoc_cursor_clone
 mongoc_cursor_current
 mongoc_cursor_destroy
 mongoc_cursor_error
+mongoc_cursor_get_batch_size
 mongoc_cursor_get_hint
 mongoc_cursor_get_host
+mongoc_cursor_get_id
 mongoc_cursor_is_alive
 mongoc_cursor_more
 mongoc_cursor_next
+mongoc_cursor_set_batch_size
 mongoc_database_add_user
 mongoc_database_command
 mongoc_database_command_simple
diff --git a/build/cmake/libmongoc.def b/build/cmake/libmongoc.def
@@ -29,6 +29,7 @@ mongoc_client_get_read_prefs
 mongoc_client_get_server_status
 mongoc_client_get_uri
 mongoc_client_get_write_concern
+mongoc_client_kill_cursor
 mongoc_client_new
 mongoc_client_new_from_uri
 mongoc_client_pool_destroy
@@ -73,11 +74,14 @@ mongoc_cursor_clone
 mongoc_cursor_current
 mongoc_cursor_destroy
 mongoc_cursor_error
+mongoc_cursor_get_batch_size
 mongoc_cursor_get_hint
 mongoc_cursor_get_host
+mongoc_cursor_get_id
 mongoc_cursor_is_alive
 mongoc_cursor_more
 mongoc_cursor_next
+mongoc_cursor_set_batch_size
 mongoc_database_add_user
 mongoc_database_command
 mongoc_database_command_simple
diff --git a/src/libmongoc.symbols b/src/libmongoc.symbols
@@ -28,6 +28,7 @@ mongoc_client_get_read_prefs
 mongoc_client_get_server_status
 mongoc_client_get_uri
 mongoc_client_get_write_concern
+mongoc_client_kill_cursor
 mongoc_client_new
 mongoc_client_new_from_uri
 mongoc_client_pool_destroy
@@ -74,11 +75,14 @@ mongoc_cursor_clone
 mongoc_cursor_current
 mongoc_cursor_destroy
 mongoc_cursor_error
+mongoc_cursor_get_batch_size
 mongoc_cursor_get_hint
 mongoc_cursor_get_host
+mongoc_cursor_get_id
 mongoc_cursor_is_alive
 mongoc_cursor_more
 mongoc_cursor_next
+mongoc_cursor_set_batch_size
 mongoc_database_add_user
 mongoc_database_command
 mongoc_database_command_simple
diff --git a/src/mongoc/mongoc-cursor.c b/src/mongoc/mongoc-cursor.c
@@ -1055,7 +1055,7 @@ mongoc_cursor_get_hint (const mongoc_cursor_t *cursor)
    return cursor->hint;
 }
 
-uint64_t
+int64_t
 mongoc_cursor_get_id (const mongoc_cursor_t  *cursor)
 {
    BSON_ASSERT(cursor);
diff --git a/src/mongoc/mongoc-cursor.h b/src/mongoc/mongoc-cursor.h
@@ -47,7 +47,7 @@ void             mongoc_cursor_set_batch_size (mongoc_cursor_t  *cursor,
                                                uint32_t          batch_size);
 uint32_t         mongoc_cursor_get_batch_size (const mongoc_cursor_t *cursor);
 uint32_t         mongoc_cursor_get_hint (const mongoc_cursor_t  *cursor);
-uint64_t         mongoc_cursor_get_id   (const mongoc_cursor_t  *cursor);
+int64_t          mongoc_cursor_get_id   (const mongoc_cursor_t  *cursor);
 
 
 BSON_END_DECLS

Original file line number	Diff line number	Diff line change
`@@ -1055,7 +1055,7 @@ mongoc_cursor_get_hint (const mongoc_cursor_t *cursor)`
`1055`	`1055`	`return cursor->hint;`
`1056`	`1056`	`}`
`1057`	`1057`
`1058`		`-uint64_t`
	`1058`	`+int64_t`
`1059`	`1059`	`mongoc_cursor_get_id (const mongoc_cursor_t *cursor)`
`1060`	`1060`	`{`
`1061`	`1061`	`BSON_ASSERT(cursor);`