inserted 2 columns: version and pragramme name

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

diff --git a/datadb/compbio/cassandra/CassandraNativeConnector.java b/datadb/compbio/cassandra/CassandraNativeConnector.java
index 9d8d01d..beb83c4 100644 (file)
--- a/datadb/compbio/cassandra/CassandraNativeConnector.java
+++ b/datadb/compbio/cassandra/CassandraNativeConnector.java
@@ -73,7 +73,7 @@ public class CassandraNativeConnector {
 
                session.execute("CREATE TABLE IF NOT EXISTS ProteinLog "
                                + "(JobID ascii, DataBegin ascii, DataEnd ascii, ip ascii, FinalStatus ascii, "
-                               + "ExecutionStatus ascii, Protein ascii, PRIMARY KEY(JobID));");
+                               + "ExecutionStatus ascii, Protein ascii, ProgrammeName ascii, Version ascii, PRIMARY KEY(JobID));");
 
                session.execute("CREATE TABLE IF NOT EXISTS ProteinData "
                                + "(jobtime bigint, JobID ascii, ExecTime int, Protein ascii, PRIMARY KEY(jobtime, JobID));");
@@ -83,7 +83,7 @@ public class CassandraNativeConnector {
 
                session.execute("CREATE TABLE IF NOT EXISTS JpredArchive "
                                + "(JobID ascii, Protein varchar, IP ascii, StartTime bigint, ExecTime int, FinalStatus ascii, ExecutionStatus ascii, alignment map<ascii,ascii>, "
-                               + "predictions map<ascii,ascii>, ArchiveLink varchar, LOG varchar, PRIMARY KEY(JobID));");
+                               + "predictions map<ascii,ascii>, ArchiveLink varchar, LOG varchar, ProgrammeName ascii, Version ascii, PRIMARY KEY(JobID));");
 
                session.execute("CREATE TABLE IF NOT EXISTS JobDateInfo "
                                + "(jobday bigint, Total bigint,  TotalOK bigint, TotalStopped bigint, TotalError bigint, TotalTimeOut bigint, Program varchar, Version varchar, PRIMARY KEY(jobday));");
@@ -91,20 +91,13 @@ public class CassandraNativeConnector {
                String com = "CREATE TABLE IF NOT EXISTS Users "
                                + "(name varchar, id bigint, email varchar, password varchar, organisation varchar, position varchar, signedtolist boolean, registrationdate bigint, PRIMARY KEY(id));";
 
-               try {
-                       session.execute(com);
-               } catch (QueryExecutionException e) {
-                       String mess = "CassandraNativeConnector.CreateMainTables: query execution exception...";
-                       System.out.println(mess);
-                       log.error(mess);
-                       log.error(e.getLocalizedMessage(), e.getCause());
-               } catch (QueryValidationException e) {
-                       String mess = "CassandraNativeConnector.CreateMainTables: query validation exception... Command: " + com;
-                       System.out.println(mess);
-                       log.error(mess);
-                       log.error(e.getLocalizedMessage(), e.getCause());
-               }
-
+               
+       
+       //      session.execute("ALTER TABLE ProteinLog ADD ProgrammeName ascii;");
+       //      session.execute("ALTER TABLE ProteinLog ADD Version ascii;");
+       //      session.execute("ALTER TABLE JpredArchive ADD ProgrammeName ascii;");
+       //      session.execute("ALTER TABLE JpredArchive ADD Version ascii;");
+               
                session.execute("CREATE INDEX IF NOT EXISTS ProteinSeq ON ProteinRow (protein);");
                session.execute("CREATE INDEX IF NOT EXISTS ProteinIp ON ProteinLog (ip);");
                session.execute("CREATE INDEX IF NOT EXISTS ON ProteinLog (ExecutionStatus);");