Leave sym_node_host PK the same for 3.9 for backward compatibility.

JumpMind · Dec 8, 2017 · 4960afa · 4960afa
1 parent fc3d96e
commit 4960afa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeService.java
@@ -192,11 +192,11 @@ public void deleteNodeHost(String nodeId) {
 
     public void updateNodeHost(NodeHost nodeHost) {
 
-        Object[] params = new Object[] { nodeHost.getIpAddress(), nodeHost.getHostName(), nodeHost.getOsUser(), nodeHost.getOsName(), nodeHost.getOsArch(),
+        Object[] params = new Object[] { nodeHost.getIpAddress(), nodeHost.getInstanceId(), nodeHost.getOsUser(), nodeHost.getOsName(), nodeHost.getOsArch(),
                 nodeHost.getOsVersion(), nodeHost.getAvailableProcessors(), nodeHost.getFreeMemoryBytes(), nodeHost.getTotalMemoryBytes(),
                 nodeHost.getMaxMemoryBytes(), nodeHost.getJavaVersion(), nodeHost.getJavaVendor(), nodeHost.getJdbcVersion(),
                 nodeHost.getSymmetricVersion(), nodeHost.getTimezoneOffset(), nodeHost.getHeartbeatTime(), nodeHost.getLastRestartTime(),
-                nodeHost.getNodeId(), nodeHost.getInstanceId()};
+                nodeHost.getNodeId(), nodeHost.getHostName()};
 
         if (sqlTemplate.update(getSql("updateNodeHostSql"), params) <= 0) {
             sqlTemplate.update(getSql("insertNodeHostSql"), params);

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeServiceSqlMap.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeServiceSqlMap.java
@@ -169,15 +169,15 @@ public NodeServiceSqlMap(IDatabasePlatform platform, Map<String, String> replace
 
         putSql("insertNodeHostSql",
                 "insert into $(node_host)                                                                                                                                                                                                                                            "
-                        + "  (ip_address, host_name, os_user, os_name, os_arch, os_version, available_processors, free_memory_bytes, total_memory_bytes, max_memory_bytes, java_version, java_vendor, jdbc_version, symmetric_version, timezone_offset, heartbeat_time, last_restart_time, create_time, node_id, instance_id)"
+                        + "  (ip_address, instance_id, os_user, os_name, os_arch, os_version, available_processors, free_memory_bytes, total_memory_bytes, max_memory_bytes, java_version, java_vendor, jdbc_version, symmetric_version, timezone_offset, heartbeat_time, last_restart_time, create_time, node_id, host_name)"
                         + "  values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?, current_timestamp,?,?)");
 
         putSql("updateNodeHostSql",
                 ""
                         + "update $(node_host) set                                                                                                          "
-                        + "  ip_address=?, host_name=?, os_user=?, os_name=?, os_arch=?, os_version=?, available_processors=?, free_memory_bytes=?,                            "
+                        + "  ip_address=?, instance_id=?, os_user=?, os_name=?, os_arch=?, os_version=?, available_processors=?, free_memory_bytes=?,                            "
                         + "  total_memory_bytes=?, max_memory_bytes=?, java_version=?, java_vendor=?, jdbc_version=?, symmetric_version=?, timezone_offset=?, heartbeat_time=?,   "
-                        + "  last_restart_time=? where node_id=? and instance_id=?                                                                                  ");
+                        + "  last_restart_time=? where node_id=? and host_name=?                                                                                  ");
 
         putSql("findNodeHeartbeatsSql",
                 "select h.node_id, h.heartbeat_time, h.timezone_offset from $(node_host) h inner join $(node) n on h.node_id=n.node_id"