Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小五666\n哈哈
Rocketmq
提交
97da4ac9
R
Rocketmq
项目概览
小五666\n哈哈
/
Rocketmq
与 Fork 源项目一致
Fork自
Apache RocketMQ / Rocketmq
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
Rocketmq
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
97da4ac9
编写于
9月 06, 2021
作者:
8
844392610
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Improve performance of expandIP, and readable
上级
6358b3c9
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
19 addition
and
48 deletion
+19
-48
acl/src/main/java/org/apache/rocketmq/acl/common/AclUtils.java
...rc/main/java/org/apache/rocketmq/acl/common/AclUtils.java
+18
-48
acl/src/test/java/org/apache/rocketmq/acl/common/AclUtilsTest.java
...est/java/org/apache/rocketmq/acl/common/AclUtilsTest.java
+1
-0
未找到文件。
acl/src/main/java/org/apache/rocketmq/acl/common/AclUtils.java
浏览文件 @
97da4ac9
...
@@ -206,61 +206,31 @@ public class AclUtils {
...
@@ -206,61 +206,31 @@ public class AclUtils {
}
}
public
static
String
expandIP
(
String
netaddress
,
int
part
)
{
public
static
String
expandIP
(
String
netaddress
,
int
part
)
{
boolean
compress
=
false
;
// expand netaddress
int
compressIndex
=
-
1
;
int
separatorCount
=
StringUtils
.
countMatches
(
netaddress
,
":"
);
String
[]
strArray
=
StringUtils
.
split
(
netaddress
,
":"
);
int
padCount
=
part
-
separatorCount
;
ArrayList
<
Integer
>
indexes
=
new
ArrayList
<>();
if
(
padCount
>
0
){
for
(
int
i
=
0
;
i
<
netaddress
.
length
();
i
++)
{
StringBuilder
padStr
=
new
StringBuilder
(
":"
);
if
(
netaddress
.
charAt
(
i
)
==
':'
)
{
for
(
int
i
=
0
;
i
<
padCount
;
i
++){
if
(
indexes
.
size
()
>
0
&&
i
-
indexes
.
get
(
indexes
.
size
()
-
1
)
==
1
)
{
padStr
.
append
(
":"
);
compressIndex
=
i
;
compress
=
true
;
}
indexes
.
add
(
i
);
}
}
netaddress
=
StringUtils
.
replace
(
netaddress
,
"::"
,
padStr
.
toString
());
}
}
// pad netaddress
String
[]
strArray
=
StringUtils
.
splitPreserveAllTokens
(
netaddress
,
":"
);
for
(
int
i
=
0
;
i
<
strArray
.
length
;
i
++)
{
for
(
int
i
=
0
;
i
<
strArray
.
length
;
i
++)
{
if
(
strArray
[
i
].
length
()
<
4
)
{
if
(
strArray
[
i
].
length
()
<
4
)
{
strArray
[
i
]
=
"0000"
.
substring
(
0
,
4
-
strArray
[
i
].
length
())
+
strArray
[
i
]
;
strArray
[
i
]
=
StringUtils
.
leftPad
(
strArray
[
i
],
4
,
'0'
)
;
}
}
}
}
// output
StringBuilder
sb
=
new
StringBuilder
();
StringBuilder
sb
=
new
StringBuilder
();
if
(
compress
)
{
for
(
int
i
=
0
;
i
<
strArray
.
length
;
i
++)
{
int
pos
=
indexes
.
indexOf
(
compressIndex
);
sb
.
append
(
strArray
[
i
]);
int
index
=
0
;
if
(
i
!=
strArray
.
length
-
1
)
{
if
(!
netaddress
.
startsWith
(
":"
))
{
sb
.
append
(
":"
);
for
(
int
i
=
0
;
i
<
pos
;
i
++)
{
sb
.
append
(
strArray
[
index
]).
append
(
":"
);
index
+=
1
;
}
}
int
zeroNum
=
part
-
strArray
.
length
;
if
(
netaddress
.
endsWith
(
":"
))
{
for
(
int
i
=
0
;
i
<
zeroNum
;
i
++)
{
sb
.
append
(
"0000"
);
if
(
i
!=
zeroNum
-
1
)
{
sb
.
append
(
":"
);
}
}
}
else
{
for
(
int
i
=
0
;
i
<
zeroNum
;
i
++)
{
sb
.
append
(
"0000"
).
append
(
":"
);
}
for
(
int
i
=
index
;
i
<
strArray
.
length
;
i
++)
{
sb
.
append
(
strArray
[
i
]);
if
(
i
!=
strArray
.
length
-
1
)
{
sb
.
append
(
":"
);
}
}
}
}
else
{
for
(
int
i
=
0
;
i
<
strArray
.
length
;
i
++)
{
sb
.
append
(
strArray
[
i
]);
if
(
i
!=
strArray
.
length
-
1
)
{
sb
.
append
(
":"
);
}
}
}
}
}
return
sb
.
toString
().
toUpperCase
();
return
sb
.
toString
().
toUpperCase
();
...
@@ -308,7 +278,7 @@ public class AclUtils {
...
@@ -308,7 +278,7 @@ public class AclUtils {
JSONObject
yamlDataObject
=
null
;
JSONObject
yamlDataObject
=
null
;
try
{
try
{
yamlDataObject
=
AclUtils
.
getYamlDataObject
(
fileName
,
yamlDataObject
=
AclUtils
.
getYamlDataObject
(
fileName
,
JSONObject
.
class
);
JSONObject
.
class
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
error
(
"Convert yaml file to data object error, "
,
e
);
log
.
error
(
"Convert yaml file to data object error, "
,
e
);
return
null
;
return
null
;
...
...
acl/src/test/java/org/apache/rocketmq/acl/common/AclUtilsTest.java
浏览文件 @
97da4ac9
...
@@ -198,6 +198,7 @@ public class AclUtilsTest {
...
@@ -198,6 +198,7 @@ public class AclUtilsTest {
@Test
@Test
public
void
expandIPTest
()
{
public
void
expandIPTest
()
{
Assert
.
assertEquals
(
AclUtils
.
expandIP
(
"::"
,
8
),
"0000:0000:0000:0000:0000:0000:0000:0000"
);
Assert
.
assertEquals
(
AclUtils
.
expandIP
(
"::1"
,
8
),
"0000:0000:0000:0000:0000:0000:0000:0001"
);
Assert
.
assertEquals
(
AclUtils
.
expandIP
(
"::1"
,
8
),
"0000:0000:0000:0000:0000:0000:0000:0001"
);
Assert
.
assertEquals
(
AclUtils
.
expandIP
(
"3::"
,
8
),
"0003:0000:0000:0000:0000:0000:0000:0000"
);
Assert
.
assertEquals
(
AclUtils
.
expandIP
(
"3::"
,
8
),
"0003:0000:0000:0000:0000:0000:0000:0000"
);
Assert
.
assertEquals
(
AclUtils
.
expandIP
(
"2::2"
,
8
),
"0002:0000:0000:0000:0000:0000:0000:0002"
);
Assert
.
assertEquals
(
AclUtils
.
expandIP
(
"2::2"
,
8
),
"0002:0000:0000:0000:0000:0000:0000:0002"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录