X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fibex%2Fmail%2FSqliteMailbox.java;h=c6fb37798eb9895c8767e1db695e08f3302cdacb;hb=3450e48824396ee8cda39aaf0caeb81bb5f09c8d;hp=384dc4d73d76c65de78e7300c7f1f1a2b07bf99c;hpb=f110e29a9029e8f12957edfcda0330a95c6814ee;p=org.ibex.mail.git diff --git a/src/org/ibex/mail/SqliteMailbox.java b/src/org/ibex/mail/SqliteMailbox.java index 384dc4d..c6fb377 100644 --- a/src/org/ibex/mail/SqliteMailbox.java +++ b/src/org/ibex/mail/SqliteMailbox.java @@ -12,7 +12,11 @@ import java.util.*; public class SqliteMailbox extends Mailbox.Default implements MailTree { - public MailTree slash(String name, boolean create) { return null; } + public MailTree slash(String name, boolean create) { + String p = file.getAbsolutePath(); + if (p.endsWith(".sqlite")) p = p.substring(0, p.length()-".sqlite".length()); + return FileBasedMailbox.getFileBasedMailbox(p+"/"+name, create); + } public String[] children() { return new String[0]; } public void rmdir(String subdir) { throw new RuntimeException("invalid"); } public void rename(String subdir, MailTree newParent, String newName) { throw new RuntimeException("invalid"); } @@ -46,36 +50,44 @@ public class SqliteMailbox extends Mailbox.Default implements MailTree { * allowed and any attempt to insert a new row will fail with an * SQLITE_FULL error. */ - // FIXME: should messageid_ be decared unique? private static final String columns_ = - "uid_ INTEGER PRIMARY KEY AUTOINCREMENT, messageid_ unique,from_,to_,date_,subject_,headers_,body_,flags_"; + "uid_ INTEGER PRIMARY KEY AUTOINCREMENT, messageid_,from_,to_,date_,subject_,headers_,body_,flags_"; private final int uidValidity; private final File file; + private final SqliteDB db; + public int uidValidity() { return uidValidity; } public String toString() { return file.getName(); } public SqliteMailbox(String filename) throws SQLException { + ResultSet rs = null; try { this.file = new File(filename); + this.db = new SqliteDB(filename); + /* Class.forName("org.sqlite.JDBC"); conn = DriverManager.getConnection("jdbc:sqlite:"+filename); + */ + conn = db.getConnection(); conn.prepareStatement("create table if not exists uidvalidity (uidvalidity)").executeUpdate(); - ResultSet rs = conn.prepareStatement("select uidvalidity from uidvalidity").executeQuery(); - if (!rs.next()) { - this.uidValidity = new Random().nextInt(); - PreparedStatement ps = conn.prepareStatement("insert into uidvalidity (uidvalidity) values (?)"); - ps.setInt(1, uidValidity); - ps.executeUpdate(); - } else { - this.uidValidity = rs.getInt(1); - } - conn.prepareStatement("create table if not exists 'mail' ("+columns_+")").executeUpdate(); - for(String name : indexedColumns) - conn.prepareStatement("create index if not exists "+name+"index on mail("+name+");").executeUpdate(); + try { + rs = conn.prepareStatement("select uidvalidity from uidvalidity").executeQuery(); + if (!rs.next()) { + this.uidValidity = new Random().nextInt(); + PreparedStatement ps = conn.prepareStatement("insert into uidvalidity (uidvalidity) values (?)"); + ps.setInt(1, uidValidity); + ps.executeUpdate(); + } else { + this.uidValidity = rs.getInt(1); + } + conn.prepareStatement("create table if not exists 'mail' ("+columns_+")").executeUpdate(); + for(String name : indexedColumns) + conn.prepareStatement("create index if not exists "+name+"index on mail("+name+");").executeUpdate(); + } finally { db.close(rs); } } catch (SQLException e) { throw new RuntimeException(e); } - catch (ClassNotFoundException e) { throw new RuntimeException(e); } + //catch (ClassNotFoundException e) { throw new RuntimeException(e); } } private HashMap imapToUid = new HashMap(); @@ -88,13 +100,15 @@ public class SqliteMailbox extends Mailbox.Default implements MailTree { uidToImap.clear(); PreparedStatement q = conn.prepareStatement("select uid_ from mail"); ResultSet rs = q.executeQuery(); - int num = 1; - while(rs.next()) { - imapToUid.put(num, rs.getInt(1)); - uidToImap.put(rs.getInt(1), num); - num++; - } - imapNumberCacheValid = true; + try { + int num = 1; + while(rs.next()) { + imapToUid.put(num, rs.getInt(1)); + uidToImap.put(rs.getInt(1), num); + num++; + } + imapNumberCacheValid = true; + } finally { db.close(rs); } } } public int queryImapNumberCache(int uid) throws SQLException { @@ -121,8 +135,10 @@ public class SqliteMailbox extends Mailbox.Default implements MailTree { PreparedStatement q = conn.prepareStatement("select max(uid_) from mail"); ResultSet rs = q.executeQuery(); //if (!rs.next()) return -1; - if (!rs.next()) throw new RuntimeException("select max(uid_) returned no rows!"); - return rs.getInt(1)+1; + try { + if (!rs.next()) throw new RuntimeException("select max(uid_) returned no rows!"); + return rs.getInt(1)+1; + } finally { db.close(rs); } } catch (Exception e) { throw new RuntimeException(e); } } @@ -228,15 +244,19 @@ public class SqliteMailbox extends Mailbox.Default implements MailTree { try { Log.warn("SQL", "select count(*) from mail where " + whereClause); ResultSet rs = conn.prepareStatement("select count(*) from mail where " + whereClause).executeQuery(); - rs.next(); - return rs.getInt(1); + try { + rs.next(); + return rs.getInt(1); + } finally { db.close(rs); } } catch (Exception e) { throw new RuntimeException(e); } } catch (UnsupportedQueryException _) { return super.count(q); } } - public void insert(Message m, int flags) { + public synchronized void insert(Message m, int flags) { try { + + /* PreparedStatement query = conn.prepareStatement("select headers_,body_,flags_ from 'mail' where messageid_=?"); query.setString(1, m.messageid); Log.warn("SQL", "select headers_,body_,flags_ from 'mail' where messageid_="+m.messageid); @@ -260,6 +280,7 @@ public class SqliteMailbox extends Mailbox.Default implements MailTree { return; } } + */ PreparedStatement add = conn.prepareStatement("insert "+/*"or replace "+*/"into 'mail' ("+columns+") values (?,?,?,?,?,?,?,?)"); add.setString(1, m.messageid+""); @@ -301,9 +322,9 @@ public class SqliteMailbox extends Mailbox.Default implements MailTree { public Headers head() { if (m != null) return m.headers; try { - PreparedStatement query = conn.prepareStatement("select headers_,flags_ from 'mail' where messageid_=?"); - query.setString(1, rs.getString(1)); - Log.warn("SQL", "select headers_,flags_ from 'mail' where messageid_="+rs.getString(1)); + PreparedStatement query = conn.prepareStatement("select headers_,flags_ from 'mail' where uid_=?"); + query.setString(1, rs.getString(2)); + Log.warn("SQL", "select headers_,flags_ from 'mail' where uid_="+rs.getString(2)); ResultSet rs2 = query.executeQuery(); if (!rs2.next()) { Log.error("XXX", "should not happen"); return null; } @@ -314,9 +335,9 @@ public class SqliteMailbox extends Mailbox.Default implements MailTree { public Message cur() { try { if (m!=null) return m; - PreparedStatement query = conn.prepareStatement("select headers_,body_,flags_ from 'mail' where messageid_=?"); - query.setString(1, rs.getString(1)); - Log.warn("SQL", "select headers_,body_,flags_ from 'mail' where messageid_="+rs.getString(1)); + PreparedStatement query = conn.prepareStatement("select headers_,body_,flags_ from 'mail' where uid_=?"); + query.setString(1, rs.getString(2)); + Log.warn("SQL", "select headers_,body_,flags_ from 'mail' where uid_="+rs.getString(2)); ResultSet rs2 = query.executeQuery(); if (!rs2.next()) { Log.error("XXX", "should not happen"); return null; }