LPS-27274 Remove unneccessary joins

mhan810 · May 14, 2012 · 4b12ec6 · 4b12ec6
1 parent 0a9a3c2
commit 4b12ec6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 26 deletions.
diff --git a/...l-impl/src/com/liferay/portlet/messageboards/service/persistence/MBMessageFinderImpl.java b/...l-impl/src/com/liferay/portlet/messageboards/service/persistence/MBMessageFinderImpl.java
@@ -227,8 +227,8 @@ protected int doCountByG_U_C_S(
 
 			if (inlineSQLHelper) {
 				sql = InlineSQLHelperUtil.replacePermissionCheck(
-					sql, MBMessage.class.getName(), "rootMessage.messageId",
-					groupId);
+					sql, MBMessage.class.getName(),
+					"currentMessage.rootMessageId", groupId);
 			}
 
 			SQLQuery q = session.createSQLQuery(sql);
@@ -299,8 +299,8 @@ protected int doCountByG_U_C_A_S(
 
 			if (inlineSQLHelper) {
 				sql = InlineSQLHelperUtil.replacePermissionCheck(
-					sql, MBMessage.class.getName(), "rootMessage.messageId",
-					groupId);
+					sql, MBMessage.class.getName(),
+					"currentMessage.rootMessageId", groupId);
 			}
 
 			SQLQuery q = session.createSQLQuery(sql);
@@ -373,8 +373,8 @@ protected List<Long> doFindByG_U_C_S(
 
 			if (inlineSQLHelper) {
 				sql = InlineSQLHelperUtil.replacePermissionCheck(
-					sql, MBMessage.class.getName(), "rootMessage.messageId",
-					groupId);
+					sql, MBMessage.class.getName(),
+					"currentMessage.rootMessageId", groupId);
 			}
 
 			SQLQuery q = session.createSQLQuery(sql);
@@ -435,8 +435,8 @@ protected List<Long> doFindByG_U_C_A_S(
 
 			if (inlineSQLHelper) {
 				sql = InlineSQLHelperUtil.replacePermissionCheck(
-					sql, MBMessage.class.getName(), "rootMessage.messageId",
-					groupId);
+					sql, MBMessage.class.getName(),
+					"currentMessage.rootMessageId", groupId);
 			}
 
 			SQLQuery q = session.createSQLQuery(sql);

diff --git a/portal-impl/src/custom-sql/messageboards.xml b/portal-impl/src/custom-sql/messageboards.xml
@@ -51,12 +51,9 @@
 	<sql id="com.liferay.portlet.messageboards.service.persistence.MBMessageFinder.countByG_U_C_S">
 		<![CDATA[
 			SELECT
-				COUNT(DISTINCT currentMessage.threadId) AS COUNT_VALUE
+				COUNT(DISTINCT currentMessage.rootMessageId) AS COUNT_VALUE
 			FROM
 				MBMessage currentMessage
-			INNER JOIN
-				MBMessage rootMessage ON
-					(rootMessage.messageId = currentMessage.rootMessageId)
 			WHERE
 				(currentMessage.groupId = ?) AND
 				(currentMessage.categoryId = ?) AND
@@ -66,12 +63,9 @@
 	<sql id="com.liferay.portlet.messageboards.service.persistence.MBMessageFinder.countByG_U_C_A_S">
 		<![CDATA[
 			SELECT
-				COUNT(DISTINCT currentMessage.threadId) AS COUNT_VALUE
+				COUNT(DISTINCT currentMessage.rootMessageId) AS COUNT_VALUE
 			FROM
 				MBMessage currentMessage
-			INNER JOIN
-				MBMessage rootMessage ON
-					(rootMessage.messageId = currentMessage.rootMessageId)
 			WHERE
 				(currentMessage.groupId = ?) AND
 				(currentMessage.categoryId = ?) AND
@@ -100,18 +94,15 @@
 	<sql id="com.liferay.portlet.messageboards.service.persistence.MBMessageFinder.findByG_U_C_S">
 		<![CDATA[
 			SELECT
-				currentMessage.threadId
+				currentMessage.threadId, currentMessage.rootMessageId
 			FROM
 				MBMessage currentMessage
-			INNER JOIN
-				MBMessage rootMessage ON
-					(rootMessage.messageId = currentMessage.rootMessageId)
 			WHERE
 				(currentMessage.groupId = ?) AND
 				(currentMessage.categoryId = ?) AND
 				(currentMessage.userId = ?)
 			GROUP BY
-				currentMessage.threadId
+				currentMessage.rootMessageId
 			ORDER BY
 				MAX(currentMessage.priority) DESC,
 				MAX(currentMessage.modifiedDate) DESC
@@ -120,19 +111,16 @@
 	<sql id="com.liferay.portlet.messageboards.service.persistence.MBMessageFinder.findByG_U_C_A_S">
 		<![CDATA[
 			SELECT
-				currentMessage.threadId
+				currentMessage.threadId, currentMessage.rootMessageId
 			FROM
 				MBMessage currentMessage
-			INNER JOIN
-				MBMessage rootMessage ON
-					(rootMessage.messageId = currentMessage.rootMessageId)
 			WHERE
 				(currentMessage.groupId = ?) AND
 				(currentMessage.categoryId = ?) AND
 				(currentMessage.userId = ?) AND
 				(currentMessage.anonymous = ?)
 			GROUP BY
-				currentMessage.threadId
+				currentMessage.rootMessageId
 			ORDER BY
 				MAX(currentMessage.priority) DESC,
 				MAX(currentMessage.modifiedDate) DESC