inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.2 to HEAD

Browse Source 
16030: Merged V3.1 to V3.2
        16001: Merged V2.2 to V3.1
            15999: Temp build/test (AVM permissions - testSimpleInternalLayer)
    16223: WCM UI - simple perf improvement when displaying modified list (lock icon)
    16472: Merged V3.1 to V3.2
        16180: ETHREEOH-2821 - fix deployment of WCM layered (ie. across web project) file
        16188: WCM - minor: display (localisable) "File" text (follow-on fix for r15970)
        16255: WCM - ETHREEOH-2836
        16257: AVM - minor updates to unit tests
        16275: WCM - ETHREEOH-2844
        16277: WCM - ETHREEOH-2829 - added simple unit test
        16341: AVM - minor update to reuse core (path) utils
        16344: Merged V2.2 to V3.1
            16323: Fix ETWOTWO-1266 (unexpected AVM conflict)
        16457: Fix ETHREEOH-2836 (WCM layered files) - follow-on fix, with additional unit test
    16649: Fix ETHREEOH-1878 - configure WCM locking for CIFS/FTP
    16654: Merged V3.1 to V3.2
        16507: Fix ETHREEOH-2604 - update unsecured-public-services-security-context.xml.sample (to allow server to start)
        16527: Fix ETHREEOH-2868 - can't submit removal of WCM layered file (Older version prevents update)
        16607: AVM - additional tests when deleting LD + fix to avoid cycle
        16612: AVM - console improvement (lsver, rmvers) to enable admin/support to list & purge snapshots between dates
        16638: Fix ETHREEOH-2893 - stale WCM/AVM layered dir
        16643: AVM - console improvement (setopacity) -> eg. to set stale/modifed WCM layered folder as opaque


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16895 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2009-10-14 09:20:15 +00:00
parent 51e37ecf1a
commit e096d59076
30 changed files with 2414 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/java/org/alfresco/repo/avm/AVMDiffPerformanceTest.java
View File

@@ -27,9 +27,6 @@ import java.util.List;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.cmr.avmsync.AVMDifference;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.search.ResultSet;
import org.alfresco.service.cmr.search.SearchService;
import org.alfresco.util.GUID;
public class AVMDiffPerformanceTest extends AVMServiceTestBase
@@ -69,39 +66,45 @@ public class AVMDiffPerformanceTest extends AVMServiceTestBase
fService.createDirectory("StagingArea:/www", "test");
fService.createLayeredDirectory("StagingArea:/www", "SandBox:/", "www");
long start = System.nanoTime();
for(int i = 0; i < cnt; i++)
{
String name = GUID.generate();
fService.createFile("SandBox:/www", name).close();
}
System.out.println("Create SandBox:/www");
long end = System.nanoTime();
System.out.println("Create SandBox:/www in "+( (end-start)/1000000000.0f));
start = System.nanoTime();
for(int i = 0; i < cnt; i++)
{
String name = GUID.generate();
fService.createFile("SandBox:/www/test", name).close();
}
System.out.println("Create SandBox:/www/test");
end = System.nanoTime();
System.out.println("Create SandBox:/www/test in "+( (end-start)/1000000000.0f));
start = System.nanoTime();
for(int i = 0; i < cnt; i++)
{
String name = GUID.generate();
fService.createFile("StagingArea:/www", name).close();
}
System.out.println("Create StagingArea:/www");
end = System.nanoTime();
System.out.println("Create StagingArea:/www in "+( (end-start)/1000000000.0f));
start = System.nanoTime();
for(int i = 0; i < cnt; i++)
{
String name = GUID.generate();
fService.createFile("StagingArea:/www/test", name).close();
}
System.out.println("Create StagingArea:/www/test");
end = System.nanoTime();
System.out.println("Create StagingArea:/www/test in "+( (end-start)/1000000000.0f));
long start = System.nanoTime();
start = System.nanoTime();
List<AVMDifference> diffs = fSyncService.compare(-1, "SandBox:/www", -1, "StagingArea:/www", null);
long end = System.nanoTime();
end = System.nanoTime();
System.out.println("Diff in "+( (end-start)/1000000000.0f));
assertEquals(cnt*2, diffs.size());
@@ -115,4 +118,4 @@ public class AVMDiffPerformanceTest extends AVMServiceTestBase
}});
}
}
}