Changes done for v4.1.9.

IBMStreams · Nov 29, 2023 · dc4a5b1 · dc4a5b1
1 parent f477bf1
commit dc4a5b1
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 11 deletions.
diff --git a/com.ibm.streamsx.dps/info.xml b/com.ibm.streamsx.dps/info.xml
@@ -235,7 +235,7 @@ To specifically learn how to call the DPS APIs from SPL native functions, C++ an
 # Reference information
 [../../javadoc/dps/index.html| DPS Java API Reference]
   </info:description>
-    <info:version>4.1.8</info:version>
+    <info:version>4.1.9</info:version>
     <info:requiredProductVersion>4.2.0.0</info:requiredProductVersion>
   </info:identity>
   <info:dependencies/>

diff --git a/samples/DPSUsageFromCpp/etc/no-sql-kv-store-servers.cfg b/samples/DPSUsageFromCpp/etc/no-sql-kv-store-servers.cfg
@@ -180,7 +180,7 @@
 #       If TLS for the Redis Cluster is enabled, three fully qualified file names for TLS certificate, TLS key and
 #       TLS CA certificate must be specified in the order shown below.
 #
-#       RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyileName:RedisClusterCACertificateFileName
+#       RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyFileName:RedisClusterCACertificateFileName
 #       (e-g:)
 #       Machine1:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt
 #       Machine2:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt

diff --git a/samples/DPSUsageFromJava/etc/no-sql-kv-store-servers.cfg b/samples/DPSUsageFromJava/etc/no-sql-kv-store-servers.cfg
@@ -180,7 +180,7 @@
 #       If TLS for the Redis Cluster is enabled, three fully qualified file names for TLS certificate, TLS key and
 #       TLS CA certificate must be specified in the order shown below.
 #
-#       RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyileName:RedisClusterCACertificateFileName
+#       RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyFileName:RedisClusterCACertificateFileName
 #       (e-g:)
 #       Machine1:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt
 #       Machine2:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt

diff --git a/samples/DPSUsageFromSPL/etc/no-sql-kv-store-servers.cfg b/samples/DPSUsageFromSPL/etc/no-sql-kv-store-servers.cfg
@@ -180,7 +180,7 @@
 #       If TLS for the Redis Cluster is enabled, three fully qualified file names for TLS certificate, TLS key and
 #       TLS CA certificate must be specified in the order shown below.
 #
-#       RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyileName:RedisClusterCACertificateFileName
+#       RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyFileName:RedisClusterCACertificateFileName
 #       (e-g:)
 #       Machine1:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt
 #       Machine2:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt

diff --git a/samples/DpsTTLCompositesSample/etc/no-sql-kv-store-servers.cfg b/samples/DpsTTLCompositesSample/etc/no-sql-kv-store-servers.cfg
@@ -180,7 +180,7 @@
 #       If TLS for the Redis Cluster is enabled, three fully qualified file names for TLS certificate, TLS key and
 #       TLS CA certificate must be specified in the order shown below.
 #
-#       RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyileName:RedisClusterCACertificateFileName
+#       RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyFileName:RedisClusterCACertificateFileName
 #       (e-g:)
 #       Machine1:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt
 #       Machine2:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt

diff --git a/...using_no_sql_db_in_spl_custom_and_cpp_primitive_operators/etc/no-sql-kv-store-servers.cfg b/...using_no_sql_db_in_spl_custom_and_cpp_primitive_operators/etc/no-sql-kv-store-servers.cfg
@@ -180,7 +180,7 @@
 #       If TLS for the Redis Cluster is enabled, three fully qualified file names for TLS certificate, TLS key and
 #       TLS CA certificate must be specified in the order shown below.
 #
-#       RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyileName:RedisClusterCACertificateFileName
+#       RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyFileName:RedisClusterCACertificateFileName
 #       (e-g:)
 #       Machine1:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt
 #       Machine2:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt

diff --git a/..._sql_db_in_spl_custom_operators_and_a_cpp_native_function/etc/no-sql-kv-store-servers.cfg b/..._sql_db_in_spl_custom_operators_and_a_cpp_native_function/etc/no-sql-kv-store-servers.cfg
@@ -180,7 +180,7 @@
 #       If TLS for the Redis Cluster is enabled, three fully qualified file names for TLS certificate, TLS key and
 #       TLS CA certificate must be specified in the order shown below.
 #
-#       RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyileName:RedisClusterCACertificateFileName
+#       RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyFileName:RedisClusterCACertificateFileName
 #       (e-g:)
 #       Machine1:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt
 #       Machine2:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt

diff --git a/...sing_no_sql_db_in_spl_custom_and_java_primitive_operators/etc/no-sql-kv-store-servers.cfg b/...sing_no_sql_db_in_spl_custom_and_java_primitive_operators/etc/no-sql-kv-store-servers.cfg
@@ -180,7 +180,7 @@
 #       If TLS for the Redis Cluster is enabled, three fully qualified file names for TLS certificate, TLS key and
 #       TLS CA certificate must be specified in the order shown below.
 #
-#       RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyileName:RedisClusterCACertificateFileName
+#       RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyFileName:RedisClusterCACertificateFileName
 #       (e-g:)
 #       Machine1:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt
 #       Machine2:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt

diff --git a/samples/advanced/04_all_dps_apis_at_work_in_spl/com.acme.test/Main.splmm b/samples/advanced/04_all_dps_apis_at_work_in_spl/com.acme.test/Main.splmm
@@ -1117,6 +1117,19 @@ composite GeneralTest()
 						}
 					}
 
+                                        // We can perform the following bulk operations only for the
+                                        // K/V stores such as redis and redis-cluster-plus-plus.
+                                        // We can skip it for the other K/V stores.
+                                        if (dbProductName != "redis" && dbProductName != "redis-cluster-plus-plus") {
+                                           printStringLn("");
+                                           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 + ".");
+                                           printStringLn("");                                  
+                                           // Signal the next operator to read and write using the two presidential stores we created above.
+                                           mutable NextBeat _beat = {};
+                                           submit(_beat, NextBeat);                                           
+                                           return;
+                                        }
+
                                         // <<<<<<< BEGIN BULK dpsGetKeys API TEST >>>>>>>
                                         // Let us do a quick run to show how to obtain multiple keys in a given store.
                                         printStringLn("");
@@ -2830,6 +2843,7 @@ composite StateUpdater()  {
                                               }
 					   } else {
 					      printStringLn("dpsGet successful.");
+                                              printStringLn("val=" + (rstring)val + " as read from the store during lock test #" + (rstring)lockTestCnt);
                                               break;
 					   }
                                         } // End of while(++cnt <= 5)
@@ -2839,7 +2853,6 @@ composite StateUpdater()  {
                                         }
 
                                         // assert(err == 0ul);					
-					printStringLn("val=" + (rstring)val + " as read from the store during lock test #" + (rstring)lockTestCnt);
                                         cnt = 0;
 
                                         if(lockTestCnt == 1) {

diff --git a/samples/advanced/04_all_dps_apis_at_work_in_spl/etc/no-sql-kv-store-servers.cfg b/samples/advanced/04_all_dps_apis_at_work_in_spl/etc/no-sql-kv-store-servers.cfg
@@ -180,7 +180,7 @@
 #       If TLS for the Redis Cluster is enabled, three fully qualified file names for TLS certificate, TLS key and
 #       TLS CA certificate must be specified in the order shown below.
 #
-#       RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyileName:RedisClusterCACertificateFileName
+#       RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyFileName:RedisClusterCACertificateFileName
 #       (e-g:)
 #       Machine1:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt
 #       Machine2:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt

diff --git a/samples/advanced/04_all_dps_apis_at_work_in_spl/info.xml b/samples/advanced/04_all_dps_apis_at_work_in_spl/info.xml
@@ -4,7 +4,7 @@
  <info:identity>
    <info:name>04_all_dps_apis_at_work_in_spl</info:name>
    <info:description></info:description>
-   <info:version>1.0.7</info:version>
+   <info:version>1.0.8</info:version>
    <info:requiredProductVersion>4.2.0.0</info:requiredProductVersion>
  </info:identity>
  <info:dependencies>