Implement query options for n1ql

Change-Id: I9145934ed96bc6a80dd14840f25cd2e49e373695
Reviewed-on: http://review.couchbase.org/109902
Tested-by: Build Bot <[email protected]>
Reviewed-by: Sergey Avseyev <[email protected]>

Author: avsej

config.m4

@@ -88,7 +88,6 @@ COUCHBASE_FILES=" \
     src/couchbase/mutation_state.c \
     src/couchbase/mutation_token.c \
     src/couchbase/n1ql_index.c \
-    src/couchbase/n1ql_query.c \
     src/couchbase/password_authenticator.c \
     src/couchbase/pool.c \
     src/couchbase/result.c \

config.w32

@@ -41,7 +41,6 @@ if (PHP_COUCHBASE != "no") {
             "mutation_state.c " +
             "mutation_token.c " +
             "n1ql_index.c " +
-            "n1ql_query.c " +
             "pool.c " +
             "search_index_manager.c " +
             "search_query.c ";

couchbase.c

@@ -205,7 +205,6 @@ PHP_MINIT_FUNCTION(PasswordAuthenticator);
 PHP_MINIT_FUNCTION(MutationToken);
 PHP_MINIT_FUNCTION(MutationState);
 PHP_MINIT_FUNCTION(AnalyticsQuery);
-PHP_MINIT_FUNCTION(N1qlQuery);
 PHP_MINIT_FUNCTION(N1qlIndex);
 PHP_MINIT_FUNCTION(LookupInSpec);
 PHP_MINIT_FUNCTION(MutateInSpec);
@@ -251,7 +250,8 @@ PHP_MINIT_FUNCTION(CollectionTouch);
 PHP_MINIT_FUNCTION(CollectionCounter);
 PHP_MINIT_FUNCTION(CollectionRemove);
 PHP_MINIT_FUNCTION(CollectionSubdoc);
-PHP_MINIT_FUNCTION(CollectionView);
+PHP_MINIT_FUNCTION(BucketView);
+PHP_MINIT_FUNCTION(BucketQuery);
 
 
 PHP_MINIT_FUNCTION(couchbase)
@@ -285,7 +285,6 @@ PHP_MINIT_FUNCTION(couchbase)
     PHP_MINIT(MutationToken)(INIT_FUNC_ARGS_PASSTHRU);
     PHP_MINIT(MutationState)(INIT_FUNC_ARGS_PASSTHRU);
     PHP_MINIT(AnalyticsQuery)(INIT_FUNC_ARGS_PASSTHRU);
-    PHP_MINIT(N1qlQuery)(INIT_FUNC_ARGS_PASSTHRU);
     PHP_MINIT(N1qlIndex)(INIT_FUNC_ARGS_PASSTHRU);
     PHP_MINIT(LookupInSpec)(INIT_FUNC_ARGS_PASSTHRU);
     PHP_MINIT(MutateInSpec)(INIT_FUNC_ARGS_PASSTHRU);
@@ -331,7 +330,8 @@ PHP_MINIT_FUNCTION(couchbase)
     PHP_MINIT(CollectionCounter)(INIT_FUNC_ARGS_PASSTHRU);
     PHP_MINIT(CollectionRemove)(INIT_FUNC_ARGS_PASSTHRU);
     PHP_MINIT(CollectionSubdoc)(INIT_FUNC_ARGS_PASSTHRU);
-    PHP_MINIT(CollectionView)(INIT_FUNC_ARGS_PASSTHRU);
+    PHP_MINIT(BucketView)(INIT_FUNC_ARGS_PASSTHRU);
+    PHP_MINIT(BucketQuery)(INIT_FUNC_ARGS_PASSTHRU);
 
     PCBC_REGISTER_CONST(PERSISTTO_MASTER);
     PCBC_REGISTER_CONST(PERSISTTO_ONE);

package.xml

@@ -107,7 +107,6 @@
             <file role="src" name="src/couchbase/mutation_state.c" />
             <file role="src" name="src/couchbase/mutation_token.c" />
             <file role="src" name="src/couchbase/n1ql_index.c" />
-            <file role="src" name="src/couchbase/n1ql_query.c" />
             <file role="src" name="src/couchbase/password_authenticator.c" />
             <file role="src" name="src/couchbase/pool.c" />
             <file role="src" name="src/couchbase/result.c" />