Skip to content

Commit 84e760f

Browse files
author
Michael Penick
committed
Added whitelist/blacklist host and dcs to hash key
1 parent f3924c1 commit 84e760f

File tree

1 file changed

+24
-2
lines changed

1 file changed

+24
-2
lines changed

ext/src/Cassandra/Cluster/Builder.c

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ PHP_METHOD(ClusterBuilder, build)
5050
php5to7_zend_resource_le *le;
5151

5252
hash_key_len = spprintf(&hash_key, 0,
53-
"cassandra:%s:%d:%d:%s:%d:%d:%d:%s:%s:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d",
53+
"cassandra:%s:%d:%d:%s:%d:%d:%d:%s:%s:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%s:%s:%s:%s",
5454
builder->contact_points, builder->port, builder->load_balancing_policy,
5555
SAFE_STR(builder->local_dc), builder->used_hosts_per_remote_dc,
5656
builder->allow_remote_dcs_for_local_cl, builder->use_token_aware_routing,
@@ -60,7 +60,9 @@ PHP_METHOD(ClusterBuilder, build)
6060
builder->core_connections_per_host, builder->max_connections_per_host,
6161
builder->reconnect_interval, builder->enable_latency_aware_routing,
6262
builder->enable_tcp_nodelay, builder->enable_tcp_keepalive,
63-
builder->tcp_keepalive_delay, builder->enable_schema);
63+
builder->tcp_keepalive_delay, builder->enable_schema,
64+
SAFE_STR(builder->whitelist_hosts), SAFE_STR(builder->whitelist_dcs),
65+
SAFE_STR(builder->blacklist_hosts), SAFE_STR(builder->blacklist_dcs));
6466

6567
cluster->hash_key = hash_key;
6668
cluster->hash_key_len = hash_key_len;
@@ -1278,6 +1280,26 @@ php_cassandra_cluster_builder_free(php5to7_zend_object_free *object TSRMLS_DC)
12781280
self->password = NULL;
12791281
}
12801282

1283+
if (self->whitelist_hosts) {
1284+
efree(self->whitelist_hosts);
1285+
self->whitelist_hosts = NULL;
1286+
}
1287+
1288+
if (self->blacklist_hosts) {
1289+
efree(self->blacklist_hosts);
1290+
self->blacklist_hosts = NULL;
1291+
}
1292+
1293+
if (self->whitelist_dcs) {
1294+
efree(self->whitelist_dcs);
1295+
self->whitelist_dcs = NULL;
1296+
}
1297+
1298+
if (self->blacklist_dcs) {
1299+
efree(self->blacklist_dcs);
1300+
self->whitelist_dcs = NULL;
1301+
}
1302+
12811303
PHP5TO7_ZVAL_MAYBE_DESTROY(self->ssl_options);
12821304
PHP5TO7_ZVAL_MAYBE_DESTROY(self->default_timeout);
12831305
PHP5TO7_ZVAL_MAYBE_DESTROY(self->retry_policy);

0 commit comments

Comments
 (0)