This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch ci/skip in repository https://gitbox.apache.org/repos/asf/skywalking.git.
discard eee2d67 Skip CI in some cases to save resources add fc23dab Support multiple implementations of StorageBuilder in different storage implementations - stage 1. (#6334) add 5e8f1eb Support multiple implementations of StorageBuilder in different storage implementations - stage 2 (#6336) add ba6d49a Update the timestamp field type for LogQuery (#6335) add a3eedd9 Skip CI in some cases to save resources This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (eee2d67) \ N -- N -- N refs/heads/ci/skip (a3eedd9) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: CHANGES.md | 1 + .../provider/meter/process/MeterBaseTest.java | 124 --------------------- .../provider/meter/process/MeterBuilderTest.java | 92 --------------- .../org/apache/skywalking/oal/rt/OALRuntime.java | 18 ++- .../{data2Map.ftl => entity2Storage.ftl} | 2 +- .../{map2Data.ftl => storage2Entity.ftl} | 2 +- .../oap/server/core/alarm/AlarmRecord.java | 8 +- .../oap/server/core/analysis/Stream.java | 7 +- .../core/analysis/StreamAnnotationListener.java | 4 + .../oap/server/core/analysis/StreamDefinition.java | 2 +- .../manual/database/TopNDatabaseStatement.java | 8 +- .../analysis/manual/endpoint/EndpointTraffic.java | 8 +- .../analysis/manual/instance/InstanceTraffic.java | 8 +- .../analysis/manual/log/AbstractLogRecord.java | 4 +- .../server/core/analysis/manual/log/LogRecord.java | 4 +- .../manual/networkalias/NetworkAddressAlias.java | 8 +- .../EndpointRelationServerSideMetrics.java | 8 +- .../ServiceInstanceRelationClientSideMetrics.java | 8 +- .../ServiceInstanceRelationServerSideMetrics.java | 8 +- .../service/ServiceRelationClientSideMetrics.java | 8 +- .../service/ServiceRelationServerSideMetrics.java | 8 +- .../analysis/manual/segment/SegmentRecord.java | 8 +- .../analysis/manual/service/ServiceTraffic.java | 8 +- .../analysis/meter/function/AcceptableValue.java | 4 +- .../analysis/meter/function/HistogramFunction.java | 10 +- .../meter/function/PercentileFunction.java | 10 +- .../analysis/meter/function/avg/AvgFunction.java | 10 +- .../meter/function/avg/AvgHistogramFunction.java | 8 +- .../avg/AvgHistogramPercentileFunction.java | 8 +- .../meter/function/avg/AvgLabeledFunction.java | 8 +- .../meter/function/latest/LatestFunction.java | 8 +- .../analysis/worker/ManagementStreamProcessor.java | 15 ++- .../analysis/worker/MetricsStreamProcessor.java | 17 +-- .../core/analysis/worker/NoneStreamProcessor.java | 17 +-- .../analysis/worker/RecordStreamProcessor.java | 17 +-- .../core/analysis/worker/TopNStreamProcessor.java | 21 ++-- .../manual/errorlog/BrowserErrorLogRecord.java | 8 +- .../skywalking/oap/server/core/event/Event.java | 8 +- .../core/management/ui/template/UITemplate.java | 8 +- .../oap/server/core/oal/rt/OALEngine.java | 3 + .../server/core/oal/rt/OALEngineLoaderService.java | 5 + .../server/core/profile/ProfileTaskLogRecord.java | 8 +- .../oap/server/core/profile/ProfileTaskRecord.java | 8 +- .../core/profile/ProfileThreadSnapshotRecord.java | 8 +- .../skywalking/oap/server/core/query/type/Log.java | 2 +- .../server/core/storage/StorageBuilderFactory.java | 80 +++++++++++++ .../oap/server/core/storage/StorageDAO.java | 13 +-- ...rageBuilder.java => StorageHashMapBuilder.java} | 9 +- .../oap/server/core/storage/StorageModule.java | 39 +++---- .../type/StorageBuilder.java} | 12 +- .../manual/endpoint/EndpointTrafficTest.java | 2 +- .../manual/service/ServiceTrafficTest.java | 4 +- .../meter/function/HistogramFunctionTest.java | 8 +- .../meter/function/PercentileFunctionTest.java | 8 +- .../function/avg/AvgHistogramFunctionTest.java | 8 +- .../avg/AvgHistogramPercentileFunctionTest.java | 8 +- .../meter/function/avg/AvgLabeledFunctionTest.java | 8 +- .../meter/function/latest/LatestFunctionTest.java | 8 +- .../management/ui/template/UITemplateTest.java | 2 +- .../core/storage/model/StorageModelsTest.java | 8 +- .../src/main/resources/query-protocol | 2 +- .../StorageModuleElasticsearchProvider.java | 3 + .../plugin/elasticsearch/base/ManagementEsDAO.java | 8 +- .../plugin/elasticsearch/base/MetricsEsDAO.java | 12 +- .../plugin/elasticsearch/base/NoneStreamEsDAO.java | 8 +- .../plugin/elasticsearch/base/RecordEsDAO.java | 8 +- .../plugin/elasticsearch/base/StorageEsDAO.java | 19 ++-- .../cache/NetworkAddressAliasEsDAO.java | 2 +- .../elasticsearch/query/AlarmQueryEsDAO.java | 2 +- .../plugin/elasticsearch/query/LogQueryEsDAO.java | 2 +- .../elasticsearch/query/MetadataQueryEsDAO.java | 6 +- .../query/ProfileThreadSnapshotQueryEsDAO.java | 2 +- .../query/UITemplateManagementEsDAO.java | 10 +- .../StorageModuleElasticsearch7Provider.java | 3 + .../plugin/elasticsearch7/dao/MetricsEs7DAO.java | 6 +- .../plugin/elasticsearch7/dao/StorageEs7DAO.java | 19 ++-- .../elasticsearch7/query/AlarmQueryEs7DAO.java | 2 +- .../elasticsearch7/query/LogQueryEs7DAO.java | 2 +- .../plugin/influxdb/InfluxStorageProvider.java | 3 + .../plugin/influxdb/base/InfluxInsertRequest.java | 6 +- .../plugin/influxdb/base/InfluxStorageDAO.java | 19 ++-- .../plugin/influxdb/base/ManagementDAO.java | 8 +- .../storage/plugin/influxdb/base/MetricsDAO.java | 8 +- .../plugin/influxdb/base/NoneStreamDAO.java | 6 +- .../storage/plugin/influxdb/base/RecordDAO.java | 6 +- .../storage/plugin/influxdb/query/LogQuery.java | 2 +- .../influxdb/query/NetworkAddressAliasDAO.java | 2 +- .../query/UITemplateManagementDAOImpl.java | 6 +- .../storage/plugin/jaeger/JaegerSpanRecord.java | 8 +- .../storage/plugin/jdbc/h2/H2StorageProvider.java | 3 + .../jdbc/h2/dao/AbstractSearchTagBuilder.java | 4 +- .../storage/plugin/jdbc/h2/dao/H2LogQueryDAO.java | 2 +- .../plugin/jdbc/h2/dao/H2LogRecordBuilder.java | 4 +- .../plugin/jdbc/h2/dao/H2ManagementDAO.java | 6 +- .../storage/plugin/jdbc/h2/dao/H2MetricsDAO.java | 6 +- .../plugin/jdbc/h2/dao/H2NoneStreamDAO.java | 6 +- .../storage/plugin/jdbc/h2/dao/H2RecordDAO.java | 10 +- .../storage/plugin/jdbc/h2/dao/H2SQLExecutor.java | 22 ++-- .../plugin/jdbc/h2/dao/H2SegmentRecordBuilder.java | 4 +- .../storage/plugin/jdbc/h2/dao/H2StorageDAO.java | 19 ++-- .../plugin/jdbc/mysql/MySQLStorageProvider.java | 3 + .../plugin/jdbc/tidb/TiDBStorageProvider.java | 3 + .../storage/plugin/zipkin/ZipkinSpanRecord.java | 8 +- .../e2e/browser/BrowserErrorLogMatcher.java | 6 +- .../dashboard/DashboardConfigurationMatcher.java | 4 +- .../java/org/apache/skywalking/e2e/log/Log.java | 2 +- .../apache/skywalking/e2e/trace/TraceMatcher.java | 2 +- .../e2e/verification/AbstractMatcher.java | 12 ++ .../org/apache/skywalking/e2e/TestLogsMatcher.java | 4 +- test/e2e/e2e-data/src/test/resources/log.yml | 2 +- .../src/test/resources/expected/log/logs.yml | 2 +- 111 files changed, 524 insertions(+), 584 deletions(-) delete mode 100644 oap-server/analyzer/agent-analyzer/src/test/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/MeterBaseTest.java delete mode 100644 oap-server/analyzer/agent-analyzer/src/test/java/org/apache/skywalking/oap/server/analyzer/provider/meter/process/MeterBuilderTest.java rename oap-server/oal-rt/src/main/resources/code-templates/metrics-builder/{data2Map.ftl => entity2Storage.ftl} (93%) rename oap-server/oal-rt/src/main/resources/code-templates/metrics-builder/{map2Data.ftl => storage2Entity.ftl} (96%) create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/StorageBuilderFactory.java rename oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/{StorageBuilder.java => StorageHashMapBuilder.java} (70%) copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{analysis/management/ManagementData.java => storage/type/StorageBuilder.java} (71%)