Merge pull request #22638 from owncloud/comments-db-indexes

add index definitions for comments tables

db_structure.xml

@@ -1541,8 +1541,7 @@
 				<notnull>true</notnull>
 				<length>64</length>
 			</field>
-<!--
-			TODO: finalize indexes when all queries are done
+
 			<index>
 				<name>comments_parent_id_index</name>
 				<unique>false</unique>
@@ -1553,15 +1552,11 @@
 			</index>
 
 			<index>
-				<name>comments_actor_index</name>
+				<name>comments_topmost_parent_id_idx</name>
 				<unique>false</unique>
 				<field>
-					<name>actor_type</name>
-					<sorting>ascending</sorting>
-				</field>
-				<field>
-					<name>actor_id</name>
-					<sorting>ascending</sorting>
+					<name>topmost_parent_id</name>
+					<sorting>descending</sorting>
 				</field>
 			</index>
 
@@ -1581,7 +1576,19 @@
 					<sorting>descending</sorting>
 				</field>
 			</index>
--->
+
+			<index>
+				<name>comments_actor_index</name>
+				<unique>false</unique>
+				<field>
+					<name>actor_type</name>
+					<sorting>ascending</sorting>
+				</field>
+				<field>
+					<name>actor_id</name>
+					<sorting>ascending</sorting>
+				</field>
+			</index>
 
 		</declaration>
 
@@ -1626,6 +1633,36 @@
 				<length>64</length>
 			</field>
 
+			<index>
+				<name>comments_marker_object_index</name>
+				<unique>false</unique>
+				<field>
+					<name>object_type</name>
+					<sorting>ascending</sorting>
+				</field>
+				<field>
+					<name>object_id</name>
+					<sorting>ascending</sorting>
+				</field>
+			</index>
+
+			<index>
+				<name>comments_marker_index</name>
+				<unique>true</unique>
+				<field>
+					<name>user_id</name>
+					<sorting>descending</sorting>
+				</field>
+				<field>
+					<name>object_type</name>
+					<sorting>ascending</sorting>
+				</field>
+				<field>
+					<name>object_id</name>
+					<sorting>ascending</sorting>
+				</field>
+			</index>
+
 		</declaration>
 
 	</table>

version.php

@@ -25,7 +25,7 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version = array(9, 0, 0, 13);
+$OC_Version = array(9, 0, 0, 15);
 
 // The human readable string
 $OC_VersionString = '9.0.0 beta 2';