From c9fc57b3fd88137ac48c2fa9d47cf12a7703993a Mon Sep 17 00:00:00 2001 From: hagaic Date: Tue, 21 Aug 2018 02:05:45 +0300 Subject: [PATCH] make hybrid db optional --- .../thingsboard/server/install/ThingsboardInstallService.java | 2 +- application/src/main/resources/thingsboard.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java index d0add1aa89..884afc06c9 100644 --- a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java +++ b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java @@ -116,7 +116,7 @@ public class ThingsboardInstallService { log.info("Installing DataBase schema..."); - databaseSchemaService.createDatabaseSchema();//TODO + databaseSchemaService.createDatabaseSchema();//TODO issue 1005 - create both SQL and C* schemas in hybrid mode log.info("Loading system data..."); diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index 5573c7538b..a379e472aa 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -164,7 +164,8 @@ database: entities: type: "${DATABASE_TYPE:sql}" # cassandra OR sql ts: - type: "${DATABASE_TYPE:cassandra}" # cassandra OR sql + type: "${DATABASE_TYPE:sql}" # cassandra OR sql (for hybrid mode, only this value should be cassandra) + # Cassandra driver configuration parameters cassandra: