From 0ffa755e7764c34282cd66a7e60eeb4924ee7d73 Mon Sep 17 00:00:00 2001
From: Jeremy Fee <jmfee@usgs.gov>
Date: Sun, 8 Nov 2020 14:00:58 -0700
Subject: [PATCH] Rename tracking index key column to name

---
 .../usgs/earthquake/aws/TrackingIndex.java    | 26 +++++++++----------
 .../distribution/ProductClient.java           |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/java/gov/usgs/earthquake/aws/TrackingIndex.java b/src/main/java/gov/usgs/earthquake/aws/TrackingIndex.java
index d68fe2b2..7a71cc8d 100644
--- a/src/main/java/gov/usgs/earthquake/aws/TrackingIndex.java
+++ b/src/main/java/gov/usgs/earthquake/aws/TrackingIndex.java
@@ -118,11 +118,11 @@ public void createSchema() throws Exception {
           "CREATE TABLE " + this.table
           + " (id INTEGER PRIMARY KEY " + autoIncrement
           + ", created VARCHAR(255)"
-          + ", key VARCHAR(255)"
+          + ", name VARCHAR(255)"
           + ", data TEXT"
           + ")");
       statement.executeUpdate(
-          "CREATE UNIQUE INDEX key_index ON " + this.table + "(key)");
+          "CREATE UNIQUE INDEX name_index ON " + this.table + "(name)");
       db.commit();
     } catch (Exception e) {
       db.rollback();
@@ -132,14 +132,14 @@ public void createSchema() throws Exception {
     }
   }
 
-  public synchronized JsonObject getTrackingData(final String key) throws Exception {
+  public synchronized JsonObject getTrackingData(final String name) throws Exception {
     final Connection db = getConnection();
     JsonObject data = null;
 
-    final String sql = "SELECT * FROM " + this.table + " WHERE key=?";
+    final String sql = "SELECT * FROM " + this.table + " WHERE name=?";
     db.setAutoCommit(false);
     try (final PreparedStatement statement = db.prepareStatement(sql)) {
-      statement.setString(1, key);
+      statement.setString(1, name);
 
       // execute and parse data
       try (final ResultSet rs = statement.executeQuery()) {
@@ -163,14 +163,14 @@ public synchronized JsonObject getTrackingData(final String key) throws Exceptio
     return data;
   }
 
-  public synchronized void removeTrackingData(final String key) throws Exception {
+  public synchronized void removeTrackingData(final String name) throws Exception {
     final Connection db = getConnection();
 
-    final String sql = "DELETE FROM " + this.table + " WHERE key=?";
+    final String sql = "DELETE FROM " + this.table + " WHERE name=?";
     // create schema
     db.setAutoCommit(false);
     try (final PreparedStatement statement = db.prepareStatement(sql)) {
-      statement.setString(1, key);
+      statement.setString(1, name);
 
       statement.executeUpdate();
       db.commit();
@@ -182,24 +182,24 @@ public synchronized void removeTrackingData(final String key) throws Exception {
     }
   }
 
-  public synchronized void setTrackingData(final String key, final JsonObject data) throws Exception {
+  public synchronized void setTrackingData(final String name, final JsonObject data) throws Exception {
     final Connection db = getConnection();
 
-    final String update = "UPDATE " + this.table + " SET data=? WHERE key=?";
+    final String update = "UPDATE " + this.table + " SET data=? WHERE name=?";
     // usually updated, try update first
     db.setAutoCommit(false);
     try (final PreparedStatement updateStatement = db.prepareStatement(update)) {
       updateStatement.setString(1, data.toString());
-      updateStatement.setString(2, key);
+      updateStatement.setString(2, name);
       // execute update
       final int count = updateStatement.executeUpdate();
       // check number of rows updated (whether row already exists)
       if (count == 0) {
-        final String insert = "INSERT INTO " + this.table + " (data, key) VALUES (?, ?)";
+        final String insert = "INSERT INTO " + this.table + " (data, name) VALUES (?, ?)";
         // no rows updated
         try (final PreparedStatement insertStatement = db.prepareStatement(insert)) {
           insertStatement.setString(1, data.toString());
-          insertStatement.setString(2, key);
+          insertStatement.setString(2, name);
           // execute insert
           insertStatement.executeUpdate();
         }
diff --git a/src/main/java/gov/usgs/earthquake/distribution/ProductClient.java b/src/main/java/gov/usgs/earthquake/distribution/ProductClient.java
index 30fe4455..f0d6897e 100644
--- a/src/main/java/gov/usgs/earthquake/distribution/ProductClient.java
+++ b/src/main/java/gov/usgs/earthquake/distribution/ProductClient.java
@@ -64,7 +64,7 @@ public class ProductClient extends DefaultConfigurable implements
 		ProductClientMBean, Bootstrappable {
 
 	/** The "release" version number. */
-	public static final String RELEASE_VERSION = "Version 2.6.0-rc2 2020-11-04";
+	public static final String RELEASE_VERSION = "Version 2.6.0-rc3 2020-11-08";
 
 	/** Property name used on products for current RELEASE_VERSION. */
 	public static final String PDL_CLIENT_VERSION_PROPERTY = "pdl-client-version";