From d3d687797f27aad62fa51a4d72d1169b06bdae32 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Thu, 18 Sep 2014 17:26:23 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 84121: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) 82508: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) 82319: Merged DEV to V4.1-BUG-FIX (4.1.10) 81073 : MNT-9532 : SQL performance issue - WHERE ... IS NULL statements - Initial commit to revert fixes for MNT-8527 (r48757) and MNT-9483 (r56137) as this fixes causes performance issue for Oracle. 81966 : MNT-9532 : SQL performance issue - WHERE ... IS NULL statements - Default value for feed_user_id and site_network is now @@NULL@@. - IS NULL clause was completly removed from activities queries. - Upgrade sql script was added to replace nulls for Oracle (empty strings for other dialect) with @@NULL@@. - Version schema was incremented by 1. 82278 : MNT-9532 : SQL performance issue - WHERE ... IS NULL statements - Fixed unit test failure. 83431: MNT-9532 : SQL performance issue - WHERE ... IS NULL statements - Fixed build failure 84115: MNT-9532/MNT-11871: with the revert of MNT-11871 patch, MNT-9532 should be using a lower schema number. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84632 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../activities/SiteActivitySystemTest.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/source/test-java/org/alfresco/repo/web/scripts/activities/SiteActivitySystemTest.java b/source/test-java/org/alfresco/repo/web/scripts/activities/SiteActivitySystemTest.java index ae6eacfa79..dd3426abf0 100644 --- a/source/test-java/org/alfresco/repo/web/scripts/activities/SiteActivitySystemTest.java +++ b/source/test-java/org/alfresco/repo/web/scripts/activities/SiteActivitySystemTest.java @@ -531,21 +531,21 @@ public class SiteActivitySystemTest extends TestCase // site 2, with 4 users, each with 1 join, 1 role change = 4x2 = 8 // site 3, with 3 users, each with 1 join, 1 role change = 3x2 = 6 - // user 1 belongs to 3 sites = (2x8)+(1x6) = 22 - // user 2 belongs to 3 sites = (2x8)+(1x6) = 22 - // user 3 belongs to 3 sites = (2x8)+(1x6) = 22 - // user 4 belongs to 2 sites = (2x8) = 16 + // user 1 belongs to 3 sites = (2x9)+(1x7) = 25 + // user 2 belongs to 3 sites = (2x9)+(1x7) = 25 + // user 3 belongs to 3 sites = (2x9)+(1x7) = 25 + // user 4 belongs to 2 sites = (2x9) = 18 - getUserFeed(user1, ticket, true, 14); // 14 = (22 - 8) due to feed control - exclude site 1 + getUserFeed(user1, ticket, true, 16); // 16 = (25 - 9) due to feed control - exclude site 1 getUserFeed(user2, ticket, true, 0); // 0 = due to feed control - exclude site membership activities (across all sites) - getUserFeed(user3, ticket, true, 14); // 14 = (22 - 8) due to feed control - exclude site membership activities for site 1 - getUserFeed(user4, ticket, true, 16); // 16 = no feed control + getUserFeed(user3, ticket, true, 16); // 16 = (25 - 9) due to feed control - exclude site membership activities for site 1 + getUserFeed(user4, ticket, true, 18); // 18 = no feed control // as user1 ticket = callLoginWebScript(WEBSCRIPT_ENDPOINT, user1, USER_PW); - getUserFeed(user1, ticket, false, 14); + getUserFeed(user1, ticket, false, 16); // as user2 @@ -553,7 +553,7 @@ public class SiteActivitySystemTest extends TestCase try { - getUserFeed(user1, ticket, true, 14); + getUserFeed(user1, ticket, true, 16); fail("User feed should only be accessible to user or an admin"); } @@ -567,12 +567,12 @@ public class SiteActivitySystemTest extends TestCase ticket = callLoginWebScript(WEBSCRIPT_ENDPOINT, user1, USER_PW); getUserFeed(null, site1, ticket, false, false, false, 0); - getUserFeed(null, site2, ticket, false, false, false, 8); - getUserFeed(null, site3, ticket, false, false, false, 6); + getUserFeed(null, site2, ticket, false, false, false, 9); + getUserFeed(null, site3, ticket, false, false, false, 7); - getUserFeed(null, null, ticket, false, false, false, 14); // no filter + getUserFeed(null, null, ticket, false, false, false, 16); // no filter getUserFeed(null, null, ticket, false, true, false, 12); // exclude any from user1 - getUserFeed(null, null, ticket, false, false, true, 2); // exclude all except user1 + getUserFeed(null, null, ticket, false, false, true, 4); // exclude all except user1 getUserFeed(null, null, ticket, false, true, true, 0); // exclude all (NOOP) // TODO - add more (eg. other non-admin user activities)