From e26ba4c01a9a16d9f36e56843b67df4a2ffb27d2 Mon Sep 17 00:00:00 2001
From: "d.buechler" <d.buechler@adito.de>
Date: Mon, 7 Oct 2019 09:57:21 +0200
Subject: [PATCH] New field BLOCK_SIZE which specifies the bulk size of data
which gets loaded. This is used in the case of a cache rebuild, the data to
scan for duplicates gets loaded in the thru BLOCK_SIZE specified size.
---
.../Duplicates/create_duplicateScanner.xml | 3 +++
aliasDefinition/Data_alias/Data_alias.aod | 14 ++++++++++++++
.../DuplicateScanner_entity.aod | 9 +++++++++
.../_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod | 3 +++
language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 4 ++++
language/_____LANGUAGE_en/_____LANGUAGE_en.aod | 3 +++
.../DuplicateScannerEdit_view.aod | 4 ++++
7 files changed, 40 insertions(+)
diff --git a/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateScanner.xml b/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateScanner.xml
index fc7be7e82c9..19d8c86619f 100644
--- a/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateScanner.xml
+++ b/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateScanner.xml
@@ -14,6 +14,9 @@
<column name="EXTERNAL_SERVICE_USAGE_ALLOWED" type="INTEGER" >
<constraints nullable="false"/>
</column>
+ <column name="BLOCK_SIZE" type="INTEGER">
+ <constraints nullable="false"/>
+ </column>
<column name="USER_NEW" type="NVARCHAR(50)">
<constraints nullable="false"/>
</column>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 236078f2231..dbf98f33240 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -11344,6 +11344,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>BLOCK_SIZE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="4" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
diff --git a/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod b/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
index 5f813c626c3..6091a9846a5 100644
--- a/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
+++ b/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
@@ -116,9 +116,14 @@
<entityActionField>
<name>RebuildOrganisationDuplicatesCache</name>
<title>Rebuild Organisation duplicates cache</title>
+ <onActionProcess>%aditoprj%/entity/DuplicateScanner_entity/entityfields/runactiongroup/children/rebuildorganisationduplicatescache/onActionProcess.js</onActionProcess>
</entityActionField>
</children>
</entityActionGroup>
+ <entityField>
+ <name>BLOCK_SIZE</name>
+ <title>Data block size</title>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -167,6 +172,10 @@
<name>DATE_EDIT.value</name>
<recordfield>DUPLICATESCANNER.DATE_EDIT</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>BLOCK_SIZE.value</name>
+ <recordfield>DUPLICATESCANNER.BLOCK_SIZE</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 6885b3761f7..ee0f9cacabd 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -5181,6 +5181,9 @@
<entry>
<key>Quick entry</key>
</entry>
+ <entry>
+ <key>Data block size</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 77dfd124b46..b8fe1b3b4d3 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -6533,6 +6533,10 @@
<key>Configurations</key>
<value>Konfigurationen</value>
</entry>
+ <entry>
+ <key>Data block size</key>
+ <value>Datenblockgröße</value>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index db7a20091f5..8c4f9f08837 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -5231,6 +5231,9 @@
<entry>
<key>Quick entry</key>
</entry>
+ <entry>
+ <key>Data block size</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod b/neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod
index 51be866e59e..e6fac3bde05 100644
--- a/neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod
+++ b/neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod
@@ -23,6 +23,10 @@
<name>c021711c-9f3e-454d-964c-1339e3463329</name>
<entityField>ENTITY_TO_SCAN_NAME</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>bc526338-19bb-4587-8321-7bd53c267c6d</name>
+ <entityField>BLOCK_SIZE</entityField>
+ </entityFieldLink>
</fields>
</genericViewTemplate>
<neonViewReference>
--
GitLab