#589 - ElasticSearch - DocStoreMode renamed from DocStoreEvent

This commit is contained in:
Robin Bygrave committed 2016-03-07 19:10:15 +13:00
1 parent 32bcd5e853
commit a0609b1726
15 files changed
+75 -108

No files matched your search

@@ -1,7 +1,7 @@
package com.avaje.ebeaninternal.api;
import com.avaje.ebean.TransactionCallback;
import com.avaje.ebean.annotation.DocStoreEvent;
import com.avaje.ebean.annotation.DocStoreMode;
import com.avaje.ebean.bean.PersistenceContext;
import com.avaje.ebean.config.PersistBatch;
import com.avaje.ebean.event.changelog.BeanChange;
@@ -61,13 +61,13 @@ public class ScopedTransaction implements SpiTransaction {
}
@Override
public DocStoreEvent getDocStoreUpdateMode() {
public DocStoreMode getDocStoreUpdateMode() {
return transaction.getDocStoreUpdateMode();
}
@Override
public void setDocStoreUpdateMode(DocStoreEvent indexUpdateMode) {
transaction.setDocStoreUpdateMode(indexUpdateMode);
public void setDocStoreUpdateMode(DocStoreMode mode) {
transaction.setDocStoreUpdateMode(mode);
}
@Override
@@ -4,7 +4,7 @@ import java.sql.Connection;
import java.util.List;
import com.avaje.ebean.Transaction;
import com.avaje.ebean.annotation.DocStoreEvent;
import com.avaje.ebean.annotation.DocStoreMode;
import com.avaje.ebean.bean.PersistenceContext;
import com.avaje.ebean.event.changelog.BeanChange;
import com.avaje.ebean.event.changelog.ChangeSet;
@@ -109,7 +109,7 @@ public interface SpiTransaction extends Transaction {
* Returning 0 implies to use the system wide default batch size.
* </p>
*/
DocStoreEvent getDocStoreUpdateMode();
DocStoreMode getDocStoreUpdateMode();
/**
* Return the batch size to us for ElasticSearch Bulk API calls
@@ -2,7 +2,7 @@ package com.avaje.ebeaninternal.server.core;
import com.avaje.ebean.ValuePair;
import com.avaje.ebean.annotation.ConcurrencyMode;
import com.avaje.ebean.annotation.DocStoreEvent;
import com.avaje.ebean.annotation.DocStoreMode;
import com.avaje.ebean.bean.EntityBean;
import com.avaje.ebean.bean.EntityBeanIntercept;
import com.avaje.ebean.event.BeanPersistController;
@@ -69,7 +69,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
private final boolean publish;
private DocStoreEvent docStoreEvent;
private DocStoreMode docStoreMode;
private ConcurrencyMode concurrencyMode;
@@ -147,7 +147,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
this.parentBean = parentBean;
this.controller = beanDescriptor.getPersistController();
this.type = type;
this.docStoreEvent = calcDocStoreEvent(transaction, type);
this.docStoreMode = calcDocStoreEvent(transaction, type);
if (saveRecurse) {
this.persistCascade = t.isPersistCascade();
}
@@ -175,9 +175,9 @@ 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 DocStoreEvent calcDocStoreEvent(SpiTransaction txn, Type type) {
DocStoreEvent docStoreEvent = (txn == null) ? null : txn.getDocStoreUpdateMode();
return beanDescriptor.getDocStoreEvent(type, docStoreEvent);
private DocStoreMode calcDocStoreEvent(SpiTransaction txn, Type type) {
DocStoreMode docStoreMode = (txn == null) ? null : txn.getDocStoreUpdateMode();
return beanDescriptor.getDocStoreMode(type, docStoreMode);
}
/**
@@ -203,7 +203,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
public void initTransIfRequiredWithBatchCascade() {
if (createImplicitTransIfRequired()) {
docStoreEvent = calcDocStoreEvent(transaction, type);
docStoreMode = calcDocStoreEvent(transaction, type);
}
if (transaction.checkBatchEscalationOnCascade(this)) {
// we escalated to use batch mode so flush when done
@@ -309,7 +309,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
*/
private boolean isDocStoreNotify() {
// Either queue or directly update the document store
return docStoreEvent != DocStoreEvent.IGNORE;
return docStoreMode != DocStoreMode.IGNORE;
}
public boolean isNotifyPersistListener() {
@@ -731,7 +731,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
controllerPost();
}
if (type == Type.UPDATE && docStoreEvent == DocStoreEvent.UPDATE) {
if (type == Type.UPDATE && docStoreMode == DocStoreMode.UPDATE) {
// get the dirty properties for update notification to the doc store
dirtyProperties = intercept.getDirtyProperties();
}
@@ -913,7 +913,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
if (type == Type.UPDATE) {
beanDescriptor.docStoreUpdateEmbedded(this, docStoreUpdates);
}
switch (docStoreEvent) {
switch (docStoreMode) {
case UPDATE: {
docStoreUpdates.addPersist(this);
return;
@@ -7,7 +7,7 @@ import com.avaje.ebean.SqlUpdate;
import com.avaje.ebean.Transaction;
import com.avaje.ebean.ValuePair;
import com.avaje.ebean.annotation.ConcurrencyMode;
import com.avaje.ebean.annotation.DocStoreEvent;
import com.avaje.ebean.annotation.DocStoreMode;
import com.avaje.ebean.bean.BeanCollection;
import com.avaje.ebean.bean.EntityBean;
import com.avaje.ebean.bean.EntityBeanIntercept;
@@ -84,7 +84,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -367,7 +366,6 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
private final DocStoreBeanAdapter<T> docStoreAdapter;
private final String defaultSelectClause;
private final LinkedHashSet<String> defaultSelectClauseSet;
private SpiEbeanServer ebeanServer;
@@ -401,8 +399,6 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
this.changeLogFilter = deploy.getChangeLogFilter();
this.defaultSelectClause = deploy.getDefaultSelectClause();
this.defaultSelectClauseSet = deploy.parseDefaultSelectClause(defaultSelectClause);
this.idType = deploy.getIdType();
this.idTypePlatformDefault = deploy.isIdTypePlatformDefault();
this.idGenerator = deploy.getIdGenerator();
@@ -889,13 +885,6 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
return defaultSelectClause;
}
/**
* Return the default select clause already parsed into an ordered Set.
*/
public LinkedHashSet<String> getDefaultSelectClauseSet() {
return defaultSelectClauseSet;
}
/**
* Return true if this object is the root level object in its entity
* inheritance.
@@ -929,7 +918,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
* Return the doc store helper for this bean type.
*/
@Override
public BeanDocType docStore() {
public BeanDocType<T> docStore() {
return docStoreAdapter;
}
@@ -956,11 +945,11 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
}
/**
* Return the type of DocStoreEvent that should occur for this type of persist request
* Return the type of DocStoreMode that should occur for this type of persist request
* given the transactions requested mode.
*/
public DocStoreEvent getDocStoreEvent(PersistRequest.Type persistType, DocStoreEvent txnMode) {
return docStoreAdapter.getEvent(persistType, txnMode);
public DocStoreMode getDocStoreMode(PersistRequest.Type persistType, DocStoreMode txnMode) {
return docStoreAdapter.getMode(persistType, txnMode);
}
public void docStoreInsert(Object idValue, PersistRequestBean<T> persistRequest, DocStoreUpdateContext bulkUpdate) throws IOException {
@@ -1457,6 +1446,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
}
@Override
@SuppressWarnings("unchecked")
public T createBean() {
return (T)createEntityBean();
}
@@ -1464,6 +1454,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
/**
* Creates a new EntityBean.
*/
@SuppressWarnings("unchecked")
public EntityBean createEntityBean() {
try {
EntityBean bean = (EntityBean)prototypeEntityBean._ebean_newInstance();
@@ -2,7 +2,7 @@ package com.avaje.ebeaninternal.server.deploy.meta;
import com.avaje.ebean.annotation.ConcurrencyMode;
import com.avaje.ebean.annotation.DocStore;
import com.avaje.ebean.annotation.DocStoreEvent;
import com.avaje.ebean.annotation.DocStoreMode;
import com.avaje.ebean.config.ServerConfig;
import com.avaje.ebean.config.TableName;
import com.avaje.ebean.config.dbplatform.IdGenerator;
@@ -34,7 +34,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
@@ -187,10 +186,10 @@ public class DeployBeanDescriptor<T> {
private String docStoreIndexType;
private DocStoreEvent docStorePersist;
private DocStoreEvent docStoreInsert;
private DocStoreEvent docStoreUpdate;
private DocStoreEvent docStoreDelete;
private DocStoreMode docStorePersist;
private DocStoreMode docStoreInsert;
private DocStoreMode docStoreUpdate;
private DocStoreMode docStoreDelete;
/**
* Construct the BeanDescriptor.
@@ -805,29 +804,6 @@ public class DeployBeanDescriptor<T> {
return selectClause.substring(0, selectClause.length() - 1);
}
/**
* Parse the include separating by comma or semicolon.
*/
public LinkedHashSet<String> parseDefaultSelectClause(String rawList) {
if (rawList == null) {
return null;
}
String[] res = rawList.split(",");
LinkedHashSet<String> set = new LinkedHashSet<String>(res.length + 3);
String temp;
for (int i = 0; i < res.length; i++) {
temp = res[i].trim();
if (temp.length() > 0) {
set.add(temp);
}
}
return set;
}
/**
* Return true if the primary key is a compound key or if it's database type
* is non-numeric (and hence not suitable for db identity or sequence.
@@ -1008,30 +984,30 @@ public class DeployBeanDescriptor<T> {
/**
* Return the DocStore index behavior for bean inserts.
*/
public DocStoreEvent getDocStoreInsertEvent() {
public DocStoreMode getDocStoreInsertEvent() {
return getDocStoreIndexEvent(docStoreInsert);
}
/**
* Return the DocStore index behavior for bean updates.
*/
public DocStoreEvent getDocStoreUpdateEvent() {
public DocStoreMode getDocStoreUpdateEvent() {
return getDocStoreIndexEvent(docStoreUpdate);
}
/**
* Return the DocStore index behavior for bean deletes.
*/
public DocStoreEvent getDocStoreDeleteEvent() {
public DocStoreMode getDocStoreDeleteEvent() {
return getDocStoreIndexEvent(docStoreDelete);
}
private DocStoreEvent getDocStoreIndexEvent(DocStoreEvent mostSpecific) {
private DocStoreMode getDocStoreIndexEvent(DocStoreMode mostSpecific) {
if (!docStoreMapped) {
return DocStoreEvent.IGNORE;
return DocStoreMode.IGNORE;
}
if (mostSpecific != DocStoreEvent.DEFAULT) return mostSpecific;
if (docStorePersist != DocStoreEvent.DEFAULT) return docStorePersist;
if (mostSpecific != DocStoreMode.DEFAULT) return mostSpecific;
if (docStorePersist != DocStoreMode.DEFAULT) return docStorePersist;
return serverConfig.getDocStoreConfig().getPersist();
}
}
@@ -9,7 +9,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import com.avaje.ebean.annotation.DocStoreEvent;
import com.avaje.ebean.annotation.DocStoreMode;
import com.avaje.ebeanservice.docstore.api.support.DocStoreDeleteEvent;
import com.avaje.ebeanservice.docstore.api.DocStoreUpdates;
@@ -79,13 +79,13 @@ public final class DeleteByIdMap {
/**
* Add the deletes to the DocStoreUpdates.
*/
public void addDocStoreUpdates(DocStoreUpdates docStoreUpdates, DocStoreEvent txnIndexMode) {
public void addDocStoreUpdates(DocStoreUpdates docStoreUpdates, DocStoreMode txnIndexMode) {
for (BeanPersistIds deleteIds : beanMap.values()) {
BeanDescriptor<?> desc = deleteIds.getBeanDescriptor();
DocStoreEvent docStoreEvent = desc.getDocStoreEvent(PersistRequest.Type.DELETE, txnIndexMode);
if (DocStoreEvent.IGNORE != docStoreEvent) {
DocStoreMode mode = desc.getDocStoreMode(PersistRequest.Type.DELETE, txnIndexMode);
if (DocStoreMode.IGNORE != mode) {
// Add to queue or bulk update entries
boolean queue = (DocStoreEvent.QUEUE == docStoreEvent);
boolean queue = (DocStoreMode.QUEUE == mode);
String queueId = desc.getDocStoreQueueId();
List<Serializable> idValues = deleteIds.getDeleteIds();
if (idValues != null) {
@@ -1,7 +1,7 @@
package com.avaje.ebeaninternal.server.transaction;
import com.avaje.ebean.TransactionCallback;
import com.avaje.ebean.annotation.DocStoreEvent;
import com.avaje.ebean.annotation.DocStoreMode;
import com.avaje.ebean.bean.PersistenceContext;
import com.avaje.ebean.config.PersistBatch;
import com.avaje.ebean.config.dbplatform.DatabasePlatform.OnQueryOnly;
@@ -147,7 +147,7 @@ public class JdbcTransaction implements SpiTransaction {
* The mode for updating doc store indexes for this transaction.
* Only set when you want to override the default behavior.
*/
protected DocStoreEvent docStoreUpdateMode;
protected DocStoreMode docStoreUpdateMode;
protected int docStoreBulkBatchSize;
@@ -291,12 +291,12 @@ public class JdbcTransaction implements SpiTransaction {
this.docStoreBulkBatchSize = docStoreBulkBatchSize;
}
public DocStoreEvent getDocStoreUpdateMode() {
public DocStoreMode getDocStoreUpdateMode() {
return docStoreUpdateMode;
}
@Override
public void setDocStoreUpdateMode(DocStoreEvent docStoreUpdateMode) {
public void setDocStoreUpdateMode(DocStoreMode docStoreUpdateMode) {
this.docStoreUpdateMode = docStoreUpdateMode;
}
@@ -1,6 +1,6 @@
package com.avaje.ebeaninternal.server.transaction;
import com.avaje.ebean.annotation.DocStoreEvent;
import com.avaje.ebean.annotation.DocStoreMode;
import com.avaje.ebeaninternal.api.SpiTransaction;
import com.avaje.ebeaninternal.api.TransactionEvent;
import com.avaje.ebeaninternal.api.TransactionEventTable;
@@ -40,7 +40,7 @@ public final class PostCommitProcessing {
private final DeleteByIdMap deleteByIdMap;
private final DocStoreEvent txnDocStoreMode;
private final DocStoreMode txnDocStoreMode;
private final int txnDocStoreBatchSize;
@@ -52,7 +52,7 @@ public final class PostCommitProcessing {
this.clusterManager = clusterManager;
this.manager = manager;
this.serverName = manager.getServerName();
this.txnDocStoreMode = DocStoreEvent.IGNORE;
this.txnDocStoreMode = DocStoreMode.IGNORE;
this.txnDocStoreBatchSize = 0;
this.event = event;
this.deleteByIdMap = event.getDeleteByIdMap();
@@ -126,7 +126,7 @@ public final class PostCommitProcessing {
* Return true if updates to the document store occur for this transaction.
*/
private boolean isDocStoreUpdate() {
return manager.isDocStoreActive() && (txnDocStoreMode == null || txnDocStoreMode != DocStoreEvent.IGNORE);
return manager.isDocStoreActive() && (txnDocStoreMode == null || txnDocStoreMode != DocStoreMode.IGNORE);
}
public void notifyCluster() {