Cleanup source tree

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

Author: avsej

config.m4

@@ -84,7 +84,6 @@ COUCHBASE_FILES=" \
     src/couchbase/managers/query_index_manager.c \
     src/couchbase/mutate_spec.c \
     src/couchbase/mutation_state.c \
-    src/couchbase/n1ql_index.c \
     src/couchbase/password_authenticator.c \
     src/couchbase/pool.c \
     src/couchbase/result.c \

config.w32

@@ -31,7 +31,6 @@ if (PHP_COUCHBASE != "no") {
             "lookup_spec.c " +
             "mutate_spec.c " +
             "mutation_state.c " +
-            "n1ql_index.c " +
             "pool.c " +
             "result.c " +
             "search_options.c ";

couchbase.c

@@ -197,7 +197,6 @@ PHP_MINIT_FUNCTION(CertAuthenticator);
 PHP_MINIT_FUNCTION(PasswordAuthenticator);
 PHP_MINIT_FUNCTION(MutationState);
 PHP_MINIT_FUNCTION(AnalyticsQuery);
-PHP_MINIT_FUNCTION(N1qlIndex);
 PHP_MINIT_FUNCTION(LookupInSpec);
 PHP_MINIT_FUNCTION(MutateInSpec);
 PHP_MINIT_FUNCTION(SearchOptions);
@@ -277,7 +276,6 @@ PHP_MINIT_FUNCTION(couchbase)
     PHP_MINIT(PasswordAuthenticator)(INIT_FUNC_ARGS_PASSTHRU);
     PHP_MINIT(MutationState)(INIT_FUNC_ARGS_PASSTHRU);
     PHP_MINIT(AnalyticsQuery)(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);
     PHP_MINIT(SearchOptions)(INIT_FUNC_ARGS_PASSTHRU);

couchbase.h

@@ -91,23 +91,6 @@ ZEND_EXTERN_MODULE_GLOBALS(couchbase)
 #define PCBCG(v) (couchbase_globals.v)
 #endif
 
-#if PHP_VERSION_ID < 70200
-
-#define php_base64_decode_str(arg) php_base64_decode((const unsigned char *)ZSTR_VAL(arg), ZSTR_LEN(arg))
-
-#undef ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO
-#define ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(name, type, allow_null)                                                   \
-    ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, 0, -1, type, NULL, allow_null)
-
-#define zend_parse_parameters_none_throw zend_parse_parameters_none
-
-#define ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO(name, class_name, allow_null)                                              \
-    ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, 0, -1, IS_OBJECT, NULL, allow_null)
-
-#define ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(name, return_reference, required_num_args, class_name, allow_null)      \
-    ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, IS_OBJECT, NULL, allow_null)
-#endif
-
 #define PCBC_DATE_FORMAT_RFC3339 "Y-m-d\\TH:i:sP"
 
 extern char *pcbc_client_string;
@@ -191,10 +174,6 @@ void pcbc_exception_init(zval *return_value, long code, const char *message TSRM
 #define PCBC_CONTENT_TYPE_FORM "application/x-www-form-urlencoded"
 #define PCBC_CONTENT_TYPE_JSON "application/json"
 
-#define PCBC_ARRAY_MERGE(__pcbc_dest, __pcbc_src) php_array_merge((__pcbc_dest), (__pcbc_src)TSRMLS_CC)
-
-#define ADD_NEXT_INDEX_STRING(zv, value) add_next_index_string(zv, value);
-
 #define PCBC_ALLOC_OBJECT_T(obj_t, class_type)                                                                         \
     (obj_t *)ecalloc(1, sizeof(obj_t) + zend_object_properties_size(class_type))
 
@@ -292,11 +271,6 @@ typedef struct {
     zend_object std;
 } pcbc_bucket_t;
 
-typedef struct {
-    pcbc_connection_t *conn;
-    zend_object std;
-} pcbc_query_index_manager_t;
-
 typedef struct {
     void *next;
     lcb_STATUS err;
@@ -314,8 +288,6 @@ int pcbc_encode_value(pcbc_bucket_t *bucket, zval *value, void **bytes, lcb_size
 void pcbc_http_request(zval *return_value, lcb_INSTANCE *conn, lcb_CMDHTTP *cmd, int json_response, void *cbctx,
                        void(httpcb)(void *, zval *, zval *), int(errorcb)(void *, zval *) TSRMLS_DC);
 
-void pcbc_query_index_manager_init(zval *return_value, zval *cluster TSRMLS_DC);
-
 void pcbc_mutation_state_export_for_n1ql(zval *obj, zval *scan_vectors TSRMLS_DC);
 void pcbc_mutation_state_export_for_search(zval *mutation_state, zval *scan_vectors TSRMLS_DC);
 

package.xml

@@ -100,7 +100,6 @@
             <file role="src" name="src/couchbase/managers/query_index_manager.c" />
             <file role="src" name="src/couchbase/mutate_spec.c" />
             <file role="src" name="src/couchbase/mutation_state.c" />
-            <file role="src" name="src/couchbase/n1ql_index.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" />