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 8cb499ec7cc branch-2.1: [opt](audit) add new variable
audit_plugin_max_insert_stmt_length to limit the length of insert stmt #51314
(#51391)
8cb499ec7cc is described below
commit 8cb499ec7cc90b3a1ae7ba0b7fb5f0fb50b83f6a
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Mon Jun 2 09:32:36 2025 +0800
branch-2.1: [opt](audit) add new variable
audit_plugin_max_insert_stmt_length to limit the length of insert stmt #51314
(#51391)
Cherry-picked from #51314
Co-authored-by: Mingyu Chen (Rayner) <morning...@163.com>
---
.../java/org/apache/doris/qe/AuditLogHelper.java | 42 +-
.../java/org/apache/doris/qe/GlobalVariable.java | 11 +
.../doris/plugin/audit/AuditLogBuilderTest.java | 641 ++++++++++++++++++++-
.../suites/audit/test_audit_log_behavior.groovy | 24 +-
4 files changed, 679 insertions(+), 39 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogHelper.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogHelper.java
index d7621a1476e..a596da65485 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogHelper.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/AuditLogHelper.java
@@ -55,6 +55,7 @@ import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder;
import java.nio.charset.CodingErrorAction;
import java.util.List;
+import java.util.Optional;
public class AuditLogHelper {
@@ -87,16 +88,22 @@ public class AuditLogHelper {
if (origStmt == null) {
return null;
}
+ // 1. handle insert statement first
+ Optional<String> res = handleInsertStmt(origStmt, parsedStmt);
+ if (res.isPresent()) {
+ return res.get();
+ }
+
+ // 2. handle other statement
int maxLen = GlobalVariable.auditPluginMaxSqlLength;
- if (origStmt.length() <= maxLen) {
- return origStmt.replace("\n", "\\n")
+ origStmt = truncateByBytes(origStmt, maxLen, " ... /* truncated.
audit_plugin_max_sql_length=" + maxLen
+ + " */");
+ return origStmt.replace("\n", "\\n")
.replace("\t", "\\t")
.replace("\r", "\\r");
- }
- origStmt = truncateByBytes(origStmt)
- .replace("\n", "\\n")
- .replace("\t", "\\t")
- .replace("\r", "\\r");
+ }
+
+ private static Optional<String> handleInsertStmt(String origStmt,
StatementBase parsedStmt) {
int rowCnt = 0;
// old planner
if (parsedStmt instanceof NativeInsertStmt) {
@@ -119,17 +126,21 @@ public class AuditLogHelper {
}
}
if (rowCnt > 0) {
- return origStmt + " ... /* total " + rowCnt + " rows, truncated
audit_plugin_max_sql_length="
- + GlobalVariable.auditPluginMaxSqlLength + " */";
+ // This is an insert statement.
+ int maxLen = Math.max(0,
+ Math.min(GlobalVariable.auditPluginMaxInsertStmtLength,
GlobalVariable.auditPluginMaxSqlLength));
+ origStmt = truncateByBytes(origStmt, maxLen, " ... /* total " +
rowCnt
+ + " rows, truncated. audit_plugin_max_insert_stmt_length="
+ maxLen + " */");
+ origStmt = origStmt.replace("\n", "\\n")
+ .replace("\t", "\\t")
+ .replace("\r", "\\r");
+ return Optional.of(origStmt);
} else {
- return origStmt
- + " ... /* truncated audit_plugin_max_sql_length="
- + GlobalVariable.auditPluginMaxSqlLength + " */";
+ return Optional.empty();
}
}
- private static String truncateByBytes(String str) {
- int maxLen = Math.min(GlobalVariable.auditPluginMaxSqlLength,
str.getBytes().length);
+ private static String truncateByBytes(String str, int maxLen, String
suffix) {
// use `getBytes().length` to get real byte length
if (maxLen >= str.getBytes().length) {
return str;
@@ -142,7 +153,7 @@ public class AuditLogHelper {
decoder.onMalformedInput(CodingErrorAction.IGNORE);
decoder.decode(buffer, charBuffer, true);
decoder.flush(charBuffer);
- return new String(charBuffer.array(), 0, charBuffer.position());
+ return new String(charBuffer.array(), 0, charBuffer.position()) +
suffix;
}
/**
@@ -265,3 +276,4 @@ public class AuditLogHelper {
}
}
}
+
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/GlobalVariable.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/GlobalVariable.java
index 40ac152abc2..10b4953e525 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/GlobalVariable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/GlobalVariable.java
@@ -61,6 +61,7 @@ public final class GlobalVariable {
public static final String AUDIT_PLUGIN_MAX_BATCH_BYTES =
"audit_plugin_max_batch_bytes";
public static final String AUDIT_PLUGIN_MAX_BATCH_INTERVAL_SEC =
"audit_plugin_max_batch_interval_sec";
public static final String AUDIT_PLUGIN_MAX_SQL_LENGTH =
"audit_plugin_max_sql_length";
+ public static final String AUDIT_PLUGIN_MAX_INSERT_STMT_LENGTH =
"audit_plugin_max_insert_stmt_length";
public static final String AUDIT_PLUGIN_LOAD_TIMEOUT =
"audit_plugin_load_timeout";
public static final String ENABLE_GET_ROW_COUNT_FROM_FILE_LIST =
"enable_get_row_count_from_file_list";
@@ -144,6 +145,16 @@ public final class GlobalVariable {
@VariableMgr.VarAttr(name = AUDIT_PLUGIN_MAX_SQL_LENGTH, flag =
VariableMgr.GLOBAL)
public static int auditPluginMaxSqlLength = 4096;
+ @VariableMgr.VarAttr(name = AUDIT_PLUGIN_MAX_INSERT_STMT_LENGTH, flag =
VariableMgr.GLOBAL,
+ description = {"专门用于限制 INSERT 语句的长度。如果该值大于
AUDIT_PLUGIN_MAX_SQL_LENGTH，"
+ + "则使用 AUDIT_PLUGIN_MAX_SQL_LENGTH 的值。"
+ + "如果 INSERT 语句超过该长度，将会被截断。",
+ "This is specifically used to limit the length of INSERT
statements. "
+ + "If this value is greater than
AUDIT_PLUGIN_MAX_SQL_LENGTH, "
+ + "it will use the value of
AUDIT_PLUGIN_MAX_SQL_LENGTH. "
+ + "If an INSERT statement exceeds this length, it
will be truncated."})
+ public static int auditPluginMaxInsertStmtLength = Integer.MAX_VALUE;
+
@VariableMgr.VarAttr(name = AUDIT_PLUGIN_LOAD_TIMEOUT, flag =
VariableMgr.GLOBAL)
public static int auditPluginLoadTimeoutS = 600;
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/plugin/audit/AuditLogBuilderTest.java
b/fe/fe-core/src/test/java/org/apache/doris/plugin/audit/AuditLogBuilderTest.java
index f0b00dcdfb9..8c678447c3a 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/plugin/audit/AuditLogBuilderTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/plugin/audit/AuditLogBuilderTest.java
@@ -17,8 +17,14 @@
package org.apache.doris.plugin.audit;
+import org.apache.doris.analysis.EmptyStmt;
+import org.apache.doris.analysis.StatementBase;
import org.apache.doris.common.jmockit.Deencapsulation;
+import org.apache.doris.nereids.parser.NereidsParser;
import org.apache.doris.plugin.AuditEvent;
+import org.apache.doris.qe.AuditLogHelper;
+import org.apache.doris.qe.ConnectContext;
+import org.apache.doris.qe.GlobalVariable;
import org.junit.Assert;
import org.junit.Test;
@@ -28,21 +34,632 @@ public class AuditLogBuilderTest {
@Test
public void testTimestampOutput() {
AuditLogBuilder auditLogBuilder = new AuditLogBuilder();
- // 1 set a valid value
- {
- long currentTime = 1741760376000L;
- AuditEvent auditEvent = new AuditEvent.AuditEventBuilder()
- .setTimestamp(currentTime).build();
- String result = Deencapsulation.invoke(auditLogBuilder,
"getAuditLogString", auditEvent);
- Assert.assertTrue(result.contains("Timestamp=2025-03-12
14:19:36.000"));
+ // 1 set a valid value
+ long currentTime = 1741760376000L;
+ AuditEvent auditEvent = new AuditEvent.AuditEventBuilder()
+ .setTimestamp(currentTime).build();
+ String result = Deencapsulation.invoke(auditLogBuilder,
"getAuditLogString", auditEvent);
+ Assert.assertTrue(result.contains("Timestamp=2025-03-12
14:19:36.000"));
+
+ // 2 not set value
+ auditEvent = new AuditEvent.AuditEventBuilder().build();
+ result = Deencapsulation.invoke(auditLogBuilder, "getAuditLogString",
auditEvent);
+ Assert.assertTrue(result.contains("Timestamp=\\N"));
+ }
+
+ @Test
+ public void testHandleStmtTruncationForNonInsertStmt() {
+ // Save original values
+ int originalMaxSqlLength = GlobalVariable.auditPluginMaxSqlLength;
+
+ try {
+ // Set smaller max length for testing
+ GlobalVariable.auditPluginMaxSqlLength = 50;
+
+ // Use EmptyStmt as representative of non-INSERT statements
+ StatementBase nonInsertStmt = new EmptyStmt();
+
+ // 1. Test null input
+ String result = AuditLogHelper.handleStmt(null, nonInsertStmt);
+ Assert.assertNull(result);
+
+ // 2. Test short statement not truncated
+ String shortStmt = "SELECT * FROM table1";
+ result = AuditLogHelper.handleStmt(shortStmt, nonInsertStmt);
+ Assert.assertEquals(shortStmt, result);
+
+ // 3. Test long statement truncated (using
audit_plugin_max_sql_length)
+ String longStmt
+ = "SELECT * FROM
very_long_table_name_that_exceeds_the_maximum_length_limit_for_audit_log";
+ result = AuditLogHelper.handleStmt(longStmt, nonInsertStmt);
+ Assert.assertTrue("Result should contain truncation message",
+ result.contains("/* truncated.
audit_plugin_max_sql_length=50 */"));
+ Assert.assertTrue("Result should be shorter than original",
+ result.getBytes().length < longStmt.getBytes().length +
100); // Add length for truncation message
+
+ // 4. Test statement with newlines, tabs, carriage returns
+ String stmtWithSpecialChars = "SELECT *\nFROM table1\tWHERE id =
1\r";
+ result = AuditLogHelper.handleStmt(stmtWithSpecialChars,
nonInsertStmt);
+ Assert.assertTrue("Should escape newlines",
result.contains("\\n"));
+ Assert.assertTrue("Should escape tabs", result.contains("\\t"));
+ Assert.assertTrue("Should escape carriage returns",
result.contains("\\r"));
+ Assert.assertFalse("Should not contain actual newlines",
result.contains("\n"));
+ Assert.assertFalse("Should not contain actual tabs",
result.contains("\t"));
+ Assert.assertFalse("Should not contain actual carriage returns",
result.contains("\r"));
+
+ // 5. Test long statement with Chinese characters truncation
+ String chineseStmt
+ = "SELECT * FROM 表名很长的中文表名字符测试表名很长的中文表名字符测试表名很长的中文表名字符测试";
+ result = AuditLogHelper.handleStmt(chineseStmt, nonInsertStmt);
+ Assert.assertTrue("Should contain truncation message for Chinese
text",
+ result.contains("/* truncated.
audit_plugin_max_sql_length=50 */"));
+
+ // 6. Test boundary case: exactly equal to max length
+ // Create a string exactly equal to max length
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < 50; i++) {
+ sb.append("a");
+ }
+ String exactLengthStmt = sb.toString();
+ result = AuditLogHelper.handleStmt(exactLengthStmt, nonInsertStmt);
+ Assert.assertEquals("Should not be truncated when exactly at
limit", exactLengthStmt, result);
+
+ // 7. Test boundary case: exceeding max length by 1 character
+ sb = new StringBuilder();
+ for (int i = 0; i < 51; i++) {
+ sb.append("a");
+ }
+ String overLimitStmt = sb.toString();
+ result = AuditLogHelper.handleStmt(overLimitStmt, nonInsertStmt);
+ Assert.assertTrue("Should be truncated when over limit by 1 char",
+ result.contains("/* truncated.
audit_plugin_max_sql_length=50 */"));
+
+ // 8. Test empty string
+ String emptyStmt = "";
+ result = AuditLogHelper.handleStmt(emptyStmt, nonInsertStmt);
+ Assert.assertEquals("Empty string should remain empty", "",
result);
+
+ // 9. Test statement with only special characters
+ String specialCharsStmt = "\n\t\r\n\t\r";
+ result = AuditLogHelper.handleStmt(specialCharsStmt,
nonInsertStmt);
+ Assert.assertEquals("Should escape all special characters",
"\\n\\t\\r\\n\\t\\r", result);
+
+ } finally {
+ // Restore original values
+ GlobalVariable.auditPluginMaxSqlLength = originalMaxSqlLength;
+ }
+ }
+
+ @Test
+ public void testHandleStmtTruncationForInsertStmt() {
+ // Save original values
+ int originalMaxSqlLength = GlobalVariable.auditPluginMaxSqlLength;
+ int originalMaxInsertStmtLength =
GlobalVariable.auditPluginMaxInsertStmtLength;
+ ConnectContext ctx = new ConnectContext();
+ ctx.changeDefaultCatalog("internal");
+ ctx.setDatabase("db1");
+ try {
+ ctx.setThreadLocalInfo();
+ // Set different length limits to test INSERT statement special
handling
+ GlobalVariable.auditPluginMaxSqlLength = 200; // Regular
statement limit
+ GlobalVariable.auditPluginMaxInsertStmtLength = 80; // INSERT
statement limit (smaller)
+
+ NereidsParser parser = new NereidsParser();
+
+ // 1. Test real INSERT statement correctly identified and uses
INSERT-specific length limit
+ String longInsertStmt
+ = "INSERT INTO table_with_very_long_name VALUES (1,
'test_value_1'), (2, 'test_value_2'), (3, 'test_value_3')";
+ StatementBase insertStmt = parser.parseSQL(longInsertStmt).get(0);
+ String result = AuditLogHelper.handleStmt(longInsertStmt,
insertStmt);
+
+ // Should use audit_plugin_max_insert_stmt_length=80 for truncation
+ Assert.assertTrue("Should contain insert stmt length truncation
message",
+ result.contains("/* total 3 rows, truncated.
audit_plugin_max_insert_stmt_length=80 */"));
+
+ // 2. Test short INSERT statement not truncated
+ String shortInsertStmt = "INSERT INTO tbl VALUES (1, 'a')";
+ insertStmt = parser.parseSQL(shortInsertStmt).get(0);
+ result = AuditLogHelper.handleStmt(shortInsertStmt, insertStmt);
+
+ // Should not be truncated, and special characters should be
properly escaped
+ Assert.assertFalse("Short INSERT should not be truncated",
+ result.contains("/* truncated."));
+ Assert.assertEquals("Short INSERT should remain unchanged",
shortInsertStmt, result);
+
+ // 3. Test special character handling in INSERT statements
+ String insertWithSpecialChars = "INSERT INTO
tbl\nVALUES\t(1,\r'test')";
+ insertStmt = parser.parseSQL(insertWithSpecialChars).get(0);
+ result = AuditLogHelper.handleStmt(insertWithSpecialChars,
insertStmt);
+
+ // Verify special characters are properly escaped
+ Assert.assertTrue("Should escape newlines in INSERT",
result.contains("\\n"));
+ Assert.assertTrue("Should escape tabs in INSERT",
result.contains("\\t"));
+ Assert.assertTrue("Should escape carriage returns in INSERT",
result.contains("\\r"));
+ Assert.assertFalse("Should not contain actual newlines",
result.contains("\n"));
+ Assert.assertFalse("Should not contain actual tabs",
result.contains("\t"));
+ Assert.assertFalse("Should not contain actual carriage returns",
result.contains("\r"));
+
+ // 4. Test comparison: same length statements, different handling
for INSERT vs non-INSERT
+ // Create a statement with length between 80-200
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < 120; i++) {
+ sb.append("x");
+ }
+ String testContent = sb.toString();
+
+ // INSERT statement
+ String insertStmtStr = "INSERT INTO tbl VALUES (1, '" +
testContent + "')";
+ StatementBase parsedInsertStmt =
parser.parseSQL(insertStmtStr).get(0);
+ String insertResult = AuditLogHelper.handleStmt(insertStmtStr,
parsedInsertStmt);
+
+ // Non-INSERT statement
+ String selectStmt = "SELECT '" + testContent + "' FROM tbl";
+ StatementBase parsedSelectStmt =
parser.parseSQL(selectStmt).get(0);
+ String selectResult = AuditLogHelper.handleStmt(selectStmt,
parsedSelectStmt);
+
+ // INSERT should be truncated (using limit of 80)
+ Assert.assertTrue("INSERT should be truncated with insert length
limit",
+ insertResult.contains("/* total 1 rows, truncated.
audit_plugin_max_insert_stmt_length=80 */"));
+
+ // SELECT should not be truncated (using limit of 200)
+ Assert.assertFalse("SELECT should not be truncated with sql length
limit",
+ selectResult.contains("/* truncated."));
+
+ // 5. Test boundary case: INSERT statement exactly equal to limit
length
+ // Create a statement exactly equal to INSERT limit length
+ sb = new StringBuilder("INSERT INTO tbl VALUES (1, '");
+ while (sb.length() < 78) { // Leave 2 characters for ending ')
+ sb.append("a");
+ }
+ sb.append("')");
+ String exactLengthInsert = sb.toString();
+
+ insertStmt = parser.parseSQL(exactLengthInsert).get(0);
+ result = AuditLogHelper.handleStmt(exactLengthInsert, insertStmt);
+
+ // Should not be truncated
+ Assert.assertFalse("INSERT at exact limit should not be truncated",
+ result.contains("/* truncated."));
+ Assert.assertEquals("INSERT at exact limit should remain
unchanged",
+ exactLengthInsert, result);
+
+ } finally {
+ // Restore original values
+ GlobalVariable.auditPluginMaxSqlLength = originalMaxSqlLength;
+ GlobalVariable.auditPluginMaxInsertStmtLength =
originalMaxInsertStmtLength;
+ ConnectContext.remove();
+ }
+ }
+
+ @Test
+ public void testHandleStmtTruncationWithDifferentLengths() {
+ // Save original values
+ int originalMaxSqlLength = GlobalVariable.auditPluginMaxSqlLength;
+
+ try {
+ // Test different max length settings
+ int[] testLengths = {10, 100, 1000, 4096};
+ StatementBase nonInsertStmt = new EmptyStmt();
+
+ for (int maxLength : testLengths) {
+ GlobalVariable.auditPluginMaxSqlLength = maxLength;
+
+ // Create a statement exceeding current max length
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < maxLength + 100; i++) {
+ sb.append("x");
+ }
+ String longStmt = sb.toString();
+
+ String result = AuditLogHelper.handleStmt(longStmt,
nonInsertStmt);
+
+ Assert.assertTrue("Should contain truncation message for
length " + maxLength,
+ result.contains("/* truncated.
audit_plugin_max_sql_length=" + maxLength + " */"));
+
+ // Verify truncated length is reasonable (original part +
truncation info)
+ String expectedTruncationMsg = " ... /* truncated
audit_plugin_max_sql_length=" + maxLength + " */";
+ Assert.assertTrue("Truncated. result should be reasonable
length",
+ result.getBytes().length <= maxLength +
expectedTruncationMsg.getBytes().length + 10); // Allow some UTF-8 encoding
error margin
}
- // 2 not set value
- {
- AuditEvent auditEvent = new
AuditEvent.AuditEventBuilder().build();
- String result = Deencapsulation.invoke(auditLogBuilder,
"getAuditLogString", auditEvent);
- Assert.assertTrue(result.contains("Timestamp=\\N"));
+ } finally {
+ // Restore original values
+ GlobalVariable.auditPluginMaxSqlLength = originalMaxSqlLength;
+ }
+ }
+
+ @Test
+ public void testHandleStmtUtf8Truncation() {
+ // Save original values
+ int originalMaxSqlLength = GlobalVariable.auditPluginMaxSqlLength;
+
+ try {
+ // Set a smaller character length limit
+ GlobalVariable.auditPluginMaxSqlLength = 20;
+ StatementBase nonInsertStmt = new EmptyStmt();
+
+ // Test truncation with Chinese characters (calculated by
character count, not byte count)
+ String utf8Stmt = "SELECT * FROM 测试表名"; // Chinese characters
calculated by character count
+ String result = AuditLogHelper.handleStmt(utf8Stmt, nonInsertStmt);
+
+ // Verify result is a valid string
+ Assert.assertNotNull("Result should not be null", result);
+
+ // If truncated, should contain truncation info
+ if (utf8Stmt.getBytes().length > 20) {
+ Assert.assertTrue("Should contain truncation message for UTF-8
text",
+ result.contains("/* truncated.
audit_plugin_max_sql_length=20 */"));
+ } else {
+ // If not exceeding character limit, should not be truncated
+ Assert.assertEquals("Should not be truncated if within
character limit", utf8Stmt, result);
}
+
+ // Test a definitely truncated long Chinese string
+ String longUtf8Stmt = "SELECT * FROM 这是一个很长的中文表名用来测试字符截断功能是否正常工作";
+ String longResult = AuditLogHelper.handleStmt(longUtf8Stmt,
nonInsertStmt);
+
+ Assert.assertTrue("Long UTF-8 string should be truncated",
+ longResult.contains("/* truncated.
audit_plugin_max_sql_length=20 */"));
+
+ } finally {
+ // Restore original values
+ GlobalVariable.auditPluginMaxSqlLength = originalMaxSqlLength;
+ }
+ }
+
+ @Test
+ public void testHandleStmtInsertVsNonInsertBehavior() {
+ // Save original values
+ int originalMaxSqlLength = GlobalVariable.auditPluginMaxSqlLength;
+ int originalMaxInsertStmtLength =
GlobalVariable.auditPluginMaxInsertStmtLength;
+
+ try {
+ // Set different length limits to highlight INSERT vs non-INSERT
differences
+ GlobalVariable.auditPluginMaxSqlLength = 100; // Regular
statement limit
+ GlobalVariable.auditPluginMaxInsertStmtLength = 60; // INSERT
statement limit
+
+ StatementBase nonInsertStmt = new EmptyStmt();
+
+ // Create a statement with length between 60-100
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < 80; i++) {
+ sb.append("a");
+ }
+ String testStmt = sb.toString();
+
+ // 1. Test non-INSERT statement behavior
+ String result = AuditLogHelper.handleStmt(testStmt, nonInsertStmt);
+ // Should use audit_plugin_max_sql_length=100, so not truncated
+ Assert.assertFalse("Non-INSERT statement should not be truncated
with sql length limit",
+ result.contains("/* truncated."));
+ Assert.assertEquals("Non-INSERT statement should remain
unchanged", testStmt, result);
+
+ // 2. Test behavior when statement exceeds regular limit
+ StringBuilder longSb = new StringBuilder();
+ for (int i = 0; i < 120; i++) {
+ longSb.append("b");
+ }
+ String longTestStmt = longSb.toString();
+
+ result = AuditLogHelper.handleStmt(longTestStmt, nonInsertStmt);
+ // Should use audit_plugin_max_sql_length=100 for truncation
+ Assert.assertTrue("Long non-INSERT statement should be truncated",
+ result.contains("/* truncated.
audit_plugin_max_sql_length=100 */"));
+ Assert.assertFalse("Should not use insert stmt length limit",
+ result.contains("audit_plugin_max_insert_stmt_length"));
+
+ } finally {
+ // Restore original values
+ GlobalVariable.auditPluginMaxSqlLength = originalMaxSqlLength;
+ GlobalVariable.auditPluginMaxInsertStmtLength =
originalMaxInsertStmtLength;
+ }
+ }
+
+ @Test
+ public void testHandleStmtInsertLengthLimitLogic() {
+ // Save original values
+ int originalMaxSqlLength = GlobalVariable.auditPluginMaxSqlLength;
+ int originalMaxInsertStmtLength =
GlobalVariable.auditPluginMaxInsertStmtLength;
+ ConnectContext ctx = new ConnectContext();
+ ctx.changeDefaultCatalog("internal");
+ ctx.setDatabase("db1");
+
+ try {
+ ctx.setThreadLocalInfo();
+ NereidsParser parser = new NereidsParser();
+
+ // Test 1: auditPluginMaxInsertStmtLength < auditPluginMaxSqlLength
+ // Should use the smaller INSERT limit
+ GlobalVariable.auditPluginMaxSqlLength = 200;
+ GlobalVariable.auditPluginMaxInsertStmtLength = 80;
+
+ String insertStmt = "INSERT INTO test_table VALUES " +
generateValueList(50); // Generate a long INSERT
+ StatementBase parsedStmt = parser.parseSQL(insertStmt).get(0);
+ String result = AuditLogHelper.handleStmt(insertStmt, parsedStmt);
+
+ if (insertStmt.getBytes().length > 80) {
+ Assert.assertTrue("Should use insert stmt length limit (80)
when it's smaller",
+
result.contains("audit_plugin_max_insert_stmt_length=80"));
+ Assert.assertFalse("Should not use sql length limit when
insert limit is smaller",
+ result.contains("audit_plugin_max_sql_length=200"));
+ }
+
+ // Test 2: auditPluginMaxInsertStmtLength > auditPluginMaxSqlLength
+ // Should use the smaller SQL limit
+ GlobalVariable.auditPluginMaxSqlLength = 60;
+ GlobalVariable.auditPluginMaxInsertStmtLength = 150;
+
+ result = AuditLogHelper.handleStmt(insertStmt, parsedStmt);
+
+ if (insertStmt.getBytes().length > 60) {
+ Assert.assertTrue("Should use insert stmt length limit (60)
when sql limit is smaller",
+
result.contains("audit_plugin_max_insert_stmt_length=60"));
+ }
+
+ // Test 3: auditPluginMaxInsertStmtLength = auditPluginMaxSqlLength
+ // Should use the same limit value
+ GlobalVariable.auditPluginMaxSqlLength = 100;
+ GlobalVariable.auditPluginMaxInsertStmtLength = 100;
+
+ result = AuditLogHelper.handleStmt(insertStmt, parsedStmt);
+
+ if (insertStmt.getBytes().length > 100) {
+ Assert.assertTrue("Should use limit (100) when both limits are
equal",
+
result.contains("audit_plugin_max_insert_stmt_length=100"));
+ }
+
+ // Test 4: Test with very small but valid limits
+ GlobalVariable.auditPluginMaxSqlLength = 10;
+ GlobalVariable.auditPluginMaxInsertStmtLength = 15;
+
+ // Create a short INSERT that will exceed the 10-char SQL limit
+ String shortInsert = "INSERT INTO t VALUES (1, 'data')";
+ parsedStmt = parser.parseSQL(shortInsert).get(0);
+ result = AuditLogHelper.handleStmt(shortInsert, parsedStmt);
+
+ // Math.max(0, Math.min(15, 10)) = Math.max(0, 10) = 10
+ if (shortInsert.getBytes().length > 10) {
+ Assert.assertTrue("Should use the smaller limit (10) when sql
limit is smaller",
+
result.contains("audit_plugin_max_insert_stmt_length=10"));
+ }
+
+ // Test 5: Test with small INSERT limit but larger SQL limit
+ GlobalVariable.auditPluginMaxSqlLength = 100;
+ GlobalVariable.auditPluginMaxInsertStmtLength = 25;
+
+ result = AuditLogHelper.handleStmt(shortInsert, parsedStmt);
+
+ // Math.max(0, Math.min(25, 100)) = Math.max(0, 25) = 25
+ if (shortInsert.getBytes().length > 25) {
+ Assert.assertTrue("Should use the insert limit (25) when it's
smaller",
+
result.contains("audit_plugin_max_insert_stmt_length=25"));
+ }
+
+ // Test 6: Verify the exact boundary behavior
+ GlobalVariable.auditPluginMaxSqlLength = 100;
+ GlobalVariable.auditPluginMaxInsertStmtLength = 50;
+
+ // Create an INSERT statement with exactly 50 characters
+ String exactLengthInsert = createExactLengthInsertStatement(50);
+ parsedStmt = parser.parseSQL(exactLengthInsert).get(0);
+ result = AuditLogHelper.handleStmt(exactLengthInsert, parsedStmt);
+
+ Assert.assertFalse("Statement with exactly max length should not
be truncated",
+ result.contains("truncated"));
+
+ // Create an INSERT statement with 51 characters (1 over limit)
+ String overLimitInsert = createExactLengthInsertStatement(51);
+ parsedStmt = parser.parseSQL(overLimitInsert).get(0);
+ result = AuditLogHelper.handleStmt(overLimitInsert, parsedStmt);
+
+ Assert.assertTrue("Statement exceeding max length by 1 should be
truncated",
+ result.contains("audit_plugin_max_insert_stmt_length=50"));
+
+ // Test 7: Test the Math.min logic with different combinations
+ GlobalVariable.auditPluginMaxSqlLength = 120;
+ GlobalVariable.auditPluginMaxInsertStmtLength = 80;
+
+ String mediumInsert = "INSERT INTO table_name VALUES " +
generateValueList(10);
+ parsedStmt = parser.parseSQL(mediumInsert).get(0);
+ result = AuditLogHelper.handleStmt(mediumInsert, parsedStmt);
+
+ // Should use Math.max(0, Math.min(80, 120)) = 80
+ if (mediumInsert.getBytes().length > 80) {
+ Assert.assertTrue("Should use the smaller insert limit (80)",
+
result.contains("audit_plugin_max_insert_stmt_length=80"));
+ }
+
+ } finally {
+ // Restore original values
+ GlobalVariable.auditPluginMaxSqlLength = originalMaxSqlLength;
+ GlobalVariable.auditPluginMaxInsertStmtLength =
originalMaxInsertStmtLength;
+ ConnectContext.remove();
+ }
+ }
+
+ /**
+ * Helper method to generate a VALUES list with specified number of rows
+ */
+ private String generateValueList(int rowCount) {
+ StringBuilder sb = new StringBuilder("(1, 'value1')");
+ for (int i = 2; i <= rowCount; i++) {
+ sb.append(", (").append(i).append(",
'value").append(i).append("')");
+ }
+ return sb.toString();
+ }
+
+ /**
+ * Helper method to create INSERT statement with exact character length
+ */
+ private String createExactLengthInsertStatement(int targetLength) {
+ String prefix = "INSERT INTO t VALUES (1, '";
+ String suffix = "')";
+ int dataLength = targetLength - prefix.getBytes().length -
suffix.getBytes().length;
+
+ if (dataLength <= 0) {
+ // If target length is too small, create minimal valid INSERT
+ return "INSERT INTO t VALUES (1)";
+ }
+
+ StringBuilder data = new StringBuilder();
+ for (int i = 0; i < dataLength; i++) {
+ data.append("a");
+ }
+
+ return prefix + data.toString() + suffix;
+ }
+
+ @Test
+ public void testHandleStmtWithAbnormalLengthLimits() {
+ // Save original values
+ int originalMaxSqlLength = GlobalVariable.auditPluginMaxSqlLength;
+ int originalMaxInsertStmtLength =
GlobalVariable.auditPluginMaxInsertStmtLength;
+ ConnectContext ctx = new ConnectContext();
+ ctx.changeDefaultCatalog("internal");
+ ctx.setDatabase("db1");
+
+ try {
+ ctx.setThreadLocalInfo();
+ NereidsParser parser = new NereidsParser();
+
+ // Test INSERT statement that will be used across multiple test
cases
+ String testInsertStmt = "INSERT INTO test_table VALUES (1,
'test_data')";
+ StatementBase parsedInsertStmt =
parser.parseSQL(testInsertStmt).get(0);
+
+ // Test non-INSERT statement
+ StatementBase nonInsertStmt = new EmptyStmt();
+ String testSelectStmt = "SELECT * FROM test_table WHERE id = 1";
+
+ // Test Case 1: auditPluginMaxSqlLength = 0,
auditPluginMaxInsertStmtLength > 0
+ // Expected: Math.max(0, Math.min(positive, 0)) = Math.max(0, 0) = 0
+ GlobalVariable.auditPluginMaxSqlLength = 0;
+ GlobalVariable.auditPluginMaxInsertStmtLength = 50;
+
+ String result = AuditLogHelper.handleStmt(testInsertStmt,
parsedInsertStmt);
+ Assert.assertNotNull("Result should not be null when sql length
limit is 0", result);
+ // When maxLen = 0, the statement should be heavily truncated
+ if (testInsertStmt.getBytes().length > 0) {
+ Assert.assertTrue("Should be truncated when effective limit is
0",
+
result.contains("audit_plugin_max_insert_stmt_length=0") || result.isEmpty());
+ }
+
+ // Test Case 2: auditPluginMaxSqlLength > 0,
auditPluginMaxInsertStmtLength = 0
+ // Expected: Math.max(0, Math.min(0, positive)) = Math.max(0, 0) = 0
+ GlobalVariable.auditPluginMaxSqlLength = 50;
+ GlobalVariable.auditPluginMaxInsertStmtLength = 0;
+
+ result = AuditLogHelper.handleStmt(testInsertStmt,
parsedInsertStmt);
+ Assert.assertNotNull("Result should not be null when insert length
limit is 0", result);
+ if (testInsertStmt.getBytes().length > 0) {
+ Assert.assertTrue("Should be truncated when effective limit is
0",
+
result.contains("audit_plugin_max_insert_stmt_length=0") || result.isEmpty());
+ }
+
+ // Test Case 3: Both limits are 0
+ // Expected: Math.max(0, Math.min(0, 0)) = Math.max(0, 0) = 0
+ GlobalVariable.auditPluginMaxSqlLength = 0;
+ GlobalVariable.auditPluginMaxInsertStmtLength = 0;
+
+ result = AuditLogHelper.handleStmt(testInsertStmt,
parsedInsertStmt);
+ Assert.assertNotNull("Result should not be null when both limits
are 0", result);
+ if (testInsertStmt.getBytes().length > 0) {
+ Assert.assertTrue("Should be truncated when both limits are 0",
+
result.contains("audit_plugin_max_insert_stmt_length=0") || result.isEmpty());
+ }
+
+ // Test Case 4: Negative auditPluginMaxSqlLength
+ // Expected: Math.max(0, Math.min(positive, negative)) =
Math.max(0, negative) = 0
+ GlobalVariable.auditPluginMaxSqlLength = -10;
+ GlobalVariable.auditPluginMaxInsertStmtLength = 50;
+
+ result = AuditLogHelper.handleStmt(testInsertStmt,
parsedInsertStmt);
+ Assert.assertNotNull("Result should not be null when sql length
limit is negative", result);
+ if (testInsertStmt.getBytes().length > 0) {
+ Assert.assertTrue("Should be truncated when sql limit is
negative",
+
result.contains("audit_plugin_max_insert_stmt_length=0") || result.isEmpty());
+ }
+
+ // Test Case 5: Negative auditPluginMaxInsertStmtLength
+ // Expected: Math.max(0, Math.min(negative, positive)) =
Math.max(0, negative) = 0
+ GlobalVariable.auditPluginMaxSqlLength = 50;
+ GlobalVariable.auditPluginMaxInsertStmtLength = -20;
+
+ result = AuditLogHelper.handleStmt(testInsertStmt,
parsedInsertStmt);
+ Assert.assertNotNull("Result should not be null when insert length
limit is negative", result);
+ if (testInsertStmt.getBytes().length > 0) {
+ Assert.assertTrue("Should be truncated when insert limit is
negative",
+
result.contains("audit_plugin_max_insert_stmt_length=0") || result.isEmpty());
+ }
+
+ // Test Case 6: Both limits are negative
+ // Expected: Math.max(0, Math.min(negative1, negative2)) =
Math.max(0, min(neg1,neg2)) = 0
+ GlobalVariable.auditPluginMaxSqlLength = -15;
+ GlobalVariable.auditPluginMaxInsertStmtLength = -25;
+
+ result = AuditLogHelper.handleStmt(testInsertStmt,
parsedInsertStmt);
+ Assert.assertNotNull("Result should not be null when both limits
are negative", result);
+ if (testInsertStmt.getBytes().length > 0) {
+ Assert.assertTrue("Should be truncated when both limits are
negative",
+
result.contains("audit_plugin_max_insert_stmt_length=0") || result.isEmpty());
+ }
+
+ // Test Case 7: Test non-INSERT statement with abnormal limits
+ // Non-INSERT statements should use auditPluginMaxSqlLength
directly in truncateByBytes
+ GlobalVariable.auditPluginMaxSqlLength = 0;
+ GlobalVariable.auditPluginMaxInsertStmtLength = 100; // This
should be ignored for non-INSERT
+
+ result = AuditLogHelper.handleStmt(testSelectStmt, nonInsertStmt);
+ Assert.assertNotNull("Result should not be null for non-INSERT
with zero sql limit", result);
+ // Non-INSERT statements bypass the Math.max(0, Math.min(...))
logic and go directly to truncateByBytes
+
+ // Test Case 8: Very large negative numbers
+ GlobalVariable.auditPluginMaxSqlLength = Integer.MIN_VALUE;
+ GlobalVariable.auditPluginMaxInsertStmtLength = Integer.MIN_VALUE;
+
+ result = AuditLogHelper.handleStmt(testInsertStmt,
parsedInsertStmt);
+ Assert.assertNotNull("Result should not be null with very large
negative values", result);
+
+ // Test Case 9: Mixed extreme values
+ GlobalVariable.auditPluginMaxSqlLength = Integer.MAX_VALUE;
+ GlobalVariable.auditPluginMaxInsertStmtLength = Integer.MIN_VALUE;
+
+ result = AuditLogHelper.handleStmt(testInsertStmt,
parsedInsertStmt);
+ Assert.assertNotNull("Result should not be null with mixed extreme
values", result);
+ // Expected: Math.max(0, Math.min(MIN_VALUE, MAX_VALUE)) =
Math.max(0, MIN_VALUE) = 0
+
+ // Test Case 10: Edge case with very small positive numbers
+ GlobalVariable.auditPluginMaxSqlLength = 1;
+ GlobalVariable.auditPluginMaxInsertStmtLength = 1;
+
+ result = AuditLogHelper.handleStmt(testInsertStmt,
parsedInsertStmt);
+ Assert.assertNotNull("Result should not be null with very small
positive limits", result);
+ // Expected: Math.max(0, Math.min(1, 1)) = Math.max(0, 1) = 1
+ if (testInsertStmt.getBytes().length > 1) {
+ Assert.assertTrue("Should be truncated with limit of 1",
+
result.contains("audit_plugin_max_insert_stmt_length=1"));
+ }
+
+ // Test Case 11: Test empty string with abnormal limits
+ String emptyStmt = "";
+ GlobalVariable.auditPluginMaxSqlLength = -5;
+ GlobalVariable.auditPluginMaxInsertStmtLength = -10;
+
+ result = AuditLogHelper.handleStmt(emptyStmt, parsedInsertStmt);
+ Assert.assertNotNull("Result should not be null for empty string",
result);
+ Assert.assertEquals("Empty string should remain empty", "",
result);
+
+ } catch (Exception e) {
+ // If any exception occurs, we want to log it but not fail the
test immediately
+ // This helps us identify which specific abnormal values cause
issues
+ Assert.fail("Unexpected exception with abnormal length limits: " +
e.getMessage()
+ + ". sqlLength=" + GlobalVariable.auditPluginMaxSqlLength
+ + ", insertLength=" +
GlobalVariable.auditPluginMaxInsertStmtLength);
+ } finally {
+ // Restore original values
+ GlobalVariable.auditPluginMaxSqlLength = originalMaxSqlLength;
+ GlobalVariable.auditPluginMaxInsertStmtLength =
originalMaxInsertStmtLength;
+ ConnectContext.remove();
+ }
}
}
diff --git a/regression-test/suites/audit/test_audit_log_behavior.groovy
b/regression-test/suites/audit/test_audit_log_behavior.groovy
index 8cba62e03e2..8b31c18f40d 100644
--- a/regression-test/suites/audit/test_audit_log_behavior.groovy
+++ b/regression-test/suites/audit/test_audit_log_behavior.groovy
@@ -47,27 +47,27 @@ suite("test_audit_log_behavior") {
"insert into audit_log_behavior values (1,
'3F6B9A_${cnt++}')"
],
[
- "insert into audit_log_behavior values (1,
'3F6B9A_${cnt}'), (2, 'Jelly')",
- "insert into audit_log_behavior values (1,
'3F6B9A_${cnt++}'), (2, ... /* total 2 rows, truncated
audit_plugin_max_sql_length=58 */"
+ "insert into audit_log_behavior values (2,
'3F6B9A_${cnt}'), (2, 'Jelly')",
+ "insert into audit_log_behavior values (2,
'3F6B9A_${cnt++}'), (2, ... /* total 2 rows, truncated.
audit_plugin_max_insert_stmt_length=58 */"
],
[
- "insert into audit_log_behavior values (1,
'3F6B9A_${cnt}'), (2, 'Jelly'), (3, 'foobar')",
- "insert into audit_log_behavior values (1,
'3F6B9A_${cnt++}'), (2, ... /* total 3 rows, truncated
audit_plugin_max_sql_length=58 */"
+ "insert into audit_log_behavior values (3,
'3F6B9A_${cnt}'), (2, 'Jelly'), (3, 'foobar')",
+ "insert into audit_log_behavior values (3,
'3F6B9A_${cnt++}'), (2, ... /* total 3 rows, truncated.
audit_plugin_max_insert_stmt_length=58 */"
],
[
- "insert into audit_log_behavior select 1, '3F6B9A_${cnt}'",
- "insert into audit_log_behavior select 1,
'3F6B9A_${cnt++}'"],
+ "insert into audit_log_behavior select 4, '3F6B9A_${cnt}'",
+ "insert into audit_log_behavior select 4,
'3F6B9A_${cnt++}'"],
[
- "insert into audit_log_behavior select 1, '3F6B9A_${cnt}'
union select 2, 'Jelly'",
- "insert into audit_log_behavior select 1,
'3F6B9A_${cnt++}' union ... /* truncated audit_plugin_max_sql_length=58 */"
+ "insert into audit_log_behavior select 5, '3F6B9A_${cnt}'
union select 2, 'Jelly'",
+ "insert into audit_log_behavior select 5,
'3F6B9A_${cnt++}' union ... /* truncated. audit_plugin_max_sql_length=58 */"
],
[
- "insert into audit_log_behavior select 1, '3F6B9A_${cnt}'
from audit_log_behavior",
- "insert into audit_log_behavior select 1,
'3F6B9A_${cnt++}' from a ... /* truncated audit_plugin_max_sql_length=58 */"
+ "insert into audit_log_behavior select 6, '3F6B9A_${cnt}'
from audit_log_behavior",
+ "insert into audit_log_behavior select 6,
'3F6B9A_${cnt++}' from a ... /* truncated. audit_plugin_max_sql_length=58 */"
],
[
"select id, name from audit_log_behavior as
loooooooooooooooong_alias",
- "select id, name from audit_log_behavior as
loooooooooooooo ... /* truncated audit_plugin_max_sql_length=58 */"
+ "select id, name from audit_log_behavior as
loooooooooooooo ... /* truncated. audit_plugin_max_sql_length=58 */"
]
]
@@ -97,7 +97,7 @@ suite("test_audit_log_behavior") {
sleep(1000)
res = sql "${query}"
}
- assertEquals(res[0][0].toString(), tuple2[1].toString())
+ assertEquals(tuple2[1].toString(), res[0][0].toString())
}
// do not turn off
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
