Merge pull request #50 from topcoder-platform/dev-maven

Dev maven

Author: eisbilir

Dockerfile

@@ -10,4 +10,4 @@ Add ./target/auto-pilot-1.0-SNAPSHOT-spring-boot.jar /opt/autopilot/
 Add ./xml_phase_template.xsd /opt/autopilot/
 Add ./target/templates /opt/autopilot/templates/
 
-CMD ["java", "-jar", "auto-pilot-1.0-SNAPSHOT-spring-boot.jar", "-poll", "5"]
+CMD ["java", "-jar", "auto-pilot-1.0-SNAPSHOT-spring-boot.jar", "-poll", "1"]

ECSDockerfile

@@ -10,4 +10,4 @@ Add ./target/auto-pilot-1.0-SNAPSHOT-spring-boot.jar /opt/autopilot/
 Add ./xml_phase_template.xsd /opt/autopilot/
 Add ./target/templates /opt/autopilot/templates/
 
-CMD ["java", "-jar", "auto-pilot-1.0-SNAPSHOT-spring-boot.jar", "-poll", "5"]
+CMD ["java", "-jar", "auto-pilot-1.0-SNAPSHOT-spring-boot.jar", "-poll", "1"]

src/main/java/com/topcoder/management/phase/autopilot/AutoPilot.java

@@ -12,6 +12,9 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * <p>
@@ -50,6 +53,8 @@ public class AutoPilot {
      */
     private static final AutoPilotResult[] ZERO_AUTO_PILOT_RESULT_ARRAY = new AutoPilotResult[0];
 
+    private static final ExecutorService THREAD_POOL = Executors.newFixedThreadPool(20);
+
     /**
      * <p>
      * Represents the AutoPilotSource instance that is used to retrieve a list of project ids to
@@ -158,37 +163,48 @@ public AutoPilotResult[] advanceProjects(long[] projectId, String operator) thro
 
         // Map key is Long (project id). Map value is AutoPilotResult instance.
         Map resMap = new HashMap();
-        for (int i = 0; i < projectId.length; i++) {
-            AutoPilotResult result = null;
-            Long longProjectId = new Long(projectId[i]);
-
-            // Check if the project is processing by another thread
-            synchronized (processingProjectIds) {
-                if (processingProjectIds.contains(longProjectId)) {
-                    log.info(new LogMessage(null, operator, "Stopped in synchronized for projectId=" + longProjectId).toString());
-                    continue;
-                } else {
-                    processingProjectIds.add(longProjectId);
-                }
-            }
-
-            try {
-                result = advanceProject(projectId[i], operator);
-                // store/aggregate into Map
-                if (resMap.containsKey(longProjectId)) {
-                    // Aggregate the result only if at least one of counters > 0.
-                    if (result.getPhaseEndedCount() > 0 || result.getPhaseStartedCount() > 0) {
-                        ((AutoPilotResult) resMap.get(longProjectId)).aggregate(result);
+        CountDownLatch latch = new CountDownLatch(projectId.length);
+        for (long id : projectId) {
+            THREAD_POOL.execute(() -> {
+                AutoPilotResult result = null;
+                Long longProjectId = new Long(id);
+
+                // Check if the project is processing by another thread
+                synchronized (processingProjectIds) {
+                    if (processingProjectIds.contains(longProjectId)) {
+                        log.info(
+                                new LogMessage(null, operator, "Stopped in synchronized for projectId=" + longProjectId)
+                                        .toString());
+                        return;
+                    } else {
+                        processingProjectIds.add(longProjectId);
                     }
-                } else {
-                    resMap.put(longProjectId, result);
                 }
-            } finally {
-                // Make sure this project can be processed by next thread
-                synchronized (processingProjectIds) {
-                    processingProjectIds.remove(longProjectId);
+
+                try {
+                    result = advanceProject(longProjectId, operator);
+                    // store/aggregate into Map
+                    if (resMap.containsKey(longProjectId)) {
+                        // Aggregate the result only if at least one of counters > 0.
+                        if (result.getPhaseEndedCount() > 0 || result.getPhaseStartedCount() > 0) {
+                            ((AutoPilotResult) resMap.get(longProjectId)).aggregate(result);
+                        }
+                    } else {
+                        resMap.put(longProjectId, result);
+                    }
+                } finally {
+                    // Make sure this project can be processed by next thread
+                    synchronized (processingProjectIds) {
+                        processingProjectIds.remove(longProjectId);
+                        latch.countDown();
+                    }
                 }
-            }
+            });
+        }
+        try {
+            latch.await();
+        } catch (InterruptedException E) {
+
         }
 
         return (AutoPilotResult[]) resMap.values().toArray(new AutoPilotResult[resMap.size()]);

src/main/java/com/topcoder/management/phase/autopilot/impl/ActiveAutoPilotSource.java

@@ -65,6 +65,13 @@ public class ActiveAutoPilotSource implements AutoPilotSource {
      * <p>The log used by this class for logging errors and debug information.</p>
      */
     private static final Logger log = LoggerFactory.getLogger(ActiveAutoPilotSource.class);
+
+    private static final String QUERY_SEARCH_PROJECTS =
+        "SELECT DISTINCT project.project_id " +
+        "FROM project " +
+        "LEFT JOIN project_info ON project.project_id = project_info.project_id " +
+        "LEFT JOIN project_info_type_lu ON project_info.project_info_type_id = project_info_type_lu.project_info_type_id " +
+        "WHERE project.project_status_id=1 and project_info_type_lu.name = 'Autopilot Option' and project_info.value = 'On'";
 
     /**
      * <p>
@@ -170,11 +177,8 @@ public void setExtPropAutoPilotSwitchValue(String extPropAutoPilotSwitchValue) {
      * @throws AutoPilotSourceException if an error occurs retrieving the project ids
      */
     public long[] getProjectIds() throws AutoPilotSourceException {
-        Filter f = buildFilter();
         try {
-            Project[] proj = projectManager.searchProjects(f);
-
-            return processProject(proj);
+            return projectManager.searchProjectsForIds(QUERY_SEARCH_PROJECTS);
         } catch (Exception e) {
         	log.error("Fail to get projects from projectManager.\n" + LogMessage.getExceptionStackTrace(e));
             return ZERO_LONG_ARRAY;