This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new e84b9a0eaaa [fix](auth)fix fe can not restart when replay create row
policy log (… (#37820)
e84b9a0eaaa is described below
commit e84b9a0eaaa2c91533097b0839d9326a5e323bd7
Author: zhangdong <[email protected]>
AuthorDate: Tue Jul 16 11:28:19 2024 +0800
[fix](auth)fix fe can not restart when replay create row policy log (…
(#37820)
pick: https://github.com/apache/doris/pull/37342
---
.../main/java/org/apache/doris/policy/Policy.java | 3 ++-
.../java/org/apache/doris/policy/RowPolicy.java | 20 ++++++++++++++++----
.../java/org/apache/doris/qe/ConnectProcessor.java | 2 +-
.../java/org/apache/doris/policy/PolicyTest.java | 21 ++++++++++++++++++++-
4 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/policy/Policy.java
b/fe/fe-core/src/main/java/org/apache/doris/policy/Policy.java
index 81016e94826..01c5399d4ab 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/policy/Policy.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/policy/Policy.java
@@ -117,7 +117,8 @@ public abstract class Policy implements Writable,
GsonPostProcessable {
}
return new RowPolicy(policyId, stmt.getPolicyName(),
stmt.getTableName().getCtl(),
stmt.getTableName().getDb(),
stmt.getTableName().getTbl(), userIdent, stmt.getRoleName(),
- stmt.getOrigStmt().originStmt, stmt.getFilterType(),
stmt.getWherePredicate());
+ stmt.getOrigStmt().originStmt, stmt.getOrigStmt().idx,
stmt.getFilterType(),
+ stmt.getWherePredicate());
default:
throw new AnalysisException("Unknown policy type: " +
stmt.getType());
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/policy/RowPolicy.java
b/fe/fe-core/src/main/java/org/apache/doris/policy/RowPolicy.java
index 2b52c03b7d5..2b8a492e82c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/policy/RowPolicy.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/policy/RowPolicy.java
@@ -102,6 +102,8 @@ public class RowPolicy extends Policy implements
RowFilterPolicy {
**/
@SerializedName(value = "originStmt")
private String originStmt;
+ @SerializedName(value = "stmtIdx")
+ private int stmtIdx;
private Expr wherePredicate = null;
@@ -123,7 +125,7 @@ public class RowPolicy extends Policy implements
RowFilterPolicy {
* @param wherePredicate where predicate
*/
public RowPolicy(long policyId, final String policyName, long dbId,
UserIdentity user, String roleName,
- String originStmt,
+ String originStmt, int stmtIdx,
final long tableId, final FilterType filterType, final Expr
wherePredicate) {
super(policyId, PolicyTypeEnum.ROW, policyName);
this.user = user;
@@ -132,12 +134,13 @@ public class RowPolicy extends Policy implements
RowFilterPolicy {
this.tableId = tableId;
this.filterType = filterType;
this.originStmt = originStmt;
+ this.stmtIdx = stmtIdx;
this.wherePredicate = wherePredicate;
}
public RowPolicy(long policyId, final String policyName, String ctlName,
String dbName, String tableName,
UserIdentity user, String roleName,
- String originStmt, final FilterType filterType, final Expr
wherePredicate) {
+ String originStmt, int stmtIdx, final FilterType filterType, final
Expr wherePredicate) {
super(policyId, PolicyTypeEnum.ROW, policyName);
this.user = user;
this.roleName = roleName;
@@ -146,6 +149,7 @@ public class RowPolicy extends Policy implements
RowFilterPolicy {
this.tableName = tableName;
this.filterType = filterType;
this.originStmt = originStmt;
+ this.stmtIdx = stmtIdx;
this.wherePredicate = wherePredicate;
}
@@ -166,16 +170,20 @@ public class RowPolicy extends Policy implements
RowFilterPolicy {
try {
SqlScanner input = new SqlScanner(new StringReader(originStmt),
0L);
SqlParser parser = new SqlParser(input);
- CreatePolicyStmt stmt = (CreatePolicyStmt)
SqlParserUtils.getFirstStmt(parser);
+ CreatePolicyStmt stmt = (CreatePolicyStmt)
SqlParserUtils.getStmt(parser, stmtIdx);
wherePredicate = stmt.getWherePredicate();
} catch (Exception e) {
- throw new IOException("table policy parse originStmt error", e);
+ String errorMsg = String.format("table policy parse originStmt
error, originStmt: %s, stmtIdx: %s.",
+ originStmt, stmtIdx);
+ // Only print logs to avoid cluster failure to start
+ LOG.warn(errorMsg, e);
}
}
@Override
public RowPolicy clone() {
return new RowPolicy(this.id, this.policyName, this.dbId, this.user,
this.roleName, this.originStmt,
+ this.stmtIdx,
this.tableId,
this.filterType, this.wherePredicate);
}
@@ -218,6 +226,10 @@ public class RowPolicy extends Policy implements
RowFilterPolicy {
public Expression getFilterExpression() throws AnalysisException {
NereidsParser nereidsParser = new NereidsParser();
String sql = getOriginStmt();
+ if (getStmtIdx() != 0) {
+ // Under normal circumstances, the index will only be equal to 0
+ throw new AnalysisException("Invalid row policy [" +
getPolicyIdent() + "], " + sql);
+ }
CreatePolicyCommand command = (CreatePolicyCommand)
nereidsParser.parseSingle(sql);
Optional<Expression> wherePredicate = command.getWherePredicate();
if (!wherePredicate.isPresent()) {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java
index 049d21a4c9d..aac7951ecdf 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java
@@ -303,7 +303,7 @@ public abstract class ConnectProcessor {
}
StatementBase parsedStmt = stmts.get(i);
- parsedStmt.setOrigStmt(new OriginStatement(convertedStmt, i));
+ parsedStmt.setOrigStmt(new OriginStatement(auditStmt,
usingOrigSingleStmt ? 0 : i));
parsedStmt.setUserInfo(ctx.getCurrentUserIdentity());
executor = new StmtExecutor(ctx, parsedStmt);
executor.getProfile().getSummaryProfile().setParseSqlStartTime(parseSqlStartTime);
diff --git a/fe/fe-core/src/test/java/org/apache/doris/policy/PolicyTest.java
b/fe/fe-core/src/test/java/org/apache/doris/policy/PolicyTest.java
index ddf0d68fd2b..8d6a2a48ae3 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/policy/PolicyTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/policy/PolicyTest.java
@@ -34,6 +34,7 @@ import org.apache.doris.common.Config;
import org.apache.doris.common.DdlException;
import org.apache.doris.common.ExceptionChecker;
import org.apache.doris.common.FeConstants;
+import org.apache.doris.persist.gson.GsonUtils;
import org.apache.doris.utframe.TestWithFeService;
import com.google.common.collect.Lists;
@@ -341,7 +342,7 @@ public class PolicyTest extends TestWithFeService {
FilterType filterType = FilterType.PERMISSIVE;
Expr wherePredicate = null;
- Policy rowPolicy = new RowPolicy(10000, policyName, dbId, user, null,
originStmt, tableId, filterType,
+ Policy rowPolicy = new RowPolicy(10000, policyName, dbId, user, null,
originStmt, 0, tableId, filterType,
wherePredicate);
ByteArrayOutputStream emptyOutputStream = new ByteArrayOutputStream();
@@ -364,4 +365,22 @@ public class PolicyTest extends TestWithFeService {
Assertions.assertEquals(tableId, newRowPolicy.getTableId());
Assertions.assertEquals(filterType, newRowPolicy.getFilterType());
}
+
+ @Test
+ public void testCompatibility() {
+ String s1 = "{\n"
+ + " \"clazz\": \"RowPolicy\",\n"
+ + " \"roleName\": \"role1\",\n"
+ + " \"dbId\": 2,\n"
+ + " \"tableId\": 2,\n"
+ + " \"filterType\": \"PERMISSIVE\",\n"
+ + " \"originStmt\": \"CREATE ROW POLICY test_row_policy ON
test.table1 AS PERMISSIVE TO test_policy USING (k1 \\u003d 1)\",\n"
+ + " \"id\": 1,\n"
+ + " \"type\": \"ROW\",\n"
+ + " \"policyName\": \"cc\",\n"
+ + " \"version\": 0\n"
+ + "}";
+ RowPolicy rowPolicy = GsonUtils.GSON.fromJson(s1, RowPolicy.class);
+ Assertions.assertEquals(rowPolicy.getStmtIdx(), 0);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
