|
18 | 18 |
|
19 | 19 | package com.dtstack.flinkx.connector.redis.converter; |
20 | 20 |
|
| 21 | +import com.dtstack.flinkx.conf.FieldConf; |
21 | 22 | import com.dtstack.flinkx.connector.redis.conf.RedisConf; |
22 | 23 | import com.dtstack.flinkx.connector.redis.enums.RedisDataMode; |
23 | 24 | import com.dtstack.flinkx.connector.redis.enums.RedisDataType; |
24 | 25 | import com.dtstack.flinkx.converter.AbstractRowConverter; |
25 | 26 | import com.dtstack.flinkx.element.ColumnRowData; |
26 | 27 | import com.dtstack.flinkx.element.column.StringColumn; |
27 | 28 | import com.dtstack.flinkx.element.column.TimestampColumn; |
| 29 | +import com.dtstack.flinkx.util.JsonUtil; |
28 | 30 |
|
29 | 31 | import org.apache.flink.table.data.RowData; |
30 | 32 | import org.apache.flink.table.types.logical.LogicalType; |
|
34 | 36 |
|
35 | 37 | import java.text.SimpleDateFormat; |
36 | 38 | import java.util.ArrayList; |
| 39 | +import java.util.HashMap; |
37 | 40 | import java.util.List; |
| 41 | +import java.util.Map; |
| 42 | +import java.util.Objects; |
38 | 43 |
|
39 | 44 | import static com.dtstack.flinkx.connector.redis.options.RedisOptions.REDIS_CRITICAL_TIME; |
40 | 45 | import static com.dtstack.flinkx.connector.redis.options.RedisOptions.REDIS_KEY_VALUE_SIZE; |
@@ -141,7 +146,17 @@ private String[] getValues(ColumnRowData row) { |
141 | 146 | } |
142 | 147 |
|
143 | 148 | private String concatValues(ColumnRowData row) { |
144 | | - return StringUtils.join(getValues(row), redisConf.getValueFieldDelimiter()); |
| 149 | + List<FieldConf> columns = redisConf.getColumn(); |
| 150 | + Map<String, Object> fieldMap = new HashMap<>(); |
| 151 | + int index = 0; |
| 152 | + |
| 153 | + for (FieldConf fieldConf : columns) { |
| 154 | + if (Objects.nonNull(row.getField(index))) { |
| 155 | + fieldMap.put(fieldConf.getName(), row.getField(index).getData()); |
| 156 | + } |
| 157 | + index++; |
| 158 | + } |
| 159 | + return JsonUtil.toJson(fieldMap); |
145 | 160 | } |
146 | 161 |
|
147 | 162 | private String concatKey(ColumnRowData row) { |
|
0 commit comments