Some queries will be excluded from count

Author: tarelli

src/main/java/org/geppetto/datasources/ADataSourceService.java

@@ -184,8 +184,11 @@ public int getNumberOfResults(Query query, Variable variable) throws GeppettoDat
 			}
 			else
 			{
+				runQueryVisitor.countOnly(true);
+				runQueryVisitor.doSwitch(query);
+				QueryResults results = runQueryVisitor.getResults();
 				// There is no query specified, we run everything and we cache it so if it will be actually run later one we'll already have the results
-				count = execute(query, variable).getResults().size();
+				count = results.getResults().size();
 
 			}
 		}

src/main/java/org/geppetto/datasources/ExecuteQueryVisitor.java

@@ -102,22 +102,24 @@ private ADataSourceService getDataSourceService(Query query) throws GeppettoInit
 	@Override
 	public Object caseProcessQuery(ProcessQuery query)
 	{
-
-		if(QueryChecker.check(query, getVariable()))
+		if(!count || (count && query.isRunForCount()))
 		{
-			try
-			{
-				IQueryProcessor queryProcessor = (IQueryProcessor) ServiceCreator.getNewServiceInstance(query.getQueryProcessorId());
-				this.results = queryProcessor.process(query, getDataSource(query), getVariable(), getResults(), geppettoModelAccess);
-				this.processingOutputMap = queryProcessor.getProcessingOutputMap();
-			}
-			catch(GeppettoInitializationException e)
-			{
-				return new GeppettoVisitingException(e);
-			}
-			catch(GeppettoDataSourceException e)
+			if(QueryChecker.check(query, getVariable()))
 			{
-				return new GeppettoVisitingException(e);
+				try
+				{
+					IQueryProcessor queryProcessor = (IQueryProcessor) ServiceCreator.getNewServiceInstance(query.getQueryProcessorId());
+					this.results = queryProcessor.process(query, getDataSource(query), getVariable(), getResults(), geppettoModelAccess);
+					this.processingOutputMap = queryProcessor.getProcessingOutputMap();
+				}
+				catch(GeppettoInitializationException e)
+				{
+					return new GeppettoVisitingException(e);
+				}
+				catch(GeppettoDataSourceException e)
+				{
+					return new GeppettoVisitingException(e);
+				}
 			}
 		}
 		return super.caseProcessQuery(query);
@@ -131,23 +133,25 @@ public Object caseProcessQuery(ProcessQuery query)
 	@Override
 	public Object caseCompoundQuery(CompoundQuery query)
 	{
-		ExecuteQueryVisitor runQueryVisitor = new ExecuteQueryVisitor(variable, geppettoModelAccess);
-		runQueryVisitor.processingOutputMap.putAll(processingOutputMap);
-
-		try
-		{
-			GeppettoModelTraversal.applyDirectChildrenOnly(query, runQueryVisitor);
-			mergeResults(runQueryVisitor.getResults());
-		}
-		catch(GeppettoVisitingException e)
+		if(!count || (count && query.isRunForCount()))
 		{
-			return e;
-		}
-		catch(GeppettoDataSourceException e)
-		{
-			return new GeppettoVisitingException(e);
-		}
+			ExecuteQueryVisitor runQueryVisitor = new ExecuteQueryVisitor(variable, geppettoModelAccess);
+			runQueryVisitor.processingOutputMap.putAll(processingOutputMap);
 
+			try
+			{
+				GeppettoModelTraversal.applyDirectChildrenOnly(query, runQueryVisitor);
+				mergeResults(runQueryVisitor.getResults());
+			}
+			catch(GeppettoVisitingException e)
+			{
+				return e;
+			}
+			catch(GeppettoDataSourceException e)
+			{
+				return new GeppettoVisitingException(e);
+			}
+		}
 		return super.caseCompoundQuery(query);
 	}
 
@@ -157,13 +161,16 @@ public Object caseCompoundQuery(CompoundQuery query)
 	 * @see org.geppetto.model.datasources.util.DatasourcesSwitch#caseCompoundRefQuery(org.geppetto.model.datasources.CompoundRefQuery)
 	 */
 	@Override
-	public Object caseCompoundRefQuery(CompoundRefQuery object)
+	public Object caseCompoundRefQuery(CompoundRefQuery compoundQuery)
 	{
-		for(Query query : object.getQueryChain())
+		if(!count || (count && compoundQuery.isRunForCount()))
 		{
-			this.doSwitch(query);
+			for(Query query : compoundQuery.getQueryChain())
+			{
+				this.doSwitch(query);
+			}
 		}
-		return super.caseCompoundRefQuery(object);
+		return super.caseCompoundRefQuery(compoundQuery);
 	}
 
 	/*
@@ -174,47 +181,57 @@ public Object caseCompoundRefQuery(CompoundRefQuery object)
 	@Override
 	public Object caseSimpleQuery(SimpleQuery query)
 	{
-		try
+		if(!count || (count && query.isRunForCount()))
 		{
-			if(QueryChecker.check(query, getVariable()))
+			try
 			{
-				ADataSourceService dataSourceService = getDataSourceService(query);
-				String url = getDataSource(query).getUrl();
+				if(QueryChecker.check(query, getVariable()))
+				{
+					ADataSourceService dataSourceService = getDataSourceService(query);
+					String url = getDataSource(query).getUrl();
+					String queryString = null;
+					if(count)
+					{
+						queryString = !query.getCountQuery().isEmpty() ? query.getCountQuery() : query.getQuery();
+					}
+					else
+					{
+						queryString = query.getQuery();
+					}
 
-				String queryString = count ? query.getCountQuery() : query.getQuery();
+					Map<String, Object> properties = new HashMap<String, Object>();
+					properties.put(ID, getVariable().getId());
+					properties.put("QUERY", queryString);
 
-				Map<String, Object> properties = new HashMap<String, Object>();
-				properties.put(ID, getVariable().getId());
-				properties.put("QUERY", queryString);
+					if(processingOutputMap != null)
+					{
+						properties.putAll(processingOutputMap);
+					}
 
-				if(processingOutputMap != null)
-				{
-					properties.putAll(processingOutputMap);
-				}
+					String processedQueryString = VelocityUtils.processTemplate(dataSourceService.getTemplate(), properties);
 
-				String processedQueryString = VelocityUtils.processTemplate(dataSourceService.getTemplate(), properties);
+					String response = null;
+					switch(dataSourceService.getConnectionType())
+					{
+						case GET:
+							response = GeppettoHTTPClient.doGET(url, processedQueryString);
+							break;
+						case POST:
+							response = GeppettoHTTPClient.doJSONPost(url, processedQueryString);
+							break;
+					}
 
-				String response = null;
-				switch(dataSourceService.getConnectionType())
-				{
-					case GET:
-						response = GeppettoHTTPClient.doGET(url, processedQueryString);
-						break;
-					case POST:
-						response = GeppettoHTTPClient.doJSONPost(url, processedQueryString);
-						break;
+					processResponse(response, dataSourceService);
 				}
-
-				processResponse(response, dataSourceService);
 			}
-		}
-		catch(GeppettoDataSourceException e)
-		{
-			return new GeppettoVisitingException(e);
-		}
-		catch(GeppettoInitializationException e)
-		{
-			return new GeppettoVisitingException(e);
+			catch(GeppettoDataSourceException e)
+			{
+				return new GeppettoVisitingException(e);
+			}
+			catch(GeppettoInitializationException e)
+			{
+				return new GeppettoVisitingException(e);
+			}
 		}
 		return super.caseSimpleQuery(query);
 	}