Allow developers to opt out of sorting select fields in selector subclasses, in order to improve performance.

Author: dfruddffdc

fflib/src/classes/fflib_SObjectSelector.cls

@@ -59,6 +59,12 @@ public abstract with sharing class fflib_SObjectSelector
     * Order by field
     **/
     	private String m_orderBy;
+
+    /**
+     * Sort the query fields in the select statement (defaults to true, at the expense of performance).
+     * Switch this off if you need more performant queries.
+     **/
+    private Boolean m_sortSelectFields;
 
    /**
    * Describe helper
@@ -106,10 +112,21 @@ public abstract with sharing class fflib_SObjectSelector
      * @param includeFieldSetFields Set to true if the Selector queries are to include Fieldset fields as well 
      **/
     public fflib_SObjectSelector(Boolean includeFieldSetFields, Boolean enforceCRUD, Boolean enforceFLS)
+    {
+        this(includeFieldSetFields, enforceCRUD, enforceFLS, true);
+    }
+
+    /**
+     * Constructs the Selector
+     *
+     * @param includeFieldSetFields Set to true if the Selector queries are to include Fieldset fields as well 
+     **/
+    public fflib_SObjectSelector(Boolean includeFieldSetFields, Boolean enforceCRUD, Boolean enforceFLS, Boolean sortSelectFields)
     {
         m_includeFieldSetFields = includeFieldSetFields;
         m_enforceCRUD = enforceCRUD;
         m_enforceFLS = enforceFLS;
+        m_sortSelectFields = sortSelectFields;
     }
 
     /**
@@ -366,7 +383,8 @@ public abstract with sharing class fflib_SObjectSelector
         if(includeSelectorFields)
         {
 	        // select the Selector fields and Fieldsets and set order
-	        queryFactory.selectFields(new Set<SObjectField>(getSObjectFieldList()));
+            queryFactory.selectFields(getSObjectFieldList());
+
 	        List<Schema.FieldSet> fieldSetList = getSObjectFieldSetList();
 	        if(m_includeFieldSetFields && fieldSetList != null)
 	            for(Schema.FieldSet fieldSet : fieldSetList)
@@ -394,7 +412,9 @@ public abstract with sharing class fflib_SObjectSelector
                 fieldSortOrder = fflib_QueryFactory.SortOrder.ASCENDING;
             queryFactory.addOrdering(fieldNamePart, fieldSortOrder);
         }           
-                
+        
+        queryFactory.setSortSelectFields(m_sortSelectFields);           
+
         return queryFactory;    
     }    
 }

fflib/src/classes/fflib_SObjectSelectorTest.cls

@@ -144,7 +144,7 @@ private with sharing class fflib_SObjectSelectorTest
 			return; // Abort the test if unable to create a user with low enough acess
 		System.runAs(testUser)
 		{					
-			Testfflib_SObjectSelector selector = new Testfflib_SObjectSelector(false, false, false);
+			Testfflib_SObjectSelector selector = new Testfflib_SObjectSelector(false, false, false, true);
 			try
 			{
 				List<Account> result = (List<Account>) selector.selectSObjectsById(idSet);
@@ -205,16 +205,50 @@ private with sharing class fflib_SObjectSelectorTest
 		}
 	}
 
+
+	@isTest
+	static void testWithoutSorting()
+	{
+		//Given
+		Testfflib_SObjectSelector selector = new Testfflib_SObjectSelector(false, false, false, false);
+		fflib_QueryFactory qf = selector.newQueryFactory();
+		
+		Set<String> expectedSelectFields = new Set<String>{ 'Name', 'Id', 'AccountNumber', 'AnnualRevenue' };
+		if (UserInfo.isMultiCurrencyOrganization())
+		{
+			expectedSelectFields.add('CurrencyIsoCode');
+		}
+
+		//When
+		String soql = qf.toSOQL();
+
+		//Then
+		Pattern soqlPattern = Pattern.compile('SELECT (.*) FROM Account ORDER BY Name DESC NULLS FIRST , AnnualRevenue ASC NULLS FIRST ');
+		Matcher soqlMatcher = soqlPattern.matcher(soql);
+		soqlMatcher.matches();
+
+		List<String> actualSelectFields = soqlMatcher.group(1).deleteWhiteSpace().split(',');
+		System.assertEquals(expectedSelectFields, new Set<String>(actualSelectFields));
+	}
+	
+	private static void assertEqualsSelectFields(String expectedSelectFields, String actualSelectFields)
+	{
+		Set<String> expected = new Set<String>(expectedSelectFields.deleteWhiteSpace().split(','));
+		Set<String> actual = new Set<String>(actualSelectFields.deleteWhiteSpace().split(','));
+
+		System.assertEquals(expected, actual);
+	}
+	
 	private class Testfflib_SObjectSelector extends fflib_SObjectSelector
 	{
 		public Testfflib_SObjectSelector()
 		{
 			super();
 		}
 
-		public Testfflib_SObjectSelector(Boolean includeFieldSetFields, Boolean enforceCRUD, Boolean enforceFLS)
+		public Testfflib_SObjectSelector(Boolean includeFieldSetFields, Boolean enforceCRUD, Boolean enforceFLS, Boolean sortSelectFields)
 		{
-			super(includeFieldSetFields, enforceCRUD, enforceFLS);
+			super(includeFieldSetFields, enforceCRUD, enforceFLS, sortSelectFields);
 		}
 
 		public List<Schema.SObjectField> getSObjectFieldList()