Changeset 12932

Timestamp:

03/02/09 16:02:44 (3 years ago)

Author:

sys

Message:

Amélioration gestion events d'update d'items multi-flux + réduction des appels aux refresh pour checker les modifs externes.

Location:

trunk/Jav_BDP_FS/com/scenari/m/bdp/item/fs

Files:

• HContentAccessFs.java (modified) (6 diffs)
• XItemCache.java (modified) (8 diffs)
• XItemCacheData.java (modified) (1 diff)

trunk/Jav_BDP_FS/com/scenari/m/bdp/item/fs/HContentAccessFs.java

@@ -50 +50 @@
 import java.util.List;
 
+import com.scenari.m.bdp.context.ContextBdp;
 import com.scenari.m.bdp.item.IHItemDef;
 import com.scenari.m.bdp.item.fs.TransfCacheMgr.CacheDef;
@@ -70 +71 @@
 import com.scenari.src.feature.paths.SrcFeaturePaths;
 import com.scenari.src.feature.random.SrcFeatureRandom;
-import com.scenari.src.feature.refresh.SrcFeatureRefresh;
 import com.scenari.src.feature.rights.SrcFeatureRights;
 import com.scenari.src.fs.mini.FsMiniFactory;
@@ -158 +158 @@
                 if (vItem == null) { return null; }
                 ISrcNode vItemSrc = vItem.getSource();
-                // vItem.hRefresh();
                 if (pTransforms == null) {
                         ISrcNode vSource;
@@ -431 +430 @@
 
                 if (vSource != vItemSource) {
-                        //Si on a modifié une ressource dans l'item, on force un refresh de l'item. 
-                        SrcFeatureRefresh.refresh(vItemSource);
+                        //Si on a modifié une ressource dans l'item, on force un recalcul de l'item. 
+                        vItem.reloadAfterUpdate(ContextBdp.getThreadClient());
                 }
         }
@@ -472 +471 @@
         public final int hDeleteRes(IHItemDef pItemDef, String pFormat, String pUriRes, IHTransaction pTransaction) throws Exception {
                 XItemCache vItem = xGetItemCache(pItemDef);
-                // vItem.hRefresh();
                 if (vItem == null) { return 0; }
                 ISrcNode vItemSrc = vItem.getSource();
@@ -483 +481 @@
                 int vResult = vContent.removeSrc() ? 1 : 0;
                 if (vItemSrc != vContent) {
-                        //Si on a modifié une ressource dans l'item, on force un refresh de l'item. 
-                        SrcFeatureRefresh.refresh(vItemSrc);
+                        //Si on a modifié une ressource dans l'item, on force un recalcul de l'item. 
+                        vItem.reloadAfterUpdate(ContextBdp.getThreadClient());
                 }
                 return vResult;

trunk/Jav_BDP_FS/com/scenari/m/bdp/item/fs/XItemCache.java

@@ -79 +79 @@
 public class XItemCache {
 
+        public static long sElapseBetweenRefresh = 1500;
+
         /**
          * AttrLink.
@@ -648 +650 @@
         public void hRefresh() throws Exception {
                 XItemCacheData vDatas = getDatas();
+                if (vDatas.fLastRefresh > 0 && vDatas.fLastRefresh >= System.currentTimeMillis() - sElapseBetweenRefresh) {
+                        //Dernier refresh très récent, pas d'écriture entre temps, on passe.
+                        //System.out.print('.');
+                        return;
+                }
                 ISrcNode vSrc = vDatas.getWspSrcNodeItem().getSubSrcNode();
                 if (fStatusItem == IHItem.STATUS_UNKNOWN) {
-                        xLoadItemFromSource(fStatusItem != IHItem.STATUS_UNKNOWN, vSrc, vSrc.getLastModifWithChildren());
+                        xLoadItemFromSource(false, vSrc, vSrc.getLastModifWithChildren(), IContextBdp.CLIENTID_NONE);
                 } else {
                         SrcFeatureRefresh.refresh(vSrc);
                         long vLastUpdt = vSrc.getLastModifWithChildren();
                         if (vLastUpdt != fMemLastModif) {
-                                xLoadItemFromSource(fStatusItem != IHItem.STATUS_UNKNOWN, vSrc, vLastUpdt);
-                        }
-                }
+                                xLoadItemFromSource(true, vSrc, vLastUpdt, IContextBdp.CLIENTID_NONE);
+                        }
+                }
+                vDatas.fLastRefresh = System.currentTimeMillis();
+        }
+
+        /**
+         * Rafraichit cet item si la source a été modifiée (cas des itesm multi-flux).
+         */
+        public void reloadAfterUpdate(int pClientId) throws Exception {
+                XItemCacheData vDatas = getDatas();
+                ISrcNode vSrc = vDatas.getWspSrcNodeItem().getSubSrcNode();
+                SrcFeatureRefresh.refresh(vSrc);
+                long vLastUpdt = vSrc.getLastModifWithChildren();
+                xLoadItemFromSource(true, vSrc, vLastUpdt, pClientId);
+                vDatas.fLastRefresh = System.currentTimeMillis();
         }
 
@@ -823 +843 @@
         public void hCommit() throws Exception {
                 XItemCacheData vItemData = getDatas();
+                vItemData.fLastRefresh = System.currentTimeMillis();
                 fMemLastModif = vItemData.getWspSrcNodeItem().getSubSrcNode().getLastModifWithChildren();
         }
@@ -916 +937 @@
                 if (vSrc == null) return;
                 long vLastModif = vSrc.getLastModifWithChildren();
-                xLoadItemFromSource(pFireEventUpdated, vSrc, vLastModif);
+                xLoadItemFromSource(pFireEventUpdated, vSrc, vLastModif, IContextBdp.CLIENTID_NONE);
+                vDatas.fLastRefresh = System.currentTimeMillis();
         }
 
@@ -926 +948 @@
          *            (et pas une découverte ou un chargement initial).
          */
-        protected void xLoadItemFromSource(boolean pFireEventUpdated, ISrcNode pSrc, long pLastModif) throws Exception {
+        protected void xLoadItemFromSource(boolean pFireEventUpdated, ISrcNode pSrc, long pLastModif, int pClientId) throws Exception {
                 boolean vFireEventUpdated = pFireEventUpdated || fWsp.fFireDiscoveredItems;
                 int vStatus = pSrc.getContentStatus();
@@ -932 +954 @@
                 if (vStatus <= ISrcNode.STATUS_NONE) {
                         //L'item est supprimé
-                        hRemove(vFireEventUpdated, IContextBdp.CLIENTID_NONE);
+                        hRemove(vFireEventUpdated, pClientId);
                         if (vStatus == ISrcNode.STATUS_CONFLICT) {
                                 fStatusItem = IHItemDef.STATUS_CONFLICT;
@@ -948 +970 @@
                                         IHModuleSave vModuleSave = vItemType.hGetModuleSave();
                                         IHItem vNewItem = vModuleSave.hFillItem(vCurrent, null, vStream, null);
-                                        hSaveInCache(vNewItem, vFireEventUpdated, IContextBdp.CLIENTID_NONE);
+                                        hSaveInCache(vNewItem, vFireEventUpdated, pClientId);
                                 } else {
                                         fStatusItem = IHItem.STATUS_ERRORS;
-                                        if (vFireEventUpdated) fWsp.xFireEventItemRemoved(this, null, IContextBdp.CLIENTID_NONE);
+                                        if (vFireEventUpdated) fWsp.xFireEventItemRemoved(this, null, pClientId);
                                         xValidPointers(vFireEventUpdated);
                                 }
@@ -957 +979 @@
                                 HLogMgr.hPublishException(e, "Echec au traitement d'un item : " + hGetSpace() + "/" + hGetCode(), IHLogMessage.TYPE_WARNING);
                                 fStatusItem = IHItem.STATUS_ERRORS;
-                                if (vFireEventUpdated) fWsp.xFireEventItemRemoved(this, null, IContextBdp.CLIENTID_NONE);
+                                if (vFireEventUpdated) fWsp.xFireEventItemRemoved(this, null, pClientId);
                                 xValidPointers(vFireEventUpdated);
                         } finally {

trunk/Jav_BDP_FS/com/scenari/m/bdp/item/fs/XItemCacheData.java

@@ -69 +69 @@
         /** Dom en cache. */
         protected Document fDom = null;
+
+        protected long fLastRefresh = -1L;
 
         public XItemCacheData(XItemCache pItemCache, ISrcNode pSource) {