Skip to content

Commit 156ed51

Browse files
lbschannolbschanno
authored
Merge branch 'integration' into task/queryLimit
2 parents c78389d + bd01db6 commit 156ed51

File tree

111 files changed

+869
-6347
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+869
-6347
lines changed

‎contrib/datawave-quickstart/bin/services/datawave/bootstrap.sh‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,6 @@ function setBuildPropertyOverrides() {
172172

173173
echo "cached.results.hdfs.uri=${DW_HADOOP_DFS_URI_CLIENT}" >> ${BUILD_PROPERTIES_FILE}
174174
echo "type.metadata.hdfs.uri=${DW_HADOOP_DFS_URI_CLIENT}" >> ${BUILD_PROPERTIES_FILE}
175-
echo "mapReduce.hdfs.uri=${DW_HADOOP_DFS_URI_CLIENT}" >> ${BUILD_PROPERTIES_FILE}
176-
echo "bulkResults.hdfs.uri=${DW_HADOOP_DFS_URI_CLIENT}" >> ${BUILD_PROPERTIES_FILE}
177175
echo "jboss.log.hdfs.uri=${DW_HADOOP_DFS_URI_CLIENT}" >> ${BUILD_PROPERTIES_FILE}
178176

179177
echo "lock.file.dir=${DW_DATAWAVE_INGEST_LOCKFILE_DIR}" >> ${BUILD_PROPERTIES_FILE}
@@ -183,8 +181,6 @@ function setBuildPropertyOverrides() {
183181
echo "jboss.managed.executor.service.default.max.threads=${DW_WILDFLY_EE_DEFAULT_MAX_THREADS:-48}" >> ${BUILD_PROPERTIES_FILE}
184182
echo "hornetq.cluster.password=${DW_ACCUMULO_PASSWORD}" >> ${BUILD_PROPERTIES_FILE}
185183
echo "hornetq.system.password=${DW_ACCUMULO_PASSWORD}" >> ${BUILD_PROPERTIES_FILE}
186-
echo "mapReduce.job.tracker=${DW_HADOOP_RESOURCE_MANAGER_ADDRESS_CLIENT}" >> ${BUILD_PROPERTIES_FILE}
187-
echo "bulkResults.job.tracker=${DW_HADOOP_RESOURCE_MANAGER_ADDRESS_CLIENT}" >> ${BUILD_PROPERTIES_FILE}
188184
echo "EVENT_DISCARD_INTERVAL=0" >> ${BUILD_PROPERTIES_FILE}
189185
echo "EVENT_DISCARD_FUTURE_INTERVAL=0" >> ${BUILD_PROPERTIES_FILE}
190186
echo "ingest.data.types=${DW_DATAWAVE_INGEST_LIVE_DATA_TYPES},${DW_DATAWAVE_INGEST_BULK_DATA_TYPES}" >> ${BUILD_PROPERTIES_FILE}

‎core/base-rest-responses/src/main/java/datawave/webservice/result/BaseResponse.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,14 @@ public void setOperationTimeMS(long operationTimeMS) {
5151
}
5252

5353
public void setMessages(List<String> messages) {
54-
this.messages = messages;
54+
if (messages == null) {
55+
this.messages = null;
56+
} else if (this.messages == null) {
57+
this.messages = new ArrayList<>(messages);
58+
} else {
59+
this.messages.clear();
60+
this.messages.addAll(messages);
61+
}
5562
}
5663

5764
public void setExceptions(LinkedList<QueryExceptionType> exceptions) {

‎core/query/src/main/java/datawave/core/query/configuration/GenericQueryConfiguration.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,13 +362,15 @@ && getBypassAccumulo() == that.getBypassAccumulo() && Objects.equals(getAuthoriz
362362
&& Objects.equals(getBeginDate(), that.getBeginDate()) && Objects.equals(getEndDate(), that.getEndDate())
363363
&& Objects.equals(getMaxWork(), that.getMaxWork()) && Objects.equals(getTableName(), that.getTableName())
364364
&& Objects.equals(getQueries(), that.getQueries()) && Objects.equals(getAccumuloPassword(), that.getAccumuloPassword())
365-
&& Objects.equals(getConnPoolName(), that.getConnPoolName()) && Objects.equals(isReduceResults(), that.isReduceResults());
365+
&& Objects.equals(getConnPoolName(), that.getConnPoolName()) && Objects.equals(isReduceResults(), that.isReduceResults())
366+
&& Objects.equals(getTableHints(), that.getTableHints())
367+
&& Objects.equals(getTableConsistencyLevels(), that.getTableConsistencyLevels());
366368
}
367369

368370
@Override
369371
public int hashCode() {
370372
return Objects.hash(isCheckpointable(), getAuthorizations(), getQuery(), getQueryString(), getBeginDate(), getEndDate(), getMaxWork(),
371373
getBaseIteratorPriority(), getTableName(), getQueries(), getBypassAccumulo(), getConnPoolName(), getAccumuloPassword(),
372-
isReduceResults());
374+
isReduceResults(), getTableHints(), getTableConsistencyLevels());
373375
}
374376
}

‎core/utils/type-utils/src/main/java/datawave/webservice/query/util/QueryUncaughtExceptionHandler.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
package datawave.webservice.query.util;
22

33
import java.lang.Thread.UncaughtExceptionHandler;
4+
import java.util.ArrayList;
5+
import java.util.Collections;
6+
import java.util.List;
47

58
public class QueryUncaughtExceptionHandler implements UncaughtExceptionHandler {
69

710
private Thread thread;
811
private Throwable throwable;
12+
private List<String> messages = Collections.synchronizedList(new ArrayList<>());
913

1014
@Override
1115
public void uncaughtException(Thread t, Throwable e) {
@@ -25,4 +29,14 @@ public Thread getThread() {
2529
public Throwable getThrowable() {
2630
return throwable;
2731
}
32+
33+
public void addMessage(String message) {
34+
messages.add(message);
35+
}
36+
37+
public List<String> getMessages() {
38+
synchronized (messages) {
39+
return Collections.unmodifiableList(new ArrayList<>(messages));
40+
}
41+
}
2842
}

‎coverage/pom.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -261,21 +261,6 @@
261261
<artifactId>datawave-ws-dictionary</artifactId>
262262
<version>${project.version}</version>
263263
</dependency>
264-
<dependency>
265-
<groupId>gov.nsa.datawave.webservices</groupId>
266-
<artifactId>datawave-ws-map-reduce</artifactId>
267-
<version>${project.version}</version>
268-
</dependency>
269-
<dependency>
270-
<groupId>gov.nsa.datawave.webservices</groupId>
271-
<artifactId>datawave-ws-map-reduce-embedded</artifactId>
272-
<version>${project.version}</version>
273-
</dependency>
274-
<dependency>
275-
<groupId>gov.nsa.datawave.webservices</groupId>
276-
<artifactId>datawave-ws-map-reduce-status</artifactId>
277-
<version>${project.version}</version>
278-
</dependency>
279264
<dependency>
280265
<groupId>gov.nsa.datawave.webservices</groupId>
281266
<artifactId>datawave-ws-model</artifactId>

‎docs/pom.xml‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -118,18 +118,6 @@
118118
<version>${project.version}</version>
119119
<optional>true</optional>
120120
</dependency>
121-
<dependency>
122-
<groupId>gov.nsa.datawave.webservices</groupId>
123-
<artifactId>datawave-ws-map-reduce</artifactId>
124-
<version>${project.version}</version>
125-
<optional>true</optional>
126-
</dependency>
127-
<dependency>
128-
<groupId>gov.nsa.datawave.webservices</groupId>
129-
<artifactId>datawave-ws-map-reduce-status</artifactId>
130-
<version>${project.version}</version>
131-
<optional>true</optional>
132-
</dependency>
133121
<dependency>
134122
<groupId>gov.nsa.datawave.webservices</groupId>
135123
<artifactId>datawave-ws-model</artifactId>
@@ -166,6 +154,11 @@
166154
<artifactId>jackson-jaxrs</artifactId>
167155
<version>1.8.8</version>
168156
</dependency>
157+
<dependency>
158+
<groupId>org.jboss.weld</groupId>
159+
<artifactId>weld-core-impl</artifactId>
160+
<version>${version.weld}</version>
161+
</dependency>
169162
<dependency>
170163
<groupId>org.springframework.security</groupId>
171164
<artifactId>spring-security-core</artifactId>

‎microservices/configcheck/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
<spotbugs.excludes.file />
2525
<surefire.forkCount>1C</surefire.forkCount>
2626
<version.jackson>2.13.2</version.jackson>
27-
<version.log4j.bom>2.19.0</version.log4j.bom>
28-
<version.spring.boot>2.7.1</version.spring.boot>
2927
<version.junit5>5.12.0</version.junit5>
3028
<version.junit5.platform>1.12.0</version.junit5.platform>
29+
<version.log4j.bom>2.19.0</version.log4j.bom>
30+
<version.spring.boot>2.7.1</version.spring.boot>
3131
</properties>
3232
<dependencyManagement>
3333
<dependencies>

‎microservices/configcheck/src/test/resources/input/webservice/properties/default.properties‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -356,25 +356,6 @@ lookup.uuid.uuidTypes=
356356
# Default lookup.uuid.beginDate
357357
lookup.uuid.beginDate=20100101
358358

359-
############################
360-
#
361-
# MapReduce Service
362-
#
363-
############################
364-
# Default restrict input formats
365-
mapReduce.inputFormat.restrict=true
366-
mapReduce.job.tracker=localhost:8021
367-
#mapreduce.http.port identifies Wildfly address and port
368-
mapReduce.http.port=http://localhost:8443
369-
mapReduce.hdfs.uri=hdfs://localhost:8020/
370-
mapReduce.hdfs.base.dir=/datawave/MapReduceService
371-
372-
bulkResults.job.tracker=localhost:8021
373-
bulkResults.http.port=http://localhost:8080
374-
bulkResults.hdfs.uri=hdfs://localhost:8020/
375-
bulkResults.hdfs.base.dir=/datawave/BulkResults
376-
mapreduce.securitydomain.useJobCache=true
377-
378359
# Query configuration parameter, true by default, but may cause an issue with malformed UIDs
379360
include.hierarchy.fields=false
380361
hierarchy.field.options=

‎pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@
102102
<version.infinispan>9.4.21.Final</version.infinispan>
103103
<version.jackson>2.10.0.pr1</version.jackson>
104104
<version.jackson-mapper-asl>1.9.13</version.jackson-mapper-asl>
105-
<version.jackson.protobuf>0.9.12</version.jackson.protobuf>
106105
<version.jakarta>2.3.3</version.jakarta>
107106
<version.javassist>3.24.0-GA</version.javassist>
108107
<version.javastatsd>3.1.0</version.javastatsd>
@@ -269,11 +268,6 @@
269268
<artifactId>json-simple</artifactId>
270269
<version>${version.googlecode-json-simple}</version>
271270
</dependency>
272-
<dependency>
273-
<groupId>com.hubspot.jackson</groupId>
274-
<artifactId>jackson-datatype-protobuf</artifactId>
275-
<version>${version.jackson.protobuf}</version>
276-
</dependency>
277271
<dependency>
278272
<groupId>com.mysql</groupId>
279273
<artifactId>mysql-connector-j</artifactId>

‎properties/default.properties‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -411,25 +411,6 @@ lookup.uuid.uuidTypes=
411411
# Default lookup.uuid.beginDate
412412
lookup.uuid.beginDate=19700101
413413

414-
############################
415-
#
416-
# MapReduce Service
417-
#
418-
############################
419-
# Default restrict input formats
420-
mapReduce.inputFormat.restrict=true
421-
mapReduce.job.tracker=localhost:8021
422-
#mapreduce.http.port identifies Wildfly address and port
423-
mapReduce.http.port=http://localhost:8443
424-
mapReduce.hdfs.uri=hdfs://localhost:8020/
425-
mapReduce.hdfs.base.dir=/datawave/MapReduceService
426-
427-
bulkResults.job.tracker=localhost:8021
428-
bulkResults.http.port=http://localhost:8080
429-
bulkResults.hdfs.uri=hdfs://localhost:8020/
430-
bulkResults.hdfs.base.dir=/datawave/BulkResults
431-
mapreduce.securitydomain.useJobCache=true
432-
433414
# Query configuration parameter, true by default, but may cause an issue with malformed UIDs
434415
include.hierarchy.fields=false
435416
hierarchy.field.options=

0 commit comments

Comments
 (0)