This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch mesh-receiver
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from 726faed Refactor mock data
add 7bb577a Provide auto delete history data service. (#1797)
new 423fd24 Merge commit '7bb577a4e900c7f747a3e665b448f1ca1d93c415' into
mesh-receiver
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../oap/server/core/CoreModuleConfig.java | 15 +++
.../oap/server/core/CoreModuleProvider.java | 4 +
.../core/{query/entity/KVInt.java => DataTTL.java} | 11 +-
.../generated/all/AllHeatmapIndicator.java | 19 ++--
.../analysis/generated/all/AllP50Indicator.java | 19 ++--
.../analysis/generated/all/AllP75Indicator.java | 19 ++--
.../analysis/generated/all/AllP90Indicator.java | 19 ++--
.../analysis/generated/all/AllP95Indicator.java | 19 ++--
.../analysis/generated/all/AllP99Indicator.java | 19 ++--
.../generated/endpoint/EndpointAvgIndicator.java | 7 +-
.../generated/endpoint/EndpointCpmIndicator.java | 7 +-
.../generated/endpoint/EndpointP50Indicator.java | 19 ++--
.../generated/endpoint/EndpointP75Indicator.java | 19 ++--
.../generated/endpoint/EndpointP90Indicator.java | 19 ++--
.../generated/endpoint/EndpointP95Indicator.java | 19 ++--
.../generated/endpoint/EndpointP99Indicator.java | 19 ++--
.../generated/endpoint/EndpointSlaIndicator.java | 7 +-
.../EndpointRelationCpmIndicator.java | 7 +-
.../EndpointRelationRespTimeIndicator.java | 7 +-
.../generated/service/ServiceCpmIndicator.java | 7 +-
.../generated/service/ServiceP50Indicator.java | 19 ++--
.../generated/service/ServiceP75Indicator.java | 19 ++--
.../generated/service/ServiceP90Indicator.java | 19 ++--
.../generated/service/ServiceP95Indicator.java | 19 ++--
.../generated/service/ServiceP99Indicator.java | 19 ++--
.../service/ServiceRespTimeIndicator.java | 7 +-
.../generated/service/ServiceSlaIndicator.java | 7 +-
.../ServiceInstanceCpmIndicator.java | 7 +-
.../ServiceInstanceRespTimeIndicator.java | 7 +-
.../InstanceJvmCpuIndicator.java | 7 +-
.../InstanceJvmOldGcCountIndicator.java | 7 +-
.../InstanceJvmOldGcTimeIndicator.java | 7 +-
.../InstanceJvmYoungGcCountIndicator.java | 7 +-
.../InstanceJvmYoungGcTimeIndicator.java | 7 +-
.../InstanceJvmMemoryHeapIndicator.java | 7 +-
.../InstanceJvmMemoryHeapMaxIndicator.java | 7 +-
.../InstanceJvmMemoryNoheapIndicator.java | 7 +-
.../InstanceJvmMemoryNoheapMaxIndicator.java | 7 +-
.../ServiceRelationClientCallSlaIndicator.java | 7 +-
.../ServiceRelationClientCpmIndicator.java | 7 +-
.../ServiceRelationClientRespTimeIndicator.java | 7 +-
.../ServiceRelationServerCallSlaIndicator.java | 7 +-
.../ServiceRelationServerCpmIndicator.java | 7 +-
.../ServiceRelationServerRespTimeIndicator.java | 7 +-
.../server/core/analysis/indicator/Indicator.java | 7 +-
.../core/analysis/indicator/IntKeyLongValue.java | 6 +
.../analysis/indicator/IntKeyLongValueArray.java | 13 +++
.../analysis/manual/segment/SegmentRecord.java | 2 +-
.../analysis/worker/IndicatorPersistentWorker.java | 46 +++++++-
.../core/analysis/worker/PersistenceWorker.java | 2 +-
.../analysis/worker/RecordPersistentWorker.java | 35 ++++++
.../server/core/register/EndpointInventory.java | 2 +-
.../core/register/NetworkAddressInventory.java | 2 +-
.../core/register/ServiceInstanceInventory.java | 2 +-
.../oap/server/core/register/ServiceInventory.java | 2 +-
.../server/core/remote/RemoteSenderService.java | 5 +-
.../{IBatchDAO.java => IHistoryDeleteDAO.java} | 6 +-
.../oap/server/core/storage/IIndicatorDAO.java | 2 -
.../oap/server/core/storage/IRecordDAO.java | 2 -
.../oap/server/core/storage/StorageModule.java | 1 +
.../annotation/StorageAnnotationListener.java | 3 +-
.../core/storage/annotation/StorageEntity.java | 2 +
.../annotation/StorageEntityAnnotationUtils.java | 9 ++
.../oap/server/core/storage/model/Model.java | 6 +-
.../server/core/storage/model/ModelInstaller.java | 4 +-
.../core/storage/ttl/DataTTLKeeperTimer.java | 122 +++++++++++++++++++++
.../server/core/storage/type/StorageDataType.java | 2 +
.../client/elasticsearch/ElasticSearchClient.java | 11 +-
.../src/main/resources/application.yml | 18 +--
.../StorageModuleElasticsearchProvider.java | 1 +
.../{StorageEsDAO.java => HistoryDeleteEsDAO.java} | 28 +++--
.../plugin/elasticsearch/base/IndicatorEsDAO.java | 6 +-
.../plugin/elasticsearch/base/RecordEsDAO.java | 3 -
73 files changed, 583 insertions(+), 276 deletions(-)
copy
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{query/entity/KVInt.java
=> DataTTL.java} (78%)
copy
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/{IBatchDAO.java
=> IHistoryDeleteDAO.java} (82%)
create mode 100644
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/ttl/DataTTLKeeperTimer.java
copy
oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/{StorageEsDAO.java
=> HistoryDeleteEsDAO.java} (58%)
