database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Add cpu and io indicates to audit log (#531)

Browse Source
This commit is contained in:
chenhao
2019-01-17 12:43:15 +08:00
committed by ZHAO Chun
parent 33b133c6ff
commit 0e5b193243
44 changed files with 608 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fe/src/test/java/org/apache/doris/qe/ConnectProcessorTest.java
View File

@ -26,6 +26,7 @@ import org.apache.doris.mysql.MysqlEofPacket;
import org.apache.doris.mysql.MysqlErrPacket;
import org.apache.doris.mysql.MysqlOkPacket;
import org.apache.doris.mysql.MysqlSerializer;
import org.apache.doris.rpc.PQueryStatistics;
import org.easymock.EasyMock;
import org.junit.Assert;
@ -231,6 +232,7 @@ public class ConnectProcessorTest {
// Mock statement executor
StmtExecutor qe = EasyMock.createNiceMock(StmtExecutor.class);
qe.execute();
EasyMock.expect(qe.getQueryStatisticsForAuditLog()).andReturn(new PQueryStatistics());
EasyMock.expectLastCall().anyTimes();
EasyMock.replay(qe);
PowerMock.expectNew(
@ -254,11 +256,11 @@ public class ConnectProcessorTest {
StmtExecutor qe = EasyMock.createNiceMock(StmtExecutor.class);
qe.execute();
EasyMock.expectLastCall().andThrow(new IOException("Fail")).anyTimes();
EasyMock.expect(qe.getQueryStatisticsForAuditLog()).andReturn(new PQueryStatistics());
EasyMock.replay(qe);
PowerMock.expectNew(StmtExecutor.class, EasyMock.isA(ConnectContext.class), EasyMock.isA(String.class))
.andReturn(qe).anyTimes();
PowerMock.replay(StmtExecutor.class);
processor.processOnce();
Assert.assertEquals(MysqlCommand.COM_QUERY, myContext.getCommand());
}
@ -272,6 +274,7 @@ public class ConnectProcessorTest {
// Mock statement executor
StmtExecutor qe = EasyMock.createNiceMock(StmtExecutor.class);
qe.execute();
EasyMock.expect(qe.getQueryStatisticsForAuditLog()).andReturn(new PQueryStatistics());
EasyMock.expectLastCall().andThrow(new NullPointerException("Fail")).anyTimes();
EasyMock.replay(qe);
PowerMock.expectNew(StmtExecutor.class, EasyMock.isA(ConnectContext.class), EasyMock.isA(String.class))

2
fe/src/test/java/org/apache/doris/qe/StmtExecutorTest.java
View File

@ -160,7 +160,7 @@ public class StmtExecutorTest {
cood.endProfile();
EasyMock.expectLastCall().anyTimes();
EasyMock.expect(cood.getQueryProfile()).andReturn(new RuntimeProfile()).anyTimes();
EasyMock.expect(cood.getNext()).andReturn(null).anyTimes();
EasyMock.expect(cood.getNext()).andReturn(new RowBatch()).anyTimes();
EasyMock.replay(cood);
PowerMock.expectNew(Coordinator.class, EasyMock.isA(ConnectContext.class),
EasyMock.isA(Analyzer.class), EasyMock.isA(Planner.class))