rohangarg commented on code in PR #12867:
URL: https://github.com/apache/druid/pull/12867#discussion_r959288460
##########
services/src/test/java/org/apache/druid/server/AsyncQueryForwardingServletTest.java:
##########
@@ -525,30 +555,62 @@ public int read()
return b;
}
};
+ final HttpServletRequest requestMock =
EasyMock.createMock(HttpServletRequest.class);
+ final boolean isAnySql = isJDBCSql || isNativeSql;
EasyMock.expect(requestMock.getContentType()).andReturn("application/json").times(2);
requestMock.setAttribute("org.apache.druid.proxy.objectMapper",
jsonMapper);
EasyMock.expectLastCall();
- EasyMock.expect(requestMock.getRequestURI()).andReturn(isSql ?
"/druid/v2/sql" : "/druid/v2/");
+ EasyMock.expect(requestMock.getRequestURI())
+ .andReturn(isNativeSql ? "/druid/v2/sql" : (isJDBCSql ?
"/druid/v2/sql/avatica" : "/druid/v2/"));
EasyMock.expect(requestMock.getMethod()).andReturn("POST");
-
EasyMock.expect(requestMock.getInputStream()).andReturn(servletInputStream);
requestMock.setAttribute(
- isSql ? "org.apache.druid.proxy.sqlQuery" :
"org.apache.druid.proxy.query",
- query
+ "org.apache.druid.proxy." + (isNativeSql ? "sqlQuery" : (isJDBCSql ?
"avaticaQuery" : "query")),
+ isJDBCSql ? jsonMapper.writeValueAsBytes(query) : query
);
+ EasyMock.expectLastCall();
+
EasyMock.expect(requestMock.getInputStream()).andReturn(servletInputStream);
+
+ // metrics related mocking
+
EasyMock.expect(requestMock.getAttribute("org.apache.druid.proxy.avaticaQuery"))
+ .andReturn(isJDBCSql ? query : null);
+ EasyMock.expect(requestMock.getAttribute("org.apache.druid.proxy.query"))
+ .andReturn(isJDBCSql ? null : (isNativeSql ? null : query));
+
EasyMock.expect(requestMock.getAttribute("org.apache.druid.proxy.sqlQuery"))
+ .andReturn(isJDBCSql ? null : (isNativeSql ? query : null));
+
EasyMock.expect(requestMock.getRemoteAddr()).andReturn("0.0.0.0:0").times(isJDBCSql
? 1 : 2);
requestMock.setAttribute("org.apache.druid.proxy.to.host", "1.2.3.4:9999");
+ EasyMock.expectLastCall();
requestMock.setAttribute("org.apache.druid.proxy.to.host.scheme", "http");
EasyMock.expectLastCall();
EasyMock.replay(requestMock);
final AtomicLong didService = new AtomicLong();
+ final Request proxyRequestMock = Mockito.spy(Request.class);
+ final Result result = new Result(
+ proxyRequestMock,
+ new HttpResponse(proxyRequestMock, ImmutableList.of())
+ {
+ @Override
+ public HttpFields getHeaders()
+ {
+ HttpFields httpFields = new HttpFields();
+ httpFields.add(new
HttpField(QueryResource.QUERY_ID_RESPONSE_HEADER, "dummy"));
Review Comment:
Yes, that makes sense to me! :+1: have updated to use hardcoded values to
protect against silent failures
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
