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

fix(database-change): supports the execution of sql by downloading files from a separate bucket #3436

Open
wants to merge 9 commits into
base: feat/obcloud_202409
Choose a base branch
from
Open

fix(database-change): supports the execution of sql by downloading files from a separate bucket #3436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
47667e1
feat: download the attachment that needs to execute SQL from OSS
kiko-art Sep 11, 2024
7663a4a
Merge branch 'refs/heads/dev/4.3.x' into ziyan_24v3_feat_sql_plan_tas…
guowl3 Sep 11, 2024
cbe2e9e
Merge branch 'dev/4.3.x' into ziyan_24v3_feat_sql_plan_task_file_down…
kiko-art Sep 11, 2024
461ac1f
feat: download the attachment that needs to execute SQL from OSS
kiko-art Sep 11, 2024
0905f93
Merge remote-tracking branch 'origin/ziyan_24v3_feat_sql_plan_task_fi…
kiko-art Sep 11, 2024
fe7295a
Merge branch 'dev/4.3.x' into ziyan_24v3_feat_sql_plan_task_file_down…
kiko-art Sep 12, 2024
0b2004e
Merge branch 'dev/4.3.x' into ziyan_24v3_feat_sql_plan_task_file_down…
kiko-art Sep 12, 2024
ed3c5bc
Merge branch 'dev/4.3.x' into ziyan_24v3_feat_sql_plan_task_file_down…
kiko-art Sep 13, 2024
3762a8d
Merge branch 'feat/obcloud_202409' into ziyan_24v3_feat_sql_plan_task…
kiko-art Sep 19, 2024
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
3 changes: 2 additions & 1 deletion server/odc-service/src/main/java/com/oceanbase/odc/service/quartz/QuartzJobService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ public void changeQuartzJob(ChangeQuartJobParam req) {
pauseJob(jobKey);
break;
}
case TERMINATE: {
case TERMINATE:
case DELETE: {
deleteJob(jobKey);
break;
}
Expand Down
54 changes: 48 additions & 6 deletions ...r/odc-service/src/main/java/com/oceanbase/odc/service/task/executor/task/SqlPlanTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.springframework.jdbc.core.ConnectionCallback;
import org.springframework.jdbc.core.StatementCallback;

import com.amazonaws.util.CollectionUtils;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use apache commons instead.

import com.oceanbase.odc.common.json.JsonUtils;
import com.oceanbase.odc.common.util.CSVUtils;
import com.oceanbase.odc.common.util.StringUtils;
Expand Down Expand Up @@ -117,13 +118,13 @@ protected void doInit(JobContext context) {

@Override
protected boolean doStart(JobContext context) throws Exception {
String sqlContent = parameters.getSqlContent();
log.info("sql content={}", sqlContent);
// todo: Download the attachment that needs to execute SQL from OSS
SqlCommentProcessor processor = ConnectionSessionUtil.getSqlCommentProcessor(connectionSession);

List<OffsetString> offsetStringList = processor.split(new StringBuffer(), sqlContent);
result.setTotalStatements(offsetStringList.size());
if (CollectionUtils.isNullOrEmpty(parameters.getSqlObjectIds())
&& StringUtils.isBlank(parameters.getSqlContent())) {
log.warn("Sql content and sql object id can not be null at the same time.");
return false;
}
List<OffsetString> offsetStringList = getSplitSql();

for (int i = 0; i <= offsetStringList.size() - 1; i++) {
OffsetString offsetString = offsetStringList.get(i);
Expand Down Expand Up @@ -163,6 +164,47 @@ protected boolean doStart(JobContext context) throws Exception {
return true;
}

private List<OffsetString> getSplitSql() {
SqlCommentProcessor processor = ConnectionSessionUtil.getSqlCommentProcessor(connectionSession);
StringBuffer buffer = new StringBuffer();
List<OffsetString> splitSqlList = new ArrayList<>();

if (CollectionUtils.isNullOrEmpty(parameters.getSqlObjectIds())) {
String sqlContent = parameters.getSqlContent();
log.info("SQL content={}", sqlContent);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sqlContent may too long for log output


List<OffsetString> offsetStringList = processor.split(buffer, sqlContent);
result.setTotalStatements(offsetStringList.size());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

result.setTotalStatements may set out of getSplitSql method, responsibility should isolated


return offsetStringList;
}

CloudObjectStorageService cloudObjectStorageService = getCloudObjectStorageService();

if (Objects.isNull(cloudObjectStorageService) || !cloudObjectStorageService.supported()) {
log.warn("Cloud object storage service not supported.");
throw new UnexpectedException("Cloud object storage service not supported");
}

for (String objectId : parameters.getSqlObjectIds()) {
try {
byte[] bytes = cloudObjectStorageService.readContent(objectId);
if (Objects.isNull(bytes)) {
log.warn("Read content from cloud storage returned null, objectId={}", objectId);
continue;
}
log.info("successfully read content from cloud storage, objectId={}", objectId);
String sqlContent = new String(bytes, StandardCharsets.UTF_8);
List<OffsetString> offsetStringList = processor.split(buffer, sqlContent);
splitSqlList.addAll(offsetStringList);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

read all sql statement into memory may cost a lot of memory,
the database change task already contains stream read/split logic, sql plan may follow the same flow.

} catch (IOException e) {
log.warn("Read content from cloud storage failed, objectId={}", objectId, e);
}
}

this.result.setTotalStatements(splitSqlList.size());
return splitSqlList;
}


@Override
Expand Down