CDRIVER-1522 define constants for "find" opts

Author: ajdavis

src/mongoc/mongoc-cursor-cursorid.c

@@ -193,7 +193,7 @@ _mongoc_cursor_prepare_getmore_command (mongoc_cursor_t *cursor,
 
    /* See find, getMore, and killCursors Spec for batchSize rules */
    if (batch_size) {
-      bson_append_int64 (command, "batchSize", 9,
+      bson_append_int64 (command, BATCH_SIZE, BATCH_SIZE_LEN,
                          abs (_mongoc_n_return (cursor)));
    }
 
@@ -204,14 +204,15 @@ _mongoc_cursor_prepare_getmore_command (mongoc_cursor_t *cursor,
       option maxAwaitTimeMS. If no maxAwaitTimeMS is specified, the driver
       SHOULD not set maxTimeMS on the getMore command."
     */
-   await_data = _mongoc_cursor_get_opt_bool (cursor, "tailable") &&
-                _mongoc_cursor_get_opt_bool (cursor, "awaitData");
+   await_data = _mongoc_cursor_get_opt_bool (cursor, TAILABLE) &&
+                _mongoc_cursor_get_opt_bool (cursor, AWAIT_DATA);
 
 
    if (await_data) {
       max_await_time_ms = (int32_t) mongoc_cursor_get_max_await_time_ms (cursor);
       if (max_await_time_ms) {
-         bson_append_int32 (command, "maxTimeMS", 9, max_await_time_ms);
+         bson_append_int32 (command, MAX_TIME_MS, MAX_TIME_MS_LEN,
+                            max_await_time_ms);
       }
    }
 

src/mongoc/mongoc-cursor-private.h

@@ -47,6 +47,62 @@ struct _mongoc_cursor_interface_t
                                  mongoc_host_list_t     *host);
 };
 
+#define ALLOW_PARTIAL_RESULTS "allowPartialResults"
+#define ALLOW_PARTIAL_RESULTS_LEN 19
+#define AWAIT_DATA "awaitData"
+#define AWAIT_DATA_LEN 9
+#define BATCH_SIZE "batchSize"
+#define BATCH_SIZE_LEN 9
+#define COMMENT "comment"
+#define COMMENT_LEN 7
+#define EXHAUST "exhaust"
+#define EXHAUST_LEN 7
+#define FILTER "filter"
+#define FILTER_LEN 6
+#define FIND "find"
+#define FIND_LEN 4
+#define HINT "hint"
+#define HINT_LEN 4
+#define LIMIT "limit"
+#define LIMIT_LEN 5
+#define MAX "max"
+#define MAX_LEN 3
+#define MAX_AWAIT_TIME_MS "maxAwaitTimeMS"
+#define MAX_AWAIT_TIME_MS_LEN 14
+#define MAX_SCAN "maxScan"
+#define MAX_SCAN_LEN 7
+#define MAX_TIME_MS "maxTimeMS"
+#define MAX_TIME_MS_LEN 9
+#define MIN "min"
+#define MIN_LEN 3
+#define NO_CURSOR_TIMEOUT "noCursorTimeout"
+#define NO_CURSOR_TIMEOUT_LEN 15
+#define OPLOG_REPLAY "oplogReplay"
+#define OPLOG_REPLAY_LEN 11
+#define ORDERBY "orderby"
+#define ORDERBY_LEN 7
+#define PROJECTION "projection"
+#define PROJECTION_LEN 10
+#define QUERY "query"
+#define QUERY_LEN 5
+#define READ_CONCERN "readConcern"
+#define READ_CONCERN_LEN 11
+#define RETURN_KEY "returnKey"
+#define RETURN_KEY_LEN 9
+#define SHOW_DISK_LOC "showDiskLoc"
+#define SHOW_DISK_LOC_LEN 11
+#define SHOW_RECORD_ID "showRecordId"
+#define SHOW_RECORD_ID_LEN 12
+#define SINGLE_BATCH "singleBatch"
+#define SINGLE_BATCH_LEN 11
+#define SKIP "skip"
+#define SKIP_LEN 4
+#define SNAPSHOT "snapshot"
+#define SNAPSHOT_LEN 8
+#define SORT "sort"
+#define SORT_LEN 4
+#define TAILABLE "tailable"
+#define TAILABLE_LEN 8
 
 struct _mongoc_cursor_t
 {