doleyzi commented on code in PR #10428:
URL: https://github.com/apache/inlong/pull/10428#discussion_r1642344340
##########
inlong-audit/audit-service/src/main/java/org/apache/inlong/audit/cache/AbstractCache.java:
##########
@@ -96,38 +95,47 @@ public Cache<String, StatData> getCache() {
public List<StatData> getData(String startTime, String endTime, String
inlongGroupId,
String inlongStreamId, String auditId, String auditTag) {
List<StatData> result = new LinkedList<>();
- List<String> keyList = buildCacheKeyList(startTime, endTime,
inlongGroupId,
+ List<CacheKeyEntity> keyList = buildCacheKeyList(startTime, endTime,
inlongGroupId,
inlongStreamId, auditId, auditTag);
- for (String cacheKey : keyList) {
- StatData statData = cache.getIfPresent(cacheKey);
+ for (CacheKeyEntity cacheKey : keyList) {
+ StatData statData = cache.getIfPresent(cacheKey.getCacheKey());
if (null == statData) {
// Compatible with scenarios where the auditTag openapi
parameter can be empty.
- statData = cache.getIfPresent(cacheKey + DEFAULT_AUDIT_TAG);
+ statData = cache.getIfPresent(cacheKey.getCacheKey() +
DEFAULT_AUDIT_TAG);
}
if (null != statData) {
result.add(statData);
+ } else {
+ statData = fetchDataFromAuditStorage(cacheKey.getStartTime(),
cacheKey.getEndTime(), inlongGroupId,
+ inlongStreamId,
+ auditId, auditTag);
+ result.add(statData);
}
+
}
return result;
}
- private List<String> buildCacheKeyList(String startTime, String endTime,
String inlongGroupId,
+ private List<CacheKeyEntity> buildCacheKeyList(String startTime, String
endTime, String inlongGroupId,
String inlongStreamId, String auditId, String auditTag) {
- List<String> keyList = new LinkedList<>();
+ List<CacheKeyEntity> keyList = new LinkedList<>();
try {
- SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT);
- Date startDate = dateFormat.parse(startTime);
- Date endDate = dateFormat.parse(endTime);
- for (int index = 0; index < MAX_CACHE_KEY_SIZE; index++) {
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(startDate);
- calendar.add(Calendar.MINUTE, index * auditCycle.getValue());
- calendar.set(Calendar.SECOND, 0);
- if (calendar.getTime().compareTo(endDate) > 0) {
+ DateTimeFormatter formatter =
DateTimeFormatter.ofPattern(DATE_FORMAT);
Review Comment:
Fixed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
