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

tools cassandra-all bumped to v5

Browse Source
This commit is contained in:
Sergey Matvienko 2025-05-10 12:16:25 +02:00
parent 7e49730be6
commit 8b00da12c4
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pom.xml
View File

@ -57,7 +57,7 @@
<rat.version>0.10</rat.version> <!-- unused --> <rat.version>0.10</rat.version> <!-- unused -->
<cassandra.version>4.17.0</cassandra.version> <cassandra.version>4.17.0</cassandra.version>
<metrics.version>4.2.25</metrics.version> <metrics.version>4.2.25</metrics.version>
<cassandra-all.version>3.11.17</cassandra-all.version> <!-- tools --> <cassandra-all.version>5.0.4</cassandra-all.version> <!-- tools -->
<guava.version>33.1.0-jre</guava.version> <guava.version>33.1.0-jre</guava.version>
<caffeine.version>3.1.8</caffeine.version> <caffeine.version>3.1.8</caffeine.version>
<commons-lang3.version>3.14.0</commons-lang3.version> <commons-lang3.version>3.14.0</commons-lang3.version>
@ -1827,11 +1827,6 @@
<artifactId>cassandra-all</artifactId> <artifactId>cassandra-all</artifactId>
<version>${cassandra-all.version}</version> <version>${cassandra-all.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-thrift</artifactId>
<version>${cassandra-all.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.junit.vintage</groupId> <groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId> <artifactId>junit-vintage-engine</artifactId>

6
tools/src/main/java/org/thingsboard/client/tools/migrator/WriterBuilder.java
View File

@ -59,7 +59,7 @@ public class WriterBuilder {
public static CQLSSTableWriter getTsWriter(File dir) { public static CQLSSTableWriter getTsWriter(File dir) {
return CQLSSTableWriter.builder() return CQLSSTableWriter.builder()
.inDirectory(dir) .inDirectory(dir.getAbsolutePath())
.forTable(tsSchema) .forTable(tsSchema)
.using("INSERT INTO thingsboard.ts_kv_cf (entity_type, entity_id, key, partition, ts, bool_v, str_v, long_v, dbl_v, json_v) " + .using("INSERT INTO thingsboard.ts_kv_cf (entity_type, entity_id, key, partition, ts, bool_v, str_v, long_v, dbl_v, json_v) " +
"VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)") "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")
@ -68,7 +68,7 @@ public class WriterBuilder {
public static CQLSSTableWriter getLatestWriter(File dir) { public static CQLSSTableWriter getLatestWriter(File dir) {
return CQLSSTableWriter.builder() return CQLSSTableWriter.builder()
.inDirectory(dir) .inDirectory(dir.getAbsolutePath())
.forTable(latestSchema) .forTable(latestSchema)
.using("INSERT INTO thingsboard.ts_kv_latest_cf (entity_type, entity_id, key, ts, bool_v, str_v, long_v, dbl_v, json_v) " + .using("INSERT INTO thingsboard.ts_kv_latest_cf (entity_type, entity_id, key, ts, bool_v, str_v, long_v, dbl_v, json_v) " +
"VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)") "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)")
@ -77,7 +77,7 @@ public class WriterBuilder {
public static CQLSSTableWriter getPartitionWriter(File dir) { public static CQLSSTableWriter getPartitionWriter(File dir) {
return CQLSSTableWriter.builder() return CQLSSTableWriter.builder()
.inDirectory(dir) .inDirectory(dir.getAbsolutePath())
.forTable(partitionSchema) .forTable(partitionSchema)
.using("INSERT INTO thingsboard.ts_kv_partitions_cf (entity_type, entity_id, key, partition) " + .using("INSERT INTO thingsboard.ts_kv_partitions_cf (entity_type, entity_id, key, partition) " +
"VALUES (?, ?, ?, ?)") "VALUES (?, ?, ?, ?)")