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:48 UTC
[incubator-skywalking] 01/01: Merge branch 'master' into timebucket
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(-)