|
22 | 22 | #include "qgslogger.h"
|
23 | 23 | #include "qgsmessagelog.h"
|
24 | 24 |
|
25 |
| -#include <QElapsedTimer> |
26 | 25 | #include <QObject>
|
27 | 26 | #include <QSettings>
|
28 | 27 |
|
| 28 | + |
| 29 | +const int QgsPostgresFeatureIterator::sFeatureQueueSize = 2000; |
| 30 | + |
| 31 | + |
29 | 32 | QgsPostgresFeatureIterator::QgsPostgresFeatureIterator( QgsPostgresFeatureSource* source, bool ownSource, const QgsFeatureRequest& request )
|
30 | 33 | : QgsAbstractFeatureIteratorFromSource<QgsPostgresFeatureSource>( source, ownSource, request )
|
31 |
| - , mFeatureQueueSize( 1 ) |
| 34 | + , mFeatureQueueSize( sFeatureQueueSize ) |
32 | 35 | , mFetched( 0 )
|
33 | 36 | , mFetchGeometry( false )
|
34 | 37 | , mExpressionCompiled( false )
|
@@ -224,9 +227,6 @@ bool QgsPostgresFeatureIterator::fetchFeature( QgsFeature& feature )
|
224 | 227 |
|
225 | 228 | if ( mFeatureQueue.empty() && !mLastFetch )
|
226 | 229 | {
|
227 |
| - QElapsedTimer timer; |
228 |
| - timer.start(); |
229 |
| - |
230 | 230 | QString fetch = QString( "FETCH FORWARD %1 FROM %2" ).arg( mFeatureQueueSize ).arg( mCursorName );
|
231 | 231 | QgsDebugMsgLevel( QString( "fetching %1 features." ).arg( mFeatureQueueSize ), 4 );
|
232 | 232 |
|
@@ -262,15 +262,6 @@ bool QgsPostgresFeatureIterator::fetchFeature( QgsFeature& feature )
|
262 | 262 | } // for each row in queue
|
263 | 263 | }
|
264 | 264 | unlock();
|
265 |
| - |
266 |
| - if ( timer.elapsed() > 500 && mFeatureQueueSize > 1 ) |
267 |
| - { |
268 |
| - mFeatureQueueSize /= 2; |
269 |
| - } |
270 |
| - else if ( timer.elapsed() < 50 && mFeatureQueueSize < 10000 ) |
271 |
| - { |
272 |
| - mFeatureQueueSize *= 2; |
273 |
| - } |
274 | 265 | }
|
275 | 266 |
|
276 | 267 | if ( mFeatureQueue.empty() )
|
|
0 commit comments