WIP: working on (bad) performance (#888)

tolldemo 
---------

Signed-off-by: Mark Nelson <mark.x.nelson@oracle.com>

Author: markxnelson

tolldemo/queue-reader/README.md

@@ -0,0 +1,11 @@
+# mark's dodgy bodgy sql slower downer
+
+```sql
+create or replace function remove_state(plate in varchar2)
+return varchar2
+is
+begin
+  dbms_lock.sleep(dbms_random.value(0.004,0.005));
+  return regexp_replace(plate, '[A-Z]+-', '', 1, 1);
+end;
+```

tolldemo/queue-reader/pom.xml

@@ -146,6 +146,24 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+            <!-- for migration to Spring Boot 3 -->
+            <plugin>
+                <groupId>org.openrewrite.maven</groupId>
+                <artifactId>rewrite-maven-plugin</artifactId>
+                <version>5.29.0</version>
+                <configuration>
+                  <activeRecipes>
+                    <recipe>org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_2</recipe>
+                  </activeRecipes>
+                </configuration>
+                <dependencies>
+                  <dependency>
+                    <groupId>org.openrewrite.recipe</groupId>
+                    <artifactId>rewrite-spring</artifactId>
+                    <version>5.8.0</version>
+                  </dependency>
+                </dependencies>
+              </plugin>
         </plugins>
     </build>
 

tolldemo/queue-reader/src/main/java/com/example/queuereader/QueueReaderApplication.java

@@ -3,10 +3,16 @@
 
 package com.example.queuereader;
 
+import javax.jms.ConnectionFactory;
+
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.DependsOn;
 import org.springframework.jms.annotation.EnableJms;
+import org.springframework.jms.config.DefaultJmsListenerContainerFactory;
 
 @EnableJms
 @SpringBootApplication
@@ -17,4 +23,15 @@ public static void main(String[] args) {
         SpringApplication.run(QueueReaderApplication.class, args);
     }
 
+    @Bean
+    @DependsOn("aqJmsConnectionFactory")
+    public DefaultJmsListenerContainerFactory jmsListenerContainerFactory(ApplicationContext context) {
+        DefaultJmsListenerContainerFactory factory = 
+            new DefaultJmsListenerContainerFactory();
+        ConnectionFactory connectionFactory = (ConnectionFactory) context.getBean("aqJmsConnectionFactory");
+        factory.setConnectionFactory(connectionFactory);
+        factory.setConcurrency("1-1");
+        return factory;
+    }
+
 }

tolldemo/queue-reader/src/main/java/com/example/queuereader/controller/TollReaderReceiver.java

@@ -13,13 +13,15 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import io.micrometer.core.annotation.Timed;
+import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.Tags;
 import io.micrometer.core.instrument.Timer;
 import io.micrometer.prometheus.PrometheusMeterRegistry;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.List;
 
+import org.apache.tomcat.util.modeler.Registry;
 import org.springframework.jms.annotation.JmsListener;
 import org.springframework.stereotype.Component;
 
@@ -33,6 +35,7 @@ public class TollReaderReceiver {
     private AIVisionService aiVisionService;
     private CustomerDataService customerDataService;
     private Timer timer;
+    private Counter counter;
 
     public TollReaderReceiver(
         JournalService journalService, 
@@ -44,10 +47,12 @@ public TollReaderReceiver(
         this.aiVisionService = aiVisionService;
         this.customerDataService = customerDataService;
         timer = registry.timer("process.toll.read", Tags.empty());
+        counter = registry.counter("toll.messages.count", Tags.empty());
     }
 
     @JmsListener(destination = "TollGate")
     public void receiveTollData(String tollData) {
+        counter.increment();
         Timer.Sample sample = Timer.start();
         log.info("Received message {}", tollData);
         try {
@@ -58,9 +63,10 @@ public void receiveTollData(String tollData) {
             log.info("Check that the tag, licensePlate and accountNumber match up");
             String tagId = tollDataJson.get("tagId").asText();
             String accountId = tollDataJson.get("accountNumber").asText();
-            String licensePlate = tollDataJson.get("licensePlate").asText().split("-")[1];
+            String licensePlate = tollDataJson.get("licensePlate").asText();
+            String vehicleType = tollDataJson.get("vehicleType").asText();
 
-            List<AccountDetails> accountDetails = customerDataService.getAccountDetails(licensePlate);
+            List<AccountDetails> accountDetails = customerDataService.getAccountDetails(licensePlate, vehicleType);
             boolean found = false;
             for (AccountDetails a : accountDetails) {
                 if (a.getAccountNumber().equalsIgnoreCase(accountId) && a.getTagId().equalsIgnoreCase(tagId)) {
@@ -85,7 +91,7 @@ public void receiveTollData(String tollData) {
         } catch (JsonProcessingException e) {
             e.printStackTrace();
         } finally {
-            timer.record(() -> sample.stop(timer) / 1_000_000);
+            timer.record(() -> sample.stop(timer) / 1_000);
         }
     }
 }

tolldemo/queue-reader/src/main/java/com/example/queuereader/service/CustomerDataService.java

@@ -9,35 +9,55 @@
 
 import com.example.queuereader.model.AccountDetails;
 
+import io.micrometer.core.instrument.Tags;
+import io.micrometer.core.instrument.Timer;
+import io.micrometer.prometheus.PrometheusMeterRegistry;
 import lombok.extern.slf4j.Slf4j;
 
 @Service
 @Slf4j
 public class CustomerDataService {
 
+    private Timer timer;
+
     private final JdbcTemplate jdbcTemplate;
 
-    public CustomerDataService(JdbcTemplate jdbcTemplate) {
+    public CustomerDataService(JdbcTemplate jdbcTemplate, PrometheusMeterRegistry registry) {
         this.jdbcTemplate = jdbcTemplate;
+        timer = registry.timer("get.account.details", Tags.empty());
     }
 
-
+    // slower query
     final String accountDetailsQuery = 
-    "select c.customer_id, c.account_number, c.first_name, c.last_name, c.address, c.city, c.zipcode, "
+    "select /*+ ORDERED_PREDICATES */ c.customer_id, c.account_number, c.first_name, c.last_name, c.address, c.city, c.zipcode, "
     + "v.vehicle_id, v.tag_id, v.state, v.license_plate, v.vehicle_type "
     + "from customer c, vehicle v " 
     + "where c.customer_id like '%'||v.customer_id||'%' "
     + "and c.customer_id like ("
-    + "  select '%'||customer_id||'%' "
+    + "  select /*+ ORDERED_PREDICATES */ '%'||customer_id||'%' "
+    + "  from vehicle "
+    + "  where vehicle_type = 'TTTTTT' "
+    + "  and license_plate like '%'|| remove_state('XXXXXX') || '%'"
+    + ")";
+
+    // faster query
+    final String fasterAccountDetailsQuery = 
+    "select c.customer_id, c.account_number, c.first_name, c.last_name, c.address, c.city, c.zipcode, "
+    + "v.vehicle_id, v.tag_id, v.state, v.license_plate, v.vehicle_type "
+    + "from customer c, vehicle v " 
+    + "where c.customer_id = v.customer_id "
+    + "and c.customer_id = ("
+    + "  select customer_id "
     + "  from vehicle "
-    + "  where license_plate like '%XXXXXX%'"
+    + "  where license_plate = regexp_replace('XXXXXX', '[A-Z]+-', 1, 1)"
     + ")";
 
 
-    public List<AccountDetails> getAccountDetails(String licensePlate) {
+    public List<AccountDetails> getAccountDetails(String licensePlate, String vehicleType) {
         List<AccountDetails> result = new ArrayList<AccountDetails>();
         long startTime = System.currentTimeMillis();
-        jdbcTemplate.query(accountDetailsQuery.replace("XXXXXX", licensePlate),
+        Timer.Sample sample = Timer.start();
+        jdbcTemplate.query(accountDetailsQuery.replace("XXXXXX", licensePlate).replace("TTTTTT", vehicleType),
         (rs, rowNum) -> new AccountDetails(
             rs.getString("customer_id"),
             rs.getString("account_number"),
@@ -53,6 +73,7 @@ public List<AccountDetails> getAccountDetails(String licensePlate) {
             rs.getString("vehicle_type")
         )).forEach(accountDetails -> result.add(accountDetails));
         long endTime = System.currentTimeMillis();
+        timer.record(() -> sample.stop(timer) / 1_000);
         log.info("The query took " + (endTime - startTime) + "ms");
 
         log.info("returning " + result.size() + " account detail rows");

tolldemo/queue-reader/src/main/java/com/example/queuereader/service/JournalService.java

@@ -31,7 +31,7 @@ public void journal(JsonNode tollData) {
         Timer.Sample sample = Timer.start();
         log.info("Journal data: {}", tollData);
         journalClient.journal(tollData);
-        timer.record(() -> sample.stop(timer) / 1_000_000);
+        timer.record(() -> sample.stop(timer) / 1_000);
 
     }
 }

tolldemo/queue-reader/src/main/resources/application.yaml

@@ -31,4 +31,8 @@ management:
         include: "*"
   metrics:
     tags:
-      application: ${spring.application.name}    
+      application: ${spring.application.name}    
+
+# server:
+#   tomcat:
+#     max-threads: 10