Skip to content
Open
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
26 changes: 16 additions & 10 deletions mustang-core/src/main/java/com/phonepe/mustang/MustangEngine.java
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,12 @@ public String snapshot(final String indexName) {
}

public SimilarityStats checkSimilarity(final String indexName, Criteria criteria) {
return SimilarityDetector.builder()
return indexingFacde.readSecurely(indexName, () -> SimilarityDetector.builder()
.mapper(mapper)
.indexGroup(indexingFacde.getIndexGroup(indexName))
.criteria(criteria)
.build()
.checkSimilarity();
.checkSimilarity());
}

public Set<String> search(final String indexName, final RequestContext context) {
Expand All @@ -116,11 +116,11 @@ public Set<String> search(final String indexName, final RequestContext context,
}

public Set<String> scan(final String indexName, final RequestContext context) {
return Scanner.builder()
return indexingFacde.readSecurely(indexName, () -> Scanner.builder()
.indexGroup(indexingFacde.getIndexGroup(indexName))
.context(context)
.build()
.scan();
.scan());
}

public List<Criteria> scan(final List<Criteria> criterias, final RequestContext context) {
Expand Down Expand Up @@ -153,12 +153,18 @@ public void ratify(final String indexName) {
}

public void ratify(final String indexName, final boolean fullFledged) {
processor.process(RatificationRequest.builder()
.mapper(mapper)
.indexGroup(indexingFacde.getIndexGroup(indexName))
.fullFledged(fullFledged)
.requestedAt(System.currentTimeMillis())
.build());
// AsyncProcessor dispatches via Guava's (synchronous) EventBus, so the
// ratification handler's read of the IndexGroup runs on this thread,
// inside this read lock, before process() returns.
indexingFacde.readSecurely(indexName, () -> {
processor.process(RatificationRequest.builder()
.mapper(mapper)
.indexGroup(indexingFacde.getIndexGroup(indexName))
.fullFledged(fullFledged)
.requestedAt(System.currentTimeMillis())
.build());
return null;
});
}

public RatificationResult getRatificationResult(final String indexName) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Maps;
import com.phonepe.mustang.common.SecureExecution;
import com.phonepe.mustang.criteria.Criteria;
import com.phonepe.mustang.exception.ErrorCode;
import com.phonepe.mustang.exception.MustangException;
Expand All @@ -40,11 +41,25 @@
@Builder
public class IndexingFacade {
private final Map<String, IndexGroup> indexMap = Maps.newConcurrentMap();
private final Map<String, ReentrantReadWriteLock.WriteLock> indexLocks = Maps.newConcurrentMap();
private final Map<String, ReentrantReadWriteLock> indexLocks = Maps.newConcurrentMap();

/**
* Runs {@code block} while holding {@code index}'s read lock, so it is serialized
* against concurrent {@code add}/{@code update}/{@code delete}/{@code replace} on
* the same index but not against other concurrent reads. Callers that read an
* {@link IndexGroup}'s internals beyond a single field access (search, scan,
* ratify, similarity checks) must go through this rather than calling
* {@link #getIndexGroup(String)} directly, since add/delete mutate shared,
* non-thread-safe collections (e.g. the inverted index's nested {@code TreeMap}s)
* in place.
*/
public <T> T readSecurely(final String index, final SecureExecution<T> block) {
return executeSecurely(getLock(index).readLock(), block);
}

public void add(final String index, final Criteria criteria) {
final IndexGroup indexGroup = get(index);
executeSecurely(getLock(index), () -> {
executeSecurely(getLock(index).writeLock(), () -> {
if (indexGroup.getAllCriterias()
.containsKey(criteria.getId())) {
throw MustangException.builder()
Expand All @@ -64,7 +79,7 @@ public void add(final String index, final Criteria criteria) {

public void add(final String index, final List<Criteria> criterias) {
final IndexGroup indexGroup = get(index);
executeSecurely(getLock(index), () -> {
executeSecurely(getLock(index).writeLock(), () -> {
criterias.forEach(criteria -> {
if (indexGroup.getAllCriterias()
.containsKey(criteria.getId())) {
Expand All @@ -85,7 +100,7 @@ public void add(final String index, final List<Criteria> criterias) {

public void update(final String index, final Criteria criteria) {
final IndexGroup indexGroup = get(index);
executeSecurely(getLock(index), () -> {
executeSecurely(getLock(index).writeLock(), () -> {
criteria.accept(CriteriaIndexBuilder.builder()
.indexGroup(indexGroup)
.operation(IndexOperation.UPDATE)
Expand All @@ -98,7 +113,7 @@ public void update(final String index, final Criteria criteria) {

public void delete(final String index, final Criteria criteria) {
final IndexGroup indexGroup = get(index);
executeSecurely(getLock(index), () -> {
executeSecurely(getLock(index).writeLock(), () -> {
if (indexGroup.getAllCriterias()
.containsKey(criteria.getId())) {
criteria.accept(CriteriaIndexBuilder.builder()
Expand All @@ -116,7 +131,7 @@ public void delete(final String index, final Criteria criteria) {
}

public void replace(final String oldIndex, final String newIndex) {
executeSecurely(getLock(oldIndex), () -> {
executeSecurely(getLock(oldIndex).writeLock(), () -> {
if (indexMap.containsKey(newIndex)) {
if (indexMap.containsKey(oldIndex)) {
indexMap.replace(oldIndex, getIndexGroup(oldIndex), getIndexGroup(newIndex));
Expand All @@ -133,7 +148,7 @@ public void replace(final String oldIndex, final String newIndex) {
}

public String exportIndexGroup(final String index, final ObjectMapper mapper) {
return executeSecurely(getLock(index), () -> {
return executeSecurely(getLock(index).writeLock(), () -> {
try {
return mapper.writeValueAsString(getIndexGroup(index).getAllCriterias()
.values());
Expand All @@ -147,7 +162,7 @@ public String exportIndexGroup(final String index, final ObjectMapper mapper) {
}

public String snapshot(final String index, final ObjectMapper mapper) {
return executeSecurely(getLock(index), () -> {
return executeSecurely(getLock(index).writeLock(), () -> {
try {
return mapper.writeValueAsString(getIndexGroup(index));
} catch (JsonProcessingException e) {
Expand All @@ -166,7 +181,7 @@ public IndexGroup importIndexGroup(final String indexName, final String groupDet
.errorCode(ErrorCode.INDEX_GROUP_EXISTS)
.build();
}
executeSecurely(getLock(indexName), () -> {
executeSecurely(getLock(indexName).writeLock(), () -> {
try {
final List<Criteria> criterias = mapper.readValue(groupDetails, new TypeReference<List<Criteria>>() {
});
Expand Down Expand Up @@ -198,8 +213,8 @@ private IndexGroup get(final String index) {
.build());
}

private ReentrantReadWriteLock.WriteLock getLock(final String index) {
return indexLocks.computeIfAbsent(index, x -> new ReentrantReadWriteLock(true).writeLock());
private ReentrantReadWriteLock getLock(final String index) {
return indexLocks.computeIfAbsent(index, x -> new ReentrantReadWriteLock(true));
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,27 @@ public class SearchFacade {
private final IndexingFacade indexingFacade;

public Set<String> search(final String indexName, final Query query, final int topN, final boolean score) {
final Map<String, Double> result = CriteriaSearchHandler.builder()
.indexGroup(indexingFacade.getIndexGroup(indexName))
.query(query)
.score(score)
.build()
.handle();
if (!score) {
return result.keySet();
}

return result.entrySet()
.stream()
.sorted(Map.Entry.comparingByValue(Comparator.reverseOrder()))
.limit(topN == -1 ? result.size() : topN)
.map(Map.Entry::getKey)
.collect(Collectors.toCollection(LinkedHashSet::new));
// The whole read — fetching the IndexGroup and traversing its inverted
// index — must stay inside the read lock: add/update/delete/replace
// mutate those nested, non-thread-safe collections in place.
return indexingFacade.readSecurely(indexName, () -> {
final Map<String, Double> result = CriteriaSearchHandler.builder()
.indexGroup(indexingFacade.getIndexGroup(indexName))
.query(query)
.score(score)
.build()
.handle();
if (!score) {
return result.keySet();
}

return result.entrySet()
.stream()
.sorted(Map.Entry.comparingByValue(Comparator.reverseOrder()))
.limit(topN == -1 ? result.size() : topN)
.map(Map.Entry::getKey)
.collect(Collectors.toCollection(LinkedHashSet::new));
});
}

}
Loading