dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7561 from imbeacon/cassandra-dao-refactoring

Browse Source 
[3.4.2] CassandraBaseTimeseriesDao refactoring
This commit is contained in:
Andrew Shvayka 2022-11-07 13:33:56 +02:00 committed by GitHub
commit 54f1694f1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java
View File

@ -645,14 +645,7 @@ public class CassandraBaseTimeseriesDao extends AbstractCassandraBaseTimeseriesD
if (saveStmts == null) { if (saveStmts == null) {
var stmts = new PreparedStatement[DataType.values().length]; var stmts = new PreparedStatement[DataType.values().length];
for (DataType type : DataType.values()) { for (DataType type : DataType.values()) {
stmts[type.ordinal()] = prepare(INSERT_INTO + ModelConstants.TS_KV_CF + stmts[type.ordinal()] = prepare(getPreparedStatementQuery(type));
"(" + ModelConstants.ENTITY_TYPE_COLUMN +
"," + ModelConstants.ENTITY_ID_COLUMN +
"," + ModelConstants.KEY_COLUMN +
"," + ModelConstants.PARTITION_COLUMN +
"," + ModelConstants.TS_COLUMN +
"," + getColumnName(type) + ")" +
" VALUES(?, ?, ?, ?, ?, ?)");
} }
saveStmts = stmts; saveStmts = stmts;
} }
@ -670,14 +663,7 @@ public class CassandraBaseTimeseriesDao extends AbstractCassandraBaseTimeseriesD
if (saveTtlStmts == null) { if (saveTtlStmts == null) {
var stmts = new PreparedStatement[DataType.values().length]; var stmts = new PreparedStatement[DataType.values().length];
for (DataType type : DataType.values()) { for (DataType type : DataType.values()) {
stmts[type.ordinal()] = prepare(INSERT_INTO + ModelConstants.TS_KV_CF + stmts[type.ordinal()] = prepare(getPreparedStatementQueryWithTtl(type));
"(" + ModelConstants.ENTITY_TYPE_COLUMN +
"," + ModelConstants.ENTITY_ID_COLUMN +
"," + ModelConstants.KEY_COLUMN +
"," + ModelConstants.PARTITION_COLUMN +
"," + ModelConstants.TS_COLUMN +
"," + getColumnName(type) + ")" +
" VALUES(?, ?, ?, ?, ?, ?) USING TTL ?");
} }
saveTtlStmts = stmts; saveTtlStmts = stmts;
} }
@ -688,6 +674,21 @@ public class CassandraBaseTimeseriesDao extends AbstractCassandraBaseTimeseriesD
return saveTtlStmts[dataType.ordinal()]; return saveTtlStmts[dataType.ordinal()];
} }
private String getPreparedStatementQuery(DataType type) {
return INSERT_INTO + ModelConstants.TS_KV_CF +
"(" + ModelConstants.ENTITY_TYPE_COLUMN +
"," + ModelConstants.ENTITY_ID_COLUMN +
"," + ModelConstants.KEY_COLUMN +
"," + ModelConstants.PARTITION_COLUMN +
"," + ModelConstants.TS_COLUMN +
"," + getColumnName(type) + ")" +
" VALUES(?, ?, ?, ?, ?, ?)";
}
private String getPreparedStatementQueryWithTtl(DataType type) {
return getPreparedStatementQuery(type) + " USING TTL ?";
}
private PreparedStatement getPartitionInsertStmt() { private PreparedStatement getPartitionInsertStmt() {
if (partitionInsertStmt == null) { if (partitionInsertStmt == null) {
stmtCreationLock.lock(); stmtCreationLock.lock();