#191 New property for customizing thread count while loading modules

Author: rjrudin

gradle.properties

@@ -1,6 +1,6 @@
 group=com.marklogic
 javadocsDir=../gh-pages-marklogic-java/javadocs
 version=3.1-alpha3
-mlJavaclientUtilVersion=3.1-alpha3
+mlJavaclientUtilVersion=3.1-alpha4
 mlJunitVersion=3.1-alpha1
 

src/main/java/com/marklogic/appdeployer/AppConfig.java

@@ -113,6 +113,7 @@ public class AppConfig {
 	private String moduleTimestampsPath = PropertiesModuleManager.DEFAULT_FILE_PATH;
 	private boolean deleteTestModules = false;
 	private String deleteTestModulesPattern = "/test/**";
+	private int modulesLoaderThreadCount = 8;
 
     private String schemasPath;
     private ConfigDir configDir;
@@ -922,4 +923,12 @@ public Pattern getResourceFilenamesIncludePattern() {
 	public void setResourceFilenamesIncludePattern(Pattern resourceFilenamesIncludePattern) {
 		this.resourceFilenamesIncludePattern = resourceFilenamesIncludePattern;
 	}
+
+	public int getModulesLoaderThreadCount() {
+		return modulesLoaderThreadCount;
+	}
+
+	public void setModulesLoaderThreadCount(int modulesLoaderThreadCount) {
+		this.modulesLoaderThreadCount = modulesLoaderThreadCount;
+	}
 }

src/main/java/com/marklogic/appdeployer/DefaultAppConfigFactory.java

@@ -446,6 +446,12 @@ public AppConfig newAppConfig() {
 			c.setDeleteTestModulesPattern(prop);
 		}
 
+		prop = getProperty("mlModulesLoaderThreadCount");
+		if (prop != null) {
+			logger.info("Modules loader thread count: " + prop);
+			c.setModulesLoaderThreadCount(Integer.parseInt(prop));
+		}
+
 		/**
 		 * The following properties are all for generating Entity Services artifacts.
 		 */

src/main/java/com/marklogic/appdeployer/command/modules/DefaultModulesLoaderFactory.java

@@ -1,18 +1,17 @@
 package com.marklogic.appdeployer.command.modules;
 
 import com.marklogic.appdeployer.AppConfig;
-import com.marklogic.client.DatabaseClient;
-import com.marklogic.client.ext.tokenreplacer.DefaultTokenReplacer;
-import com.marklogic.client.ext.tokenreplacer.PropertiesSource;
-import com.marklogic.client.ext.tokenreplacer.RoxyTokenReplacer;
-import com.marklogic.client.ext.tokenreplacer.TokenReplacer;
+import com.marklogic.client.ext.batch.RestBatchWriter;
 import com.marklogic.client.ext.helper.LoggingObject;
 import com.marklogic.client.ext.modulesloader.ModulesLoader;
 import com.marklogic.client.ext.modulesloader.ModulesManager;
 import com.marklogic.client.ext.modulesloader.impl.*;
+import com.marklogic.client.ext.tokenreplacer.DefaultTokenReplacer;
+import com.marklogic.client.ext.tokenreplacer.PropertiesSource;
+import com.marklogic.client.ext.tokenreplacer.RoxyTokenReplacer;
+import com.marklogic.client.ext.tokenreplacer.TokenReplacer;
 import com.marklogic.xcc.template.XccTemplate;
 
-import java.io.File;
 import java.util.Map;
 import java.util.Properties;
 
@@ -26,8 +25,11 @@ public ModulesLoader newModulesLoader(AppConfig appConfig) {
 			modulesManager = new PropertiesModuleManager(path);
 		}
 
-		DatabaseClient modulesDatabaseClient = appConfig.newModulesDatabaseClient();
-		AssetFileLoader assetFileLoader = new AssetFileLoader(modulesDatabaseClient, modulesManager);
+		int threadCount = appConfig.getModulesLoaderThreadCount();
+
+		RestBatchWriter assetBatchWriter = new RestBatchWriter(appConfig.newModulesDatabaseClient(), false);
+		assetBatchWriter.setThreadCount(threadCount);
+		AssetFileLoader assetFileLoader = new AssetFileLoader(assetBatchWriter, modulesManager);
 
 		String permissions = appConfig.getModulePermissions();
 		if (permissions != null) {
@@ -49,6 +51,7 @@ public ModulesLoader newModulesLoader(AppConfig appConfig) {
 
 		DefaultModulesLoader modulesLoader = new DefaultModulesLoader(assetFileLoader);
 		modulesLoader.setModulesManager(modulesManager);
+		modulesLoader.setTaskThreadCount(threadCount);
 
 		if (appConfig.isStaticCheckAssets()) {
 			modulesLoader.setStaticChecker(newStaticChecker(appConfig));

src/test/java/com/marklogic/appdeployer/DefaultAppConfigFactoryTest.java

@@ -121,6 +121,7 @@ public void allProperties() {
         p.setProperty("mlModuleTimestampsPath", "custom/timestamps/path.properties");
         p.setProperty("mlDeleteTestModules", "true");
         p.setProperty("mlDeleteTestModulesPattern", "/some/pattern");
+        p.setProperty("mlModulesLoaderThreadCount", "3");
 
         p.setProperty("mlModelsPath", "ml/models");
         p.setProperty("mlInstanceConverterPath", "ext/my/path");
@@ -193,6 +194,7 @@ public void allProperties() {
         assertFalse(config.isUseRoxyTokenPrefix());
         assertTrue(config.isDeleteTestModules());
         assertEquals("/some/pattern", config.getDeleteTestModulesPattern());
+        assertEquals(3, config.getModulesLoaderThreadCount());
 
         assertEquals("ml/models", config.getModelsPath());
         assertEquals("ext/my/path", config.getInstanceConverterPath());