Skip to content

Commit 9724fcc

Browse files
committed
Merge pull request #22638 from owncloud/comments-db-indexes
add index definitions for comments tables
2 parents 6526c12 + b3ac81f commit 9724fcc

2 files changed

Lines changed: 48 additions & 11 deletions

File tree

db_structure.xml

Lines changed: 47 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1541,8 +1541,7 @@
15411541
<notnull>true</notnull>
15421542
<length>64</length>
15431543
</field>
1544-
<!--
1545-
TODO: finalize indexes when all queries are done
1544+
15461545
<index>
15471546
<name>comments_parent_id_index</name>
15481547
<unique>false</unique>
@@ -1553,15 +1552,11 @@
15531552
</index>
15541553

15551554
<index>
1556-
<name>comments_actor_index</name>
1555+
<name>comments_topmost_parent_id_idx</name>
15571556
<unique>false</unique>
15581557
<field>
1559-
<name>actor_type</name>
1560-
<sorting>ascending</sorting>
1561-
</field>
1562-
<field>
1563-
<name>actor_id</name>
1564-
<sorting>ascending</sorting>
1558+
<name>topmost_parent_id</name>
1559+
<sorting>descending</sorting>
15651560
</field>
15661561
</index>
15671562

@@ -1581,7 +1576,19 @@
15811576
<sorting>descending</sorting>
15821577
</field>
15831578
</index>
1584-
-->
1579+
1580+
<index>
1581+
<name>comments_actor_index</name>
1582+
<unique>false</unique>
1583+
<field>
1584+
<name>actor_type</name>
1585+
<sorting>ascending</sorting>
1586+
</field>
1587+
<field>
1588+
<name>actor_id</name>
1589+
<sorting>ascending</sorting>
1590+
</field>
1591+
</index>
15851592

15861593
</declaration>
15871594

@@ -1626,6 +1633,36 @@
16261633
<length>64</length>
16271634
</field>
16281635

1636+
<index>
1637+
<name>comments_marker_object_index</name>
1638+
<unique>false</unique>
1639+
<field>
1640+
<name>object_type</name>
1641+
<sorting>ascending</sorting>
1642+
</field>
1643+
<field>
1644+
<name>object_id</name>
1645+
<sorting>ascending</sorting>
1646+
</field>
1647+
</index>
1648+
1649+
<index>
1650+
<name>comments_marker_index</name>
1651+
<unique>true</unique>
1652+
<field>
1653+
<name>user_id</name>
1654+
<sorting>descending</sorting>
1655+
</field>
1656+
<field>
1657+
<name>object_type</name>
1658+
<sorting>ascending</sorting>
1659+
</field>
1660+
<field>
1661+
<name>object_id</name>
1662+
<sorting>ascending</sorting>
1663+
</field>
1664+
</index>
1665+
16291666
</declaration>
16301667

16311668
</table>

version.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
2626
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
2727
// when updating major/minor version number.
28-
$OC_Version = array(9, 0, 0, 13);
28+
$OC_Version = array(9, 0, 0, 15);
2929

3030
// The human readable string
3131
$OC_VersionString = '9.0.0 beta 2';

0 commit comments

Comments
 (0)