Skip to content

Commit

Permalink
Changes done for v4.1.8.
Browse files Browse the repository at this point in the history
  • Loading branch information
Senthil Nathan committed Nov 28, 2023
1 parent 1860066 commit f477bf1
Show file tree
Hide file tree
Showing 26 changed files with 481 additions and 760 deletions.
5 changes: 4 additions & 1 deletion com.ibm.streamsx.dps/impl/include/DpsConstants.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
# Licensed Materials - Property of IBM
# Copyright IBM Corp. 2011, 2022
# Copyright IBM Corp. 2011, 2023
# US Government Users Restricted Rights - Use, duplication or
# disclosure restricted by GSA ADP Schedule Contract with
# IBM Corp.
Expand Down Expand Up @@ -84,6 +84,9 @@ interface with many different back-end in-memory stores.
#define REDIS_HMSET_CMD "hmset "
#define REDIS_HMGET_CMD "hmget "
#define REDIS_ZMSCORE_CMD "zmscore "
#define REDIS_NX_OPTION "NX"
#define REDIS_EX_OPTION "EX"
#define REDIS_PX_OPTION "PX"
#define CASSANDRA_DPS_KEYSPACE "com_ibm_streamsx_dps"
#define CASSANDRA_DPS_MAIN_TABLE "t1"
#define HBASE_DPS_MAIN_TABLE "dps_t1"
Expand Down
405 changes: 147 additions & 258 deletions com.ibm.streamsx.dps/impl/src/RedisClusterDBLayer.cpp

Large diffs are not rendered by default.

310 changes: 81 additions & 229 deletions com.ibm.streamsx.dps/impl/src/RedisClusterPlusPlusDBLayer.cpp

Large diffs are not rendered by default.

373 changes: 170 additions & 203 deletions com.ibm.streamsx.dps/impl/src/RedisDBLayer.cpp

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion com.ibm.streamsx.dps/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.7</info:version>
<info:version>4.1.8</info:version>
<info:requiredProductVersion>4.2.0.0</info:requiredProductVersion>
</info:identity>
<info:dependencies/>
Expand Down
2 changes: 1 addition & 1 deletion dependencies/hiredis/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
include ../make.variable.include

PKG_NAME := hiredis
VERSION := 1.0.0
VERSION := 1.2.0
ARCHIVE := v$(VERSION).tar.gz
ARCHIVE_INSTALL := $(PKG_NAME)-$(VERSION)-$(OS)-$(ARCH)-install-bin.tar.gz
URL := https://github.com/redis/$(PKG_NAME)/archive/$(ARCHIVE)
Expand Down
Binary file not shown.
Binary file not shown.
9 changes: 5 additions & 4 deletions dependencies/hiredis/patch/sds.h.patch
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
--- hiredis-1.0.0/sds.h.orig 2020-08-03 14:18:07.000000000 -0400
+++ hiredis-1.0.0/sds.h 2020-10-10 13:43:56.988507551 -0400
@@ -44,6 +44,9 @@
--- hiredis-1.2.0/sds.h.org 2023-07-12 03:31:17.000000000 -0400
+++ hiredis-1.2.0/sds.h 2023-11-21 17:48:03.791196553 -0500
@@ -46,6 +46,10 @@
#include <stdarg.h>
#include <stdint.h>

+#ifdef __cplusplus
+extern "C" {
+#endif
+
typedef char *sds;

/* Note: sdshdr5 is never used, we just access the flags byte directly.
@@ -275,4 +278,8 @@
@@ -277,4 +281,8 @@
int sdsTest(int argc, char *argv[]);
#endif

Expand Down
Binary file removed dependencies/hiredis/v1.0.0.tar.gz
Binary file not shown.
Binary file added dependencies/hiredis/v1.2.0.tar.gz
Binary file not shown.
11 changes: 6 additions & 5 deletions dependencies/redis-plus-plus/Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
include ../make.variable.include

PKG_NAME := redis-plus-plus
VERSION := 1.2.1
VERSION := 1.3.10
ARCHIVE := $(PKG_NAME)-$(VERSION).tar.gz
ARCHIVE_INSTALL := $(PKG_NAME)-$(VERSION)-$(OS)-$(ARCH)-install-bin.tar.gz
PKG_DIR = $(PKG_NAME)-$(VERSION)
GEN_DIR := $(shell pwd)/gen
HIREDIS_PKG := hiredis
HIREDIS_VERSION := 1.0.0
HIREDIS_VERSION := 1.2.0
HIREDIS_PKG_DIR := $(HIREDIS_PKG)-$(HIREDIS_VERSION)
HIREDIS_SRC_DIR := $(HIREDIS_PKG)-$(HIREDIS_VERSION)-src

Expand All @@ -17,18 +17,20 @@ all:
@test -n "$(TARGETDIR)" || false
mkdir -p $(TARGETDIR)
tar -C $(TARGETDIR) -xzvf $(ARCHIVE_INSTALL)
mv $(TARGETDIR)/lib64/* $(TARGETDIR)/lib
rm -rf $(TARGETDIR)/lib64
rm -f $(ARCHIVE_INSTALL)

$(ARCHIVE_INSTALL): $(PKG_DIR)/Makefile
$(MAKE) -C $(HIREDIS_SRC_DIR) PREFIX=../$(HIREDIS_PKG_DIR) USE_SSL=1
$(MAKE) -C $(HIREDIS_SRC_DIR) PREFIX=../$(HIREDIS_PKG_DIR) USE_SSL=1 install
cd $(PKG_DIR) && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=../$(HIREDIS_PKG_DIR) -DCMAKE_INSTALL_PREFIX=../$(PKG_NAME) -DREDIS_PLUS_PLUS_BUILD_TEST=OFF -DREDIS_PLUS_PLUS_BUILD_STATIC=OFF -DREDIS_PLUS_PLUS_USE_TLS=ON
cd $(PKG_DIR) && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=../$(HIREDIS_PKG_DIR) -DCMAKE_INSTALL_PREFIX=../$(PKG_NAME) -DREDIS_PLUS_PLUS_BUILD_TEST=OFF -DREDIS_PLUS_PLUS_BUILD_STATIC=OFF -DREDIS_PLUS_PLUS_USE_TLS=ON -DREDIS_PLUS_PLUS_CXX_STANDARD=11
cd $(PKG_DIR) && $(MAKE)
cd $(PKG_DIR) && $(MAKE) install
rm -rf $(HIREDIS_SRC_DIR)
rm -rf $(HIREDIS_PKG_DIR)
rm -rf $(PKG_DIR)
tar -C $(PKG_NAME) -czvf $(ARCHIVE_INSTALL) ./lib ./include
tar -C $(PKG_NAME) -czvf $(ARCHIVE_INSTALL) ./lib64 ./include
rm -rf $(PKG_NAME)

$(PKG_DIR)/Makefile: $(ARCHIVE)
Expand All @@ -39,7 +41,6 @@ $(PKG_DIR)/Makefile: $(ARCHIVE)
clean:
rm -rf $(PKG_DIR)
rm -rf $(PKG_NAME)
rm -f $(ARCHIVE_INSTALL)
rm -rf $(HIREDIS_SRC_DIR)
rm -rf $(HIREDIS_PKG_DIR)
rm -rf $(TARGETDIR)/lib/libredis++*
Expand Down
Binary file removed dependencies/redis-plus-plus/hiredis-1.0.0.tar.gz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified dps-technical-positioning.pdf
Binary file not shown.
12 changes: 7 additions & 5 deletions samples/DPSUsageFromCpp/etc/no-sql-kv-store-servers.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -177,13 +177,15 @@
# replica nodes (server name or IP address and a port number). Please refer to the commentary above
# for the non-clustered Redis to understand the connection timeout and TLS usage. Both are supported in
# the clister-mode Redis as well when configuring your key value store product as redis-cluster-plus-plus.
# 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:RedisPassword:ConnectionTimeoutValue:use_tls:RedisClusterCACertificateFile
# RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyileName:RedisClusterCACertificateFileName
# (e-g:)
# Machine1:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis-ca.crt
# Machine2:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis-ca.crt
# Machine3:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis-ca.crt
# Machine4:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis-ca.crt
# 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
# Machine3:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt
# Machine4:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt
#
# ===============================================================================
redis
Expand Down
12 changes: 7 additions & 5 deletions samples/DPSUsageFromJava/etc/no-sql-kv-store-servers.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -177,13 +177,15 @@
# replica nodes (server name or IP address and a port number). Please refer to the commentary above
# for the non-clustered Redis to understand the connection timeout and TLS usage. Both are supported in
# the clister-mode Redis as well when configuring your key value store product as redis-cluster-plus-plus.
# 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:RedisPassword:ConnectionTimeoutValue:use_tls:RedisClusterCACertificateFile
# RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyileName:RedisClusterCACertificateFileName
# (e-g:)
# Machine1:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis-ca.crt
# Machine2:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis-ca.crt
# Machine3:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis-ca.crt
# Machine4:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis-ca.crt
# 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
# Machine3:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt
# Machine4:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt
#
# ===============================================================================
redis
Expand Down
12 changes: 7 additions & 5 deletions samples/DPSUsageFromSPL/etc/no-sql-kv-store-servers.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -177,13 +177,15 @@
# replica nodes (server name or IP address and a port number). Please refer to the commentary above
# for the non-clustered Redis to understand the connection timeout and TLS usage. Both are supported in
# the clister-mode Redis as well when configuring your key value store product as redis-cluster-plus-plus.
# 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:RedisPassword:ConnectionTimeoutValue:use_tls:RedisClusterCACertificateFile
# RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyileName:RedisClusterCACertificateFileName
# (e-g:)
# Machine1:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis-ca.crt
# Machine2:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis-ca.crt
# Machine3:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis-ca.crt
# Machine4:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis-ca.crt
# 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
# Machine3:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt
# Machine4:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt
#
# ===============================================================================
redis
Expand Down
12 changes: 7 additions & 5 deletions samples/DpsTTLCompositesSample/etc/no-sql-kv-store-servers.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -177,13 +177,15 @@
# replica nodes (server name or IP address and a port number). Please refer to the commentary above
# for the non-clustered Redis to understand the connection timeout and TLS usage. Both are supported in
# the clister-mode Redis as well when configuring your key value store product as redis-cluster-plus-plus.
# 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:RedisPassword:ConnectionTimeoutValue:use_tls:RedisClusterCACertificateFile
# RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyileName:RedisClusterCACertificateFileName
# (e-g:)
# Machine1:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis-ca.crt
# Machine2:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis-ca.crt
# Machine3:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis-ca.crt
# Machine4:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis-ca.crt
# 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
# Machine3:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt
# Machine4:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt
#
# ===============================================================================
redis
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,13 +177,15 @@
# replica nodes (server name or IP address and a port number). Please refer to the commentary above
# for the non-clustered Redis to understand the connection timeout and TLS usage. Both are supported in
# the clister-mode Redis as well when configuring your key value store product as redis-cluster-plus-plus.
# 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:RedisPassword:ConnectionTimeoutValue:use_tls:RedisClusterCACertificateFile
# RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyileName:RedisClusterCACertificateFileName
# (e-g:)
# Machine1:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis-ca.crt
# Machine2:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis-ca.crt
# Machine3:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis-ca.crt
# Machine4:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis-ca.crt
# 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
# Machine3:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt
# Machine4:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt
#
# ===============================================================================
redis
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,13 +177,15 @@
# replica nodes (server name or IP address and a port number). Please refer to the commentary above
# for the non-clustered Redis to understand the connection timeout and TLS usage. Both are supported in
# the clister-mode Redis as well when configuring your key value store product as redis-cluster-plus-plus.
# 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:RedisPassword:ConnectionTimeoutValue:use_tls:RedisClusterCACertificateFile
# RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyileName:RedisClusterCACertificateFileName
# (e-g:)
# Machine1:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis-ca.crt
# Machine2:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis-ca.crt
# Machine3:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis-ca.crt
# Machine4:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis-ca.crt
# 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
# Machine3:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt
# Machine4:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt
#
# ===============================================================================
redis
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,13 +177,15 @@
# replica nodes (server name or IP address and a port number). Please refer to the commentary above
# for the non-clustered Redis to understand the connection timeout and TLS usage. Both are supported in
# the clister-mode Redis as well when configuring your key value store product as redis-cluster-plus-plus.
# 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:RedisPassword:ConnectionTimeoutValue:use_tls:RedisClusterCACertificateFile
# RedisServerNameOrIPAddress:port:RedisClusterPassword:ConnectionTimeoutValue:use_tls:RedisClusterTlsCertificateFileName:RedisClusterTlsKeyileName:RedisClusterCACertificateFileName
# (e-g:)
# Machine1:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis-ca.crt
# Machine2:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis-ca.crt
# Machine3:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis-ca.crt
# Machine4:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis-ca.crt
# 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
# Machine3:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt
# Machine4:7001:MyRedisPassword:7:1:/home/streamsadmin/my-redis.crt:/home/streamsadmin/my-redis.key:/home/streamsadmin/my-redis-ca.crt
#
# ===============================================================================
redis
Expand Down
Loading

0 comments on commit f477bf1

Please sign in to comment.