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

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

diff --git a/datadb/compbio/cassandra/CassandraNewTableWriter.java b/datadb/compbio/cassandra/CassandraNewTableWriter.java
index 6cb9c98..db0e70c 100644 (file)
--- a/datadb/compbio/cassandra/CassandraNewTableWriter.java
+++ b/datadb/compbio/cassandra/CassandraNewTableWriter.java
@@ -9,11 +9,8 @@ import org.apache.log4j.Logger;
 import com.datastax.driver.core.Row;
 import com.datastax.driver.core.Session;
 import com.datastax.driver.core.ResultSet;
-import com.datastax.driver.core.PreparedStatement;
-import com.datastax.driver.core.BoundStatement;
 import com.datastax.driver.core.exceptions.QueryExecutionException;
 
-import compbio.engine.ProteoCachePropertyHelperManager;
 import compbio.cassandra.CassandraNativeConnector;
 
 public class CassandraNewTableWriter {
@@ -45,7 +42,7 @@ public class CassandraNewTableWriter {
                }
                return false;
        }
-       
+
        /*
         * update programme name and version
         */
@@ -68,8 +65,10 @@ public class CassandraNewTableWriter {
                                List<Row> rows = results.all();
                                System.out.println(rows.size());
                                for (Row r : rows) {
-                                       session.execute("UPDATE  ProteinLog SET ProgrammeName = 'Jpred', Version = '3.0.1' WHERE JobID = '" + r.getString("JobID") + "';");
-                                       session.execute("UPDATE  JpredArchive SET ProgrammeName = 'Jpred', Version = '3.0.1' WHERE JobID = '" + r.getString("JobID") + "';");                                   
+                                       session.execute("UPDATE  ProteinLog SET ProgramName = 'Jpred', ProgramVersion = '3.0.1' WHERE JobID = '"
+                                                       + r.getString("JobID") + "';");
+                                       session.execute("UPDATE  JpredArchive SET ProgramName = 'Jpred', ProgramVersion = '3.0.1' WHERE JobID = '"
+                                                       + r.getString("JobID") + "';");
                                }
                        } catch (QueryExecutionException e) {
                                e.printStackTrace();
@@ -78,29 +77,6 @@ public class CassandraNewTableWriter {
                System.out.println("Table ProteinLog filled: total time is " + (System.currentTimeMillis() - StartTime) + " msec");
        }
 
-
-       /*
-        * fill new table
-        */
-       public void FillNewTable() {
-               final long StartTime = System.currentTimeMillis();
-               long erldate = CassandraNativeConnector.getEarliestDateInDB();
-               Calendar runnicCal = Calendar.getInstance();
-               runnicCal.setTime(new Date(erldate));
-               Calendar endcal = Calendar.getInstance();
-               long endTime = endcal.getTime().getTime();
-               for (Date date = runnicCal.getTime(); date.getTime() < endTime; runnicCal.add(Calendar.DATE, 1), date = runnicCal.getTime()) {
-                       try {
-                               ResultSet results = session.execute("SELECT * FROM ProteinData WHERE jobtime = " + date.getTime() + ";");
-                               session.execute("INSERT INTO JobDateInfo " + "(jobday, Total)" + " VALUES (" + date.getTime() + "," + results.all().size()
-                                               + ");");
-                       } catch (QueryExecutionException e) {
-                               e.printStackTrace();
-                       }
-               }
-               System.out.println("Table JobDateInfo filled: total time is " + (System.currentTimeMillis() - StartTime) + " msec");
-       }
-
        /*
         * fill a table with the database global parameters
         */