rhodes 1.5.5 → 2.0.0.beta1

data/platform/shared/db/DBAdapter.h

@@ -33,6 +33,7 @@ class CDBAdapter
     boolean m_bUIWaitDB;
     int     m_nTransactionCounter;
     CDBAttrManager m_attrMgr;
+    static HashtablePtr<String,CDBAdapter*> m_mapDBPartitions;
 
     struct CDBVersion
     {
@@ -64,6 +65,17 @@ public:
     boolean isInsideTransaction(){ return m_nTransactionCounter > 0; }
     const String& getDBPath(){ return m_strDbPath; }
 
+    static HashtablePtr<String,CDBAdapter*>& getDBPartitions(){ return  m_mapDBPartitions; }
+    static void closeAll();
+    static void initAttrManager();
+    static boolean isAnyInsideTransaction();
+    static CDBAdapter& getUserDB();
+    static CDBAdapter& getDBByHandle(sqlite3* db);
+    static CDBAdapter& getDB(const char* szPartition);
+
+    boolean isTableExist(String strTableName);
+    int prepareSqlStatement(const char* szSql, int nByte, sqlite3_stmt **ppStmt);
+
     void bind(sqlite3_stmt* st, int nPos, int val)
     {
         sqlite3_bind_int(st, nPos, val);
@@ -160,8 +172,10 @@ public:
         return executeStatement(res);
     }
 
-    template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
-    DBResultPtr executeSQLReportNonUnique( const char* szSt, T1 p1, T2 p2, T3 p3, T4 p4, T5 p5, T6 p6 )
+    DBResultPtr executeSQLReportNonUniqueEx( const char* szSt, Vector<String>& arValues );
+
+    template<typename T1, typename T2, typename T3, typename T4>
+    DBResultPtr executeSQLReportNonUnique( const char* szSt, T1 p1, T2 p2, T3 p3, T4 p4 )
     {
         DBResultPtr res = prepareStatement(szSt);
         if ( res->getStatement() == null )
@@ -171,8 +185,6 @@ public:
         bind(res->getStatement(), 2, p2);
         bind(res->getStatement(), 3, p3);
         bind(res->getStatement(), 4, p4);
-        bind(res->getStatement(), 5, p5);
-        bind(res->getStatement(), 6, p6);
 
         res->setReportNonUnique(true);
         return executeStatement(res);
@@ -207,21 +219,24 @@ public:
         return executeStatement(res);
     }
 
+    DBResultPtr executeSQLEx( const char* szSt, Vector<String>& arValues);
     DBResultPtr executeSQL( const char* szSt);
 
     void startTransaction();
     void endTransaction();
     void rollback();
-    void destroy_table(String strTable);
-    void setInitialSyncDB(String fDataName);
+    void destroy_tables(const rho::Vector<rho::String>& arIncludeTables, const rho::Vector<rho::String>& arExcludeTables);
+    void setBulkSyncDB(String fDataName);
 
-//private:
+    void createDeleteTrigger(const String& strTable);
+private:
     DBResultPtr executeStatement(common::CAutoPtr<CDBResult>& res);
 
     void checkDBVersion(String& strVer);
     CDBVersion readDBVersion();//throws Exception
     void       writeDBVersion(const CDBVersion& ver);//throws Exception
     void createSchema();
+    void createTriggers();
     boolean checkDbError(int rc);
     boolean checkDbErrorEx(int rc, rho::db::CDBResult& res);
     sqlite3_stmt* createInsertStatement(rho::db::CDBResult& res, const String& tableName, CDBAdapter& db, String& strInsert);
@@ -229,8 +244,10 @@ public:
     virtual DBResultPtr prepareStatement( const char* szSt );
 
     boolean migrateDB(const CDBVersion& dbVer, const String& strRhoDBVer, const String& strAppDBVer);
+
 };
 
 }
 }
 
+extern "C" void rho_db_init_attr_manager();

data/platform/shared/db/DBAttrManager.cpp

@@ -77,36 +77,7 @@ void CDBAttrManager::load(CDBAdapter& db)
 {
     synchronized(m_mxSrcAttrs)
     {
-        DBResult( res, db.executeSQL("SELECT source_id,source_attribs from sources") );
-        for ( ; !res.isEnd(); res.next() )
-        { 
-            int nSrcID = res.getIntByIdx(0);
-            String strAttribs = res.getStringByIdx(1);
-            if ( strAttribs.length() == 0 )
-                continue;
-
-            CTokenizer oTokenizer( strAttribs, "," );
-
-            Hashtable<String,int>* pmapAttr = new Hashtable<String,int>();
-            String strAttr = "";
-		    while (oTokenizer.hasMoreTokens()) 
-            {
-			    String tok = oTokenizer.nextToken();
-			    if (tok.length() == 0)
-				    continue;
-                
-                if ( strAttr.length() > 0 )
-                {
-                    int nCounter = 0;
-                    convertFromStringA(tok.c_str(),nCounter);
-                    pmapAttr->put(strAttr, nCounter);
-                    strAttr = "";
-                }else
-                    strAttr = tok;
-            }
-
-            m_mapSrcAttrs.put(nSrcID,pmapAttr);
-        }
+        loadAttrs(db, m_mapSrcAttrs, "source_attribs");
     }
 }
 
@@ -141,5 +112,87 @@ unsigned long CDBAttrManager::getAttrsBySrc(int nSrcID)
     }
 }
 
+boolean CDBAttrManager::isBlobAttr(int nSrcID, const char* szAttr)
+{
+    Hashtable<String,int>* pmapAttr = m_mapBlobAttrs.get(nSrcID);
+    if ( pmapAttr != null )
+    {
+        Hashtable<String,int>& mapAttr = *pmapAttr;
+        return mapAttr.containsKey(szAttr);
+    }
+
+    return false;
+}
+
+boolean CDBAttrManager::isOverwriteBlobFromServer(int nSrcID, const String& strAttr)
+{
+    Hashtable<String,int>* pmapAttr = m_mapBlobAttrs.get(nSrcID);
+    if ( pmapAttr != null )
+    {
+        Hashtable<String,int>& mapAttr = *pmapAttr;
+        return mapAttr.get(strAttr) != 0;
+    }
+
+    return false;
+}
+
+void CDBAttrManager::loadBlobAttrs(CDBAdapter& db)
+{
+    loadAttrs(db, m_mapBlobAttrs, "blob_attribs");
+
+    for ( HashtablePtr< int, Hashtable<String,int>* >::iterator it = m_mapBlobAttrs.begin();  it != m_mapBlobAttrs.end(); ++it )
+    {
+        int nSrcID = it->first;
+
+        DBResult( res, db.executeSQL("SELECT name FROM sources WHERE source_id=?", nSrcID) );
+        if ( res.isEnd() )
+            continue;
+
+        String strName = res.getStringByIdx(0);
+        if ( !db.isTableExist(strName) )
+            continue;
+
+        db.createDeleteTrigger(strName);
+    }
+}
+
+/*static*/void CDBAttrManager::loadAttrs(CDBAdapter& db, HashtablePtr< int, Hashtable<String,int>* >& mapAttrs, String strDBAttr)
+{
+    mapAttrs.clear();
+    String strSql = "SELECT source_id,";
+    strSql += strDBAttr + " from sources";
+
+    DBResult( res, db.executeSQL(strSql.c_str()) );
+    for ( ; !res.isEnd(); res.next() )
+    { 
+        int nSrcID = res.getIntByIdx(0);
+        String strAttribs = res.getStringByIdx(1);
+        if ( strAttribs.length() == 0 )
+            continue;
+
+        CTokenizer oTokenizer( strAttribs, "," );
+
+        Hashtable<String,int>* pmapAttr = new Hashtable<String,int>();
+        String strAttr = "";
+	    while (oTokenizer.hasMoreTokens()) 
+        {
+		    String tok = oTokenizer.nextToken();
+		    if (tok.length() == 0)
+			    continue;
+            
+            if ( strAttr.length() > 0 )
+            {
+                int nCounter = 0;
+                convertFromStringA(tok.c_str(),nCounter);
+                pmapAttr->put(strAttr, nCounter);
+                strAttr = "";
+            }else
+                strAttr = tok;
+        }
+
+        mapAttrs.put(nSrcID,pmapAttr);
+    }
+}
+
 }
 }

data/platform/shared/db/DBAttrManager.h

@@ -12,6 +12,9 @@ class CDBAttrManager
     common::CMutex m_mxSrcAttrs;
     HashtablePtr< int, Hashtable<String,int>* > m_mapSrcAttrs;
 
+    HashtablePtr< int, Hashtable<String,int>* > m_mapBlobAttrs;
+
+    static void loadAttrs(CDBAdapter& db, HashtablePtr< int, Hashtable<String,int>* >& mapAttrs, String strDBAttr);
 public:
     
     void add( int nSrcID, const char* szAttr );
@@ -21,6 +24,9 @@ public:
     void reset(CDBAdapter& db);
     unsigned long getAttrsBySrc(int nSrcID);
 
+    boolean isBlobAttr(int nSrcID, const char* szAttr);
+    boolean isOverwriteBlobFromServer(int nSrcID, const String& strAttr);
+    void loadBlobAttrs(CDBAdapter& db);
 };
 
 }

data/platform/shared/db/DBResult.h

@@ -9,10 +9,8 @@ namespace rho{
 namespace db{
 
 class CDBAdapter;
-
 class CDBResult
 {
-    //common::CMutexLock m_lockDB;
     CDBAdapter* m_pDB;
     sqlite3_stmt* m_dbStatement;
     boolean m_bReportNonUnique;
@@ -53,8 +51,21 @@ public:
     {
         return sqlite3_column_int64(m_dbStatement, nCol);
     }
-//private:
-    //CDBResult() : m_lockDB(*new common::CMutex() ){} //TEST ONLY
+
+    int getColCount()
+    {
+        return sqlite3_data_count(m_dbStatement);
+    }
+
+    boolean isNullByIdx(int nCol)
+    {
+        return sqlite3_column_type(m_dbStatement,nCol) == SQLITE_NULL;
+    }
+
+    String getColName(int nCol)
+    {
+        return sqlite3_column_name(m_dbStatement,nCol);;
+    }
 
 };
 

data/platform/shared/json/JSONIterator.cpp

@@ -20,6 +20,9 @@ long long int rho_atoi64(const char *instr)
 namespace rho {
 namespace json {
 
+/////////////////////////////////////////////////////////////////////
+//CJSONArrayIterator
+
 CJSONArrayIterator::CJSONArrayIterator(const char* szData)
 {
     m_array = 0;
@@ -32,7 +35,7 @@ CJSONArrayIterator::CJSONArrayIterator(const char* szData)
         m_array = json_object_get_array((struct json_object *)m_rootObject);
 }
 
-CJSONArrayIterator::CJSONArrayIterator(CJSONEntry& oEntry, const char* strName)
+CJSONArrayIterator::CJSONArrayIterator(const CJSONEntry& oEntry, const char* strName)
 {
     m_array = 0;
     m_nCurItem = 0;
@@ -43,6 +46,15 @@ CJSONArrayIterator::CJSONArrayIterator(CJSONEntry& oEntry, const char* strName)
         m_array = json_object_get_array( oItem.getObject() );
 }
 
+CJSONArrayIterator::CJSONArrayIterator(const CJSONEntry& oEntry)
+{
+    m_array = 0;
+    m_nCurItem = 0;
+    m_rootObject = 0;
+
+    m_array = json_object_get_array( oEntry.getObject() );
+}
+
 CJSONArrayIterator::~CJSONArrayIterator(void)
 {
     if ( m_rootObject != 0 )
@@ -70,6 +82,86 @@ CJSONEntry CJSONArrayIterator::getCurItem()
         ( struct json_object *) array_list_get_idx(m_array, m_nCurItem) );
 }
 
+/////////////////////////////////////////////////////////////////////
+//CJSONStructIterator
+
+CJSONStructIterator::CJSONStructIterator(const char* szData)
+{
+    m_struct = 0;
+    m_curEntry = 0;
+    m_rootObject = json_tokener_parse(const_cast<char*>(szData));
+
+	if ( !m_rootObject || is_error(m_rootObject) ) 
+        m_rootObject = 0;
+    else
+    {
+        m_struct = json_object_get_object((struct json_object *)m_rootObject);
+        m_curEntry = m_struct->head;
+    }
+}
+
+CJSONStructIterator::CJSONStructIterator(const CJSONEntry& oEntry, const char* strName)
+{
+    m_struct = 0;
+    m_curEntry = 0;
+    m_rootObject = 0;
+
+    CJSONEntry oItem = oEntry.getEntry(strName);
+    if ( !oItem.isEmpty() )
+    {
+        m_struct = json_object_get_object( oItem.getObject() );
+        m_curEntry = m_struct->head;
+    }
+}
+
+CJSONStructIterator::CJSONStructIterator(const CJSONEntry& oEntry)
+{
+    m_rootObject = 0;
+
+    m_struct = json_object_get_object( oEntry.getObject() );
+    m_curEntry = m_struct->head;
+}
+
+CJSONStructIterator::~CJSONStructIterator(void)
+{
+    if ( m_rootObject != 0 )
+        json_object_put(m_rootObject);
+}
+
+boolean CJSONStructIterator::isEnd()
+{
+    return m_curEntry == 0;
+}
+
+void  CJSONStructIterator::next()
+{
+    m_curEntry = m_curEntry->next;
+}
+
+void CJSONStructIterator::reset()
+{
+    m_curEntry = m_struct->head;
+}
+
+String CJSONStructIterator::getCurKey()
+{
+    return isEnd() ? String() : String((char*)m_curEntry->k);
+}
+
+CJSONEntry CJSONStructIterator::getCurValue()
+{
+    return CJSONEntry( isEnd() ? 0 :
+        ( struct json_object *) m_curEntry->v );
+}
+
+String CJSONStructIterator::getCurString()
+{
+    return getCurValue().getString();
+}
+
+/////////////////////////////////////////////////////////////////////
+//CJSONEntry
+
 CJSONEntry::CJSONEntry(struct json_object * obj) : m_rootObject(null)
 {
     m_object = obj;
@@ -107,6 +199,11 @@ const char* CJSONEntry::getString(const char* name)
     return szRes;
 }
 
+const char* CJSONEntry::getString()
+{
+    return json_object_get_string(m_object);
+}
+
 int CJSONEntry::getInt(const char* name)
 {
     int nRes = 0;
@@ -138,7 +235,7 @@ uint64 CJSONEntry::getUInt64(const char* name)
     return nRes;
 }*/
 
-CJSONEntry CJSONEntry::getEntry(const char* name)
+CJSONEntry CJSONEntry::getEntry(const char* name)const
 {
     struct json_object* obj = json_object_object_get(m_object,const_cast<char*>(name));
 
@@ -146,4 +243,4 @@ CJSONEntry CJSONEntry::getEntry(const char* name)
 }
 
 }
-}
+}

data/platform/shared/json/JSONIterator.h

@@ -4,6 +4,8 @@
 
 struct json_object;
 struct array_list;
+struct lh_entry;
+struct lh_table;
 
 namespace rho {
 namespace json {
@@ -24,10 +26,11 @@ public:
     int getInt(const char* name);
     uint64 getUInt64(const char* name);
     const char* getString(const char* name);
+    const char* getString();
 
-    CJSONEntry getEntry(const char* name);
+    CJSONEntry getEntry(const char* name)const;
 
-    struct json_object* getObject(){ return m_object; }
+    struct json_object* getObject()const{ return m_object; }
 };
 
 class CJSONArrayIterator
@@ -38,7 +41,8 @@ class CJSONArrayIterator
 
 public:
     CJSONArrayIterator(const char* szData);
-	CJSONArrayIterator(CJSONEntry& oEntry, const char* strName);
+	CJSONArrayIterator(const CJSONEntry& oEntry, const char* strName);
+    CJSONArrayIterator(const CJSONEntry& oEntry);
     ~CJSONArrayIterator(void);
 
     boolean isEnd();
@@ -49,5 +53,26 @@ public:
     CJSONEntry getCurItem();
 };
 
+class CJSONStructIterator
+{
+    struct json_object* m_rootObject;
+    struct lh_table*    m_struct;
+    struct lh_entry*    m_curEntry;
+public:
+    CJSONStructIterator(const char* szData);
+	CJSONStructIterator(const CJSONEntry& oEntry, const char* strName);
+    CJSONStructIterator(const CJSONEntry& oEntry);
+    ~CJSONStructIterator(void);
+
+    boolean isEnd();
+    void    next();
+    void    reset();
+
+    String     getCurKey();
+    CJSONEntry getCurValue();
+    String     getCurString();
+    
+};
+
 }
 }