return session;
}
- /*
+ /**
* connect to the cluster and look whether all tables exist
*/
public void Connect() {
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, ProgramName ascii, ProgramVersion ascii, PRIMARY KEY(JobID));");
session.execute("CREATE TABLE IF NOT EXISTS ProteinData "
+ "(jobtime bigint, JobID ascii, ExecTime int, Protein ascii, PRIMARY KEY(jobtime, JobID));");
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, ProgramName ascii, ProgramVersion 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));");
-
- 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());
- }
+ + "(jobday bigint, TotalOK bigint, TotalStopped bigint, TotalError bigint, TotalTimeOut bigint, PRIMARY KEY(jobday));");
+
+ session.execute("CREATE TABLE IF NOT EXISTS Programs "
+ + "(Program varchar, Version varchar, Description varchar, weblink varchar, PRIMARY KEY(Program,Version));");
+
+ session.execute("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));");
+
+ // session.execute("ALTER TABLE ProteinLog ADD ProgramName ascii;");
+ // session.execute("ALTER TABLE ProteinLog ADD ProgramVersion ascii;");
+ // session.execute("ALTER TABLE JpredArchive ADD ProgramName ascii;");
+ // session.execute("ALTER TABLE JpredArchive ADD ProgramVersion ascii;");
session.execute("CREATE INDEX IF NOT EXISTS ProteinSeq ON ProteinRow (protein);");
session.execute("CREATE INDEX IF NOT EXISTS ProteinIp ON ProteinLog (ip);");
*/
public static long getEarliestDateInDB() {
String com = "SELECT * FROM MainParameters WHERE Name = 'EarliestJobDate';";
- System.out.println("Command: " + com);
ResultSet results = session.execute(com);
if (!results.isExhausted()) {