Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GEODE-5571: Added query to history before query execution #2316

Merged
merged 2 commits into from Aug 21, 2018
Merged

GEODE-5571: Added query to history before query execution #2316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
527f77f
GEODE-5571: Added query to history before query execution
boglesby Aug 13, 2018
636d783
GEODE-5571: Force CI to re-run
boglesby Aug 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
100 changes: 99 additions & 1 deletion ...tegrationTest/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java
View file
Open in desktop
Expand Up @@ -19,10 +19,14 @@
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.verify;
import static org.powermock.api.mockito.PowerMockito.spy;
import static org.powermock.api.mockito.PowerMockito.when;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;

Expand Down Expand Up @@ -806,11 +810,105 @@ public void dataBrowserQuery() throws Exception {
doReturn(mapper.createObjectNode().put("foo", "bar")).when(cluster).executeQuery(anyString(),
anyString(), anyInt());

String query = "SELECT * FROM " + REGION_PATH;
this.mockMvc
.perform(get("/dataBrowserQuery").param("query", "SELECT * FROM " + REGION_PATH)
.perform(get("/dataBrowserQuery").param("query", query)
.param("members", MEMBER_NAME).principal(principal)
.accept(MediaType.parseMediaType(MediaType.APPLICATION_JSON_UTF8_VALUE)))
.andExpect(status().isOk()).andExpect(jsonPath("$.foo").value("bar"));

// Verify cluster addQueryInHistory is invoked
verify(this.cluster).addQueryInHistory(query, principal.getName());
}

@Test
public void dataBrowserQueryWithMessageResult() throws Exception {
String message = "Query is invalid due to error : Region mentioned in query probably missing /";
doReturn(mapper.createObjectNode().put("message", message)).when(cluster).executeQuery(
anyString(),
anyString(), anyInt());

String query = "SELECT * FROM " + REGION_PATH;
this.mockMvc
.perform(get("/dataBrowserQuery").param("query", query)
.param("members", MEMBER_NAME).principal(principal)
.accept(MediaType.parseMediaType(MediaType.APPLICATION_JSON_UTF8_VALUE)))
.andExpect(status().isOk()).andExpect(jsonPath("$.message").value(message));

// Verify cluster addQueryInHistory is invoked
verify(this.cluster).addQueryInHistory(query, principal.getName());
}

@Test
public void dataBrowserQueryWithExceptionResult() throws Exception {
doThrow(new IllegalStateException()).when(cluster).executeQuery(anyString(),
anyString(), anyInt());

String query = "SELECT * FROM " + REGION_PATH;
this.mockMvc
.perform(get("/dataBrowserQuery").param("query", query)
.param("members", MEMBER_NAME).principal(principal)
.accept(MediaType.parseMediaType(MediaType.APPLICATION_JSON_UTF8_VALUE)))
.andExpect(status().isOk()).andExpect(content().string("{}"));

// Verify cluster addQueryInHistory is invoked
verify(this.cluster).addQueryInHistory(query, principal.getName());
}

@Test
public void dataBrowserExport() throws Exception {
doReturn(mapper.createObjectNode().put("foo", "bar")).when(cluster).executeQuery(anyString(),
anyString(), anyInt());

String query = "SELECT * FROM " + REGION_PATH;
this.mockMvc
.perform(get("/dataBrowserExport").param("query", query)
.param("members", MEMBER_NAME).principal(principal)
.accept(MediaType.parseMediaType(MediaType.APPLICATION_JSON_UTF8_VALUE)))
.andExpect(status().isOk())
.andExpect(header().string("Content-Disposition", "attachment; filename=results.json"))
.andExpect(jsonPath("$.foo").value("bar"));

// Verify cluster addQueryInHistory is invoked
verify(this.cluster).addQueryInHistory(query, principal.getName());
}

@Test
public void dataBrowserExportWithMessageResult() throws Exception {
String message = "Query is invalid due to error : Region mentioned in query probably missing /";
doReturn(mapper.createObjectNode().put("message", message)).when(cluster).executeQuery(
anyString(),
anyString(), anyInt());

String query = "SELECT * FROM " + REGION_PATH;
this.mockMvc
.perform(get("/dataBrowserExport").param("query", query)
.param("members", MEMBER_NAME).principal(principal)
.accept(MediaType.parseMediaType(MediaType.APPLICATION_JSON_UTF8_VALUE)))
.andExpect(status().isOk())
.andExpect(header().string("Content-Disposition", "attachment; filename=results.json"))
.andExpect(jsonPath("$.message").value(message));

// Verify cluster addQueryInHistory is invoked
verify(this.cluster).addQueryInHistory(query, principal.getName());
}

@Test
public void dataBrowserExportWithExceptionResult() throws Exception {
doThrow(new IllegalStateException()).when(cluster).executeQuery(anyString(),
anyString(), anyInt());

String query = "SELECT * FROM " + REGION_PATH;
this.mockMvc
.perform(get("/dataBrowserExport").param("query", query)
.param("members", MEMBER_NAME).principal(principal)
.accept(MediaType.parseMediaType(MediaType.APPLICATION_JSON_UTF8_VALUE)))
.andExpect(status().isOk())
.andExpect(header().string("Content-Disposition", "attachment; filename=results.json"))
.andExpect(content().string("{}"));

// Verify cluster addQueryInHistory is invoked
verify(this.cluster).addQueryInHistory(query, principal.getName());
}

@Test
Expand Down
67 changes: 25 additions & 42 deletions ...ulse/src/main/java/org/apache/geode/tools/pulse/internal/controllers/PulseController.java
View file
Open in desktop
Expand Up @@ -319,27 +319,7 @@ public void dataBrowserQuery(HttpServletRequest request, HttpServletResponse res
logger.debug(e);
}

ObjectNode queryResult = mapper.createObjectNode();
try {

if (StringUtils.isNotBlank(query)) {
// get cluster object
Cluster cluster = Repository.get().getCluster();
String userName = request.getUserPrincipal().getName();

// Call execute query method
queryResult = cluster.executeQuery(query, members, limit);

// Add query in history if query is executed successfully
if (!queryResult.has("error")) {
// Add html escaped query to history
String escapedQuery = StringEscapeUtils.escapeHtml(query);
cluster.addQueryInHistory(escapedQuery, userName);
}
}
} catch (Exception e) {
logger.debug("Exception Occurred : ", e);
}
ObjectNode queryResult = executeQuery(request, query, members, limit);

response.getOutputStream().write(queryResult.toString().getBytes());
}
Expand Down Expand Up @@ -406,27 +386,7 @@ public void dataBrowserExport(HttpServletRequest request, HttpServletResponse re
logger.debug(e);
}

ObjectNode queryResult = mapper.createObjectNode();
try {

if (StringUtils.isNotBlank(query)) {
// get cluster object
Cluster cluster = Repository.get().getCluster();
String userName = request.getUserPrincipal().getName();

// Call execute query method
queryResult = cluster.executeQuery(query, members, limit);

// Add query in history if query is executed successfully
if (!queryResult.has("error")) {
// Add html escaped query to history
String escapedQuery = StringEscapeUtils.escapeHtml(query);
cluster.addQueryInHistory(escapedQuery, userName);
}
}
} catch (Exception e) {
logger.debug("Exception Occurred : ", e);
}
ObjectNode queryResult = executeQuery(request, query, members, limit);

response.setContentType("application/json");
response.setHeader("Content-Disposition", "attachment; filename=results.json");
Expand Down Expand Up @@ -474,4 +434,27 @@ public void getQueryStatisticsGridModel(HttpServletRequest request, HttpServletR
logger.debug("Exception Occurred : ", e);
}
}

private ObjectNode executeQuery(HttpServletRequest request, String query, String members,
int limit) {
ObjectNode queryResult = mapper.createObjectNode();
try {

if (StringUtils.isNotBlank(query)) {
// get cluster object
Cluster cluster = Repository.get().getCluster();
String userName = request.getUserPrincipal().getName();

// Add html escaped query to history
String escapedQuery = StringEscapeUtils.escapeHtml(query);
cluster.addQueryInHistory(escapedQuery, userName);

// Call execute query method
queryResult = cluster.executeQuery(query, members, limit);
}
} catch (Exception e) {
logger.debug("Exception Occurred : ", e);
}
return queryResult;
}
}
4 changes: 2 additions & 2 deletions geode-pulse/src/main/webapp/scripts/pulsescript/pages/DataBrowserQuery.js
View file
Open in desktop
Expand Up @@ -154,11 +154,11 @@ function executeDBQuery(){
if(!isEmpty($('#memberAccordion').html())){
populateResultGrids();
}
// Update queries list in history panel
updateQueryHistory("view","");
//$('.queryHistoryScroll-pane').jScrollPane();/*Custome scroll*/

}
// Update queries list in history panel
updateQueryHistory("view","");
}

// Hide Loading/Busy symbol
Expand Down