improving performance by… wait for it…. removing the performance logging. it was slow.

Author: paxtonhare

quick-start/src/main/java/com/marklogic/quickstart/service/AspectLoggerService.java

@@ -164,9 +164,9 @@ public boolean updateHub(HubConfig config) throws IOException {
         DataHub dataHub = new DataHub(config);
         boolean result = false;
         int compare = DataHub.versionCompare(dataHub.getHubVersion(), "1.1.0");
-        if (compare == -1) {
+        if (compare < 0) {
             result = dataHub.updateHubFromPre110();
-        } else if (compare == 0) {
+        } else if (compare >= 0) {
             result = dataHub.updateHubFrom110();
         }
         if (result) {

quick-start/src/main/java/com/marklogic/quickstart/service/DataHubService.java

@@ -23,7 +23,6 @@
 import com.marklogic.client.query.RawCombinedQueryDefinition;
 import com.marklogic.client.query.StructuredQueryBuilder;
 import com.marklogic.client.query.StructuredQueryDefinition;
-import com.marklogic.hub.util.PerformanceLogger;
 import com.marklogic.quickstart.model.JobQuery;
 import com.marklogic.quickstart.util.QueryHelper;
 
@@ -40,7 +39,6 @@ public JobService(DatabaseClient client) {
     }
 
     public StringHandle getJobs(JobQuery jobQuery) {
-        long startTime = PerformanceLogger.monitorTimeInsideMethod();
         queryMgr.setPageLength(jobQuery.count);
 
         StructuredQueryBuilder sb = queryMgr.newStructuredQueryBuilder(SEARCH_OPTIONS_NAME);
@@ -81,9 +79,7 @@ public StringHandle getJobs(JobQuery jobQuery) {
         querydef.setResponseTransform(new ServerTransform("job-search"));
         StringHandle sh = new StringHandle();
         sh.setFormat(Format.JSON);
-        StringHandle results = queryMgr.search(querydef, sh, jobQuery.start);
-        PerformanceLogger.logTimeInsideMethod(startTime, "JobService.getJobs()");
-        return results;
+        return queryMgr.search(querydef, sh, jobQuery.start);
     }
 
     public void cancelJob(long jobId) {

quick-start/src/main/java/com/marklogic/quickstart/service/JobService.java

@@ -26,7 +26,6 @@
 import com.marklogic.client.query.StructuredQueryDefinition;
 import com.marklogic.hub.HubConfig;
 import com.marklogic.hub.HubDatabase;
-import com.marklogic.hub.util.PerformanceLogger;
 import com.marklogic.quickstart.model.SearchQuery;
 import com.marklogic.quickstart.util.QueryHelper;
 import org.w3c.dom.Document;
@@ -74,8 +73,6 @@ private Element getOptions() {
     }
 
     public StringHandle search(SearchQuery searchQuery) {
-
-        long startTime = PerformanceLogger.monitorTimeInsideMethod();
         QueryManager queryMgr;
         if (searchQuery.database.equals(HubDatabase.STAGING)) {
             queryMgr = stagingQueryMgr;
@@ -110,9 +107,7 @@ public StringHandle search(SearchQuery searchQuery) {
 
         StringHandle sh = new StringHandle();
         sh.setFormat(Format.JSON);
-        StringHandle results = queryMgr.search(querydef, sh, searchQuery.start);
-        PerformanceLogger.logTimeInsideMethod(startTime, "SearchService.search()");
-        return results;
+        return queryMgr.search(querydef, sh, searchQuery.start);
     }
 
     public String getDoc(HubDatabase database, String docUri) {

quick-start/src/main/java/com/marklogic/quickstart/service/SearchService.java

@@ -25,7 +25,6 @@
 import com.marklogic.client.query.RawCombinedQueryDefinition;
 import com.marklogic.client.query.StructuredQueryBuilder;
 import com.marklogic.client.query.StructuredQueryDefinition;
-import com.marklogic.hub.util.PerformanceLogger;
 import com.marklogic.quickstart.model.TraceQuery;
 import com.marklogic.quickstart.util.QueryHelper;
 
@@ -46,7 +45,6 @@ public TraceService(DatabaseClient client) {
 
 
     public StringHandle getTraces(TraceQuery traceQuery) {
-        long startTime = PerformanceLogger.monitorTimeInsideMethod();
         queryMgr.setPageLength(traceQuery.count);
 
         StructuredQueryBuilder sb = queryMgr.newStructuredQueryBuilder(SEARCH_OPTIONS_NAME);
@@ -88,9 +86,7 @@ public StringHandle getTraces(TraceQuery traceQuery) {
         querydef.setResponseTransform(new ServerTransform("trace-search"));
         StringHandle sh = new StringHandle();
         sh.setFormat(Format.JSON);
-        StringHandle results = queryMgr.search(querydef, sh, traceQuery.start);
-        PerformanceLogger.logTimeInsideMethod(startTime, "TraceService.getTraces()");
-        return results;
+        return queryMgr.search(querydef, sh, traceQuery.start);
     }
 
     public JsonNode getTrace(String traceId) {

quick-start/src/main/java/com/marklogic/quickstart/service/TraceService.java

@@ -15,7 +15,6 @@
  */
 package com.marklogic.quickstart.web;
 
-import com.marklogic.hub.util.PerformanceLogger;
 import com.marklogic.quickstart.EnvironmentAware;
 import com.marklogic.quickstart.model.JobQuery;
 import com.marklogic.quickstart.service.JobService;
@@ -40,10 +39,7 @@ public class JobsController extends EnvironmentAware {
     @Bean
     @Scope(proxyMode= ScopedProxyMode.TARGET_CLASS, value="session")
     JobService jobManager() {
-        long startTime = PerformanceLogger.monitorTimeInsideMethod();
-        JobService jobService = new JobService(envConfig().getJobClient());
-        PerformanceLogger.logTimeInsideMethod(startTime, "JobsController.jobService()");
-        return jobService;
+        return new JobService(envConfig().getJobClient());
     }
 
     @RequestMapping(method = RequestMethod.POST, produces = {MediaType.APPLICATION_JSON_VALUE})