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.

Sign up for GitHub

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

Jump to bottom

Cache API improvements for observability (REST API) and configuration (copy #16625) #17623

Open
wants to merge 1 commit into
base: big_coconut_uat
Choose a base branch
from
Open

Cache API improvements for observability (REST API) and configuration (copy #16625) #17623

wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 18, 2024

#16705

This is an automatic copy of pull request #16625 done by Mergify.

@teosarca @mergify
Cache API improvements for observability (REST API) and configuration (…
8c76cb1 
…#16625)

Restrict the sizes of our CCaches
refs: #16705

(cherry picked from commit 0eed8b1)

# Conflicts:
#	backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/attachments/listener/TableAttachmentListenerService.java
#	backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/cache/CCache.java
#	backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/cache/CacheLabel.java
#	backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/cache/CacheMgt.java
#	backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/i18n/IMsgBL.java
#	backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/i18n/ImmutableTranslatableString.java
#	backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/i18n/Msg.java
#	backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/i18n/impl/ADMessageDAO.java
#	backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/i18n/impl/MsgBL.java
#	backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/i18n/impl/PlainMsgBL.java
#	backend/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/ad/element/api/impl/ADElementDAO.java
#	backend/de.metas.adempiere.adempiere/base/src/main/java/org/compiere/util/CtxNames.java
#	backend/de.metas.adempiere.adempiere/base/src/test/java/de/metas/i18n/MessagesMapRepositoryTest.java
#	backend/de.metas.handlingunits.base/src/main/java/org/adempiere/mm/attributes/spi/impl/HUBusinessPartnerAttributeValuesProvider.java
#	backend/de.metas.salescandidate.base/src/main/java/de/metas/pricing/rules/ManualPricePricingRule.java
#	backend/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/modelvalidator/SwatValidator.java
#	backend/de.metas.ui.web.base/src/main/java/de/metas/ui/web/debug/DebugRestController.java
#	backend/de.metas.ui.web.base/src/main/java/de/metas/ui/web/window/model/lookup/GenericSqlLookupDataSourceFetcher.java
#	backend/de.metas.ui.web.base/src/test/java/de/metas/ui/web/pattribute/ASIDescriptorFactoryTest.java
#	backend/de.metas.util/src/main/java/de/metas/util/NumberUtils.java
#	backend/de.metas.util/src/main/java/de/metas/util/lang/Percent.java
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Mar 18, 2024

Cherry-pick of 0eed8b1 has failed:

On branch mergify/copy/big_coconut_uat/pr-16625
Your branch is up to date with 'origin/big_coconut_uat'.

You are currently cherry-picking commit 0eed8b1baf6.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   backend/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/SpringContextHolder.java
	modified:   backend/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/model/MNote.java
	modified:   backend/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/print/layout/LayoutEngine.java
	new file:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/cache/CCacheConfig.java
	new file:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/cache/CCacheConfigDefaults.java
	new file:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/cache/CCacheStats.java
	new file:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/cache/CCacheStatsOrderBy.java
	new file:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/cache/CCacheStatsPredicate.java
	modified:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/cache/CacheInterface.java
	modified:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/cache/IDCache.java
	deleted:    backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/cache/JMXCacheMgt.java
	deleted:    backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/cache/JMXCacheMgtMBean.java
	modified:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/cache/interceptor/CachedMethodDescriptor.java
	deleted:    backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/cache/model/ITableCacheStatisticsCollector.java
	modified:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/cache/model/impl/ModelCacheService.java
	deleted:    backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/cache/model/impl/TableCacheStatisticsCollector.java
	deleted:    backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/cache/model/jmx/JMXCacheStatisticsManager.java
	deleted:    backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/cache/model/jmx/JMXCacheStatisticsManagerMBean.java
	deleted:    backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/cache/model/jmx/JMXTableCacheStatistics.java
	deleted:    backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/cache/model/jmx/JMXTableCacheStatisticsMBean.java
	new file:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/cache/rest/CacheRestControllerTemplate.java
	new file:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/cache/rest/JsonCache.java
	new file:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/cache/rest/JsonCacheResetRequest.java
	new file:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/cache/rest/JsonCacheResetResponse.java
	new file:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/cache/rest/JsonCacheStats.java
	new file:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/cache/rest/JsonCacheStatsQuery.java
	new file:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/cache/rest/JsonGetStatsResponse.java
	modified:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/i18n/AdMessageId.java
	modified:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/i18n/AdMessageKey.java
	deleted:    backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/i18n/IADMessageDAO.java
	new file:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/i18n/Message.java
	new file:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/i18n/MessageFormatter.java
	new file:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/i18n/MessagesMap.java
	new file:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/i18n/MessagesMapRepository.java
	modified:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/i18n/TranslatableStrings.java
	modified:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/notification/impl/NotificationRepository.java
	modified:   backend/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/ad/element/api/IADElementDAO.java
	modified:   backend/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/service/impl/SysConfigDAO.java
	modified:   backend/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/ui/spi/impl/DefaultGridTabSummaryInfoProvider.java
	new file:   backend/de.metas.adempiere.adempiere/base/src/test/java/de/metas/cache/CCacheStatsOrderByTest.java
	new file:   backend/de.metas.adempiere.adempiere/serverRoot/de.metas.adempiere.adempiere.serverRoot.base/src/main/java/de/metas/server/admin/CacheRestController.java
	modified:   backend/de.metas.business/src/main/java/org/adempiere/mm/attributes/spi/IAttributeValuesProvider.java
	modified:   backend/de.metas.business/src/main/java/org/adempiere/mm/attributes/spi/impl/DefaultAttributeValuesProvider.java
	modified:   backend/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/materialtracking/spi/impl/attribute/MaterialTrackingAttributeValuesProvider.java
	modified:   backend/de.metas.handlingunits.base/src/main/java/org/adempiere/mm/attributes/spi/impl/HUSubProducerBPartnerAttributeValuesProvider.java
	modified:   backend/de.metas.handlingunits.base/src/main/java/org/adempiere/mm/attributes/spi/impl/HUVendorBPartnerAttributeValuesProvider.java
	modified:   backend/de.metas.manufacturing/src/test/java/org/eevolution/mrp/api/impl/MRPNoteMatcher.java
	modified:   backend/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/invoicecandidate/api/impl/InvoiceCandBLCreateInvoices.java
	modified:   backend/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/letters/report/AD_BoilderPlate_SendToUsers.java
	modified:   backend/de.metas.ui.web.base/src/main/java/de/metas/ui/web/address/AddressCountryLookupDescriptor.java
	modified:   backend/de.metas.ui.web.base/src/main/java/de/metas/ui/web/address/AddressPostalLookupDescriptor.java
	modified:   backend/de.metas.ui.web.base/src/main/java/de/metas/ui/web/address/AddressRegionLookupDescriptor.java
	new file:   backend/de.metas.ui.web.base/src/main/java/de/metas/ui/web/admin/CacheRestController.java
	deleted:    backend/de.metas.ui.web.base/src/main/java/de/metas/ui/web/debug/JSONCacheResetResult.java
	modified:   backend/de.metas.ui.web.base/src/main/java/de/metas/ui/web/pattribute/ASILookupDescriptor.java
	modified:   backend/de.metas.ui.web.base/src/main/java/de/metas/ui/web/window/datatypes/json/JSONDocumentBase.java
	modified:   backend/de.metas.ui.web.base/src/main/java/de/metas/ui/web/window/descriptor/SimpleLookupDescriptorTemplate.java
	modified:   backend/de.metas.ui.web.base/src/main/java/de/metas/ui/web/window/model/lookup/CachedLookupDataSourceFetcherAdapter.java
	modified:   backend/de.metas.ui.web.base/src/main/java/de/metas/ui/web/window/model/lookup/FullyCachedLookupDataSource.java
	modified:   backend/de.metas.ui.web.base/src/main/java/de/metas/ui/web/window/model/lookup/LookupDataSource.java
	modified:   backend/de.metas.ui.web.base/src/main/java/de/metas/ui/web/window/model/lookup/LookupDataSourceAdapter.java
	modified:   backend/de.metas.ui.web.base/src/main/java/de/metas/ui/web/window/model/lookup/LookupDataSourceContext.java
	modified:   backend/de.metas.ui.web.base/src/main/java/de/metas/ui/web/window/model/lookup/LookupDataSourceFactory.java
	modified:   backend/de.metas.ui.web.base/src/main/java/de/metas/ui/web/window/model/lookup/LookupDataSourceFetcher.java
	modified:   backend/de.metas.ui.web.base/src/main/java/de/metas/ui/web/window/model/lookup/NullLookupDataSource.java
	modified:   backend/de.metas.ui.web.base/src/test/java/de/metas/ui/web/bankstatement_reconciliation/actions/MockedBPartnerLookupDataSource.java
	modified:   backend/de.metas.ui.web.base/src/test/java/de/metas/ui/web/shipment_candidates_editor/MockedLookupDataSource.java
	modified:   backend/de.metas.util/src/test/java/de/metas/util/NumberUtilsTest.java

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/attachments/listener/TableAttachmentListenerService.java
	both modified:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/cache/CCache.java
	both modified:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/cache/CacheLabel.java
	both modified:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/cache/CacheMgt.java
	both modified:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/i18n/IMsgBL.java
	both modified:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/i18n/ImmutableTranslatableString.java
	both modified:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/i18n/Msg.java
	deleted by them: backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/i18n/impl/ADMessageDAO.java
	both modified:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/i18n/impl/MsgBL.java
	both modified:   backend/de.metas.adempiere.adempiere/base/src/main/java/de/metas/i18n/impl/PlainMsgBL.java
	both modified:   backend/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/ad/element/api/impl/ADElementDAO.java
	both modified:   backend/de.metas.adempiere.adempiere/base/src/main/java/org/compiere/util/CtxNames.java
	deleted by us:   backend/de.metas.adempiere.adempiere/base/src/test/java/de/metas/i18n/MessagesMapRepositoryTest.java
	deleted by us:   backend/de.metas.handlingunits.base/src/main/java/org/adempiere/mm/attributes/spi/impl/HUBusinessPartnerAttributeValuesProvider.java
	deleted by us:   backend/de.metas.salescandidate.base/src/main/java/de/metas/pricing/rules/ManualPricePricingRule.java
	both modified:   backend/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/modelvalidator/SwatValidator.java
	both modified:   backend/de.metas.ui.web.base/src/main/java/de/metas/ui/web/debug/DebugRestController.java
	both modified:   backend/de.metas.ui.web.base/src/main/java/de/metas/ui/web/window/model/lookup/GenericSqlLookupDataSourceFetcher.java
	deleted by us:   backend/de.metas.ui.web.base/src/test/java/de/metas/ui/web/pattribute/ASIDescriptorFactoryTest.java
	both modified:   backend/de.metas.util/src/main/java/de/metas/util/NumberUtils.java
	both modified:   backend/de.metas.util/src/main/java/de/metas/util/lang/Percent.java


It took 2.31 seconds to enumerate untracked files. 'status -uno'
may speed it up, but you have to be careful not to forget to add
new files yourself (see 'git help status').

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label Mar 18, 2024
@mergify mergify bot mentioned this pull request Mar 18, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@teosarca