rhodes 1.5.5 → 2.0.0.beta1

data/platform/shared/sync/SyncSource.h

@@ -11,36 +11,25 @@ namespace db {
 }
 namespace net {
     struct INetRequest;
+    struct CMultipartItem;
 }
 namespace json {
     class CJSONEntry;
     class CJSONArrayIterator;
+    class CJSONStructIterator;
 }
 
 namespace sync {
+struct ISyncProtocol;
 
-class CSyncBlob
-{
-   String m_strBody;
-   String m_strFilePath;
-
-public:
-    CSyncBlob(const String& body, const String& filePath ) :
-      m_strBody(body), m_strFilePath(filePath){}
-
-    const String& getBody()const{ return m_strBody; }
-    const String& getFilePath()const{ return m_strFilePath; }
-};
-
-class CValue
+class CAttrValue
 {
 public:
+	String m_strAttrib;
     String m_strValue;
-	String m_strAttrType;
-	uint64 m_nID;
-	
-    CValue(json::CJSONEntry& oJsonEntry);//throws JSONException
-    CValue(json::CJSONEntry& oJsonEntry, int nVer);//throws JSONException
+    String m_strBlobSuffix;
+
+    CAttrValue(const String& strAttrib, const String& strValue);
 };
 
 class CSyncEngine;
@@ -49,62 +38,65 @@ class CSyncSource
 {
     DEFINE_LOGCLASS;
 
-    enum ESyncServerDataPass{ edpNone, edpDeleteObjects };
-
     CSyncEngine& m_syncEngine;
+    db::CDBAdapter& m_dbAdapter;
 
     int    m_nID;
     String m_strName;
-    String m_strUrl;
     uint64 m_token;
+    String m_strSyncType;
     boolean m_bTokenFromDB;
 
     int m_nCurPageCount, m_nInserted, m_nDeleted, m_nTotalCount;
     boolean m_bGetAtLeastOnePage;
-    ESyncServerDataPass m_eSyncServerDataPass;
     int m_nRefreshTime;
+    int m_nProgressStep;
+    boolean m_bSchemaSource;
+    Hashtable<String,String> m_hashLinks;
+    VectorPtr<net::CMultipartItem*> m_arMultipartItems;
+    Vector<String>                  m_arBlobAttrs;
 
 public:
     int m_nErrCode;
     String m_strError;
-    String m_strParams;
-    String m_strAction;
-    boolean m_bSearchSyncChanges;
-    int     m_nProgressStep;
-    String m_strUrlParams;
-private:
-    VectorPtr<CSyncBlob*> m_arSyncBlobs;
-    String m_strAskParams;
+    boolean m_bIsSearch;
 
 public:
-    CSyncSource(int id, const String& strUrl, const String& strName, uint64 token, CSyncEngine& syncEngine );
+    CSyncSource(int id, const String& strName, const String& strSyncType, db::CDBAdapter& db, CSyncEngine& syncEngine );
     virtual void sync();
+    virtual boolean syncClientChanges();
 
-    String getUrl()const { return m_strUrl; }
     int getID()const { return m_nID; }
     String getName() { return m_strName; }
+    String getSyncType(){ return m_strSyncType; }
+
     int getServerObjectsCount()const{ return m_nInserted+m_nDeleted; }
-    boolean isSearch()const{ return m_strParams.length() > 0;}
+    boolean isSearch()const{ return m_bIsSearch;}
 
     uint64 getToken()const{ return m_token; }
+    boolean isTokenFromDB(){ return m_bTokenFromDB; }
     void setToken(uint64 token){ m_token = token; m_bTokenFromDB = false; }
     virtual boolean isEmptyToken()
     {
         return m_token == 0;
     }
 
+    int getProgressStep(){ return m_nProgressStep; }
+    void setProgressStep(int nProgressStep){ m_nProgressStep = nProgressStep; }
+
+    boolean getGetAtLeastOnePage(){ return m_bGetAtLeastOnePage; }
+    int getRefreshTime(){ return m_nRefreshTime; }
+
 //private:
-    CSyncSource();
-    CSyncSource(CSyncEngine& syncEngine );
+    //CSyncSource();
+    CSyncSource(CSyncEngine& syncEngine, db::CDBAdapter& db );
 
-    void syncClientChanges();
+    void doSyncClientChanges();
     boolean isPendingClientChanges();
 
     void syncServerChanges();
-    void makePushBody(String& strBody, const char* szUpdateType);
-    void getAndremoveAsk();
-    void setAskParams(const String& ask){ m_strAskParams = ask;}
-    String getAskParams()const{ return m_strAskParams;}
+    void makePushBody_Ver3(String& strBody, const String& strUpdateType);
+
     void processToken(uint64 token);
 
     int getInsertedCount()const { return m_nInserted; }
@@ -113,29 +105,30 @@ public:
     void setTotalCount(int nTotalCount){m_nTotalCount = nTotalCount;}
     int  getCurPageCount(){return m_nCurPageCount;}
     int  getTotalCount(){return m_nTotalCount;}
-    int  getProgressStep(){ return m_nProgressStep; }
 
-    void processServerData(const char* szData);
-    boolean processSyncObject_ver1(json::CJSONEntry oJsonObject, int nSrcID);//throws Exception
-    void processServerData_Ver1(json::CJSONArrayIterator& oJsonArr);
+    void processServerResponse_ver3(json::CJSONArrayIterator& oJsonArr);
+    void processServerCmd_Ver3(const String& strCmd, const String& strObject, const String& strAttrib, const String& strValue);//throws Exception
 
-    void setSyncServerDataPass(ESyncServerDataPass ePass){m_eSyncServerDataPass = ePass;}
-    boolean isDeleteObjectsPass(){ return m_eSyncServerDataPass == edpDeleteObjects; }
+    String makeFileName(const CAttrValue& value);//throws Exception
+    boolean downloadBlob(CAttrValue& value);//throws Exception
+    boolean processBlob( const String& strCmd, const String& strObject, CAttrValue& oAttrValue );
 
-    VectorPtr<CSyncBlob*>& getSyncBlobs(){ return m_arSyncBlobs; }
-    void syncClientBlobs(const String& strBaseQuery);
+    void setRefreshTime( int nRefreshTime ){ m_nRefreshTime = nRefreshTime;}
 
-    String makeFileName(const CValue& value);//throws Exception
-    boolean downloadBlob(CValue& value);//throws Exception
+    db::CDBAdapter& getDB(){ return m_dbAdapter; }
 
-    void setRefreshTime( int nRefreshTime ){ m_nRefreshTime = nRefreshTime;}
-    void setUrlParams(String strParams){m_strUrlParams=strParams;}
-    void setUrl(String strUrl){m_strUrl=strUrl;}
+    void processSyncCommand(const String& strCmd, json::CJSONEntry oCmdEntry);
+
+    void processServerCmd_Ver3_Schema(const String& strCmd, const String& strObject, json::CJSONStructIterator& attrIter);//throws Exception
+
+    void parseLinks(const String& strLinks);
+    void processLinks(const String& strOldObject, const String& strNewObject);
+    void updateLink(const String& strOldObject, const String& strNewObject, const String& strAttrib);
 private:
     CSyncEngine& getSync(){ return m_syncEngine; }
     CSyncNotify& getNotify();
-    db::CDBAdapter& getDB();
     net::INetRequest& getNet();
+    ISyncProtocol& getProtocol();
 
 };
 

data/platform/shared/sync/SyncThread.cpp

@@ -1,6 +1,7 @@
 #include "SyncThread.h"
 #include "common/RhoTime.h"
 #include "common/RhoConf.h"
+#include "common/RhoFilePath.h"
 
 #include "ruby/ext/rho/rhoruby.h"
 
@@ -8,10 +9,10 @@ namespace rho {
 namespace sync {
 
 using namespace rho::common;
+using namespace rho::db;
 
 IMPLEMENT_LOGCLASS(CSyncThread,"Sync");
 CSyncThread* CSyncThread::m_pInstance = 0;
-db::CDBAdapter  CSyncThread::m_oDBAdapter;
 
 /*static*/ CSyncThread* CSyncThread::Create(common::IRhoClassFactory* factory)
 {
@@ -30,7 +31,7 @@ db::CDBAdapter  CSyncThread::m_oDBAdapter;
     m_pInstance = 0;
 }
 
-CSyncThread::CSyncThread(common::IRhoClassFactory* factory) : CRhoThread(factory), m_oSyncEngine(m_oDBAdapter)
+CSyncThread::CSyncThread(common::IRhoClassFactory* factory) : CRhoThread(factory)
 {
     m_nPollInterval = SYNC_POLL_INTERVAL_SECONDS;
     if( RHOCONF().isExist("sync_poll_interval") )
@@ -40,7 +41,8 @@ CSyncThread::CSyncThread(common::IRhoClassFactory* factory) : CRhoThread(factory
 
     m_oSyncEngine.setFactory(factory);
 
-    start(epLow);
+    if ( RHOCONF().getString("syncserver").length() > 0 )
+        start(epLow);
 }
 
 CSyncThread::~CSyncThread(void)
@@ -48,13 +50,17 @@ CSyncThread::~CSyncThread(void)
     m_oSyncEngine.exitSync();
     stop(SYNC_WAIT_BEFOREKILL_SECONDS);
 
-    getDBAdapter().close();
+    db::CDBAdapter::closeAll();
 
     LOG(INFO) + "Sync engine thread shutdown";
 }
 
 void CSyncThread::addSyncCommand(CSyncCommand* pSyncCmd)
 { 
+    if ( RHOCONF().getString("syncserver").length() == 0 )
+        return;
+
+   	LOG(INFO) + "addSyncCommand: " + (*pSyncCmd).m_nCmdCode;
 	{
         synchronized(m_mxStackCommands);
 
@@ -82,7 +88,7 @@ int CSyncThread::getLastSyncInterval()
 {
     uint64 nowTime = CLocalTime().toULong();
 	
-    DBResult( res, m_oSyncEngine.getDB().executeSQL("SELECT last_updated from sources") );
+    DBResult( res, CDBAdapter::getUserDB().executeSQL("SELECT last_updated from sources") );
     uint64 latestTimeUpdated = 0;
     for ( ; !res.isEnd(); res.next() )
     { 
@@ -178,34 +184,18 @@ void CSyncThread::processCommand(CSyncCommand& oSyncCmd)
         break;
     case scChangePollInterval:
         break;
-    case scSyncOneByUrl:
-        {
-            CSyncEngine::CSourceID oSrcID;
-            oSrcID.m_strUrl = oSyncCmd.m_strCmdParam;
-
-            checkShowStatus(oSyncCmd);
-            m_oSyncEngine.doSyncSource(oSrcID,"","",false, -1 );
-        }
-        break;
     case scSyncOne:
         {
-            CSyncEngine::CSourceID oSrcID;
-            oSrcID.m_nID = oSyncCmd.m_nCmdParam;
-            oSrcID.m_strName = oSyncCmd.m_strCmdParam;
-
-            checkShowStatus(oSyncCmd);
-            m_oSyncEngine.doSyncSource(oSrcID,"","",false, -1 );
+			checkShowStatus(oSyncCmd);
+            m_oSyncEngine.doSyncSource(CSyncEngine::CSourceID(oSyncCmd.m_nCmdParam,oSyncCmd.m_strCmdParam));
         }
         break;
     case scSearchOne:
         {
-            CSyncEngine::CSourceID oSrcID;
-            oSrcID.m_nID = oSyncCmd.m_nCmdParam;
-
-            checkShowStatus(oSyncCmd);
-            m_oSyncEngine.doSyncSource(oSrcID,oSyncCmd.m_strCmdParam, 
+			checkShowStatus(oSyncCmd);
+            m_oSyncEngine.doSearch( ((CSyncSearchCommand&)oSyncCmd).m_arSources, oSyncCmd.m_strCmdParam, 
                 ((CSyncSearchCommand&)oSyncCmd).m_strFrom, ((CSyncSearchCommand&)oSyncCmd).m_bSyncChanges,
-                ((CSyncSearchCommand&)oSyncCmd).m_nProgressStep);
+                oSyncCmd.m_nCmdParam);
         }
         break;
     case scLogin:
@@ -234,6 +224,7 @@ void CSyncThread::setPollInterval(int nInterval)
 extern "C" {
 
 using namespace rho::sync;
+using namespace rho::db;
 void rho_sync_destroy()
 {
 	CSyncThread::Destroy();
@@ -256,25 +247,49 @@ void rho_sync_stop()
 	if (CSyncThread::getSyncEngine().isSyncing() )
 	{
 		CSyncThread::getSyncEngine().stopSyncByUser();
-//		while( CSyncThread::getSyncEngine().getState() != CSyncEngine::esNone )
-        while( CSyncThread::getDBAdapter().isInsideTransaction() )
+        CSyncThread::getInstance()->stopWait();
+
+        while( CDBAdapter::isAnyInsideTransaction() )
 			CSyncThread::getInstance()->sleep(100);
 	}
 }
 
-void rho_sync_doSearchSource(int source_id, const char *from, const char *params, bool sync_changes, int nProgressStep, 
+extern "C" void
+source_iter(const char* szName, void* parSources)
+{
+    rho::Vector<rho::String>& arSources = *((rho::Vector<rho::String>*)(parSources));
+    arSources.addElement(szName);
+}
+
+void rho_sync_doSearch(unsigned long ar_sources, const char *from, const char *params, bool sync_changes, int nProgressStep, 
     const char* callback, const char* callback_params)
 {
     rho_sync_stop();
     if ( callback && *callback )
-        CSyncThread::getSyncEngine().getNotify().setSearchNotification(source_id, callback, callback_params ? callback_params : "");
+        CSyncThread::getSyncEngine().getNotify().setSearchNotification( callback, callback_params ? callback_params : "");
+
+    rho::Vector<rho::String> arSources;
+    rho_ruby_enum_strary(ar_sources, source_iter, &arSources);
 
-    CSyncThread::getInstance()->addSyncCommand(new CSyncThread::CSyncSearchCommand(from,params,source_id,sync_changes,nProgressStep) );
+    CSyncThread::getInstance()->addSyncCommand(new CSyncThread::CSyncSearchCommand(from,params,arSources,sync_changes,nProgressStep) );
 }	
 
 void rho_sync_doSyncSourceByUrl(const char* szSrcUrl)
 {
-    CSyncThread::getInstance()->addSyncCommand(new CSyncThread::CSyncCommand(CSyncThread::scSyncOneByUrl, szSrcUrl, false) );
+    const char* szLastSlash = strrchr(szSrcUrl, '\\');
+    if ( !szLastSlash )
+        szLastSlash = strrchr(szSrcUrl, '/');
+
+    const char* szQuest = strrchr(szSrcUrl, '?');
+
+    rho::String strName = "";
+    if (szQuest && szLastSlash)
+        strName = rho::String(szLastSlash+1, szQuest-szLastSlash-1);
+    else
+        strName = szLastSlash ? szLastSlash + 1 : szSrcUrl;
+
+    //TODO: save query params
+    CSyncThread::getInstance()->addSyncCommand(new CSyncThread::CSyncCommand(CSyncThread::scSyncOne, strName, (int)0, false ) );
 }	
 
 void rho_sync_set_pollinterval(int nInterval)
@@ -295,13 +310,15 @@ void rho_sync_login(const char *name, const char *password, const char* callback
 
 int rho_sync_logged_in()
 {
-    int nRes = CSyncThread::getSyncEngine().isLoggedIn() ? 1 : 0;
-	return nRes;
+	CDBAdapter& db = CDBAdapter::getUserDB();
+    return CSyncThread::getSyncEngine().isLoggedIn() ? 1 : 0;
 }
 
 void rho_sync_logout()
 {
     rho_sync_stop();
+
+	CDBAdapter& db = CDBAdapter::getUserDB();
     CSyncThread::getSyncEngine().logout();
 }
 
@@ -315,85 +332,24 @@ void rho_sync_clear_notification(int source_id)
     return CSyncThread::getSyncEngine().getNotify().clearSyncNotification(source_id);
 }
 
-void rho_sync_set_initial_notification(const char *url, char* params)
-{
-    return CSyncThread::getSyncEngine().getNotify().setInitialSyncNotification(url, params ? params : "");
-}
-
-void rho_sync_clear_initial_notification()
-{
-    return CSyncThread::getSyncEngine().getNotify().clearInitialSyncNotification();
-}
-
-int rho_sync_openDB(const char* szDBPath)
-{
-    rho::db::CDBAdapter& db = CSyncThread::getDBAdapter();
-    rho::String strVer = RhoRuby_getRhoDBVersion(); 
-    db.open(szDBPath,strVer, false);
-    return 0;
-}
-
-int rho_sync_closeDB()
-{
-    CSyncThread::getDBAdapter().close();
-    return 0;
-}
-
-int rho_db_startUITransaction()
-{
-    rho::db::CDBAdapter& db = rho::sync::CSyncThread::getDBAdapter();
-    db.startTransaction();
-
-    //TODO: get error code from DBException
-    return 0;
-}
-
-int rho_db_is_ui_waitfordb()
-{
-    rho::db::CDBAdapter& db = rho::sync::CSyncThread::getDBAdapter();
-    return db.isUIWaitDB() ? 1 :0;
-}
-
-int rho_db_commitUITransaction()
-{
-    CSyncThread::getDBAdapter().endTransaction();
-    //TODO: get error code from DBException
-    return 0;
-}
-
-int rho_db_rollbackUITransaction()
-{
-    CSyncThread::getDBAdapter().rollback();
-    //TODO: get error code from DBException
-    return 0;
-}
-
-int rho_db_destroy_table(const char* szTableName)
-{
-    CSyncThread::getDBAdapter().destroy_table(szTableName);
-    return 0;
-}
-
-void* rho_db_get_handle()
+void rho_sync_set_bulk_notification(const char *url, char* params)
 {
-    return CSyncThread::getDBAdapter().getDbHandle();
+    return CSyncThread::getSyncEngine().getNotify().setBulkSyncNotification(url, params ? params : "");
 }
 
-unsigned long rho_sync_get_attrs(int nSrcID)
+void rho_sync_clear_bulk_notification()
 {
-    return (VALUE)CSyncThread::getDBAdapter().getAttrMgr().getAttrsBySrc(nSrcID);
+    return CSyncThread::getSyncEngine().getNotify().clearBulkSyncNotification();
 }
 
-void rho_sync_lock()
+unsigned long rho_sync_get_attrs(const char* szPartition, int nSrcID)
 {
-    rho::db::CDBAdapter& db = rho::sync::CSyncThread::getDBAdapter();
-    db.Lock();
+    return (VALUE)CDBAdapter::getDB(szPartition).getAttrMgr().getAttrsBySrc(nSrcID);
 }
 
-void rho_sync_unlock()
+unsigned long rho_sync_is_blob_attr(const char* szPartition, int nSrcID, const char* szAttrName)
 {
-    rho::db::CDBAdapter& db = rho::sync::CSyncThread::getDBAdapter();
-    db.Unlock();
+    return rho_ruby_create_boolean( CDBAdapter::getDB(szPartition).getAttrMgr().isBlobAttr(nSrcID, szAttrName) );
 }
 
 void rho_sync_setobjectnotify_url(const char* szUrl)