diff --git a/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java b/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java index 737ef8d8f6..1b17ec1816 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDao.java @@ -115,7 +115,6 @@ public class CassandraBaseTimeseriesDao extends AbstractCassandraBaseTimeseriesD private PreparedStatement[] fetchStmtsAsc; private PreparedStatement[] fetchStmtsDesc; private PreparedStatement deleteStmt; - private PreparedStatement deletePartitionStmt; private final Lock stmtCreationLock = new ReentrantLock(); private boolean isInstall() { @@ -584,51 +583,6 @@ public class CassandraBaseTimeseriesDao extends AbstractCassandraBaseTimeseriesD return deleteStmt; } - private void deletePartitionAsync(TenantId tenantId, final QueryCursor cursor, final SimpleListenableFuture resultFuture) { - if (!cursor.hasNextPartition()) { - resultFuture.set(null); - } else { - PreparedStatement proto = getDeletePartitionStmt(); - BoundStatementBuilder stmtBuilder = new BoundStatementBuilder(proto.bind()); - stmtBuilder.setString(0, cursor.getEntityType()); - stmtBuilder.setUuid(1, cursor.getEntityId()); - stmtBuilder.setLong(2, cursor.getNextPartition()); - stmtBuilder.setString(3, cursor.getKey()); - - BoundStatement stmt = stmtBuilder.build(); - - Futures.addCallback(executeAsyncWrite(tenantId, stmt), new FutureCallback() { - @Override - public void onSuccess(@Nullable AsyncResultSet result) { - deletePartitionAsync(tenantId, cursor, resultFuture); - } - - @Override - public void onFailure(Throwable t) { - log.error("[{}][{}] Failed to delete data for query {}-{}", stmt, t); - } - }, readResultsProcessingExecutor); - } - } - - private PreparedStatement getDeletePartitionStmt() { - if (deletePartitionStmt == null) { - stmtCreationLock.lock(); - try { - if (deletePartitionStmt == null) { - deletePartitionStmt = prepare("DELETE FROM " + ModelConstants.TS_KV_PARTITIONS_CF + - " WHERE " + ModelConstants.ENTITY_TYPE_COLUMN + EQUALS_PARAM - + "AND " + ModelConstants.ENTITY_ID_COLUMN + EQUALS_PARAM - + "AND " + ModelConstants.PARTITION_COLUMN + EQUALS_PARAM - + "AND " + ModelConstants.KEY_COLUMN + EQUALS_PARAM); - } - } finally { - stmtCreationLock.unlock(); - } - } - return deletePartitionStmt; - } - private PreparedStatement getSaveStmt(DataType dataType) { if (saveStmts == null) { stmtCreationLock.lock();