Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Task/merge 5.2 to 5.8 #2062

Merged
merged 29 commits into from
Aug 8, 2023
Merged

Task/merge 5.2 to 5.8 #2062

merged 29 commits into from
Aug 8, 2023

Conversation

hgklohr
Copy link
Collaborator

@hgklohr hgklohr commented Aug 7, 2023

No description provided.

keith-ratcliffe and others added 29 commits May 16, 2023 16:30
* Date volume chooser (#1347)

* First pass at date based volume chooser

* Moved to balancers package and renamed package

* Adding missed rename

* Update dist.xml to reflect new package name

* Updates for quickstart and docs to point to new jar

* Updates for accumulo 2.1

* Some minor cleanup

* Updating tests

* Update date chooser with comments.

* Updates for date based volume chooser

---------

Co-authored-by: Adam Lerman awlerma <[email protected]>
Co-authored-by: Adam Lerman <[email protected]>
* Fixes #2039
- Restored ability to configure AccumuloOutputFormat's accumulo client via script
- Cleanup of IngestJob's CBMutationOutputFormatter setup for live ingest

* RE: #2039 - Ensure that parent class configure method is used
…#2023) (#2024)

Conflicts:
	web-services/common-util/src/main/java/datawave/webservice/common/logging/ThreadConfigurableLogger.java
* Previously, no parameters were passed. This meant the receiver did not get any information about the query to plan, resulting in an odd `415 Unsupported Media Type` error due to the empty POST body.
Conflicts:
	warehouse/query-core/src/main/java/datawave/query/tables/RemoteEventQueryLogic.java
Conflicts:
	common-test/pom.xml
	docs/pom.xml
	pom.xml
	warehouse/accumulo-extensions/pom.xml
	warehouse/accumulo-extensions/src/main/java/datawave/ingest/table/volumeChoosers/ShardedTableDateBasedTieredVolumeChooser.java
	warehouse/accumulo-extensions/src/test/java/datawave/ingest/table/volumeChoosers/ShardedTableDateBasedTieredVolumeChooserTest.java
	warehouse/assemble/datawave/pom.xml
	warehouse/assemble/pom.xml
	warehouse/assemble/webservice/pom.xml
	warehouse/common/pom.xml
	warehouse/core/pom.xml
	warehouse/core/src/main/java/datawave/ingest/data/config/ingest/AccumuloHelper.java
	warehouse/data-dictionary-core/pom.xml
	warehouse/edge-dictionary-core/pom.xml
	warehouse/edge-model-configuration-core/pom.xml
	warehouse/index-stats/pom.xml
	warehouse/ingest-configuration/pom.xml
	warehouse/ingest-core/pom.xml
	warehouse/ingest-core/src/main/java/datawave/ingest/table/aggregator/KeepCountOnlyNoUidAggregator.java
	warehouse/ingest-core/src/main/java/datawave/ingest/table/config/ShardTableConfigHelper.java
	warehouse/ingest-core/src/test/java/datawave/ingest/table/aggregator/KeepCountOnlyNoUidAggregatorTest.java
	warehouse/ingest-csv/pom.xml
	warehouse/ingest-json/pom.xml
	warehouse/ingest-nyctlc/pom.xml
	warehouse/ingest-scripts/pom.xml
	warehouse/ingest-wikipedia/pom.xml
	warehouse/metrics-core/pom.xml
	warehouse/ops-tools/config-compare/pom.xml
	warehouse/ops-tools/index-validation/pom.xml
	warehouse/ops-tools/pom.xml
	warehouse/pom.xml
	warehouse/query-core/pom.xml
	warehouse/query-core/src/main/java/datawave/query/tables/BatchScannerSession.java
	warehouse/query-core/src/main/java/datawave/query/tables/content/ContentQueryTable.java
	warehouse/query-core/src/main/java/datawave/query/transformer/ContentQueryTransformer.java
	warehouse/query-core/src/test/java/datawave/query/tables/content/ContentQueryTableTest.java
	warehouse/regression-testing/pom.xml
	web-services/accumulo/pom.xml
	web-services/atom/pom.xml
	web-services/cached-results/pom.xml
	web-services/client/pom.xml
	web-services/client/src/main/java/datawave/webservice/query/Query.java
	web-services/client/src/main/java/datawave/webservice/query/QueryImpl.java
	web-services/client/src/main/java/datawave/webservice/query/QueryParameters.java
	web-services/client/src/main/java/datawave/webservice/query/QueryParametersImpl.java
	web-services/common-util/pom.xml
	web-services/common/pom.xml
	web-services/deploy/application/pom.xml
	web-services/deploy/configuration/pom.xml
	web-services/deploy/docs/pom.xml
	web-services/deploy/pom.xml
	web-services/deploy/spring-framework-integration/pom.xml
	web-services/dictionary/pom.xml
	web-services/examples/client-login/pom.xml
	web-services/examples/http-client/pom.xml
	web-services/examples/jms-client/pom.xml
	web-services/examples/pom.xml
	web-services/examples/query-war/pom.xml
	web-services/map-reduce-embedded/pom.xml
	web-services/map-reduce-status/pom.xml
	web-services/map-reduce/pom.xml
	web-services/model/pom.xml
	web-services/modification/pom.xml
	web-services/pom.xml
	web-services/query-websocket/pom.xml
	web-services/query/pom.xml
	web-services/query/src/main/java/datawave/webservice/query/dashboard/DashboardQuery.java
	web-services/query/src/main/java/datawave/webservice/query/logic/DelegatingQueryLogic.java
	web-services/query/src/main/java/datawave/webservice/query/runner/RunningQuery.java
	web-services/query/src/main/java/datawave/webservice/query/util/LookupUUIDUtil.java
	web-services/query/src/test/java/datawave/webservice/query/configuration/TestBaseQueryLogic.java
	web-services/query/src/test/java/datawave/webservice/query/runner/ExtendedQueryExecutorBeanTest.java
	web-services/query/src/test/java/datawave/webservice/query/runner/ExtendedRunningQueryTest.java
	web-services/rest-api/pom.xml
	web-services/security/pom.xml
	web-services/web-root/pom.xml
@hgklohr hgklohr merged commit b253805 into release/version5.8 Aug 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants