Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
dce380bc
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
dce380bc
编写于
12月 01, 2016
作者:
R
Rob Lourens
提交者:
GitHub
12月 01, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #16333 from Microsoft/roblou/smarterSearchBatching
Smarter search batching
上级
22deff95
f7dff0b1
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
104 addition
and
2 deletion
+104
-2
src/vs/workbench/services/search/node/rawSearchService.ts
src/vs/workbench/services/search/node/rawSearchService.ts
+99
-1
src/vs/workbench/services/search/node/search.ts
src/vs/workbench/services/search/node/search.ts
+1
-0
src/vs/workbench/services/search/node/worker/searchWorker.ts
src/vs/workbench/services/search/node/worker/searchWorker.ts
+4
-1
未找到文件。
src/vs/workbench/services/search/node/rawSearchService.ts
浏览文件 @
dce380bc
...
@@ -45,7 +45,7 @@ export class SearchService implements IRawSearchService {
...
@@ -45,7 +45,7 @@ export class SearchService implements IRawSearchService {
maxFilesize
:
MAX_FILE_SIZE
maxFilesize
:
MAX_FILE_SIZE
}));
}));
return
this
.
doSearch
(
engine
,
SearchService
.
BATCH_SIZE
);
return
this
.
doSearch
WithBatchTimeout
(
engine
,
SearchService
.
BATCH_SIZE
);
}
}
public
doFileSearch
(
EngineClass
:
{
new
(
config
:
IRawSearch
):
ISearchEngine
<
IRawFileMatch
>
;
},
config
:
IRawSearch
,
batchSize
?:
number
):
PPromise
<
ISerializedSearchComplete
,
ISerializedSearchProgressItem
>
{
public
doFileSearch
(
EngineClass
:
{
new
(
config
:
IRawSearch
):
ISearchEngine
<
IRawFileMatch
>
;
},
config
:
IRawSearch
,
batchSize
?:
number
):
PPromise
<
ISerializedSearchComplete
,
ISerializedSearchProgressItem
>
{
...
@@ -268,6 +268,28 @@ export class SearchService implements IRawSearchService {
...
@@ -268,6 +268,28 @@ export class SearchService implements IRawSearchService {
});
});
}
}
private
doSearchWithBatchTimeout
(
engine
:
ISearchEngine
<
ISerializedFileMatch
>
,
batchSize
:
number
):
PPromise
<
ISerializedSearchComplete
,
IRawProgressItem
<
ISerializedFileMatch
>>
{
return
new
PPromise
<
ISerializedSearchComplete
,
IRawProgressItem
<
ISerializedFileMatch
>>
((
c
,
e
,
p
)
=>
{
// Use BatchedCollector to get new results to the frontend every 2s at least, until 50 results have been returned
const
collector
=
new
BatchedCollector
(
batchSize
,
p
);
engine
.
search
((
match
)
=>
{
collector
.
addItem
(
match
,
match
.
numMatches
);
},
(
progress
)
=>
{
p
(
progress
);
},
(
error
,
stats
)
=>
{
collector
.
flush
();
if
(
error
)
{
e
(
error
);
}
else
{
c
(
stats
);
}
});
},
()
=>
{
engine
.
cancel
();
});
}
private
doSearch
<
T
>
(
engine
:
ISearchEngine
<
T
>
,
batchSize
?:
number
):
PPromise
<
ISerializedSearchComplete
,
IRawProgressItem
<
T
>>
{
private
doSearch
<
T
>
(
engine
:
ISearchEngine
<
T
>
,
batchSize
?:
number
):
PPromise
<
ISerializedSearchComplete
,
IRawProgressItem
<
T
>>
{
return
new
PPromise
<
ISerializedSearchComplete
,
IRawProgressItem
<
T
>>
((
c
,
e
,
p
)
=>
{
return
new
PPromise
<
ISerializedSearchComplete
,
IRawProgressItem
<
T
>>
((
c
,
e
,
p
)
=>
{
let
batch
:
T
[]
=
[];
let
batch
:
T
[]
=
[];
...
@@ -344,3 +366,79 @@ interface CacheStats {
...
@@ -344,3 +366,79 @@ interface CacheStats {
cacheFilterStartTime
:
number
;
cacheFilterStartTime
:
number
;
cacheFilterResultCount
:
number
;
cacheFilterResultCount
:
number
;
}
}
/**
* Collects a batch of items that each have a size. When the cumulative size of the batch reaches 'maxBatchSize', it calls the callback.
* If the batch isn't filled within some time, the callback is also called.
* And after 'runTimeoutUntilCount' items, the timeout is ignored, and the callback is called only when the batch is full.
*/
class
BatchedCollector
<
T
>
{
// Use INIT_TIMEOUT for INIT_TIMEOUT_DURATION ms, then switch to LONGER_TIMEOUT
private
static
INIT_TIMEOUT
=
500
;
private
static
INIT_TIMEOUT_DURATION
=
5000
;
private
static
LONGER_TIMEOUT
=
2000
;
// After RUN_TIMEOUT_UNTIL_COUNT items have been collected, stop flushing on timeout
private
static
RUN_TIMEOUT_UNTIL_COUNT
=
50
;
private
totalNumberCompleted
=
0
;
private
batch
:
T
[]
=
[];
private
batchSize
=
0
;
private
timeoutHandle
:
number
;
private
startTime
:
number
;
constructor
(
private
maxBatchSize
:
number
,
private
cb
:
(
items
:
T
|
T
[])
=>
void
)
{
}
addItem
(
item
:
T
,
size
:
number
):
void
{
if
(
!
item
)
{
return
;
}
if
(
this
.
maxBatchSize
>
0
)
{
this
.
addItemToBatch
(
item
,
size
);
}
else
{
this
.
cb
(
item
);
}
}
private
addItemToBatch
(
item
:
T
,
size
:
number
):
void
{
if
(
!
this
.
startTime
)
{
this
.
startTime
=
Date
.
now
();
}
this
.
batch
.
push
(
item
);
this
.
batchSize
+=
size
;
if
(
this
.
batchSize
>=
this
.
maxBatchSize
)
{
// Flush because the batch is full
this
.
flush
();
}
else
if
(
!
this
.
timeoutHandle
&&
this
.
totalNumberCompleted
<
BatchedCollector
.
RUN_TIMEOUT_UNTIL_COUNT
)
{
// No timeout running, start a timeout to flush
const
t
=
this
.
getTimeout
();
this
.
timeoutHandle
=
setTimeout
(()
=>
{
this
.
flush
();
},
t
);
}
}
flush
():
void
{
if
(
this
.
batchSize
)
{
this
.
totalNumberCompleted
+=
this
.
batchSize
;
this
.
cb
(
this
.
batch
);
this
.
batch
=
[];
this
.
batchSize
=
0
;
if
(
this
.
timeoutHandle
)
{
clearTimeout
(
this
.
timeoutHandle
);
this
.
timeoutHandle
=
0
;
}
}
}
private
getTimeout
():
number
{
return
Date
.
now
()
-
this
.
startTime
<
BatchedCollector
.
INIT_TIMEOUT_DURATION
?
BatchedCollector
.
INIT_TIMEOUT
:
BatchedCollector
.
LONGER_TIMEOUT
;
}
}
src/vs/workbench/services/search/node/search.ts
浏览文件 @
dce380bc
...
@@ -49,6 +49,7 @@ export interface ISerializedSearchComplete {
...
@@ -49,6 +49,7 @@ export interface ISerializedSearchComplete {
export
interface
ISerializedFileMatch
{
export
interface
ISerializedFileMatch
{
path
:
string
;
path
:
string
;
lineMatches
?:
ILineMatch
[];
lineMatches
?:
ILineMatch
[];
numMatches
?:
number
;
}
}
// Type of the possible values for progress calls from the engine
// Type of the possible values for progress calls from the engine
...
...
src/vs/workbench/services/search/node/worker/searchWorker.ts
浏览文件 @
dce380bc
...
@@ -284,14 +284,17 @@ export class FileMatch implements ISerializedFileMatch {
...
@@ -284,14 +284,17 @@ export class FileMatch implements ISerializedFileMatch {
serialize
():
ISerializedFileMatch
{
serialize
():
ISerializedFileMatch
{
let
lineMatches
:
ILineMatch
[]
=
[];
let
lineMatches
:
ILineMatch
[]
=
[];
let
numMatches
=
0
;
for
(
let
i
=
0
;
i
<
this
.
lineMatches
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
this
.
lineMatches
.
length
;
i
++
)
{
numMatches
+=
this
.
lineMatches
[
i
].
offsetAndLengths
.
length
;
lineMatches
.
push
(
this
.
lineMatches
[
i
].
serialize
());
lineMatches
.
push
(
this
.
lineMatches
[
i
].
serialize
());
}
}
return
{
return
{
path
:
this
.
path
,
path
:
this
.
path
,
lineMatches
lineMatches
,
numMatches
};
};
}
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录