Skip to content

Commit a8b211a

Browse files
authored
fix: 优化timescaledb多列存储建表语句 (#647)
* fix: 优化timescaledb多列存储建表语句 * Update TimescaleDBColumnModeDDLOperations.java * Update TimescaleDBColumnModeDDLOperations.java
1 parent 555d6ec commit a8b211a

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

jetlinks-components/timescaledb-component/src/main/java/org/jetlinks/community/timescaledb/thing/TimescaleDBColumnModeDDLOperations.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package org.jetlinks.community.timescaledb.thing;
1717

18+
import com.google.common.collect.Sets;
1819
import lombok.extern.slf4j.Slf4j;
1920
import org.hswebframework.ezorm.rdb.codec.DateTimeCodec;
2021
import org.hswebframework.ezorm.rdb.metadata.RDBIndexMetadata;
@@ -23,7 +24,6 @@
2324
import org.hswebframework.ezorm.rdb.operator.DatabaseOperator;
2425
import org.hswebframework.ezorm.rdb.operator.ddl.TableBuilder;
2526
import org.jetlinks.core.metadata.PropertyMetadata;
26-
import org.jetlinks.community.Interval;
2727
import org.jetlinks.community.things.data.ThingsDataConstants;
2828
import org.jetlinks.community.things.data.operations.ColumnModeDDLOperationsBase;
2929
import org.jetlinks.community.things.data.operations.DataSettings;
@@ -44,6 +44,11 @@ public class TimescaleDBColumnModeDDLOperations extends ColumnModeDDLOperationsB
4444

4545
private final TimescaleDBThingsDataProperties properties;
4646

47+
static Set<String> ignoreColumn = Sets.newHashSet(
48+
ThingsDataConstants.COLUMN_ID,
49+
ThingsDataConstants.COLUMN_MESSAGE_ID
50+
);
51+
4752
public TimescaleDBColumnModeDDLOperations(String thingType,
4853
String templateId,
4954
String thingId,
@@ -70,6 +75,9 @@ protected Mono<Void> register0(MetricType metricType,
7075
List<String> partitions = new ArrayList<>();
7176
partitions.add(ThingsDataConstants.COLUMN_THING_ID);
7277
for (PropertyMetadata property : properties) {
78+
if (ignoreColumn.contains(property.getId())) {
79+
continue;
80+
}
7381
builder
7482
.addColumn(property.getId())
7583
.custom(column -> {

0 commit comments

Comments
 (0)