Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Iotdb
提交
be9e0237
I
Iotdb
项目概览
apache
/
Iotdb
11 个月 前同步成功
通知
25
Star
3344
Fork
916
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
Iotdb
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
be9e0237
编写于
1月 02, 2023
作者:
B
BUAAserein
提交者:
GitHub
1月 02, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[IOTDB-5284] Fix some confignode code smells (#8648)
* fix some code smells Co-authored-by:
N
Potato
<
tanxinyu@apache.org
>
上级
47987e24
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
32 addition
and
37 deletion
+32
-37
confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/ClusterSchemaInfo.java
...otdb/confignode/persistence/schema/ClusterSchemaInfo.java
+20
-26
confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/cq/CreateCQProcedure.java
...iotdb/confignode/procedure/impl/cq/CreateCQProcedure.java
+2
-2
confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/node/RemoveConfigNodeProcedure.java
...ignode/procedure/impl/node/RemoveConfigNodeProcedure.java
+2
-2
confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/sync/AbstractOperatePipeProcedure.java
...ode/procedure/impl/sync/AbstractOperatePipeProcedure.java
+2
-2
confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/sync/CreatePipeProcedure.java
...b/confignode/procedure/impl/sync/CreatePipeProcedure.java
+2
-1
confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/trigger/CreateTriggerProcedure.java
...ignode/procedure/impl/trigger/CreateTriggerProcedure.java
+2
-2
confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/trigger/DropTriggerProcedure.java
...nfignode/procedure/impl/trigger/DropTriggerProcedure.java
+2
-2
未找到文件。
confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/ClusterSchemaInfo.java
浏览文件 @
be9e0237
...
...
@@ -95,7 +95,9 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
private
final
ReentrantReadWriteLock
storageGroupReadWriteLock
;
private
final
ConfigMTree
mTree
;
private
final
String
SNAPSHOT_FILENAME
=
"cluster_schema.bin"
;
private
static
final
String
SNAPSHOT_FILENAME
=
"cluster_schema.bin"
;
private
final
String
ERROR_NAME
=
"Error StorageGroup name"
;
private
final
TemplateTable
templateTable
;
...
...
@@ -138,7 +140,7 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
result
.
setCode
(
TSStatusCode
.
SUCCESS_STATUS
.
getStatusCode
());
}
catch
(
MetadataException
e
)
{
LOGGER
.
error
(
"Error StorageGroup name"
,
e
);
LOGGER
.
error
(
ERROR_NAME
,
e
);
result
.
setCode
(
e
.
getErrorCode
()).
setMessage
(
e
.
getMessage
());
}
finally
{
storageGroupReadWriteLock
.
writeLock
().
unlock
();
...
...
@@ -182,10 +184,10 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
result
.
setCount
(
mTree
.
getStorageGroupNum
(
patternPath
,
false
));
result
.
setStatus
(
new
TSStatus
(
TSStatusCode
.
SUCCESS_STATUS
.
getStatusCode
()));
}
catch
(
MetadataException
e
)
{
LOGGER
.
error
(
"Error StorageGroup name"
,
e
);
LOGGER
.
error
(
ERROR_NAME
,
e
);
result
.
setStatus
(
new
TSStatus
(
TSStatusCode
.
DATABASE_NOT_EXIST
.
getStatusCode
())
.
setMessage
(
"Error StorageGroup name
: "
+
e
.
getMessage
()));
.
setMessage
(
ERROR_NAME
+
"
: "
+
e
.
getMessage
()));
}
finally
{
storageGroupReadWriteLock
.
readLock
().
unlock
();
}
...
...
@@ -208,10 +210,10 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
result
.
setSchemaMap
(
schemaMap
);
result
.
setStatus
(
new
TSStatus
(
TSStatusCode
.
SUCCESS_STATUS
.
getStatusCode
()));
}
catch
(
MetadataException
e
)
{
LOGGER
.
error
(
"Error StorageGroup name"
,
e
);
LOGGER
.
error
(
ERROR_NAME
,
e
);
result
.
setStatus
(
new
TSStatus
(
TSStatusCode
.
DATABASE_NOT_EXIST
.
getStatusCode
())
.
setMessage
(
"Error StorageGroup name
: "
+
e
.
getMessage
()));
.
setMessage
(
ERROR_NAME
+
"
: "
+
e
.
getMessage
()));
}
finally
{
storageGroupReadWriteLock
.
readLock
().
unlock
();
}
...
...
@@ -237,10 +239,8 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
result
.
setMessage
(
"StorageGroup does not exist"
);
}
}
catch
(
MetadataException
e
)
{
LOGGER
.
error
(
"Error StorageGroup name"
,
e
);
result
.
setCode
(
TSStatusCode
.
DATABASE_NOT_EXIST
.
getStatusCode
())
.
setMessage
(
"Error StorageGroupName"
);
LOGGER
.
error
(
ERROR_NAME
,
e
);
result
.
setCode
(
TSStatusCode
.
DATABASE_NOT_EXIST
.
getStatusCode
()).
setMessage
(
ERROR_NAME
);
}
finally
{
storageGroupReadWriteLock
.
writeLock
().
unlock
();
}
...
...
@@ -262,10 +262,8 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
result
.
setCode
(
TSStatusCode
.
DATABASE_NOT_EXIST
.
getStatusCode
());
}
}
catch
(
MetadataException
e
)
{
LOGGER
.
error
(
"Error StorageGroup name"
,
e
);
result
.
setCode
(
TSStatusCode
.
DATABASE_NOT_EXIST
.
getStatusCode
())
.
setMessage
(
"Error StorageGroupName"
);
LOGGER
.
error
(
ERROR_NAME
,
e
);
result
.
setCode
(
TSStatusCode
.
DATABASE_NOT_EXIST
.
getStatusCode
()).
setMessage
(
ERROR_NAME
);
}
finally
{
storageGroupReadWriteLock
.
writeLock
().
unlock
();
}
...
...
@@ -287,10 +285,8 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
result
.
setCode
(
TSStatusCode
.
DATABASE_NOT_EXIST
.
getStatusCode
());
}
}
catch
(
MetadataException
e
)
{
LOGGER
.
error
(
"Error StorageGroup name"
,
e
);
result
.
setCode
(
TSStatusCode
.
DATABASE_NOT_EXIST
.
getStatusCode
())
.
setMessage
(
"Error StorageGroupName"
);
LOGGER
.
error
(
ERROR_NAME
,
e
);
result
.
setCode
(
TSStatusCode
.
DATABASE_NOT_EXIST
.
getStatusCode
()).
setMessage
(
ERROR_NAME
);
}
finally
{
storageGroupReadWriteLock
.
writeLock
().
unlock
();
}
...
...
@@ -312,10 +308,8 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
result
.
setCode
(
TSStatusCode
.
DATABASE_NOT_EXIST
.
getStatusCode
());
}
}
catch
(
MetadataException
e
)
{
LOGGER
.
error
(
"Error StorageGroup name"
,
e
);
result
.
setCode
(
TSStatusCode
.
DATABASE_NOT_EXIST
.
getStatusCode
())
.
setMessage
(
"Error StorageGroupName"
);
LOGGER
.
error
(
ERROR_NAME
,
e
);
result
.
setCode
(
TSStatusCode
.
DATABASE_NOT_EXIST
.
getStatusCode
()).
setMessage
(
ERROR_NAME
);
}
finally
{
storageGroupReadWriteLock
.
writeLock
().
unlock
();
}
...
...
@@ -342,7 +336,7 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
}
result
.
setCode
(
TSStatusCode
.
SUCCESS_STATUS
.
getStatusCode
());
}
catch
(
MetadataException
e
)
{
LOGGER
.
error
(
"Error StorageGroup name"
,
e
);
LOGGER
.
error
(
ERROR_NAME
,
e
);
result
.
setCode
(
TSStatusCode
.
DATABASE_NOT_EXIST
.
getStatusCode
());
}
finally
{
storageGroupReadWriteLock
.
writeLock
().
unlock
();
...
...
@@ -429,7 +423,7 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
}
}
}
catch
(
MetadataException
e
)
{
LOGGER
.
warn
(
"Error StorageGroup name"
,
e
);
LOGGER
.
warn
(
ERROR_NAME
,
e
);
}
finally
{
storageGroupReadWriteLock
.
readLock
().
unlock
();
}
...
...
@@ -457,7 +451,7 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
return
storageGroupSchema
.
getMaxDataRegionGroupNum
();
}
}
catch
(
MetadataException
e
)
{
LOGGER
.
warn
(
"Error StorageGroup name"
,
e
);
LOGGER
.
warn
(
ERROR_NAME
,
e
);
return
-
1
;
}
finally
{
storageGroupReadWriteLock
.
readLock
().
unlock
();
...
...
@@ -800,7 +794,7 @@ public class ClusterSchemaInfo implements SnapshotProcessor {
path
.
getFullPath
(),
mTree
.
getStorageGroupNodeByPath
(
path
).
getStorageGroupSchema
());
}
}
catch
(
MetadataException
e
)
{
LOGGER
.
warn
(
"Error StorageGroup name"
,
e
);
LOGGER
.
warn
(
ERROR_NAME
,
e
);
}
finally
{
storageGroupReadWriteLock
.
readLock
().
unlock
();
}
...
...
confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/cq/CreateCQProcedure.java
浏览文件 @
be9e0237
...
...
@@ -54,7 +54,7 @@ public class CreateCQProcedure extends AbstractNodeProcedure<CreateCQState> {
private
static
final
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
CreateCQProcedure
.
class
);
private
static
final
int
retryThreshold
=
5
;
private
static
final
int
RETRY_THRESHOLD
=
5
;
private
final
ScheduledExecutorService
executor
;
...
...
@@ -158,7 +158,7 @@ public class CreateCQProcedure extends AbstractNodeProcedure<CreateCQState> {
}
else
{
LOGGER
.
error
(
"Retrievable error trying to create cq [{}], state [{}]"
,
req
.
getCqId
(),
state
,
t
);
if
(
getCycles
()
>
retryThreshold
)
{
if
(
getCycles
()
>
RETRY_THRESHOLD
)
{
setFailure
(
new
ProcedureException
(
String
.
format
(
...
...
confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/node/RemoveConfigNodeProcedure.java
浏览文件 @
be9e0237
...
...
@@ -37,7 +37,7 @@ import java.nio.ByteBuffer;
/** remove config node procedure */
public
class
RemoveConfigNodeProcedure
extends
AbstractNodeProcedure
<
RemoveConfigNodeState
>
{
private
static
final
Logger
LOG
=
LoggerFactory
.
getLogger
(
RemoveConfigNodeProcedure
.
class
);
private
static
final
int
retryThreshold
=
5
;
private
static
final
int
RETRY_THRESHOLD
=
5
;
private
TConfigNodeLocation
removedConfigNode
;
...
...
@@ -82,7 +82,7 @@ public class RemoveConfigNodeProcedure extends AbstractNodeProcedure<RemoveConfi
removedConfigNode
,
state
,
e
);
if
(
getCycles
()
>
retryThreshold
)
{
if
(
getCycles
()
>
RETRY_THRESHOLD
)
{
setFailure
(
new
ProcedureException
(
"State stuck at "
+
state
));
}
}
...
...
confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/sync/AbstractOperatePipeProcedure.java
浏览文件 @
be9e0237
...
...
@@ -38,7 +38,7 @@ abstract class AbstractOperatePipeProcedure
private
static
final
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
AbstractOperatePipeProcedure
.
class
);
private
static
final
int
retryThreshold
=
3
;
private
static
final
int
RETRY_THRESHOLD
=
3
;
/**
* Execute at state OPERATE_CHECK
...
...
@@ -91,7 +91,7 @@ abstract class AbstractOperatePipeProcedure
setFailure
(
new
ProcedureException
(
e
.
getMessage
()));
}
else
{
LOGGER
.
error
(
"Retrievable error trying to {} at state [{}]"
,
getOperation
(),
state
,
e
);
if
(
getCycles
()
>
retryThreshold
)
{
if
(
getCycles
()
>
RETRY_THRESHOLD
)
{
setFailure
(
new
ProcedureException
(
String
.
format
(
"Fail to %s because %s"
,
getOperation
().
name
(),
e
.
getMessage
())));
...
...
confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/sync/CreatePipeProcedure.java
浏览文件 @
be9e0237
...
...
@@ -129,8 +129,9 @@ public class CreatePipeProcedure extends AbstractOperatePipeProcedure {
case
PRE_OPERATE_PIPE_CONFIGNODE:
case
OPERATE_PIPE_DATANODE:
return
true
;
default
:
return
false
;
}
return
false
;
}
@Override
...
...
confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/trigger/CreateTriggerProcedure.java
浏览文件 @
be9e0237
...
...
@@ -48,7 +48,7 @@ import java.nio.ByteBuffer;
/** create trigger procedure */
public
class
CreateTriggerProcedure
extends
AbstractNodeProcedure
<
CreateTriggerState
>
{
private
static
final
Logger
LOG
=
LoggerFactory
.
getLogger
(
CreateTriggerProcedure
.
class
);
private
static
final
int
retryThreshold
=
5
;
private
static
final
int
RETRY_THRESHOLD
=
5
;
private
TriggerInformation
triggerInformation
;
private
Binary
jarFile
;
...
...
@@ -161,7 +161,7 @@ public class CreateTriggerProcedure extends AbstractNodeProcedure<CreateTriggerS
triggerInformation
.
getTriggerName
(),
state
,
e
);
if
(
getCycles
()
>
retryThreshold
)
{
if
(
getCycles
()
>
RETRY_THRESHOLD
)
{
setFailure
(
new
ProcedureException
(
String
.
format
(
...
...
confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/trigger/DropTriggerProcedure.java
浏览文件 @
be9e0237
...
...
@@ -43,7 +43,7 @@ import java.nio.ByteBuffer;
/** drop trigger procedure */
public
class
DropTriggerProcedure
extends
AbstractNodeProcedure
<
DropTriggerState
>
{
private
static
final
Logger
LOG
=
LoggerFactory
.
getLogger
(
DropTriggerProcedure
.
class
);
private
static
final
int
retryThreshold
=
5
;
private
static
final
int
RETRY_THRESHOLD
=
5
;
private
String
triggerName
;
...
...
@@ -110,7 +110,7 @@ public class DropTriggerProcedure extends AbstractNodeProcedure<DropTriggerState
}
else
{
LOG
.
error
(
"Retrievable error trying to drop trigger [{}], state [{}]"
,
triggerName
,
state
,
e
);
if
(
getCycles
()
>
retryThreshold
)
{
if
(
getCycles
()
>
RETRY_THRESHOLD
)
{
setFailure
(
new
ProcedureException
(
String
.
format
(
"Fail to drop trigger [%s] at STATE [%s]"
,
triggerName
,
state
)));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录