From edf288e1c79c58b2d7066b8ad27cb578d8dd5483 Mon Sep 17 00:00:00 2001 From: "Smokowski, Kevin (ks6305)" Date: Fri, 17 Aug 2018 19:36:54 +0000 Subject: SvcLogicLoader Improvements restore storing md5sum and add bulkActivate Change-Id: I27ea86c667d61f435bd2f0a77934d00db57bc218 Issue-ID: CCSDK-473 Signed-off-by: Smokowski, Kevin (ks6305) --- .../onap/ccsdk/sli/core/sli/SvcLogicJdbcStore.java | 40 +++++----------------- 1 file changed, 9 insertions(+), 31 deletions(-) (limited to 'sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicJdbcStore.java') diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicJdbcStore.java b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicJdbcStore.java index 0e7d05a6..5db2a8c9 100644 --- a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicJdbcStore.java +++ b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicJdbcStore.java @@ -58,10 +58,6 @@ public class SvcLogicJdbcStore implements SvcLogicStore { private PreparedStatement deactivateStmt = null; private PreparedStatement activateStmt = null; - private PreparedStatement registerNodeStmt = null; - private PreparedStatement unregisterNodeStmt = null; - private PreparedStatement validateNodeStmt = null; - private void getConnection() throws ConfigurationException { Properties jdbcProps = new Properties(); @@ -109,7 +105,9 @@ public class SvcLogicJdbcStore implements SvcLogicStore { } else { String crTableCmd = "CREATE TABLE " + dbName + ".SVC_LOGIC (" + "module varchar(80) NOT NULL," + "rpc varchar(80) NOT NULL," + "version varchar(40) NOT NULL," + "mode varchar(5) NOT NULL," - + "active varchar(1) NOT NULL," + "graph BLOB," + + "active varchar(1) NOT NULL,graph BLOB," + + "modified_timestamp timestamp DEFAULT NULL," + + "md5sum varchar(128) DEFAULT NULL," + "CONSTRAINT P_SVC_LOGIC PRIMARY KEY(module, rpc, version, mode))"; stmt = dbConn.createStatement(); @@ -199,7 +197,7 @@ public class SvcLogicJdbcStore implements SvcLogicStore { } String storeGraphSql = CommonConstants.JDBC_INSERT + dbName - + ".SVC_LOGIC (module, rpc, version, mode, active, graph) VALUES(?, ?, ?, ?, ?, ?)"; + + ".SVC_LOGIC (module, rpc, version, mode, active, graph, md5sum) VALUES(?, ?, ?, ?, ?, ?, ?)"; try { storeGraphStmt = dbConn.prepareStatement(storeGraphSql); @@ -233,27 +231,6 @@ public class SvcLogicJdbcStore implements SvcLogicStore { } catch (Exception e) { throw new ConfigurationException(CommonConstants.JDBC_STATEMENT_ERR + activateSql, e); } - - String registerNodeSql = CommonConstants.JDBC_INSERT + dbName + ".NODE_TYPES (nodetype) VALUES(?)"; - try { - registerNodeStmt = dbConn.prepareStatement(registerNodeSql); - } catch (Exception e) { - throw new ConfigurationException(CommonConstants.JDBC_STATEMENT_ERR + registerNodeSql, e); - } - - String unregisterNodeSql = CommonConstants.JDBC_DELETE + dbName + ".NODE_TYPES WHERE nodetype = ?"; - try { - unregisterNodeStmt = dbConn.prepareStatement(unregisterNodeSql); - } catch (Exception e) { - throw new ConfigurationException(CommonConstants.JDBC_STATEMENT_ERR + unregisterNodeSql, e); - } - - String validateNodeSql = CommonConstants.JDBC_SELECT_COUNT + dbName + ".NODE_TYPES WHERE nodetype = ?"; - try { - validateNodeStmt = dbConn.prepareStatement(validateNodeSql); - } catch (Exception e) { - throw new ConfigurationException(CommonConstants.JDBC_STATEMENT_ERR + validateNodeSql, e); - } } private void initDbResources() throws ConfigurationException { @@ -489,16 +466,17 @@ public class SvcLogicJdbcStore implements SvcLogicStore { try { boolean oldAutoCommit = dbConn.getAutoCommit(); dbConn.setAutoCommit(false); - storeGraphStmt.setString(1, graph.getModule()); - storeGraphStmt.setString(2, graph.getRpc()); + storeGraphStmt.setString(1, graph.getModule()); + storeGraphStmt.setString(2, graph.getRpc()); storeGraphStmt.setString(3, graph.getVersion()); storeGraphStmt.setString(4, graph.getMode()); storeGraphStmt.setString(5, "N"); - storeGraphStmt.setBlob(6, new ByteArrayInputStream(graphBytes)); + storeGraphStmt.setBlob(6, new ByteArrayInputStream(graphBytes)); + storeGraphStmt.setString(7, graph.getMd5sum()); storeGraphStmt.executeUpdate(); dbConn.commit(); - + dbConn.setAutoCommit(oldAutoCommit); } catch (Exception e) { throw new SvcLogicException("Could not write object to database", e); -- cgit 1.2.3-korg