Skip to content

Commit dc4a5b1

Browse files
author
Senthil Nathan
committed
Changes done for v4.1.9.
1 parent f477bf1 commit dc4a5b1

File tree

11 files changed

+24
-11
lines changed

11 files changed

+24
-11
lines changed

com.ibm.streamsx.dps/info.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ To specifically learn how to call the DPS APIs from SPL native functions, C++ an
235235
# Reference information
236236
[../../javadoc/dps/index.html| DPS Java API Reference]
237237
</info:description>
238-
<info:version>4.1.8</info:version>
238+
<info:version>4.1.9</info:version>
239239
<info:requiredProductVersion>4.2.0.0</info:requiredProductVersion>
240240
</info:identity>
241241
<info:dependencies/>

samples/DPSUsageFromCpp/etc/no-sql-kv-store-servers.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
# If TLS for the Redis Cluster is enabled, three fully qualified file names for TLS certificate, TLS key and
181181
# TLS CA certificate must be specified in the order shown below.
182182
#
183-
# RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyileName:RedisClusterCACertificateFileName
183+
# RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyFileName:RedisClusterCACertificateFileName
184184
# (e-g:)
185185
# Machine1:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt
186186
# Machine2:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt

samples/DPSUsageFromJava/etc/no-sql-kv-store-servers.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
# If TLS for the Redis Cluster is enabled, three fully qualified file names for TLS certificate, TLS key and
181181
# TLS CA certificate must be specified in the order shown below.
182182
#
183-
# RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyileName:RedisClusterCACertificateFileName
183+
# RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyFileName:RedisClusterCACertificateFileName
184184
# (e-g:)
185185
# Machine1:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt
186186
# Machine2:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt

samples/DPSUsageFromSPL/etc/no-sql-kv-store-servers.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
# If TLS for the Redis Cluster is enabled, three fully qualified file names for TLS certificate, TLS key and
181181
# TLS CA certificate must be specified in the order shown below.
182182
#
183-
# RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyileName:RedisClusterCACertificateFileName
183+
# RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyFileName:RedisClusterCACertificateFileName
184184
# (e-g:)
185185
# Machine1:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt
186186
# Machine2:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt

samples/DpsTTLCompositesSample/etc/no-sql-kv-store-servers.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
# If TLS for the Redis Cluster is enabled, three fully qualified file names for TLS certificate, TLS key and
181181
# TLS CA certificate must be specified in the order shown below.
182182
#
183-
# RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyileName:RedisClusterCACertificateFileName
183+
# RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyFileName:RedisClusterCACertificateFileName
184184
# (e-g:)
185185
# Machine1:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt
186186
# Machine2:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt

samples/advanced/01_using_no_sql_db_in_spl_custom_and_cpp_primitive_operators/etc/no-sql-kv-store-servers.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
# If TLS for the Redis Cluster is enabled, three fully qualified file names for TLS certificate, TLS key and
181181
# TLS CA certificate must be specified in the order shown below.
182182
#
183-
# RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyileName:RedisClusterCACertificateFileName
183+
# RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyFileName:RedisClusterCACertificateFileName
184184
# (e-g:)
185185
# Machine1:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt
186186
# Machine2:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt

samples/advanced/02_using_no_sql_db_in_spl_custom_operators_and_a_cpp_native_function/etc/no-sql-kv-store-servers.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
# If TLS for the Redis Cluster is enabled, three fully qualified file names for TLS certificate, TLS key and
181181
# TLS CA certificate must be specified in the order shown below.
182182
#
183-
# RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyileName:RedisClusterCACertificateFileName
183+
# RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyFileName:RedisClusterCACertificateFileName
184184
# (e-g:)
185185
# Machine1:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt
186186
# Machine2:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt

samples/advanced/03_using_no_sql_db_in_spl_custom_and_java_primitive_operators/etc/no-sql-kv-store-servers.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
# If TLS for the Redis Cluster is enabled, three fully qualified file names for TLS certificate, TLS key and
181181
# TLS CA certificate must be specified in the order shown below.
182182
#
183-
# RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyileName:RedisClusterCACertificateFileName
183+
# RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyFileName:RedisClusterCACertificateFileName
184184
# (e-g:)
185185
# Machine1:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt
186186
# Machine2:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt

samples/advanced/04_all_dps_apis_at_work_in_spl/com.acme.test/Main.splmm

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1117,6 +1117,19 @@ composite GeneralTest()
11171117
}
11181118
}
11191119

1120+
// We can perform the following bulk operations only for the
1121+
// K/V stores such as redis and redis-cluster-plus-plus.
1122+
// We can skip it for the other K/V stores.
1123+
if (dbProductName != "redis" && dbProductName != "redis-cluster-plus-plus") {
1124+
printStringLn("");
1125+
printStringLn("NOTE: We are now going to skip performing the bulk operations as they are not supported in the currently configured K/V DB name of " + dbProductName + ".");
1126+
printStringLn("");
1127+
// Signal the next operator to read and write using the two presidential stores we created above.
1128+
mutable NextBeat _beat = {};
1129+
submit(_beat, NextBeat);
1130+
return;
1131+
}
1132+
11201133
// <<<<<<< BEGIN BULK dpsGetKeys API TEST >>>>>>>
11211134
// Let us do a quick run to show how to obtain multiple keys in a given store.
11221135
printStringLn("");
@@ -2830,6 +2843,7 @@ composite StateUpdater() {
28302843
}
28312844
} else {
28322845
printStringLn("dpsGet successful.");
2846+
printStringLn("val=" + (rstring)val + " as read from the store during lock test #" + (rstring)lockTestCnt);
28332847
break;
28342848
}
28352849
} // End of while(++cnt <= 5)
@@ -2839,7 +2853,6 @@ composite StateUpdater() {
28392853
}
28402854

28412855
// assert(err == 0ul);
2842-
printStringLn("val=" + (rstring)val + " as read from the store during lock test #" + (rstring)lockTestCnt);
28432856
cnt = 0;
28442857

28452858
if(lockTestCnt == 1) {

samples/advanced/04_all_dps_apis_at_work_in_spl/etc/no-sql-kv-store-servers.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
# If TLS for the Redis Cluster is enabled, three fully qualified file names for TLS certificate, TLS key and
181181
# TLS CA certificate must be specified in the order shown below.
182182
#
183-
# RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyileName:RedisClusterCACertificateFileName
183+
# RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyFileName:RedisClusterCACertificateFileName
184184
# (e-g:)
185185
# Machine1:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt
186186
# Machine2:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt

0 commit comments

Comments
 (0)