Sharding: optimized reduce algorithm

lvca · lvca · commit 759d98b31d14 · 2014-04-30T15:41:38.000+02:00
diff --git a/server/src/main/java/com/orientechnologies/orient/server/distributed/ODistributedStorage.java b/server/src/main/java/com/orientechnologies/orient/server/distributed/ODistributedStorage.java
@@ -210,18 +210,28 @@ public Object command(final OCommandRequestText iCommand) {
                 final ODocument doc = new ODocument();
                 list.add(doc);
 
-                // MERGE NON AGGREGATED FIELDS
-                for (Map.Entry<String, Object> entry : ((Map<String, Object>) result).entrySet()) {
-                  final List<Object> resultSet = (List<Object>) entry.getValue();
+                boolean hasNonAggregates = false;
+                for (Map.Entry<String, Object> p : proj.entrySet()) {
+                  if (!(p.getValue() instanceof OSQLFunctionRuntime)) {
+                    hasNonAggregates = true;
+                    break;
+                  }
+                }
+
+                if (hasNonAggregates) {
+                  // MERGE NON AGGREGATED FIELDS
+                  for (Map.Entry<String, Object> entry : ((Map<String, Object>) result).entrySet()) {
+                    final List<Object> resultSet = (List<Object>) entry.getValue();
 
-                  for (Object r : resultSet) {
-                    if (r instanceof ODocument) {
-                      final ODocument d = (ODocument) r;
+                    for (Object r : resultSet) {
+                      if (r instanceof ODocument) {
+                        final ODocument d = (ODocument) r;
 
-                      for (Map.Entry<String, Object> p : proj.entrySet()) {
-                        // WRITE THE FIELD AS IS
-                        if (!(p.getValue() instanceof OSQLFunctionRuntime))
-                          doc.field(p.getKey(), p.getValue());
+                        for (Map.Entry<String, Object> p : proj.entrySet()) {
+                          // WRITE THE FIELD AS IS
+                          if (!(p.getValue() instanceof OSQLFunctionRuntime))
+                            doc.field(p.getKey(), p.getValue());
+                        }
                       }
                     }
                   }
