github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

#589 - ElasticSearch - Improve update notification when not mapped but has nested invalidation

Browse Source
This commit is contained in:
Robin Bygrave
2016-03-08 22:14:23 +13:00
parent 2d93d592c1
commit 3c63b79324
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java
+4 -5
View File
@@ -147,7 +147,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
this.parentBean = parentBean;
this.controller = beanDescriptor.getPersistController();
this.type = type;
this.docStoreMode = calcDocStoreEvent(transaction, type);
this.docStoreMode = calcDocStoreMode(transaction, type);
if (saveRecurse) {
this.persistCascade = t.isPersistCascade();
}
@@ -175,7 +175,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
* Used to check if the Transaction has set the mode to IGNORE when doing large batch inserts that we
* don't want to send to the doc store.
*/
private DocStoreMode calcDocStoreEvent(SpiTransaction txn, Type type) {
private DocStoreMode calcDocStoreMode(SpiTransaction txn, Type type) {
DocStoreMode txnMode = (txn == null) ? null : txn.getDocStoreMode();
return beanDescriptor.getDocStoreMode(type, txnMode);
}
@@ -203,7 +203,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
public void initTransIfRequiredWithBatchCascade() {
if (createImplicitTransIfRequired()) {
docStoreMode = calcDocStoreEvent(transaction, type);
docStoreMode = calcDocStoreMode(transaction, type);
}
if (transaction.checkBatchEscalationOnCascade(this)) {
// we escalated to use batch mode so flush when done
@@ -308,8 +308,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
* by queuing an event or direct updateAdd (via Bulk API).
*/
private boolean isDocStoreNotify() {
// Either queue or directly update the document store
return docStoreMode != DocStoreMode.IGNORE || beanDescriptor.docStoreAdapter().hasEmbeddedInvalidation();
return docStoreMode != DocStoreMode.IGNORE;
}
public boolean isNotifyPersistListener() {
src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java
+8 -1
View File
@@ -72,7 +72,7 @@ public abstract class DocStoreBeanBaseAdapter<T> implements DocStoreBeanAdapter<
/**
* Behavior on update.
*/
protected final DocStoreMode update;
protected DocStoreMode update;
/**
* Behavior on delete.
@@ -190,6 +190,13 @@ public abstract class DocStoreBeanBaseAdapter<T> implements DocStoreBeanAdapter<
@Override
public void registerInvalidationPath(String queueId, String path, Set<String> properties) {
if (!mapped) {
if (update == DocStoreMode.IGNORE) {
// bean type not mapped but is included as nested document
// in a doc store index so we need to update
update = DocStoreMode.UPDATE;
}
}
embeddedInvalidation.add(getEmbeddedInvalidation(queueId, path, properties));
}