Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
506c00b4
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,体验更适合开发者的 AI 搜索 >>
提交
506c00b4
编写于
1月 07, 2018
作者:
P
peng-yongsheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Change the aggregation and persistence worker’s generic type definition.
上级
0a4171b9
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
19 addition
and
91 deletion
+19
-91
apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/AggregationWorker.java
...llector/analysis/worker/model/impl/AggregationWorker.java
+3
-6
apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/FlushAndSwitch.java
.../collector/analysis/worker/model/impl/FlushAndSwitch.java
+0
-25
apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/MessageHolder.java
...m/collector/analysis/worker/model/impl/MessageHolder.java
+0
-41
apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/PersistenceWorker.java
...llector/analysis/worker/model/impl/PersistenceWorker.java
+2
-2
apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/PersistenceWorkerProvider.java
...analysis/worker/model/impl/PersistenceWorkerProvider.java
+2
-2
apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/DataCache.java
.../collector/analysis/worker/model/impl/data/DataCache.java
+6
-7
apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/DataCollection.java
...ector/analysis/worker/model/impl/data/DataCollection.java
+6
-7
apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/cache/Window.java
...rg/apache/skywalking/apm/collector/core/cache/Window.java
+0
-1
未找到文件。
apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/AggregationWorker.java
浏览文件 @
506c00b4
...
...
@@ -21,7 +21,7 @@ package org.apache.skywalking.apm.collector.analysis.worker.model.impl;
import
org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorker
;
import
org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerException
;
import
org.apache.skywalking.apm.collector.analysis.worker.model.impl.data.DataCache
;
import
org.apache.skywalking.apm.collector.core.data.
Abstract
Data
;
import
org.apache.skywalking.apm.collector.core.data.
Stream
Data
;
import
org.apache.skywalking.apm.collector.core.module.ModuleManager
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
/**
* @author peng-yongsheng
*/
public
abstract
class
AggregationWorker
<
INPUT
extends
AbstractData
,
OUTPUT
extends
Abstract
Data
>
extends
AbstractLocalAsyncWorker
<
INPUT
,
OUTPUT
>
{
public
abstract
class
AggregationWorker
<
INPUT
extends
StreamData
,
OUTPUT
extends
Stream
Data
>
extends
AbstractLocalAsyncWorker
<
INPUT
,
OUTPUT
>
{
private
final
Logger
logger
=
LoggerFactory
.
getLogger
(
AggregationWorker
.
class
);
...
...
@@ -47,9 +47,7 @@ public abstract class AggregationWorker<INPUT extends AbstractData, OUTPUT exten
}
@Override
protected
final
void
onWork
(
INPUT
message
)
throws
WorkerException
{
boolean
isEndOfBatch
=
message
.
isEndOfBatch
();
OUTPUT
output
=
transform
(
message
);
output
.
setEndOfBatch
(
isEndOfBatch
);
messageNum
++;
aggregate
(
output
);
...
...
@@ -58,8 +56,7 @@ public abstract class AggregationWorker<INPUT extends AbstractData, OUTPUT exten
sendToNext
();
messageNum
=
0
;
}
if
(
output
.
isEndOfBatch
())
{
output
.
setEndOfBatch
(
false
);
if
(
message
.
getEndOfBatchContext
().
isEndOfBatch
())
{
sendToNext
();
}
}
...
...
apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/FlushAndSwitch.java
已删除
100644 → 0
浏览文件 @
0a4171b9
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package
org.apache.skywalking.apm.collector.analysis.worker.model.impl
;
/**
* @author peng-yongsheng
*/
public
class
FlushAndSwitch
{
}
apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/MessageHolder.java
已删除
100644 → 0
浏览文件 @
0a4171b9
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package
org.apache.skywalking.apm.collector.analysis.worker.model.impl
;
import
org.apache.skywalking.apm.collector.core.data.EndOfBatchQueueMessage
;
/**
* @author peng-yongsheng
*/
public
class
MessageHolder
<
MESSAGE
extends
EndOfBatchQueueMessage
>
{
private
MESSAGE
message
;
public
MESSAGE
getMessage
()
{
return
message
;
}
public
void
setMessage
(
MESSAGE
message
)
{
this
.
message
=
message
;
}
public
void
reset
()
{
message
=
null
;
}
}
apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/PersistenceWorker.java
浏览文件 @
506c00b4
...
...
@@ -24,7 +24,7 @@ import java.util.Map;
import
org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorker
;
import
org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerException
;
import
org.apache.skywalking.apm.collector.analysis.worker.model.impl.data.DataCache
;
import
org.apache.skywalking.apm.collector.core.data.
Abstract
Data
;
import
org.apache.skywalking.apm.collector.core.data.
Stream
Data
;
import
org.apache.skywalking.apm.collector.core.module.ModuleManager
;
import
org.apache.skywalking.apm.collector.core.util.ObjectUtils
;
import
org.apache.skywalking.apm.collector.storage.StorageModule
;
...
...
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
/**
* @author peng-yongsheng
*/
public
abstract
class
PersistenceWorker
<
INPUT_AND_OUTPUT
extends
Abstract
Data
>
extends
AbstractLocalAsyncWorker
<
INPUT_AND_OUTPUT
,
INPUT_AND_OUTPUT
>
{
public
abstract
class
PersistenceWorker
<
INPUT_AND_OUTPUT
extends
Stream
Data
>
extends
AbstractLocalAsyncWorker
<
INPUT_AND_OUTPUT
,
INPUT_AND_OUTPUT
>
{
private
final
Logger
logger
=
LoggerFactory
.
getLogger
(
PersistenceWorker
.
class
);
...
...
apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/PersistenceWorkerProvider.java
浏览文件 @
506c00b4
...
...
@@ -19,13 +19,13 @@
package
org.apache.skywalking.apm.collector.analysis.worker.model.impl
;
import
org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider
;
import
org.apache.skywalking.apm.collector.core.data.
Abstract
Data
;
import
org.apache.skywalking.apm.collector.core.data.
Stream
Data
;
import
org.apache.skywalking.apm.collector.core.module.ModuleManager
;
/**
* @author peng-yongsheng
*/
public
abstract
class
PersistenceWorkerProvider
<
INPUT_AND_OUTPUT
extends
Abstract
Data
,
WORKER_TYPE
extends
PersistenceWorker
<
INPUT_AND_OUTPUT
>>
extends
AbstractLocalAsyncWorkerProvider
<
INPUT_AND_OUTPUT
,
INPUT_AND_OUTPUT
,
WORKER_TYPE
>
{
public
abstract
class
PersistenceWorkerProvider
<
INPUT_AND_OUTPUT
extends
Stream
Data
,
WORKER_TYPE
extends
PersistenceWorker
<
INPUT_AND_OUTPUT
>>
extends
AbstractLocalAsyncWorkerProvider
<
INPUT_AND_OUTPUT
,
INPUT_AND_OUTPUT
,
WORKER_TYPE
>
{
public
PersistenceWorkerProvider
(
ModuleManager
moduleManager
)
{
super
(
moduleManager
);
...
...
apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/DataCache.java
浏览文件 @
506c00b4
...
...
@@ -16,20 +16,19 @@
*
*/
package
org.apache.skywalking.apm.collector.analysis.worker.model.impl.data
;
import
org.apache.skywalking.apm.collector.core.cache.Window
;
import
org.apache.skywalking.apm.collector.core.data.
Abstract
Data
;
import
org.apache.skywalking.apm.collector.core.data.
Stream
Data
;
/**
* @author peng-yongsheng
*/
public
class
DataCache
<
DATA_IMPL
extends
AbstractData
>
extends
Window
<
DataCollection
<
DATA_IMPL
>>
{
public
class
DataCache
<
STREAM_DATA
extends
StreamData
>
extends
Window
<
DataCollection
<
STREAM_DATA
>>
{
private
DataCollection
<
DATA_IMPL
>
lockedDataCollection
;
private
DataCollection
<
STREAM_DATA
>
lockedDataCollection
;
@Override
public
DataCollection
<
DATA_IMPL
>
collectionInstance
()
{
@Override
public
DataCollection
<
STREAM_DATA
>
collectionInstance
()
{
return
new
DataCollection
<>();
}
...
...
@@ -37,11 +36,11 @@ public class DataCache<DATA_IMPL extends AbstractData> extends Window<DataCollec
return
lockedDataCollection
.
containsKey
(
id
);
}
public
Abstract
Data
get
(
String
id
)
{
public
Stream
Data
get
(
String
id
)
{
return
lockedDataCollection
.
get
(
id
);
}
public
void
put
(
String
id
,
DATA_IMPL
data
)
{
public
void
put
(
String
id
,
STREAM_DATA
data
)
{
lockedDataCollection
.
put
(
id
,
data
);
}
...
...
apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/DataCollection.java
浏览文件 @
506c00b4
...
...
@@ -16,19 +16,18 @@
*
*/
package
org.apache.skywalking.apm.collector.analysis.worker.model.impl.data
;
import
java.util.Map
;
import
java.util.concurrent.ConcurrentHashMap
;
import
org.apache.skywalking.apm.collector.core.cache.Collection
;
import
org.apache.skywalking.apm.collector.core.data.
Abstract
Data
;
import
org.apache.skywalking.apm.collector.core.data.
Stream
Data
;
/**
* @author peng-yongsheng
*/
public
class
DataCollection
<
DATA_IMPL
extends
AbstractData
>
implements
Collection
<
Map
<
String
,
DATA_IMPL
>>
{
private
Map
<
String
,
DATA_IMPL
>
data
;
public
class
DataCollection
<
STREAM_DATA
extends
StreamData
>
implements
Collection
<
Map
<
String
,
STREAM_DATA
>>
{
private
Map
<
String
,
STREAM_DATA
>
data
;
private
volatile
boolean
writing
;
private
volatile
boolean
reading
;
...
...
@@ -66,11 +65,11 @@ public class DataCollection<DATA_IMPL extends AbstractData> implements Collectio
return
data
.
containsKey
(
key
);
}
void
put
(
String
key
,
DATA_IMPL
value
)
{
void
put
(
String
key
,
STREAM_DATA
value
)
{
data
.
put
(
key
,
value
);
}
public
DATA_IMPL
get
(
String
key
)
{
public
STREAM_DATA
get
(
String
key
)
{
return
data
.
get
(
key
);
}
...
...
@@ -82,7 +81,7 @@ public class DataCollection<DATA_IMPL extends AbstractData> implements Collectio
data
.
clear
();
}
public
Map
<
String
,
DATA_IMPL
>
collection
()
{
public
Map
<
String
,
STREAM_DATA
>
collection
()
{
return
data
;
}
}
apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/cache/Window.java
浏览文件 @
506c00b4
...
...
@@ -16,7 +16,6 @@
*
*/
package
org.apache.skywalking.apm.collector.core.cache
;
import
java.util.concurrent.atomic.AtomicInteger
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录