-Remove dupe maxConcurrentTasks from QLF.xml (#7)

-Add maxConcurrentTasks defaults to addtl logics to fix tests
NationalSecurityAgency · Aug 15, 2024 · 4c593e4 · 4c593e4
1 parent 32d1122
commit 4c593e4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/resources/QueryLogicFactory.xml b/src/main/resources/QueryLogicFactory.xml
@@ -54,7 +54,6 @@
         <property name="reverseIndexTableName" value="${datawave.query.logic.logics.BaseEventQuery.reverseIndexTableName}" />
         <property name="maxResults" value="${datawave.query.logic.logics.BaseEventQuery.maxResults}" />
         <property name="queryThreads" value="${datawave.query.logic.logics.BaseEventQuery.queryThreads}" />
-        <property name="maxConcurrentTasks" value="${datawave.query.logic.logics.BaseEventQuery.maxConcurrentTasks}" />
         <property name="indexLookupThreads" value="${datawave.query.logic.logics.BaseEventQuery.indexLookupThreads}" />
         <property name="dateIndexThreads" value="${datawave.query.logic.logics.BaseEventQuery.dateIndexThreads}" />
         <property name="fullTableScanEnabled" value="${datawave.query.logic.logics.BaseEventQuery.fullTableScanEnabled}" />

diff --git a/src/test/resources/config/application-QueryStarterDefaults.yml b/src/test/resources/config/application-QueryStarterDefaults.yml
@@ -326,6 +326,7 @@ datawave:
           queryThreads: 16
           auditType: "NONE"
           logicDescription: "Retrieve graph edges matching the search term(s)"
+          maxConcurrentTasks: 10
           querySyntaxParsers:
             "JEXL": ""
             "LIST": ""
@@ -358,6 +359,7 @@ datawave:
           maxUniqueValues: 20000
           auditType: "NONE"
           logicDescription: "Indexed Fields Only:  Given FIELDNAME returns counts for each unique value. Given FIELDNAME:FIELDVALUE returns count for only that value."
+          maxConcurrentTasks: 10
 
         ErrorFieldIndexCountQuery:
           checkpointable: false
@@ -373,6 +375,7 @@ datawave:
           maxUniqueValues: 20000
           auditType: "NONE"
           logicDescription: "FieldIndex count query (experimental)"
+          maxConcurrentTasks: 10
 
         TermFrequencyQuery:
           tableName: ${warehouse.tables.shard.name}
@@ -460,6 +463,7 @@ datawave:
           ivaratorMaxOpenFiles: ${warehouse.defaults.ivaratorMaxOpenFiles}
           ivaratorCacheScanPersistThreshold: 100000
           ivaratorCacheScanTimeoutMinutes: ${warehouse.defaults.ivaratorCacheScanTimeoutMinutes}
+          maxConcurrentTasks: 10
           querySyntaxParsers:
             JEXL: ""
             LUCENE: "LuceneToJexlQueryParser"