<table><tr><td style="">dfaure requested changes to this revision.<br />dfaure added a comment.<br />This revision now requires changes to proceed.
</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D10742">View Revision</a></tr></table><br /><div><div><p>Since the goal is to speed up findByUrl, can you add a Q_BENCHMARK for findByUrl?<br />
I do expect it to be faster of course --- a little bit at the expense of the code which modifies items and now has to reinsert them (and that code is hard to benchmark, it's mostly called from async slots...).</p>
<p>Thanks.</p></div></div><br /><div><strong>INLINE COMMENTS</strong><div><div style="margin: 6px 0 12px 0;"><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D10742#inline-73355">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kcoredirlister.cpp:2463</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; "> <span class="n">Q_ASSERT</span><span class="p">(</span><span style="color: #aa2211">!</span><span class="n">item</span><span class="p">.</span><span class="n">isNull</span><span class="p">());</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="p">(<span class="bright"></span></span><span class="bright"></span><span style="color: #aa2211"><span class="bright">*</span></span><span class="n">lstNewItems</span><span class="p">)[</span><span class="n">directoryUrl</span><span class="p">].</span><span class="n">append</span><span class="p">(</span><span class="n">item</span><span class="p">);</span> <span style="color: #74777d">// items not filtered</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="p">(</span><span class="n">lstNewItems</span><span class="p">)[</span><span class="n">directoryUrl</span><span class="p">].</span><span class="n">append</span><span class="p">(</span><span class="n">item</span><span class="p">);</span> <span style="color: #74777d">// items not filtered</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span class="p">}</span> <span style="color: #aa4000">else</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #aa4000">if</span> <span class="p">(</span><span style="color: #aa2211">!</span><span class="n">lstMimeFilteredItems</span><span class="p">)</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="n">lstMimeFilteredItems</span> <span style="color: #aa2211">=</span> <span style="color: #aa4000">new</span> <span class="n">KFileItemList</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="p">}</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">The parenthesis around lstNewItems can be removed now.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D10742#inline-73351">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kcoredirlister.cpp:2476</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="bright"></span><span class="n"><span class="bright">NonMovableFileItemList</span></span><span class="bright"></span><span style="color: #aa2211"><span class="bright">::</span></span><span class="bright"></span><span class="n"><span class="bright">const_iterator</span></span> <span class="n">kit</span> <span style="color: #aa2211">=</span> <span class="n">items</span><span class="p">.</span><span class="n">begin</span><span class="p">();</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #aa4000">const</span> <span class="bright"></span><span class="n"><span class="bright">NonMovableFileItemList</span></span><span class="bright"></span><span style="color: #aa2211"><span class="bright">::</span></span><span class="bright"></span><span class="n"><span class="bright">const_iterator</span></span> <span class="n">kend</span> <span style="color: #aa2211">=</span> <span class="n">items</span><span class="p">.</span><span class="n">end</span><span class="p">();</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="bright"></span><span style="color: #aa4000"><span class="bright">auto</span></span> <span class="n">kit</span> <span style="color: #aa2211">=</span> <span class="n">items</span><span class="p">.<span class="bright"></span></span><span class="bright"></span><span class="n"><span class="bright">c</span>begin</span><span class="p">();</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">const</span> <span class="bright"></span><span style="color: #aa4000"><span class="bright">auto</span></span> <span class="n">kend</span> <span style="color: #aa2211">=</span> <span class="n">items</span><span class="p">.</span><span class="n">end</span><span class="p">();</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span style="color: #aa4000">for</span> <span class="p">(;</span> <span class="n">kit</span> <span style="color: #aa2211">!=</span> <span class="n">kend</span><span class="p">;</span> <span style="color: #aa2211">++</span><span class="n">kit</span><span class="p">)</span> <span class="p">{</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">end() inconsistent with cbegin() on the line just above.</p>
<p style="padding: 0; margin: 8px;">Works because the container is const, but still, better be consistent.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D10742#inline-73354">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kcoredirlister.cpp:2489</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; "> <span class="n">Q_ASSERT</span><span class="p">(</span><span style="color: #aa2211">!</span><span class="n">item</span><span class="p">.</span><span class="n">isNull</span><span class="p">());</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="p">(<span class="bright"></span></span><span class="bright"></span><span style="color: #aa2211"><span class="bright">*</span></span><span class="n">lstNewItems</span><span class="p">)[</span><span class="n">directoryUrl</span><span class="p">].</span><span class="n">append</span><span class="p">(</span><span class="n">item</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="p">(</span><span class="n">lstNewItems</span><span class="p">)[</span><span class="n">directoryUrl</span><span class="p">].</span><span class="n">append</span><span class="p">(</span><span class="n">item</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span class="p">}</span> <span style="color: #aa4000">else</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #aa4000">if</span> <span class="p">(</span><span style="color: #aa2211">!</span><span class="n">lstRefreshItems</span><span class="p">)</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="n">lstRefreshItems</span> <span style="color: #aa2211">=</span> <span style="color: #aa4000">new</span> <span class="n">QList</span><span style="color: #aa2211"><</span><span class="n">QPair</span><span style="color: #aa2211"><</span><span class="n">KFileItem</span><span class="p">,</span> <span class="n">KFileItem</span><span style="color: #aa2211">></span> <span style="color: #aa2211">></span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="p">}</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">The parenthesis around lstNewItems can be removed now.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D10742#inline-73352">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kcoredirlister.cpp:2691</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">foreach</span> <span class="p">(</span><span style="color: #aa4000">const</span> <span class="n">KFileItem</span> <span style="color: #aa2211">&</span><span class="n">item</span><span class="p">,</span> <span style="color: #aa2211">*</span><span class="n">allItems</span><span class="p">)</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">result</span><span class="p">.</span><span class="n">append</span><span class="p">(</span><span class="n">item</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="p">}</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Is this loop necessary? Can't we return KFileItemList(*allItems) ? There's such a ctor in KFileItemList.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D10742#inline-73353">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kcoredirlister_p.h:308</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">auto</span> <span class="n">it</span> <span style="color: #aa2211">=</span> <span class="n">std</span><span style="color: #aa2211">::</span><span class="n">lower_bound</span><span class="p">(</span><span class="n">dirItem</span><span style="color: #aa2211">-></span><span class="n">lstItems</span><span class="p">.</span><span class="n">begin</span><span class="p">(),</span> <span class="n">dirItem</span><span style="color: #aa2211">-></span><span class="n">lstItems</span><span class="p">.</span><span class="n">end</span><span class="p">(),</span> <span class="n">oldUrl</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">dirItem</span><span style="color: #aa2211">-></span><span class="n">lstItems</span><span class="p">.</span><span class="n">erase</span><span class="p">(</span><span class="n">it</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">dirItem</span><span style="color: #aa2211">-></span><span class="n">insert</span><span class="p">(</span><span class="n">item</span><span class="p">);</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">This is invalid code in case lower_bound() returns end().</p>
<p style="padding: 0; margin: 8px;">If you're sure it "shouldn't happen" because reinsert is always called for items that are already in lstItems, then add a Q_ASSERT. Otherwise if().</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R241 KIO</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D10742">https://phabricator.kde.org/D10742</a></div></div><br /><div><strong>To: </strong>jtamate, Frameworks, dfaure<br /><strong>Cc: </strong>bruns, kde-frameworks-devel, mwolff, markg, michaelh, ngraham<br /></div>