Skip to content

implement the expect timewait #196

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

Closed
robll-v1 wants to merge 1 commit into from
Closed

implement the expect timewait #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion mo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jdbc:
#- addr: "127.0.0.1:3306"
#- addr: "127.0.0.1:3306"
database:
default: ""
default: "test"
paremeter:
characterSetResults: "utf8"
continueBatchOnError: "false"
Expand Down
16 changes: 16 additions & 0 deletions src/main/java/io/mo/cases/SqlCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,18 @@ public class SqlCommand {
@Getter
@Setter
private int sleeptime = 0;

@Getter
@Setter
private boolean waitExpect = false;

@Getter
@Setter
private int waitExpectInterval = 0;

@Getter
@Setter
private int waitExpectTimeout = 0;

@Getter
@Setter
Expand Down Expand Up @@ -154,6 +166,10 @@ public void setActResult(StmtResult actResult) {
}
}

public StmtResult getActResult() {
return actResult;
}

public boolean checkResult() {
// Check if regex patterns are set
if (this.regexPatterns != null && !this.regexPatterns.isEmpty()) {
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/io/mo/constant/COMMON.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public class COMMON {
public static String NEW_SESSION_END_FLAG = "-- @session";
public static String BVT_SKIP_FILE_FLAG = "-- @skip:issue#";
public static String FUNC_SLEEP_FLAG = "-- @sleep:";
public static String WAIT_EXPECT_FLAG = "-- @wait_expect";
public static String BVT_ISSUE_START_FLAG = "-- @bvt:issue#";
public static String BVT_ISSUE_END_FLAG = "-- @bvt:issue";
public static String SORT_KEY_INDEX_FLAG = "-- @sortkey:";
Expand Down Expand Up @@ -89,4 +90,4 @@ public class COMMON {

public static double SCALE_TOLERABLE_ERROR = 0.0000009;
public static double INT_TOLERABLE_ERROR = 0.000000000000001;
}
}
45 changes: 45 additions & 0 deletions src/main/java/io/mo/db/Executor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,46 @@ public void run(TestScript script) {
command.setActResult(actResult);
}

if (command.isWaitExpect()) {
int intervalMs = command.getWaitExpectInterval() * 1000;
int timeoutMs = command.getWaitExpectTimeout() * 1000;
if (intervalMs > 0 && timeoutMs > 0) {
StmtResult firstActResult = command.getActResult();
if (firstActResult == null || firstActResult.getType() != RESULT.STMT_RESULT_TYPE_SET) {
logger.warn(String.format(
"wait_expect is only safe for query results. Skip retry for command[%s][row:%d].",
command.getCommand(), command.getPosition()));
} else {
long deadline = System.currentTimeMillis() + timeoutMs;
boolean matched = command.checkResult();
while (!matched && System.currentTimeMillis() < deadline) {
long now = System.currentTimeMillis();
long sleepMs = Math.min(intervalMs, Math.max(0, deadline - now));
if (sleepMs > 0) {
Thread.sleep(sleepMs);
}
if (statement != null) {
statement.close();
}
statement = connection.createStatement();
statement.execute(sqlCmd);
ResultSet retryResultSet = statement.getResultSet();
if (retryResultSet != null) {
RSSet rsSet = new RSSet(retryResultSet, command);
StmtResult actResult = new StmtResult(rsSet);
command.setActResult(actResult);
command.getTestResult().setActResult(actResult.toString());
} else {
StmtResult actResult = new StmtResult();
actResult.setType(RESULT.STMT_RESULT_TYPE_NONE);
command.setActResult(actResult);
}
matched = command.checkResult();
}
}
}
}

checkResult(command, script);
statement.close();

Expand Down Expand Up @@ -381,6 +421,11 @@ public boolean genRS(TestScript script) {
statement = connection.createStatement();

String sqlCmd = command.getCommand().replaceAll("\\$resources", COMMON.RESOURCE_PATH);
if (command.isWaitExpect() && command.getWaitExpectTimeout() > 0) {
logger.info(String.format("The tester will wait_expect for %s s before generating result, please wait....",
command.getWaitExpectTimeout()));
Thread.sleep(command.getWaitExpectTimeout() * 1000L);
}
if (command.isNeedWait()) {
execWaitOperation(command);
}
Expand Down
40 changes: 39 additions & 1 deletion src/main/java/io/mo/util/ScriptParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ private boolean processCommentLine(String trimmedLine, String path, SqlCommand c
// Simple flag handlers
if (trimmedLine.startsWith(COMMON.FUNC_SLEEP_FLAG)) {
command.setSleeptime(Integer.parseInt(trimmedLine.substring(COMMON.FUNC_SLEEP_FLAG.length())));
} else if (trimmedLine.startsWith(COMMON.WAIT_EXPECT_FLAG)) {
parseWaitExpectFlag(trimmedLine, command);
} else if (trimmedLine.startsWith(COMMON.SYSTEM_CMD_FLAG)) {
command.addSysCMD(trimmedLine.substring(COMMON.SYSTEM_CMD_FLAG.length()));
} else if (trimmedLine.startsWith(COMMON.REGULAR_MATCH_FLAG)) {
Expand Down Expand Up @@ -155,6 +157,43 @@ private void parseWaitFlag(String trimmedLine, SqlCommand command) {
command.setNeedWait(true);
}

private void parseWaitExpectFlag(String trimmedLine, SqlCommand command) {
String rest = trimmedLine.substring(COMMON.WAIT_EXPECT_FLAG.length()).trim();
if (!rest.startsWith("(") || !rest.endsWith(")")) {
LOG.warn(String.format("Invalid wait_expect flag format: %s. Expected -- @wait_expect(interval, timeout)", trimmedLine));
return;
}

String content = rest.substring(1, rest.length() - 1);
String[] parts = content.split(",");
if (parts.length != 2) {
LOG.warn(String.format("Invalid wait_expect flag format: %s. Expected -- @wait_expect(interval, timeout)", trimmedLine));
return;
}

String intervalStr = parts[0].trim();
String timeoutStr = parts[1].trim();
if (!StringUtils.isNumeric(intervalStr) || !StringUtils.isNumeric(timeoutStr)) {
LOG.warn(String.format("Invalid wait_expect flag values: %s. Interval/timeout must be numeric.", trimmedLine));
return;
}

int interval = Integer.parseInt(intervalStr);
int timeout = Integer.parseInt(timeoutStr);
if (interval <= 0 || timeout <= 0) {
LOG.warn(String.format("Invalid wait_expect flag values: %s. Interval/timeout must be > 0.", trimmedLine));
return;
}
if (interval > timeout) {
LOG.warn(String.format("wait_expect interval(%d) is greater than timeout(%d), interval will be capped to timeout.", interval, timeout));
interval = timeout;
}

command.setWaitExpect(true);
command.setWaitExpectInterval(interval);
command.setWaitExpectTimeout(timeout);
}

private void parseConnectionInfo(String trimmedLine, ConnectionInfo conInfo, String path, int rowNum) {
String conInfoStr = trimmedLine.endsWith("{")
? trimmedLine.substring(COMMON.NEW_SESSION_START_FLAG.length(), trimmedLine.length() - 1)
Expand Down Expand Up @@ -519,4 +558,3 @@ public static void main(String[] args){

}
}

Loading