Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#3056 performance issue #3057

Merged
merged 2 commits into from
Jun 14, 2020
Merged

#3056 performance issue #3057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ea2200
Merge pull request #2 from alibaba/develop
showkawa Jun 12, 2020
8c0f52f
replace "+=" to StringBuilder append method
showkawa Jun 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 41 additions & 41 deletions ...com/alibaba/nacos/config/server/service/repository/EmbeddedStoragePersistServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,7 +991,7 @@ public Page<ConfigInfo> findConfigInfo4Page(final int pageNo, final int pageSize
}
PaginationHelper<ConfigInfo> helper = createPaginationHelper();
return helper
.fetchPage(sqlCount + where, sql + where, paramList.toArray(), pageNo,
.fetchPage(sqlCount + where.toString(), sql + where.toString(), paramList.toArray(), pageNo,
pageSize, CONFIG_INFO_ROW_MAPPER);
}

Expand Down Expand Up @@ -1597,7 +1597,7 @@ public Page<ConfigInfo> findConfigInfoLike(final int pageNo, final int pageSize,
final ConfigKey[] configKeys, final boolean blacklist) {
String sqlCountRows = "select count(*) from config_info where ";
String sqlFetchRows = "select ID,data_id,group_id,tenant_id,app_name,content from config_info where ";
String where = " 1=1 ";
StringBuilder where = new StringBuilder(" 1=1 ");
// White list, please synchronize the condition is empty, there is no qualified configuration
if (configKeys.length == 0 && !blacklist) {
Page<ConfigInfo> page = new Page<ConfigInfo>();
Expand All @@ -1619,74 +1619,74 @@ public Page<ConfigInfo> findConfigInfoLike(final int pageNo, final int pageSize,
if (blacklist) {
if (isFirst) {
isFirst = false;
where += " and ";
where.append(" and ");
}
else {
where += " and ";
where.append(" and ");
}

where += "(";
where.append("(");
boolean isFirstSub = true;
if (!StringUtils.isBlank(dataId)) {
where += " data_id not like ? ";
where.append(" data_id not like ? ");
params.add(generateLikeArgument(dataId));
isFirstSub = false;
}
if (!StringUtils.isBlank(group)) {
if (!isFirstSub) {
where += " or ";
where.append(" or ");
}
where += " group_id not like ? ";
where.append(" group_id not like ? ");
params.add(generateLikeArgument(group));
isFirstSub = false;
}
if (!StringUtils.isBlank(appName)) {
if (!isFirstSub) {
where += " or ";
where.append(" or ");
}
where += " app_name != ? ";
where.append(" app_name != ? ");
params.add(appName);
isFirstSub = false;
}
where += ") ";
where.append(") ");
}
else {
if (isFirst) {
isFirst = false;
where += " and ";
where.append(" and ");
}
else {
where += " or ";
where.append(" or ");
}
where += "(";
where.append("(");
boolean isFirstSub = true;
if (!StringUtils.isBlank(dataId)) {
where += " data_id like ? ";
where.append(" data_id like ? ");
params.add(generateLikeArgument(dataId));
isFirstSub = false;
}
if (!StringUtils.isBlank(group)) {
if (!isFirstSub) {
where += " and ";
where.append(" and ");
}
where += " group_id like ? ";
where.append(" group_id like ? ");
params.add(generateLikeArgument(group));
isFirstSub = false;
}
if (!StringUtils.isBlank(appName)) {
if (!isFirstSub) {
where += " and ";
where.append(" and ");
}
where += " app_name = ? ";
where.append(" app_name = ? ");
params.add(appName);
isFirstSub = false;
}
where += ") ";
where.append(") ");
}
}
PaginationHelper<ConfigInfo> helper = createPaginationHelper();
return helper
.fetchPage(sqlCountRows + where, sqlFetchRows + where, params.toArray(),
.fetchPage(sqlCountRows + where.toString(), sqlFetchRows + where.toString(), params.toArray(),
pageNo, pageSize, CONFIG_INFO_ROW_MAPPER);

}
Expand Down Expand Up @@ -1769,7 +1769,7 @@ public Page<ConfigInfoAggr> findConfigInfoAggrLike(final int pageNo,

String sqlCountRows = "select count(*) from config_info_aggr where ";
String sqlFetchRows = "select data_id,group_id,tenant_id,datum_id,app_name,content from config_info_aggr where ";
String where = " 1=1 ";
StringBuilder where = new StringBuilder(" 1=1 ");
// White list, please synchronize the condition is empty, there is no qualified configuration
if (configKeys.length == 0 && blacklist == false) {
Page<ConfigInfoAggr> page = new Page<ConfigInfoAggr>();
Expand All @@ -1790,74 +1790,74 @@ public Page<ConfigInfoAggr> findConfigInfoAggrLike(final int pageNo,
if (blacklist) {
if (isFirst) {
isFirst = false;
where += " and ";
where.append(" and ");
}
else {
where += " and ";
where.append(" and ");
}

where += "(";
where.append("(");
boolean isFirstSub = true;
if (!StringUtils.isBlank(dataId)) {
where += " data_id not like ? ";
where.append(" data_id not like ? ");
params.add(generateLikeArgument(dataId));
isFirstSub = false;
}
if (!StringUtils.isBlank(group)) {
if (!isFirstSub) {
where += " or ";
where.append(" or ");
}
where += " group_id not like ? ";
where.append(" group_id not like ? ");
params.add(generateLikeArgument(group));
isFirstSub = false;
}
if (!StringUtils.isBlank(appName)) {
if (!isFirstSub) {
where += " or ";
where.append(" or ");
}
where += " app_name != ? ";
where.append(" app_name != ? ");
params.add(appName);
isFirstSub = false;
}
where += ") ";
where.append(") ");
}
else {
if (isFirst) {
isFirst = false;
where += " and ";
where.append(" and ");
}
else {
where += " or ";
where.append(" or ");
}
where += "(";
where.append("(");
boolean isFirstSub = true;
if (!StringUtils.isBlank(dataId)) {
where += " data_id like ? ";
where.append(" data_id like ? ");
params.add(generateLikeArgument(dataId));
isFirstSub = false;
}
if (!StringUtils.isBlank(group)) {
if (!isFirstSub) {
where += " and ";
where.append(" and ");
}
where += " group_id like ? ";
where.append(" group_id like ? ");
params.add(generateLikeArgument(group));
isFirstSub = false;
}
if (!StringUtils.isBlank(appName)) {
if (!isFirstSub) {
where += " and ";
where.append(" and ");
}
where += " app_name = ? ";
where.append(" app_name = ? ");
params.add(appName);
isFirstSub = false;
}
where += ") ";
where.append(") ");
}
}
PaginationHelper<ConfigInfoAggr> helper = createPaginationHelper();
return helper
.fetchPage(sqlCountRows + where, sqlFetchRows + where, params.toArray(),
.fetchPage(sqlCountRows + where.toString(), sqlFetchRows + where.toString(), params.toArray(),
pageNo, pageSize, CONFIG_INFO_AGGR_ROW_MAPPER);

}
Expand Down
Loading