Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Forever310
druid
提交
35d8a828
D
druid
项目概览
Forever310
/
druid
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
druid
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
35d8a828
编写于
7月 30, 2013
作者:
F
fjy
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
move the close method to the segment object
上级
f55e1204
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
43 addition
and
4 deletion
+43
-4
indexing-common/src/main/java/com/metamx/druid/index/QueryableIndex.java
.../src/main/java/com/metamx/druid/index/QueryableIndex.java
+9
-1
pom.xml
pom.xml
+1
-1
server/src/main/java/com/metamx/druid/coordination/ServerManager.java
...ain/java/com/metamx/druid/coordination/ServerManager.java
+1
-1
server/src/main/java/com/metamx/druid/index/IncrementalIndexSegment.java
.../java/com/metamx/druid/index/IncrementalIndexSegment.java
+8
-0
server/src/main/java/com/metamx/druid/index/QueryableIndexSegment.java
...in/java/com/metamx/druid/index/QueryableIndexSegment.java
+9
-0
server/src/main/java/com/metamx/druid/index/Segment.java
server/src/main/java/com/metamx/druid/index/Segment.java
+3
-1
server/src/test/java/com/metamx/druid/coordination/ServerManagerTest.java
...java/com/metamx/druid/coordination/ServerManagerTest.java
+6
-0
server/src/test/java/com/metamx/druid/loading/CacheTestSegmentLoader.java
...java/com/metamx/druid/loading/CacheTestSegmentLoader.java
+6
-0
未找到文件。
indexing-common/src/main/java/com/metamx/druid/index/QueryableIndex.java
浏览文件 @
35d8a828
...
...
@@ -24,13 +24,21 @@ import com.metamx.druid.kv.Indexed;
import
org.joda.time.Interval
;
import
java.io.Closeable
;
import
java.io.IOException
;
/**
*/
public
interface
QueryableIndex
extends
ColumnSelector
,
Closeable
public
interface
QueryableIndex
extends
ColumnSelector
{
public
Interval
getDataInterval
();
public
int
getNumRows
();
public
Indexed
<
String
>
getColumnNames
();
public
Indexed
<
String
>
getAvailableDimensions
();
/**
* The close method shouldn't actually be here as this is nasty. We will adjust it in the future.
* @throws IOException
*/
@Deprecated
public
void
close
()
throws
IOException
;
}
pom.xml
浏览文件 @
35d8a828
...
...
@@ -38,7 +38,7 @@
<properties>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<metamx.java-util.version>
0.22.5
-SNAPSHOT
</metamx.java-util.version>
<metamx.java-util.version>
0.22.5
</metamx.java-util.version>
<apache.curator.version>
2.1.0-incubating
</apache.curator.version>
</properties>
...
...
server/src/main/java/com/metamx/druid/coordination/ServerManager.java
浏览文件 @
35d8a828
...
...
@@ -185,7 +185,7 @@ public class ServerManager implements QuerySegmentWalker
}
try
{
oldQueryable
.
asQueryableIndex
().
close
();
oldQueryable
.
close
();
}
catch
(
Exception
e
)
{
log
.
error
(
"Unable to close queryable index %s"
,
oldQueryable
.
getIdentifier
());
...
...
server/src/main/java/com/metamx/druid/index/IncrementalIndexSegment.java
浏览文件 @
35d8a828
...
...
@@ -24,6 +24,8 @@ import com.metamx.druid.index.v1.IncrementalIndex;
import
com.metamx.druid.index.v1.IncrementalIndexStorageAdapter
;
import
org.joda.time.Interval
;
import
java.io.IOException
;
/**
*/
public
class
IncrementalIndexSegment
implements
Segment
...
...
@@ -60,4 +62,10 @@ public class IncrementalIndexSegment implements Segment
{
return
new
IncrementalIndexStorageAdapter
(
index
);
}
@Override
public
void
close
()
throws
IOException
{
// do nothing
}
}
server/src/main/java/com/metamx/druid/index/QueryableIndexSegment.java
浏览文件 @
35d8a828
...
...
@@ -23,6 +23,8 @@ import com.metamx.druid.StorageAdapter;
import
com.metamx.druid.index.v1.QueryableIndexStorageAdapter
;
import
org.joda.time.Interval
;
import
java.io.IOException
;
/**
*/
public
class
QueryableIndexSegment
implements
Segment
...
...
@@ -59,4 +61,11 @@ public class QueryableIndexSegment implements Segment
{
return
new
QueryableIndexStorageAdapter
(
index
);
}
@Override
public
void
close
()
throws
IOException
{
// this is kinda nasty
index
.
close
();
}
}
server/src/main/java/com/metamx/druid/index/Segment.java
浏览文件 @
35d8a828
...
...
@@ -22,9 +22,11 @@ package com.metamx.druid.index;
import
com.metamx.druid.StorageAdapter
;
import
org.joda.time.Interval
;
import
java.io.Closeable
;
/**
*/
public
interface
Segment
public
interface
Segment
extends
Closeable
{
public
String
getIdentifier
();
public
Interval
getDataInterval
();
...
...
server/src/test/java/com/metamx/druid/coordination/ServerManagerTest.java
浏览文件 @
35d8a828
...
...
@@ -352,6 +352,12 @@ public class ServerManagerTest
{
throw
new
UnsupportedOperationException
();
}
@Override
public
void
close
()
throws
IOException
{
}
}
public
static
class
MyQueryRunnerFactory
implements
QueryRunnerFactory
<
Result
<
SearchResultValue
>,
SearchQuery
>
...
...
server/src/test/java/com/metamx/druid/loading/CacheTestSegmentLoader.java
浏览文件 @
35d8a828
...
...
@@ -27,6 +27,7 @@ import com.metamx.druid.index.Segment;
import
org.joda.time.Interval
;
import
java.io.File
;
import
java.io.IOException
;
import
java.util.Map
;
/**
...
...
@@ -68,6 +69,11 @@ public class CacheTestSegmentLoader implements SegmentLoader
{
throw
new
UnsupportedOperationException
();
}
@Override
public
void
close
()
throws
IOException
{
}
};
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录