This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
commit c49a89e840529e683de52f58c6003827dbecc82d Author: Lei Zhang <[email protected]> AuthorDate: Fri Aug 9 23:00:56 2019 +0800 SCB-1411 Add parameter size to API /alpha/api/v1/transaction/slow?size=n --- .../main/java/org/apache/servicecomb/pack/alpha/core/api/APIv1.java | 2 +- .../repository/elasticsearch/ElasticsearchTransactionRepository.java | 2 +- .../org/apache/servicecomb/pack/alpha/server/api/APIv1Controller.java | 4 ++-- .../java/org/apache/servicecomb/pack/alpha/server/api/APIv1Impl.java | 4 ++-- .../servicecomb/pack/alpha/ui/controller/TransactionController.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/api/APIv1.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/api/APIv1.java index d35bb9f..9239c1b 100644 --- a/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/api/APIv1.java +++ b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/api/APIv1.java @@ -38,5 +38,5 @@ public interface APIv1 { Map<String, Long> getTransactionStatistics(); - List<GlobalTransaction> getSlowTransactions(); + List<GlobalTransaction> getSlowTransactions(int size); } diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/elasticsearch/ElasticsearchTransactionRepository.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/elasticsearch/ElasticsearchTransactionRepository.java index fe8f49a..f7aed5b 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/elasticsearch/ElasticsearchTransactionRepository.java +++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/elasticsearch/ElasticsearchTransactionRepository.java @@ -185,7 +185,7 @@ public class ElasticsearchTransactionRepository implements TransactionRepository .setSearchType(SearchType.DFS_QUERY_THEN_FETCH) .setQuery(QueryBuilders.matchAllQuery()) .addSort(SortBuilders.fieldSort("durationTime").order(SortOrder.DESC)) - .setFrom(0).setSize(10).setExplain(true) + .setFrom(0).setSize(n).setExplain(true) .get(); response.getHits().forEach(hit -> { try { diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/api/APIv1Controller.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/api/APIv1Controller.java index 976c05f..6156157 100644 --- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/api/APIv1Controller.java +++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/api/APIv1Controller.java @@ -61,7 +61,7 @@ public class APIv1Controller { } @GetMapping(value = "/transaction/slow") - ResponseEntity<List<GlobalTransaction>> getSlowTransactions() { - return ResponseEntity.ok(APIv1Impl.getSlowTransactions()); + ResponseEntity<List<GlobalTransaction>> getSlowTransactions(@RequestParam(name="size", defaultValue = "10") int size) { + return ResponseEntity.ok(APIv1Impl.getSlowTransactions(size)); } } diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/api/APIv1Impl.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/api/APIv1Impl.java index 2138906..f8ea1d2 100644 --- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/api/APIv1Impl.java +++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/api/APIv1Impl.java @@ -67,7 +67,7 @@ public class APIv1Impl implements APIv1 { return transactionRepository.getTransactionStatistics(); } - public List<GlobalTransaction> getSlowTransactions() { - return transactionRepository.getSlowGlobalTransactionsTopN(10); + public List<GlobalTransaction> getSlowTransactions(int size) { + return transactionRepository.getSlowGlobalTransactionsTopN(size); } } diff --git a/alpha/alpha-ui/src/main/java/org/apache/servicecomb/pack/alpha/ui/controller/TransactionController.java b/alpha/alpha-ui/src/main/java/org/apache/servicecomb/pack/alpha/ui/controller/TransactionController.java index 9d21367..9d429bd 100644 --- a/alpha/alpha-ui/src/main/java/org/apache/servicecomb/pack/alpha/ui/controller/TransactionController.java +++ b/alpha/alpha-ui/src/main/java/org/apache/servicecomb/pack/alpha/ui/controller/TransactionController.java @@ -222,7 +222,7 @@ public class TransactionController { @ResponseBody public List<TransactionRowDTO> getSlowGlobalTransactionTopN() { List<TransactionRowDTO> transactionRowDTOS = new ArrayList<>(); - List<GlobalTransaction> transactions = apiv1.getSlowTransactions(); + List<GlobalTransaction> transactions = apiv1.getSlowTransactions(10); transactions.stream().forEach(globalTransaction -> { transactionRowDTOS.add(TransactionRowDTO.builder() .serviceName(globalTransaction.getServiceName())
