Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
7b071bd7
S
SkyWalking
项目概览
apache
/
SkyWalking
上一次同步 1 年多
通知
302
Star
21345
Fork
6091
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
7b071bd7
编写于
5月 04, 2020
作者:
K
kezhenxu94
提交者:
GitHub
5月 04, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix nested query and type conversion in MySQL, remove unused codes (#4738)
上级
a2eddd69
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
4 addition
and
44 deletion
+4
-44
apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerPoolFactory.java
...apm/commons/datacarrier/consumer/ConsumerPoolFactory.java
+2
-42
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/TopNEntity.java
...che/skywalking/oap/server/core/query/type/TopNEntity.java
+1
-1
oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2AggregationQueryDAO.java
...ver/storage/plugin/jdbc/h2/dao/H2AggregationQueryDAO.java
+1
-1
未找到文件。
apm-commons/apm-datacarrier/src/main/java/org/apache/skywalking/apm/commons/datacarrier/consumer/ConsumerPoolFactory.java
浏览文件 @
7b071bd7
...
...
@@ -21,7 +21,6 @@ package org.apache.skywalking.apm.commons.datacarrier.consumer;
import
java.util.HashMap
;
import
java.util.Map
;
import
java.util.concurrent.Callable
;
import
org.apache.skywalking.apm.commons.datacarrier.buffer.Channels
;
/**
* Consumer Pool Factory provides global management for all Consumer Pool.
...
...
@@ -29,10 +28,10 @@ import org.apache.skywalking.apm.commons.datacarrier.buffer.Channels;
public
enum
ConsumerPoolFactory
{
INSTANCE
;
private
Map
<
String
,
ConsumerPool
>
pools
;
private
final
Map
<
String
,
ConsumerPool
>
pools
;
ConsumerPoolFactory
()
{
pools
=
new
HashMap
<
String
,
ConsumerPool
>();
pools
=
new
HashMap
<>();
}
public
synchronized
boolean
createIfAbsent
(
String
poolName
,
Callable
<
ConsumerPool
>
creator
)
throws
Exception
{
...
...
@@ -48,43 +47,4 @@ public enum ConsumerPoolFactory {
return
pools
.
get
(
poolName
);
}
/**
* Default pool provides the same capabilities as DataCarrier#consume(IConsumer, 1), which alloc one thread for one
* DataCarrier.
*/
public
static
final
ConsumerPool
DEFAULT_POOL
=
new
ConsumerPool
()
{
private
Map
<
Channels
,
ConsumeDriver
>
allDrivers
=
new
HashMap
<
Channels
,
ConsumeDriver
>();
@Override
synchronized
public
void
add
(
String
name
,
Channels
channels
,
IConsumer
consumer
)
{
if
(!
allDrivers
.
containsKey
(
channels
))
{
ConsumeDriver
consumeDriver
=
new
ConsumeDriver
(
name
,
channels
,
consumer
,
1
,
20
);
allDrivers
.
put
(
channels
,
consumeDriver
);
}
}
/**
* Always return true.
*/
@Override
public
boolean
isRunning
(
Channels
channels
)
{
return
true
;
}
@Override
public
void
close
(
Channels
channels
)
{
ConsumeDriver
driver
=
allDrivers
.
get
(
channels
);
if
(
driver
!=
null
)
{
driver
.
close
(
channels
);
}
}
@Override
public
void
begin
(
Channels
channels
)
{
ConsumeDriver
driver
=
allDrivers
.
get
(
channels
);
if
(
driver
!=
null
)
{
driver
.
begin
(
channels
);
}
}
};
}
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/TopNEntity.java
浏览文件 @
7b071bd7
...
...
@@ -38,6 +38,6 @@ public class TopNEntity {
public
TopNEntity
(
SelectedRecord
record
)
{
this
.
name
=
record
.
getName
();
this
.
id
=
record
.
getId
();
this
.
value
=
Long
.
parseLong
(
record
.
getValue
()
);
this
.
value
=
Double
.
valueOf
(
record
.
getValue
()).
longValue
(
);
}
}
oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2AggregationQueryDAO.java
浏览文件 @
7b071bd7
...
...
@@ -68,7 +68,7 @@ public class H2AggregationQueryDAO implements IAggregationQueryDAO {
});
}
sql
.
append
(
" group by "
).
append
(
Metrics
.
ENTITY_ID
);
sql
.
append
(
") order by value "
)
sql
.
append
(
")
as T
order by value "
)
.
append
(
metrics
.
getOrder
().
equals
(
Order
.
ASC
)
?
"asc"
:
"desc"
)
.
append
(
" limit "
)
.
append
(
metrics
.
getTopN
());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录