Better count query - but no speed up observed with SFSmartStoreLoadTestSuite though
Running new test (without count code change times out - with count code change runs in <10s)
Merge pull request #528 from wmathurin/countsql

Faster count query generated to estimate result set size