[exo-jcr-commits] exo-jcr SVN: r4750 - in jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr: storage and 1 other directory.

[do-not-reply at jboss.org]

Author: nzamosenchuk
Date: 2011-08-12 04:11:55 -0400 (Fri, 12 Aug 2011)
New Revision: 4750

Modified:
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionFactory.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionImpl.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/storage/WorkspaceDataContainer.java
Log:
EXOJCR-267 : (partial commit)
Changed minimal page size and warning policy

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionFactory.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionFactory.java	2011-08-12 07:48:51 UTC (rev 4749)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionFactory.java	2011-08-12 08:11:55 UTC (rev 4750)
@@ -24,6 +24,7 @@
 import org.exoplatform.services.jcr.access.DynamicIdentity;
 import org.exoplatform.services.jcr.config.WorkspaceEntry;
 import org.exoplatform.services.jcr.core.security.JCRRuntimePermissions;
+import org.exoplatform.services.jcr.storage.WorkspaceDataContainer;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 import org.exoplatform.services.security.ConversationState;
@@ -93,6 +94,13 @@
             LOG.error(e.getLocalizedMessage(), e);
          }
       }
+
+      if (config.getContainer().getParameterInteger(WorkspaceDataContainer.LAZY_NODE_ITERATOR_PAGE_SIZE,
+         WorkspaceDataContainer.LAZY_NODE_ITERATOR_PAGE_SIZE_DEFAULT) < WorkspaceDataContainer.LAZY_NODE_ITERATOR_PAGE_SIZE_MIN)
+      {
+         LOG.warn("Value for \"lazy-node-iterator-page-size\" is too small. Using allowed minimum page size : "
+            + WorkspaceDataContainer.LAZY_NODE_ITERATOR_PAGE_SIZE_MIN + ".");
+      }
    }
 
    /**
@@ -111,7 +119,7 @@
          if (security != null)
          {
             security.checkPermission(JCRRuntimePermissions.CREATE_SYSTEM_SESSION_PERMISSION);
-         }         
+         }
       }
       else if (DynamicIdentity.DYNAMIC.equals(user.getIdentity().getUserId()))
       {

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionImpl.java	2011-08-12 07:48:51 UTC (rev 4749)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionImpl.java	2011-08-12 08:11:55 UTC (rev 4750)
@@ -260,9 +260,6 @@
       if (this.lazyNodeIteatorPageSize < WorkspaceDataContainer.LAZY_NODE_ITERATOR_PAGE_SIZE_MIN)
       {
          this.lazyNodeIteatorPageSize = WorkspaceDataContainer.LAZY_NODE_ITERATOR_PAGE_SIZE_MIN;
-         log.warn("Value for \"lazy-node-iterator-page-size\" is too small. Allowed minimum page size is "
-            + WorkspaceDataContainer.LAZY_NODE_ITERATOR_PAGE_SIZE_MIN + ". Using required value: "
-            + WorkspaceDataContainer.LAZY_NODE_ITERATOR_PAGE_SIZE_MIN + ".");
       }
    }
 

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/storage/WorkspaceDataContainer.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/storage/WorkspaceDataContainer.java	2011-08-12 07:48:51 UTC (rev 4749)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/storage/WorkspaceDataContainer.java	2011-08-12 08:11:55 UTC (rev 4750)
@@ -46,7 +46,7 @@
 
    public static final int LAZY_NODE_ITERATOR_PAGE_SIZE_DEFAULT = 100;
 
-   public static final int LAZY_NODE_ITERATOR_PAGE_SIZE_MIN = 75;
+   public static final int LAZY_NODE_ITERATOR_PAGE_SIZE_MIN = 20;
 
    public final static String CONTAINER_NAME = "containerName";