Simplify the jobdateinfo table (remove Total, Program, Version)

[proteocache.git] / datadb / compbio / cassandra / CassandraRemover.java

diff --git a/datadb/compbio/cassandra/CassandraRemover.java b/datadb/compbio/cassandra/CassandraRemover.java
index d7aeafb..dbad018 100644 (file)
--- a/datadb/compbio/cassandra/CassandraRemover.java
+++ b/datadb/compbio/cassandra/CassandraRemover.java
@@ -60,7 +60,6 @@ public class CassandraRemover extends CassandraReader {
                        return 0;
                }
                Row row = results.one();
-               long njobs = row.getLong("Total") - 1;
                if (status.equals("OK")) {
                        long njobsOK = row.getLong("TotalOK") - 1;
                        String com4 = "DELETE FROM ProteinRow WHERE JobID = '" + jobid + "';";
@@ -70,20 +69,20 @@ public class CassandraRemover extends CassandraReader {
                        String com5 = "DELETE FROM ProteinData WHERE JobID = '" + jobid + "' AND jobtime = " + date + ";";
                        System.out.println("Command: " + com5);
                        CassandraQuery(com5);
-                       UpdateJobDateInfo(date, "TotalOK", njobsOK, njobs);
+                       UpdateJobDateInfo(date, "TotalOK", njobsOK);
                } else {
                        String com6 = "DELETE FROM FailLog WHERE JobID = '" + jobid + "' AND jobtime = " + date + ";";
                        System.out.println("Command: " + com6);
                        CassandraQuery(com6);
                        if (status.equals("STOPPED")) {
                                long njobsStopped = row.getLong("TotalStopped") - 1;
-                               UpdateJobDateInfo(date, "TotalStopped", njobsStopped, njobs);
+                               UpdateJobDateInfo(date, "TotalStopped", njobsStopped);
                        } else if (status.equals("ERROR")) {
                                long njobsError = row.getLong("TotalError") - 1;
-                               UpdateJobDateInfo(date, "TotalError", njobsError, njobs);
+                               UpdateJobDateInfo(date, "TotalError", njobsError);
                        } else if (status.equals("TIMEDOUT")) {
                                long njobsTimeOut = row.getLong("TotalTimeOut") - 1;
-                               UpdateJobDateInfo(date, "TotalTimeOut", njobsTimeOut, njobs);
+                               UpdateJobDateInfo(date, "TotalTimeOut", njobsTimeOut);
                        }
                }
                System.out.println("Job " + jobid + " removed...");
@@ -99,9 +98,8 @@ public class CassandraRemover extends CassandraReader {
         * @return nothing
         * 
         */
-       private void UpdateJobDateInfo(long date, String ColumnName, long totalcol, long total) {
-               String com = "UPDATE JobDateInfo SET " + ColumnName + " = " + totalcol + ", Total = " + total + " WHERE jobday = " + date + ";";
-               System.out.println("Command: " + com);
+       private void UpdateJobDateInfo(long date, String ColumnName, long totalcol) {
+               String com = "UPDATE JobDateInfo SET " + ColumnName + " = " + totalcol + " WHERE jobday = " + date + ";";
                CassandraQuery(com);
        }