From 7e36c360e0d734b2329bad697984c2d15c4d2410 Mon Sep 17 00:00:00 2001 From: Whitney O'Meara Date: Tue, 30 Apr 2024 16:22:27 +0000 Subject: [PATCH] PR feedback --- .../query/mapreduce/jobs/BulkResultsJob.java | 2 +- .../query/storage/QueryStatus.java | 20 +++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/main/java/datawave/microservice/query/mapreduce/jobs/BulkResultsJob.java b/src/main/java/datawave/microservice/query/mapreduce/jobs/BulkResultsJob.java index 01acab60..af9f4963 100644 --- a/src/main/java/datawave/microservice/query/mapreduce/jobs/BulkResultsJob.java +++ b/src/main/java/datawave/microservice/query/mapreduce/jobs/BulkResultsJob.java @@ -349,7 +349,7 @@ protected void exportSystemProperties(String id, Job job, FileSystem fs, Path cl // Note: The logic used to submit a mapreduce query is not needed when running in the mapper systemProperties.put(MapReduceQueryProperties.PREFIX + ".enabled", "false"); - + writeProperties(id, job, fs, classpath, systemProperties); } diff --git a/src/main/java/datawave/microservice/query/storage/QueryStatus.java b/src/main/java/datawave/microservice/query/storage/QueryStatus.java index a7f59418..43cc547d 100644 --- a/src/main/java/datawave/microservice/query/storage/QueryStatus.java +++ b/src/main/java/datawave/microservice/query/storage/QueryStatus.java @@ -28,18 +28,26 @@ public class QueryStatus implements Serializable { /** - * These are the possible query states correlating with the activity that the user is requesting. DEFINE: define a query CREATE: create a query and get - * results PLAN: plan a query PREDICT: predict a query CLOSE: close the activity (finish executing tasks in progress) CANCEL: cancel the activity FAIL: the - * activity failed + * These are the possible query states correlating with the activity that the user is requesting.
+ * DEFINE: define a query
+ * CREATE: create a query and get results
+ * PLAN: plan a query
+ * PREDICT: predict a query
+ * CLOSE: close the activity (finish executing tasks in progress)
+ * CANCEL: cancel the activity
+ * FAIL: the activity failed */ public enum QUERY_STATE { DEFINE, CREATE, PLAN, PREDICT, CLOSE, CANCEL, FAIL } /** - * These are the possible stages of a query create/next/close CREATE: Create the query. PLAN: The query is being planned TASK: planning is complete and next - * tasks are being generated RESULTS: All next tasks have been generated and we are only generating results DONE: The query id done (QUERY_STATE should be - * set to CLOSE, CANCEL, or FAIL). + * These are the possible stages of a query create/next/close
+ * CREATE: Create the query.
+ * PLAN: The query is being planned
+ * TASK: planning is complete and next tasks are being generated
+ * RESULTS: All next tasks have been generated and we are only generating results
+ * DONE: The query id done (QUERY_STATE should be set to CLOSE, CANCEL, or FAIL). */ public enum CREATE_STAGE { CREATE, PLAN, TASK, RESULTS