You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/09/12 09:49:47 UTC
[incubator-skywalking] branch timebucket updated (cc162a3 ->
3e52d77)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch timebucket
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from cc162a3 Support time bucket transfer.
add 23b8d6e Finished topology query. (#1663)
new 3e52d77 Merge branch 'master' into timebucket
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:
.../skywalking/oap/server/core/CoreModule.java | 6 +
.../oap/server/core/CoreModuleProvider.java | 3 +
.../server/core/analysis/indicator/Indicator.java | 2 +-
.../manual/service/ServiceComponentIndicator.java | 7 +-
.../manual/service/ServiceMappingIndicator.java | 7 +-
.../oap/server/core/query/TopologyBuilder.java | 203 +++++++++++++++++++++
.../server/core/query/TopologyQueryService.java | 127 +++++++++++++
.../oap/server/core/query/entity}/Call.java | 11 +-
.../oap/server/core/query/entity/IntValues.java} | 10 +-
.../oap/server/core/query/entity}/KVInt.java | 6 +-
.../oap/server/core/query/entity}/Node.java | 8 +-
.../oap/server/core/query/entity}/Step.java | 2 +-
.../oap/server/core/query/entity}/Topology.java | 10 +-
.../oap/server/core/query/sql/Function.java} | 5 +-
.../{source/Source.java => query/sql/GroupBy.java} | 11 +-
.../Source.java => query/sql/IntKeyValues.java} | 10 +-
.../StreamData.java => query/sql/Where.java} | 11 +-
.../oap/server/core/storage/TimePyramid.java | 23 ++-
...odule.java => TimePyramidTableNameBuilder.java} | 32 ++--
.../IMetricQueryDAO.java} | 18 +-
.../IUniqueQueryDAO.java} | 14 +-
.../query/OneIdGroupValue.java} | 11 +-
.../query/TwoIdGroup.java} | 14 +-
.../query/TwoIdGroupValue.java} | 12 +-
.../oap/query/graphql/GraphQLQueryProvider.java | 17 +-
.../oap/query/graphql/resolver/MetricQuery.java | 14 +-
.../oap/query/graphql/resolver/TopologyQuery.java | 34 +++-
.../oap/query/graphql/type/Duration.java | 1 +
.../oap/query/graphql/type/LinearIntValues.java | 25 ---
.../oap/query/graphql/util/DurationUtils.java} | 14 +-
oap-server/server-starter/pom.xml | 4 +-
.../storage-elasticsearch-plugin/pom.xml | 6 +
.../elasticsearch/base/ColumnTypeEsMapping.java | 3 +
.../storage/plugin/elasticsearch/base/EsDAO.java | 24 +++
.../elasticsearch/query/MetricQueryEsDAO.java | 122 +++++++++++++
.../elasticsearch/query/UniqueQueryEsDAO.java | 68 +++++++
.../src/test/resources/log4j2.xml | 0
37 files changed, 743 insertions(+), 152 deletions(-)
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyBuilder.java
create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyQueryService.java
rename oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity}/Call.java (84%)
copy oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/Duration.java => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/IntValues.java} (83%)
rename oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity}/KVInt.java (90%)
rename oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity}/Node.java (88%)
rename oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity}/Step.java (93%)
rename oap-server/{server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity}/Topology.java (79%)
copy oap-server/{server-library/library-server/src/main/java/org/apache/skywalking/oap/server/library/server/ServerHandler.java => server-core/src/main/java/org/apache/skywalking/oap/server/core/query/sql/Function.java} (90%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{source/Source.java => query/sql/GroupBy.java} (83%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{source/Source.java => query/sql/IntKeyValues.java} (80%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{remote/annotation/StreamData.java => query/sql/Where.java} (81%)
copy apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/OfficialComponent.java => oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/TimePyramid.java (70%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/{StorageModule.java => TimePyramidTableNameBuilder.java} (51%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/{cache/IServiceInstanceInventoryCacheDAO.java => query/IMetricQueryDAO.java} (57%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/{cache/INetworkAddressInventoryCacheDAO.java => query/IUniqueQueryDAO.java} (66%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{source/Source.java => storage/query/OneIdGroupValue.java} (83%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{analysis/data/DataCache.java => storage/query/TwoIdGroup.java} (83%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{source/Source.java => storage/query/TwoIdGroupValue.java} (83%)
delete mode 100644 oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/LinearIntValues.java
copy oap-server/{server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/handler/SegmentCounter.java => server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/util/DurationUtils.java} (71%)
create mode 100644 oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/MetricQueryEsDAO.java
create mode 100644 oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/UniqueQueryEsDAO.java
copy oap-server/{server-receiver-plugin/skywalking-trace-receiver-plugin => server-storage-plugin/storage-elasticsearch-plugin}/src/test/resources/log4j2.xml (100%)
[incubator-skywalking] 01/01: Merge branch 'master' into timebucket
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch timebucket
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 3e52d774403f7db9c8e4f7ea569519f1a5773af7
Merge: cc162a3 23b8d6e
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Sep 12 17:49:45 2018 +0800
Merge branch 'master' into timebucket
.../skywalking/oap/server/core/CoreModule.java | 6 +
.../oap/server/core/CoreModuleProvider.java | 3 +
.../server/core/analysis/indicator/Indicator.java | 2 +-
.../manual/service/ServiceComponentIndicator.java | 7 +-
.../manual/service/ServiceMappingIndicator.java | 7 +-
.../oap/server/core/query/TopologyBuilder.java | 203 +++++++++++++++++++++
.../server/core/query/TopologyQueryService.java | 127 +++++++++++++
.../oap/server/core/query/entity}/Call.java | 11 +-
.../oap/server/core/query/entity/IntValues.java} | 10 +-
.../oap/server/core/query/entity}/KVInt.java | 6 +-
.../oap/server/core/query/entity}/Node.java | 8 +-
.../oap/server/core/query/entity}/Step.java | 2 +-
.../oap/server/core/query/entity/Topology.java} | 10 +-
.../oap/server/core/query/sql/Function.java} | 11 +-
.../oap/server/core/query/sql/GroupBy.java} | 15 +-
.../oap/server/core/query/sql/IntKeyValues.java} | 14 +-
.../oap/server/core/query/sql/Where.java} | 12 +-
.../oap/server/core/storage/TimePyramid.java} | 24 ++-
.../core/storage/TimePyramidTableNameBuilder.java | 49 +++++
.../core/storage/query/IMetricQueryDAO.java} | 20 +-
.../core/storage/query/IUniqueQueryDAO.java} | 16 +-
.../core/storage/query/OneIdGroupValue.java} | 15 +-
.../oap/server/core/storage/query/TwoIdGroup.java} | 15 +-
.../core/storage/query/TwoIdGroupValue.java} | 16 +-
.../oap/query/graphql/GraphQLQueryProvider.java | 17 +-
.../oap/query/graphql/resolver/MetricQuery.java | 14 +-
.../oap/query/graphql/resolver/TopologyQuery.java | 34 +++-
.../oap/query/graphql/type/Duration.java | 1 +
.../oap/query/graphql/util/DurationUtils.java} | 14 +-
oap-server/server-starter/pom.xml | 4 +-
.../storage-elasticsearch-plugin/pom.xml | 6 +
.../elasticsearch/base/ColumnTypeEsMapping.java | 3 +
.../storage/plugin/elasticsearch/base/EsDAO.java | 24 +++
.../elasticsearch/query/MetricQueryEsDAO.java | 122 +++++++++++++
.../elasticsearch/query/UniqueQueryEsDAO.java | 68 +++++++
.../src/test/resources/log4j2.xml | 31 ++++
36 files changed, 831 insertions(+), 116 deletions(-)