Spring/spring-data-gemfire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SGF-695 - Add support for parallel snapshots.

Browse Source
This commit is contained in:
John Blum
2017-11-11 20:22:57 -08:00
parent 161d92a9f6
commit c1ccfa33f6
5 changed files with 171 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/org/springframework/data/gemfire/config/xml/SnapshotServiceParser.java
View File

@@ -16,6 +16,8 @@
package org.springframework.data.gemfire.config.xml;
import static org.springframework.data.gemfire.util.CollectionUtils.nullSafeList;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.ManagedList;
@@ -71,28 +73,31 @@ class SnapshotServiceParser extends AbstractSingleBeanDefinitionParser {
private ManagedList<BeanDefinition> parseSnapshots(Element element, ParserContext parserContext,
String childTagName) {
ManagedList<BeanDefinition> snapshotBeans = new ManagedList<BeanDefinition>();
ManagedList<BeanDefinition> snapshotBeans = new ManagedList<>();
for (Element childElement : DomUtils.getChildElementsByTagName(element, childTagName)) {
snapshotBeans.add(parseSnapshotMetadata(childElement, parserContext));
}
nullSafeList(DomUtils.getChildElementsByTagName(element, childTagName)).forEach(childElement ->
snapshotBeans.add(parseSnapshotMetadata(childElement, parserContext)));
return snapshotBeans;
}
/* (non-Javadoc) */
private BeanDefinition parseSnapshotMetadata(Element snapshotMetadataElement, ParserContext parserContext) {
BeanDefinitionBuilder snapshotMetadataBuilder = BeanDefinitionBuilder.genericBeanDefinition(
SnapshotServiceFactoryBean.SnapshotMetadata.class);
BeanDefinitionBuilder snapshotMetadataBuilder =
BeanDefinitionBuilder.genericBeanDefinition(SnapshotServiceFactoryBean.SnapshotMetadata.class);
snapshotMetadataBuilder.addConstructorArgValue(snapshotMetadataElement.getAttribute("location"));
snapshotMetadataBuilder.addConstructorArgValue(snapshotMetadataElement.getAttribute("format"));
if (isSnapshotFilterSpecified(snapshotMetadataElement)) {
snapshotMetadataBuilder.addConstructorArgValue(ParsingUtils.parseRefOrNestedBeanDeclaration(
snapshotMetadataElement, parserContext, snapshotMetadataBuilder, "filter-ref", true));
snapshotMetadataElement, parserContext, snapshotMetadataBuilder, "filter-ref",
true));
}
snapshotMetadataBuilder.addConstructorArgValue(snapshotMetadataElement.getAttribute("format"));
ParsingUtils.setPropertyValue(snapshotMetadataElement, snapshotMetadataBuilder, "parallel");
return snapshotMetadataBuilder.getBeanDefinition();
}

56
src/main/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBean.java
View File

@@ -168,7 +168,7 @@ public class SnapshotServiceFactoryBean<K, V> extends AbstractFactoryBeanSupport
* @see org.apache.geode.cache.snapshot.RegionSnapshotService
*/
protected SnapshotServiceAdapter<K, V> wrap(RegionSnapshotService<K, V> regionSnapshotService) {
return new RegionSnapshotServiceAdapter<K, V>(regionSnapshotService);
return new RegionSnapshotServiceAdapter<>(regionSnapshotService);
}
/**
@@ -446,8 +446,10 @@ public class SnapshotServiceFactoryBean<K, V> extends AbstractFactoryBeanSupport
throw new UnsupportedOperationException("not implemented");
}
protected SnapshotOptions<K, V> createOptions(SnapshotFilter<K, V> filter) {
return createOptions().setFilter(filter);
protected SnapshotOptions<K, V> createOptions(SnapshotMetadata<K, V> metadata) {
return createOptions()
.setFilter(metadata.getFilter())
.setParallelMode(metadata.isParallel());
}
@Override
@@ -455,7 +457,7 @@ public class SnapshotServiceFactoryBean<K, V> extends AbstractFactoryBeanSupport
public void doExport(SnapshotMetadata<K, V>... configurations) {
stream(nullSafeArray(configurations)).forEach(configuration ->
save(configuration.getLocation(), configuration.getFormat(), createOptions(configuration.getFilter())));
save(configuration.getLocation(), configuration.getFormat(), createOptions(configuration)));
}
@Override
@@ -463,8 +465,7 @@ public class SnapshotServiceFactoryBean<K, V> extends AbstractFactoryBeanSupport
public void doImport(SnapshotMetadata<K, V>... configurations) {
stream(nullSafeArray(configurations)).forEach(configuration ->
load(configuration.getFormat(), createOptions(configuration.getFilter()),
handleLocation(configuration)));
load(configuration.getFormat(), createOptions(configuration), handleLocation(configuration)));
}
protected abstract File[] handleLocation(SnapshotMetadata<K, V> configuration);
@@ -671,7 +672,7 @@ public class SnapshotServiceFactoryBean<K, V> extends AbstractFactoryBeanSupport
}
@Override
protected File[] handleLocation(final SnapshotMetadata<K, V> configuration) {
protected File[] handleLocation(SnapshotMetadata<K, V> configuration) {
return new File[] { configuration.getLocation() };
}
@@ -739,22 +740,33 @@ public class SnapshotServiceFactoryBean<K, V> extends AbstractFactoryBeanSupport
*/
public static class SnapshotMetadata<K, V> {
protected static final boolean DEFAULT_PARALLEL = false;
protected static final SnapshotFormat DEFAULT_SNAPSHOT_FORMAT = SnapshotFormat.GEMFIRE;
private boolean parallel;
private final File location;
private final SnapshotFilter<K, V> filter;
private final SnapshotFormat format;
public SnapshotMetadata(File location, SnapshotFormat format) {
this(location, null, format);
public SnapshotMetadata(File location) {
this(location, DEFAULT_SNAPSHOT_FORMAT, null);
}
public SnapshotMetadata(File location, SnapshotFilter<K, V> filter, SnapshotFormat format) {
Assert.notNull(location, "Location must not be null");
public SnapshotMetadata(File location, SnapshotFormat format) {
this(location, format, null);
}
public SnapshotMetadata(File location, SnapshotFormat format, SnapshotFilter<K, V> filter) {
Assert.notNull(location, "Location is required");
this.location = location;
this.filter = filter;
this.format = format;
this.filter = filter;
}
public boolean isDirectory() {
@@ -766,7 +778,11 @@ public class SnapshotServiceFactoryBean<K, V> extends AbstractFactoryBeanSupport
}
public File getLocation() {
return location;
return this.location;
}
public SnapshotFormat getFormat() {
return Optional.ofNullable(this.format).orElse(DEFAULT_SNAPSHOT_FORMAT);
}
public boolean isFilterPresent() {
@@ -774,17 +790,21 @@ public class SnapshotServiceFactoryBean<K, V> extends AbstractFactoryBeanSupport
}
public SnapshotFilter<K, V> getFilter() {
return filter;
return this.filter;
}
public SnapshotFormat getFormat() {
return (format != null ? format : SnapshotFormat.GEMFIRE);
public void setParallel(boolean parallel) {
this.parallel = parallel;
}
public boolean isParallel() {
return this.parallel;
}
@Override
public String toString() {
return String.format("{ @type = %1$s, location = %2$s, filter = %2$s, format = %4$s }",
getClass().getName(), getLocation().getAbsolutePath(), getFilter(), getFormat());
return String.format("{ @type = %1$s, location = %2$s, format = %3$s, filter = %4$s, parallel = %5$s }",
getClass().getName(), getLocation().getAbsolutePath(), getFormat(), getFilter(), isParallel());
}
}

5
src/main/resources/org/springframework/data/gemfire/config/spring-data-gemfire-2.1.xsd
View File

@@ -247,9 +247,10 @@ both in the same definition) is illegal.
</xsd:annotation>
</xsd:any>
</xsd:sequence>
<xsd:attribute name="location" type="xsd:string" use="required"/>
<xsd:attribute name="format" type="xsd:string" use="optional" default="GEMFIRE"/>
<xsd:attribute name="filter-ref" type="xsd:string" use="optional"/>
<xsd:attribute name="format" type="xsd:string" use="optional" default="GEMFIRE"/>
<xsd:attribute name="location" type="xsd:string" use="required"/>
<xsd:attribute name="parallel" type="xsd:string" use="optional" default="false"/>
</xsd:complexType>
</xsd:schema>