Skip to content

[hotfix-#1111][redis] Fix keyPrefix verification problem when Lookup … #1115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FlechazoW merged 1 commit into from
Aug 1, 2022
Merged

[hotfix-#1111][redis] Fix keyPrefix verification problem when Lookup … #1115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions ...dis/src/main/java/com/dtstack/chunjun/connector/redis/table/RedisDynamicTableFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@

import static com.dtstack.chunjun.connector.redis.options.RedisOptions.DATABASE;
import static com.dtstack.chunjun.connector.redis.options.RedisOptions.KEYEXPIREDTIME;
import static com.dtstack.chunjun.connector.redis.options.RedisOptions.KEY_PREFIX;
import static com.dtstack.chunjun.connector.redis.options.RedisOptions.MASTERNAME;
import static com.dtstack.chunjun.connector.redis.options.RedisOptions.MAXIDLE;
import static com.dtstack.chunjun.connector.redis.options.RedisOptions.MAXTOTAL;
Expand Down Expand Up @@ -123,6 +122,7 @@ public String factoryIdentifier() {
public Set<ConfigOption<?>> requiredOptions() {
Set<ConfigOption<?>> requiredOptions = new HashSet<>();
requiredOptions.add(URL);
requiredOptions.add(TABLENAME);
requiredOptions.add(REDIS_DATA_TYPE);
requiredOptions.add(REDIS_DATA_MODE);
return requiredOptions;
Expand All @@ -131,8 +131,6 @@ public Set<ConfigOption<?>> requiredOptions() {
@Override
public Set<ConfigOption<?>> optionalOptions() {
Set<ConfigOption<?>> optionalOptions = new HashSet<>();
optionalOptions.add(KEY_PREFIX);
optionalOptions.add(TABLENAME);
optionalOptions.add(PASSWORD);
optionalOptions.add(REDISTYPE);
optionalOptions.add(MASTERNAME);
Expand Down Expand Up @@ -172,7 +170,7 @@ private RedisConf getRedisConf(ReadableConfig config, TableSchema schema) {
redisConf.setExpireTime(config.get(KEYEXPIREDTIME));
redisConf.setType(RedisDataType.getDataType(config.get(REDIS_DATA_TYPE)));
redisConf.setMode(RedisDataMode.getDataMode(config.get(REDIS_DATA_MODE)));
redisConf.setKeyPrefix(config.get(KEY_PREFIX));
redisConf.setKeyPrefix(config.get(TABLENAME));
List<String> keyFields = schema.getPrimaryKey().map(pk -> pk.getColumns()).orElse(null);
redisConf.setUpdateKey(keyFields);
return redisConf;
Expand Down
4 changes: 2 additions & 2 deletions chunjun-examples/sql/redis/redis_stream.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ CREATE TABLE source
status STRING
) WITH (
'connector' = 'redis-x',
'url'= 'localhost:6379',
'url'= 'hadoop101:6379',
'database' = '1',
'password' = '123456',
'keyPrefix' = 'run_power*',
'table-name' = 'run_power*',
'type' = 'hash',
'mode' = 'hget'
);
Expand Down
2 changes: 1 addition & 1 deletion docs_zh/ChunJun连接器/redis/redis_source.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ redis2.9以上
- 描述：要写入Redis数据库
- 必选：否
- 默认值：0
- **keyPrefix**
- **table-name**
- 描述：需要匹配的key前缀
- 必选：是
- 默认值：无
Expand Down