public
/
openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not modify index or create tables when uninitialized (#13728) 

Fixes #13727

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
This commit is contained in:
Jacob Laursen 2022-11-17 20:00:31 +01:00 committed by GitHub
parent 2f786b87b4
commit dbf2358280
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/JdbcMapper.java
View File

@ -34,6 +34,7 @@ import org.openhab.core.types.State;
import org.openhab.persistence.jdbc.internal.dto.ItemVO; import org.openhab.persistence.jdbc.internal.dto.ItemVO;
import org.openhab.persistence.jdbc.internal.dto.ItemsVO; import org.openhab.persistence.jdbc.internal.dto.ItemsVO;
import org.openhab.persistence.jdbc.internal.dto.JdbcPersistenceItemInfo; import org.openhab.persistence.jdbc.internal.dto.JdbcPersistenceItemInfo;
import org.openhab.persistence.jdbc.internal.exceptions.JdbcException;
import org.openhab.persistence.jdbc.internal.exceptions.JdbcSQLException; import org.openhab.persistence.jdbc.internal.exceptions.JdbcSQLException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -183,7 +184,7 @@ public class JdbcMapper {
return vo; return vo;
} }
protected void storeItemValue(Item item, State itemState, @Nullable ZonedDateTime date) throws JdbcSQLException { protected void storeItemValue(Item item, State itemState, @Nullable ZonedDateTime date) throws JdbcException {
logger.debug("JDBC::storeItemValue: item={} state={} date={}", item, itemState, date); logger.debug("JDBC::storeItemValue: item={} state={} date={}", item, itemState, date);
String tableName = getTable(item); String tableName = getTable(item);
long timerStart = System.currentTimeMillis(); long timerStart = System.currentTimeMillis();
@ -316,20 +317,23 @@ public class JdbcMapper {
} }
} }
protected String getTable(Item item) throws JdbcSQLException { protected String getTable(Item item) throws JdbcException {
int itemId = 0;
ItemsVO isvo;
ItemVO ivo;
String itemName = item.getName(); String itemName = item.getName();
String tableName = itemNameToTableNameMap.get(itemName); if (!initialized) {
throw new JdbcException("Not initialized, unable to find table for item " + itemName);
}
// Table already exists - return the name // Table already exists - return the name
String tableName = itemNameToTableNameMap.get(itemName);
if (!Objects.isNull(tableName)) { if (!Objects.isNull(tableName)) {
return tableName; return tableName;
} }
logger.debug("JDBC::getTable: no table found for item '{}' in sqlTables", itemName); logger.debug("JDBC::getTable: no table found for item '{}' in itemNameToTableNameMap", itemName);
int itemId = 0;
ItemsVO isvo;
ItemVO ivo;
if (!conf.getTableUseRealCaseSensitiveItemNames()) { if (!conf.getTableUseRealCaseSensitiveItemNames()) {
// Create a new entry in items table // Create a new entry in items table

3
bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/JdbcPersistenceService.java
View File

@ -41,6 +41,7 @@ import org.openhab.core.persistence.strategy.PersistenceStrategy;
import org.openhab.core.types.State; import org.openhab.core.types.State;
import org.openhab.core.types.UnDefType; import org.openhab.core.types.UnDefType;
import org.openhab.persistence.jdbc.internal.dto.ItemsVO; import org.openhab.persistence.jdbc.internal.dto.ItemsVO;
import org.openhab.persistence.jdbc.internal.exceptions.JdbcException;
import org.openhab.persistence.jdbc.internal.exceptions.JdbcSQLException; import org.openhab.persistence.jdbc.internal.exceptions.JdbcSQLException;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants; import org.osgi.framework.Constants;
@ -161,7 +162,7 @@ public class JdbcPersistenceService extends JdbcMapper implements ModifiablePers
logger.debug("JDBC: Stored item '{}' as '{}' in SQL database at {} in {} ms.", item.getName(), state, logger.debug("JDBC: Stored item '{}' as '{}' in SQL database at {} in {} ms.", item.getName(), state,
new Date(), System.currentTimeMillis() - timerStart); new Date(), System.currentTimeMillis() - timerStart);
} }
} catch (JdbcSQLException e) { } catch (JdbcException e) {
logger.warn("JDBC::store: Unable to store item", e); logger.warn("JDBC::store: Unable to store item", e);
} }
} }