Skip to content

Commit ad12023

Browse files
mpenickmpenick
committed
Added "CPP" to the driver version macro's name
1 parent b0df019 commit ad12023

9 files changed

+25
-25
lines changed

‎ext/php_cassandra.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@ void throw_invalid_argument(zval* object,
100100

101101
#define ASSERT_SUCCESS_VALUE(rc, value) ASSERT_SUCCESS_BLOCK(rc, return value;)
102102

103-
#define DRIVER_VERSION(major, minor, patch) \
103+
#define CPP_DRIVER_VERSION(major, minor, patch) \
104104
(((major) << 16) + ((minor) << 8) + (patch))
105105

106-
#define CURRENT_DRIVER_VERSION \
107-
DRIVER_VERSION(CASS_VERSION_MAJOR, CASS_VERSION_MINOR, CASS_VERSION_PATCH)
106+
#define CURRENT_CPP_DRIVER_VERSION \
107+
CPP_DRIVER_VERSION(CASS_VERSION_MAJOR, CASS_VERSION_MINOR, CASS_VERSION_PATCH)
108108

109109
#include "php_cassandra_types.h"
110110

‎ext/php_cassandra_types.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ typedef struct {
260260
cassandra_ref* schema;
261261
} cassandra_schema;
262262

263-
#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
263+
#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
264264
typedef const CassKeyspaceMeta cassandra_keyspace_meta;
265265
#else
266266
typedef const CassSchemaMeta cassandra_keyspace_meta;
@@ -272,7 +272,7 @@ typedef struct {
272272
cassandra_keyspace_meta* meta;
273273
} cassandra_keyspace;
274274

275-
#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
275+
#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
276276
typedef const CassTableMeta cassandra_table_meta;
277277
#else
278278
typedef const CassSchemaMeta cassandra_table_meta;
@@ -284,7 +284,7 @@ typedef struct {
284284
cassandra_table_meta* meta;
285285
} cassandra_table;
286286

287-
#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
287+
#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
288288
typedef const CassColumnMeta cassandra_column_meta;
289289
#else
290290
typedef const CassSchemaMeta cassandra_column_meta;

‎ext/src/Cassandra/DefaultColumn.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ PHP_METHOD(DefaultColumn, isStatic)
5050
const char* str;
5151
size_t str_len;
5252

53-
#if CURRENT_DRIVER_VERSION < DRIVER_VERSION(2, 2, 0)
53+
#if CURRENT_CPP_DRIVER_VERSION < CPP_DRIVER_VERSION(2, 2, 0)
5454
const CassSchemaMetaField* field;
5555
#endif
5656

@@ -60,7 +60,7 @@ PHP_METHOD(DefaultColumn, isStatic)
6060

6161
self = (cassandra_column*) zend_object_store_get_object(getThis() TSRMLS_CC);
6262

63-
#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
63+
#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
6464
value = cass_column_meta_field_by_name(self->meta, "type");
6565
#else
6666
field = cass_schema_meta_get_field(self->meta, "type");

‎ext/src/Cassandra/DefaultKeyspace.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ PHP_METHOD(DefaultKeyspace, table)
7373
}
7474

7575
self = (cassandra_keyspace*) zend_object_store_get_object(getThis() TSRMLS_CC);
76-
#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
76+
#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
7777
meta = cass_keyspace_meta_table_by_name(self->meta, name);
7878
#else
7979
meta = cass_schema_meta_get_entry(self->meta, name);
@@ -97,7 +97,7 @@ PHP_METHOD(DefaultKeyspace, tables)
9797
return;
9898

9999
self = (cassandra_keyspace*) zend_object_store_get_object(getThis() TSRMLS_CC);
100-
#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
100+
#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
101101
iterator = cass_iterator_tables_from_keyspace_meta(self->meta);
102102
#else
103103
iterator = cass_iterator_from_schema_meta(self->meta);
@@ -112,11 +112,11 @@ PHP_METHOD(DefaultKeyspace, tables)
112112
zval* zend_table;
113113
cassandra_table* table;
114114

115-
#if CURRENT_DRIVER_VERSION < DRIVER_VERSION(2, 2, 0)
115+
#if CURRENT_CPP_DRIVER_VERSION < CPP_DRIVER_VERSION(2, 2, 0)
116116
const CassSchemaMetaField* field;
117117
#endif
118118

119-
#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
119+
#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
120120
meta = cass_iterator_get_table_meta(iterator);
121121
value = cass_table_meta_field_by_name(meta, "columnfamily_name");
122122
#else

‎ext/src/Cassandra/DefaultSchema.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ PHP_METHOD(DefaultSchema, keyspace)
1616
}
1717

1818
self = (cassandra_schema*) zend_object_store_get_object(getThis() TSRMLS_CC);
19-
#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
19+
#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
2020
meta = cass_schema_meta_keyspace_by_name_n((CassSchemaMeta*) self->schema->data, name, name_len);
2121
#else
2222
meta = cass_schema_get_keyspace_n((CassSchema*) self->schema->data, name, name_len);
@@ -41,7 +41,7 @@ PHP_METHOD(DefaultSchema, keyspaces)
4141
return;
4242

4343
self = (cassandra_schema*) zend_object_store_get_object(getThis() TSRMLS_CC);
44-
#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
44+
#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
4545
iterator = cass_iterator_keyspaces_from_schema_meta((CassSchemaMeta*) self->schema->data);
4646
#else
4747
iterator = cass_iterator_from_schema((CassSchema*) self->schema->data);
@@ -56,11 +56,11 @@ PHP_METHOD(DefaultSchema, keyspaces)
5656
zval* zend_keyspace;
5757
cassandra_keyspace* keyspace;
5858

59-
#if CURRENT_DRIVER_VERSION < DRIVER_VERSION(2, 2, 0)
59+
#if CURRENT_CPP_DRIVER_VERSION < CPP_DRIVER_VERSION(2, 2, 0)
6060
const CassSchemaMetaField* field;
6161
#endif
6262

63-
#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
63+
#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
6464
meta = cass_iterator_get_keyspace_meta(iterator);
6565
value = cass_keyspace_meta_field_by_name(meta, "keyspace_name");
6666
#else

‎ext/src/Cassandra/DefaultSession.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,7 @@ PHP_METHOD(DefaultSession, closeAsync)
685685
static void
686686
free_schema(void* schema)
687687
{
688-
#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
688+
#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
689689
cass_schema_meta_free((CassSchemaMeta*) schema);
690690
#else
691691
cass_schema_free((CassSchema*) schema);
@@ -704,7 +704,7 @@ PHP_METHOD(DefaultSession, schema)
704704
object_init_ex(return_value, cassandra_default_schema_ce);
705705
schema = (cassandra_schema*) zend_object_store_get_object(return_value TSRMLS_CC);
706706

707-
#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
707+
#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
708708
schema->schema = php_cassandra_new_ref((void*) cass_session_get_schema_meta(self->session),
709709
free_schema);
710710
#else

‎ext/src/Cassandra/DefaultTable.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -209,15 +209,15 @@ php_cassandra_create_column(cassandra_ref* schema,
209209
zval* zcolumn;
210210
cassandra_column* column;
211211

212-
#if CURRENT_DRIVER_VERSION < DRIVER_VERSION(2, 2, 0)
212+
#if CURRENT_CPP_DRIVER_VERSION < CPP_DRIVER_VERSION(2, 2, 0)
213213
const CassSchemaMetaField* field;
214214
#endif
215215
const CassValue* value;
216216

217217
const char* validator;
218218
size_t validator_length;
219219

220-
#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
220+
#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
221221
value = cass_column_meta_field_by_name(meta, "validator");
222222
#else
223223
field = cass_schema_meta_get_field(meta, "validator");
@@ -264,7 +264,7 @@ PHP_METHOD(DefaultTable, column)
264264
}
265265

266266
self = (cassandra_table*) zend_object_store_get_object(getThis() TSRMLS_CC);
267-
#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
267+
#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
268268
meta = cass_table_meta_column_by_name(self->meta, name);
269269
#else
270270
meta = cass_schema_meta_get_entry(self->meta, name);
@@ -292,7 +292,7 @@ PHP_METHOD(DefaultTable, columns)
292292
return;
293293

294294
self = (cassandra_table*) zend_object_store_get_object(getThis() TSRMLS_CC);
295-
#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
295+
#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
296296
iterator = cass_iterator_columns_from_table_meta(self->meta);
297297
#else
298298
iterator = cass_iterator_from_schema_meta(self->meta);
@@ -304,7 +304,7 @@ PHP_METHOD(DefaultTable, columns)
304304
zval* zcolumn;
305305
cassandra_column* column;
306306

307-
#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
307+
#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
308308
meta = cass_iterator_get_column_meta(iterator);
309309
#else
310310
meta = cass_iterator_get_schema_meta(iterator);

‎ext/util/result.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ php_cassandra_value(const CassValue* value, CassValueType type, zval** out TSRML
233233
return SUCCESS;
234234
}
235235

236-
#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
236+
#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
237237
int
238238
php_cassandra_get_keyspace_field(const CassKeyspaceMeta* metadata, const char* field_name, zval** out TSRMLS_DC)
239239
{

‎ext/util/result.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef PHP_CASSANDRA_RESULT_H
22
#define PHP_CASSANDRA_RESULT_H
33

4-
#if CURRENT_DRIVER_VERSION >= DRIVER_VERSION(2, 2, 0)
4+
#if CURRENT_CPP_DRIVER_VERSION >= CPP_DRIVER_VERSION(2, 2, 0)
55
int php_cassandra_get_keyspace_field(const CassKeyspaceMeta* metadata, const char* field_name, zval** out TSRMLS_DC);
66
int php_cassandra_get_table_field(const CassTableMeta* metadata, const char* field_name, zval** out TSRMLS_DC);
77
int php_cassandra_get_column_field(const CassColumnMeta* metadata, const char* field_name, zval** out TSRMLS_DC);

0 commit comments

Comments
 (0)