maheshk114 commented on a change in pull request #881: HIVE-22733 : After
disable operation log property in hive, still HS2 saving the operation log
URL: https://github.com/apache/hive/pull/881#discussion_r368355162
##########
File path:
itests/hive-unit/src/test/java/org/apache/hive/service/cli/operation/TestOperationLoggingLayout.java
##########
@@ -132,22 +133,47 @@ private void
appendHushableRandomAccessFileAppender(Appender queryAppender) {
}
}
- @Test
- public void testSwitchLogLayout() throws Exception {
+ private void executeWithOperationLog(String query, boolean queryLogEnabled)
throws Exception {
// verify whether the sql operation log is generated and fetch correctly.
- OperationHandle operationHandle = client.executeStatement(sessionHandle,
sqlCntStar, null);
+ OperationHandle operationHandle = client.executeStatement(sessionHandle,
query, null);
RowSet rowSetLog = client.fetchResults(operationHandle,
FetchOrientation.FETCH_FIRST, 1000,
- FetchType.LOG);
- String queryId = getQueryId(rowSetLog);
- Assert.assertNotNull("Could not find query id, perhaps a logging message
changed", queryId);
+ FetchType.LOG);
+ String queryId = "";
+ boolean expectedStopped = true;
+ if (queryLogEnabled) {
+ queryId = getQueryId(rowSetLog);
+ expectedStopped = false;
+ Assert.assertNotNull("Could not find query id, perhaps a logging message
changed", queryId);
+ } else {
+ Assert.assertEquals("Operation log is generated even if query logging is
disabled", rowSetLog.numRows(), 0);
+ Assert.assertNull("Query id present even if logging is disabled.",
getQueryId(rowSetLog));
+ }
- checkAppenderState("before operation close ",
LogDivertAppender.QUERY_ROUTING_APPENDER, queryId, false);
- checkAppenderState("before operation close ",
LogDivertAppenderForTest.TEST_QUERY_ROUTING_APPENDER, queryId, false);
+ checkAppenderState("before operation close ",
LogDivertAppender.QUERY_ROUTING_APPENDER, queryId, expectedStopped);
+ checkAppenderState("before operation close ",
LogDivertAppenderForTest.TEST_QUERY_ROUTING_APPENDER, queryId, expectedStopped);
client.closeOperation(operationHandle);
checkAppenderState("after operation close ",
LogDivertAppender.QUERY_ROUTING_APPENDER, queryId, true);
checkAppenderState("after operation close ",
LogDivertAppenderForTest.TEST_QUERY_ROUTING_APPENDER, queryId, true);
}
+ @Test
+ public void testSwitchLogLayout() throws Exception {
+ executeWithOperationLog(sqlCntStar, true);
+ }
+
+ @Test
+ public void testQueryLogDisabled() throws Exception {
+ OperationHandle operationHandle = client.executeStatement(sessionHandle,
+ "set hive.server2.logging.operation.enabled=false", null);
+ client.closeOperation(operationHandle);
+
+ executeWithOperationLog(sqlCntStar, false);
+
+ operationHandle = client.executeStatement(sessionHandle,
+ "set hive.server2.logging.operation.enabled=true", null);
+ client.closeOperation(operationHandle);
+ }
+
Review comment:
you mean ..without the above changes ? just back porting HIVE-22115 is
sufficient ?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
