Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions backend/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-validation'
implementation 'org.springframework.boot:spring-boot-starter-actuator'
implementation 'org.springframework.boot:spring-boot-starter-flyway'
implementation 'com.github.ben-manes.caffeine:caffeine'
implementation 'org.flywaydb:flyway-mysql'
runtimeOnly 'com.mysql:mysql-connector-j'
// 부하 테스트 지표. perf 프로필에서만 /actuator/prometheus를 연다 (application-perf.yml)
Expand All @@ -51,6 +52,8 @@ tasks.named('test') {
// 경매 시작·종료 스케줄러는 테스트에서 끈다. 다른 테스트의 데이터 정리와 겹치지 않게 하기 위해서다.
// 스케줄러를 검증하는 테스트만 @SpringBootTest(properties)로 다시 켠다.
systemProperty 'restless.auction.scheduler.enabled', 'false'
// 기존 테스트는 DB를 직접 바꾼다. 경매 조회 캐시는 AuctionQueryCacheTest에서만 켠다.
systemProperty 'restless.auction.query-cache.enabled', 'false'
systemProperty 'restless.payment.reconcile.enabled', 'false'
systemProperty 'restless.drop.expiry.enabled', 'false'
// JDBC Timestamp fixtures and JPA TIMESTAMP_UTC must use the same time zone on every host.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.restless.auction.api;

import com.restless.auction.application.AuctionQueryService;
import com.restless.auction.application.AuctionQueryCache;
import com.restless.auction.application.AuctionQueryService.AuctionDetail;
import com.restless.auction.application.AuctionQueryService.AuctionPage;
import com.restless.auction.application.AuctionQueryService.AuctionResultView;
Expand All @@ -23,6 +24,7 @@ public class AuctionController {
static final int MAX_PAGE_SIZE = 100;

private final AuctionQueryService auctionQueryService;
private final AuctionQueryCache auctionQueryCache;

/** status를 빼면 전체. page는 0부터, size는 1~100. */
@GetMapping
Expand All @@ -32,12 +34,12 @@ public AuctionPage list(@RequestParam(required = false) AuctionStatus status,
if (page < 0 || size < 1 || size > MAX_PAGE_SIZE) {
throw new BusinessException(ErrorCode.INVALID_REQUEST, "page는 0 이상, size는 1에서 100 사이여야 합니다.");
}
return auctionQueryService.list(status, page, size);
return auctionQueryCache.list(status, page, size);
}

@GetMapping("/{auctionId}")
public AuctionDetail detail(@PathVariable Long auctionId) {
return auctionQueryService.detail(auctionId);
return auctionQueryCache.detail(auctionId);
}

/** 종료 전이면 404 AUCTION_RESULT_NOT_FOUND. */
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
package com.restless.auction.application;

import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
import com.github.benmanes.caffeine.cache.Ticker;
import com.restless.auction.application.AuctionQueryService.AuctionDetail;
import com.restless.auction.application.AuctionQueryService.AuctionPage;
import com.restless.auction.domain.AuctionStatus;
import io.micrometer.core.instrument.MeterRegistry;
import java.time.Clock;
import java.time.Duration;
import java.util.concurrent.TimeUnit;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.transaction.event.TransactionPhase;
import org.springframework.transaction.event.TransactionalEventListener;

/** 목록과 상세 조회 결과를 앱 메모리에 보관한다. 트랜잭션 밖에서 호출한다. */
@Slf4j
@Component
public class AuctionQueryCache {

private final AuctionQueryService queries;
private final Clock clock;
private final MeterRegistry meters;
private final boolean enabled;
private final Cache<DetailKey, AuctionDetail> details;
private final Cache<ListKey, AuctionPage> lists;
private final Cache<Long, Long> generations;

public AuctionQueryCache(AuctionQueryService queries, Clock clock, MeterRegistry meters,
@Value("${restless.auction.query-cache.enabled:true}") boolean enabled,
@Value("${restless.auction.query-cache.ttl-ms:1000}") long ttlMs) {
if (ttlMs <= 0) {
throw new IllegalArgumentException("restless.auction.query-cache.ttl-ms must be positive");
}
this.queries = queries;
this.clock = clock;
this.meters = meters;
this.enabled = enabled;

Ticker ticker = () -> TimeUnit.MILLISECONDS.toNanos(clock.millis());
this.details = Caffeine.newBuilder()
.maximumSize(10_000)
.expireAfterWrite(ttlMs, TimeUnit.MILLISECONDS)
.ticker(ticker)
.build();
this.lists = Caffeine.newBuilder()
.maximumSize(256)
.expireAfterWrite(ttlMs, TimeUnit.MILLISECONDS)
.ticker(ticker)
.build();
this.generations = Caffeine.newBuilder()
.expireAfterWrite(generationRetentionMs(ttlMs), TimeUnit.MILLISECONDS)
.ticker(ticker)
.build();
}

public AuctionPage list(AuctionStatus status, int page, int size) {
if (!enabled) {
return queries.list(status, page, size);
}
ListKey key = new ListKey(status, page, size);
return lists.get(key, ignored -> queries.list(status, page, size));
}

public AuctionDetail detail(Long auctionId) {
if (!enabled) {
return withCurrentServerTime(queries.detail(auctionId));
}
long generation = currentGeneration(auctionId);
DetailKey key = new DetailKey(auctionId, generation);
AuctionDetail cached = details.get(key, ignored -> queries.detail(auctionId));
return withCurrentServerTime(cached);
}

@TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
public void onChanged(AuctionChangedEvent event) {
try {
generations.asMap().compute(event.auctionId(), (ignored, generation) -> generation == null ? 1 : generation + 1);
} catch (RuntimeException exception) {
log.error("Auction query cache invalidation failed auctionId={}", event.auctionId(), exception);
meters.counter("auction.query.cache.failure", "stage", "invalidate").increment();
throw exception;
}
}

private AuctionDetail withCurrentServerTime(AuctionDetail detail) {
return detail.withServerTime(clock.instant());
}

private long currentGeneration(Long auctionId) {
Long generation = generations.getIfPresent(auctionId);
return generation == null ? 0 : generation;
}

private static long generationRetentionMs(long ttlMs) {
long longerThanQueryTtl = ttlMs > Long.MAX_VALUE / 2 ? Long.MAX_VALUE : ttlMs * 2;
return Math.max(Duration.ofMinutes(1).toMillis(), longerThanQueryTtl);
}

private record DetailKey(Long auctionId, long generation) {
}

private record ListKey(AuctionStatus status, int page, int size) {
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,11 @@ public record AuctionDetail(Long auctionId, String title, String itemName, Strin
long minimumIncrementAmount, HighestBid highestBid, long minimumBidAmount,
Instant startsAt, Instant endsAt, int extensionDurationSeconds, long revision,
Instant serverTime) {
public AuctionDetail withServerTime(Instant currentTime) {
return new AuctionDetail(auctionId, title, itemName, itemDescription, sellerNickname, status,
startingPriceAmount, minimumIncrementAmount, highestBid, minimumBidAmount, startsAt, endsAt,
extensionDurationSeconds, revision, currentTime);
}
}

/** 실시간 스트림 메시지. revision이 SSE 이벤트 id가 된다. */
Expand Down
4 changes: 4 additions & 0 deletions backend/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ restless:
flush-interval-ms: 200
# SSE 연결 최대 유지 시간(ms). 지나면 서버가 닫고, 클라이언트는 상세를 다시 받은 뒤 재연결한다.
timeout-ms: 1800000
query-cache:
# 목록·상세 조회의 앱 메모리 캐시. 변경 이벤트로 상세를 즉시 갱신한다.
enabled: true
ttl-ms: 1000
fanmeeting:
worker:
# 팬미팅 응모 기간 열기·마감, 추첨 Worker. 테스트에서는 build.gradle이 false로 끈다.
Expand Down
Loading
Loading