AI data service set configurable max rows limit

Author: eng-dedalus

knowage-core/src/main/java/it/eng/spagobi/api/common/AbstractDataSetResource.java

@@ -348,7 +348,7 @@ public String getDataStore(String label, String parameters, Map<String, Object>
 	}
 
     public String getDataStoreAI(String label, String parameters, Map<String, Object> drivers, String selections,
-                               String likeSelections, int maxRowCount, String aggregations, String summaryRow, int offset, int fetchSize,
+                               String likeSelections, Integer maxRowCount, String aggregations, String summaryRow, int offset, int fetchSize,
                                Boolean isNearRealtime, String options, Set<String> indexes, String widgetName) {
         LOGGER.debug("IN");
         DatasetManagementAPI datasetManagementAPI = getDatasetManagementAPI();
@@ -358,8 +358,14 @@ public String getDataStoreAI(String label, String parameters, Map<String, Object
 
             int maxResults = Integer
                     .parseInt(SingletonConfig.getInstance().getConfigValue("SPAGOBI.API.DATASET.MAX_ROWS_NUMBER"));
+
             LOGGER.debug("Offset {}, fetch size {}, max results {}", offset, fetchSize, maxResults);
 
+
+            if (maxRowCount == null) {
+                maxRowCount = maxResults;
+            }
+
             if (maxResults <= 0) {
                 throw new SpagoBIRuntimeException(
                         "SPAGOBI.API.DATASET.MAX_ROWS_NUMBER value cannot be a non-positive integer");
@@ -371,7 +377,7 @@ public String getDataStoreAI(String label, String parameters, Map<String, Object
             }
             if (maxRowCount > maxResults) {
                 throw new IllegalArgumentException(
-                        "The dataset requested is too big. Max row count is equals to [" + maxResults + "]");
+                        "The requested number of rows is too big [ " + maxRowCount + " ]. The limit is [ " + maxResults + " ]");
             }
 
             IDataSetDAO dataSetDao = DAOFactory.getDataSetDAO();
@@ -491,6 +497,8 @@ public String getDataStoreAI(String label, String parameters, Map<String, Object
             return gridDataFeed.toString();
         } catch (ValidationException v) {
             throw v;
+        } catch (IllegalArgumentException i) {
+            throw i;
         } catch (ParametersNotValorizedException p) {
             throw p;
         } catch (CatalogFunctionException c) {

knowage-core/src/main/java/it/eng/spagobi/api/v2/DataSetResource.java

@@ -50,6 +50,7 @@
 import javax.ws.rs.core.Response.ResponseBuilder;
 import javax.ws.rs.core.Response.Status;
 
+import it.eng.spagobi.commons.SingletonConfig;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.LogMF;
 import org.apache.log4j.Logger;
@@ -787,7 +788,7 @@ public String getDataStorePostWithJsonInBody(@PathParam("label") String label, S
     @Produces(MediaType.APPLICATION_JSON)
     @UserConstraint(functionalities = { CommunityFunctionalityConstants.SELF_SERVICE_DATASET_MANAGEMENT })
     public String getAIDataStorePostWithJsonInBody(@PathParam("label") String label, String body,
-                                                   @QueryParam("widgetName") String widgetName) {
+                                                   @QueryParam("widgetName") String widgetName, @QueryParam("maxRows") Integer maxRows) {
         try {
             Monitor timing = MonitorFactory.start("Knowage.DataSetResource.getDataStorePostWithJsonInBody:parseInputs");
 
@@ -799,7 +800,7 @@ public String getAIDataStorePostWithJsonInBody(@PathParam("label") String label,
             String summaryRow = null;
             String options = null;
             JSONArray jsonIndexes = null;
-            int maxRowCount = 5000;
+            Integer maxRowCount = maxRows;
             int fetchSize = 5000;
             boolean isNearRealtime = true;
             int offset = 0;
@@ -858,7 +859,7 @@ public String getAIDataStorePostWithJsonInBody(@PathParam("label") String label,
             throw e;
         } catch (Exception e) {
             logger.error("Error loading dataset data from " + label, e);
-            throw new SpagoBIRestServiceException(buildLocaleFromSession(), e);
+            throw new SpagoBIRuntimeException(e.getMessage(), e);
         }
     }