Remove new expected result type

hms-dbmi · Oct 21, 2024 · 6e8a1a6 · 6e8a1a6
1 parent e588d65
commit 6e8a1a6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/client-api/src/main/java/edu/harvard/hms/dbmi/avillach/hpds/data/query/ResultType.java b/client-api/src/main/java/edu/harvard/hms/dbmi/avillach/hpds/data/query/ResultType.java
@@ -94,6 +94,5 @@ public enum ResultType {
      * Exports data as PFB, using avro
      * <a href="https://uc-cdis.github.io/pypfb/">https://uc-cdis.github.io/pypfb/</a>
      */
-	DATAFRAME_PFB,
-	DATAFRAME_MULTI
+	DATAFRAME_PFB
 }
diff --git a/service/src/main/java/edu/harvard/hms/dbmi/avillach/hpds/service/QueryService.java b/service/src/main/java/edu/harvard/hms/dbmi/avillach/hpds/service/QueryService.java
@@ -116,7 +116,6 @@ private AsyncResult initializeResult(Query query) throws IOException {
 
 		HpdsProcessor p;
 		switch(query.getExpectedResultType()) {
-			case DATAFRAME :
 			case SECRET_ADMIN_DATAFRAME:
 				p = queryProcessor;
 				break;
@@ -129,7 +128,7 @@ private AsyncResult initializeResult(Query query) throws IOException {
 				p = countProcessor;
 				break;
 			case DATAFRAME_PFB:
-			case DATAFRAME_MULTI:
+			case DATAFRAME:
 				p = pfbProcessor;
 				break;
 			default :

diff --git a/service/src/test/java/edu/harvard/hms/dbmi/avillach/hpds/service/QueryServiceTest.java b/service/src/test/java/edu/harvard/hms/dbmi/avillach/hpds/service/QueryServiceTest.java
@@ -45,7 +45,7 @@ public void dataframeMulti() throws IOException, InterruptedException {
         variantInfoFilters.add(variantInfoFilter);
         query.setVariantInfoFilters(variantInfoFilters);
         query.setFields(List.of("\\open_access-1000Genomes\\data\\SYNTHETIC_AGE\\"));
-        query.setExpectedResultType(ResultType.DATAFRAME_MULTI);
+        query.setExpectedResultType(ResultType.DATAFRAME);
 
         AsyncResult asyncResult = queryService.runQuery(query);