1311 Multi-thread import folders crawling

Author: car031

logicaldoc-core/src/main/java/com/logicaldoc/core/searchengine/IndexerTask.java

@@ -25,9 +25,9 @@
 import com.logicaldoc.core.document.Document;
 import com.logicaldoc.core.document.DocumentDAO;
 import com.logicaldoc.core.document.DocumentHistory;
-import com.logicaldoc.core.document.IndexingStatus;
 import com.logicaldoc.core.document.DocumentManager;
 import com.logicaldoc.core.document.DocumentStatus;
+import com.logicaldoc.core.document.IndexingStatus;
 import com.logicaldoc.core.security.Tenant;
 import com.logicaldoc.core.security.TenantDAO;
 import com.logicaldoc.core.task.Task;
@@ -152,7 +152,8 @@ protected void runTask() throws TaskException {
 				log.info("Distribute the indexing among {} threads", threadsTotal);
 
 				// Divide the docs in groups of N
-				Collection<List<Long>> partitions = CollectionUtil.partition(docIds, threadsTotal);
+				Collection<List<Long>> partitions = CollectionUtil.partition(docIds,
+						(int) Math.ceil((double) docIds.size() / (double) threadsTotal));
 
 				startIndexerThreads(threadsTotal);
 				List<IndexerThread> threads = new ArrayList<>();
@@ -298,10 +299,10 @@ else if ("smallestfirst".equals(sorting))
 		if (StringUtils.isNotEmpty(sortingCustom))
 			sorting = sortingCustom;
 
-		String where = PersistentObjectDAO.ENTITY + ".deleted = 0 and (" + PersistentObjectDAO.ENTITY + ".indexingStatus = "
-				+ IndexingStatus.TO_INDEX.ordinal() + " or " + PersistentObjectDAO.ENTITY + ".indexingStatus = "
-				+ IndexingStatus.TO_INDEX_METADATA.ordinal() + ") and not " + PersistentObjectDAO.ENTITY + ".status = "
-				+ DocumentStatus.ARCHIVED.ordinal();
+		String where = PersistentObjectDAO.ENTITY + ".deleted = 0 and (" + PersistentObjectDAO.ENTITY
+				+ ".indexingStatus = " + IndexingStatus.TO_INDEX.ordinal() + " or " + PersistentObjectDAO.ENTITY
+				+ ".indexingStatus = " + IndexingStatus.TO_INDEX_METADATA.ordinal() + ") and not "
+				+ PersistentObjectDAO.ENTITY + ".status = " + DocumentStatus.ARCHIVED.ordinal();
 
 		return new String[] { where, sorting };
 	}

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/impex/folders/ImportFolderSettings.java

@@ -0,0 +1,95 @@
+package com.logicaldoc.gui.frontend.client.impex.folders;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import com.logicaldoc.gui.common.client.DefaultAsyncCallback;
+import com.logicaldoc.gui.common.client.Session;
+import com.logicaldoc.gui.common.client.beans.GUIParameter;
+import com.logicaldoc.gui.common.client.i18n.I18N;
+import com.logicaldoc.gui.common.client.util.ItemFactory;
+import com.logicaldoc.gui.common.client.util.Util;
+import com.logicaldoc.gui.frontend.client.services.SettingService;
+import com.smartgwt.client.types.HeaderControls;
+import com.smartgwt.client.types.TitleOrientation;
+import com.smartgwt.client.widgets.Window;
+import com.smartgwt.client.widgets.form.DynamicForm;
+import com.smartgwt.client.widgets.form.fields.ButtonItem;
+import com.smartgwt.client.widgets.form.fields.SpinnerItem;
+
+/**
+ * This popup window is used to input data and obtain a prediction from the AI
+ * model.
+ * 
+ * @author Marco Meschieri - LogicalDOC
+ * @since 9.2
+ */
+public class ImportFolderSettings extends Window {
+
+	private static final String THREADS_SETTING = "threadpool.ImportFolderCrawler.max";
+
+	private DynamicForm form = new DynamicForm();
+
+	public ImportFolderSettings() {
+		setHeaderControls(HeaderControls.HEADER_LABEL, HeaderControls.CLOSE_BUTTON);
+
+		setTitle(I18N.message("settings"));
+		setAutoSize(true);
+		setCanDragResize(true);
+		setIsModal(true);
+		setShowModalMask(true);
+		centerInPage();
+
+		SettingService.Instance.get().loadSettingsByNames(Arrays.asList(new String[] { THREADS_SETTING }),
+				new DefaultAsyncCallback<>() {
+
+					@Override
+					public void onSuccess(List<GUIParameter> params) {
+						init(params);
+					}
+				});
+	}
+
+	private void init(List<GUIParameter> params) {
+		ButtonItem save = new ButtonItem();
+		save.setTitle(I18N.message("save"));
+		save.setAutoFit(true);
+		save.setStartRow(true);
+		save.addClickHandler(event -> onSave());
+
+		SpinnerItem threads = ItemFactory.newSpinnerItem("threads",
+				Integer.parseInt(Util.getValue(THREADS_SETTING, params)));
+		threads.setRequired(true);
+		threads.setMin(1);
+		threads.setStep(1);
+		threads.setVisible(Session.get().isDefaultTenant());
+
+		form.setNumCols(1);
+		form.setTitleOrientation(TitleOrientation.TOP);
+		form.setFields(threads, save);
+
+		addItem(form);
+	}
+
+	private void onSave() {
+		if (!form.validate())
+			return;
+
+		List<GUIParameter> params = new ArrayList<>();
+		params.add(new GUIParameter(THREADS_SETTING, form.getValueAsString("threads")));
+		SettingService.Instance.get().saveSettings(params, new DefaultAsyncCallback<>());
+
+		destroy();
+	}
+
+	@Override
+	public boolean equals(Object other) {
+		return super.equals(other);
+	}
+
+	@Override
+	public int hashCode() {
+		return super.hashCode();
+	}
+}

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/impex/folders/ImportFoldersPanel.java

@@ -121,6 +121,14 @@ public void onDraw() {
 		if (Feature.enabled(Feature.IMPORT_LOCAL_FOLDERS) || Feature.enabled(Feature.IMPORT_REMOTE_FOLDERS))
 			toolStrip.addButton(addImportFolder);
 
+		toolStrip.addSeparator();
+		
+		ToolStripButton settings = new ToolStripButton();
+		settings.setTitle(I18N.message("settings"));
+		toolStrip.addButton(settings);
+		settings.addClickHandler(click -> new ImportFolderSettings().show());
+
+		
 		list.addCellContextClickHandler(click -> {
 			showContextMenu();
 			click.cancel();