You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2016/09/02 00:51:29 UTC
[10/35] usergrid git commit: Add additional logging statements.
Add additional logging statements.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/dbdd2431
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/dbdd2431
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/dbdd2431
Branch: refs/heads/master
Commit: dbdd2431a7b65f6f2f8383e6c5fd598cac768329
Parents: fd7a75e
Author: Michael Russo <mr...@apigee.com>
Authored: Sat Aug 27 15:35:44 2016 -0700
Committer: Michael Russo <mr...@apigee.com>
Committed: Sat Aug 27 15:35:44 2016 -0700
----------------------------------------------------------------------
.../corepersistence/pipeline/read/ResultsPage.java | 14 +++++++++++++-
.../read/traverse/AbstractReadGraphFilter.java | 7 +++++++
.../corepersistence/results/IdQueryExecutor.java | 10 ++++++++++
.../results/ObservableQueryExecutor.java | 3 +++
4 files changed, 33 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/dbdd2431/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/ResultsPage.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/ResultsPage.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/ResultsPage.java
index 6b3a086..e4c3828 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/ResultsPage.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/ResultsPage.java
@@ -23,7 +23,9 @@ package org.apache.usergrid.corepersistence.pipeline.read;
import java.util.List;
import org.apache.usergrid.corepersistence.pipeline.cursor.ResponseCursor;
-import org.apache.usergrid.persistence.model.entity.Entity;
+import org.apache.usergrid.corepersistence.results.ObservableQueryExecutor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -34,6 +36,9 @@ import org.apache.usergrid.persistence.model.entity.Entity;
*/
public class ResultsPage<T> {
+ private static final Logger logger = LoggerFactory.getLogger( ResultsPage.class );
+
+
private final List<T> entityList;
private final int limit;
@@ -57,6 +62,13 @@ public class ResultsPage<T> {
* Return true if the results page is empty
*/
public boolean hasMoreResults() {
+ if(logger.isTraceEnabled()){
+ if(entityList != null && entityList.size() == limit){
+ logger.trace("hasMoreResults = true, entityList size: {}, limit: {}", entityList.size(), limit);
+ }else{
+ logger.trace("hasMoreResults = false, entityList size: {}, limit: {}", entityList!= null ? entityList.size() : "null", limit);
+ }
+ }
return entityList != null && entityList.size() == limit;
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/dbdd2431/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/traverse/AbstractReadGraphFilter.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/traverse/AbstractReadGraphFilter.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/traverse/AbstractReadGraphFilter.java
index f2aed89..62f6548 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/traverse/AbstractReadGraphFilter.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/traverse/AbstractReadGraphFilter.java
@@ -198,9 +198,16 @@ public abstract class AbstractReadGraphFilter extends AbstractPathFilter<Id, Id,
//if it's our first pass, there's no cursor to generate
if(cursorValue == null){
+ if(logger.isTraceEnabled()){
+ logger.trace("Cursor value is null, creating filter result with no cursor");
+ }
return new FilterResult<>( emit, parent );
}
+ if(logger.isTraceEnabled()){
+ logger.trace("Cursor value is not null, creating filter result with cursor: {}", cursorValue.toString());
+ }
+
return super.createFilterResult( emit, cursorValue, parent );
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/dbdd2431/stack/core/src/main/java/org/apache/usergrid/corepersistence/results/IdQueryExecutor.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/results/IdQueryExecutor.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/results/IdQueryExecutor.java
index 5a0bb3f..ea3d0ac 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/results/IdQueryExecutor.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/results/IdQueryExecutor.java
@@ -36,6 +36,8 @@ import org.apache.usergrid.persistence.model.entity.Id;
import com.google.common.base.Optional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import rx.Observable;
@@ -45,6 +47,9 @@ import rx.Observable;
@Deprecated//Required for 1.0 compatibility
public abstract class IdQueryExecutor extends ObservableQueryExecutor<Id> {
+ private static final Logger logger = LoggerFactory.getLogger( IdQueryExecutor.class );
+
+
protected IdQueryExecutor( final Optional<String> startCursor ) {
super( startCursor );
@@ -53,6 +58,11 @@ public abstract class IdQueryExecutor extends ObservableQueryExecutor<Id> {
@Override
protected Results createResults( final ResultsPage resultsPage ) {
+
+ if(logger.isTraceEnabled()){
+ logger.trace("Creating Id results from resultsPage");
+ }
+
final List<Id> ids = resultsPage.getEntityList();
List<UUID> uuids = ids.stream().map(id -> id.getUuid()).collect(Collectors.toList());
http://git-wip-us.apache.org/repos/asf/usergrid/blob/dbdd2431/stack/core/src/main/java/org/apache/usergrid/corepersistence/results/ObservableQueryExecutor.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/results/ObservableQueryExecutor.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/results/ObservableQueryExecutor.java
index 007486f..e12178f 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/results/ObservableQueryExecutor.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/results/ObservableQueryExecutor.java
@@ -107,6 +107,9 @@ public abstract class ObservableQueryExecutor<T> implements QueryExecutor {
public boolean hasNext() {
if ( !complete && results == null) {
+ if(logger.isTraceEnabled()){
+ logger.trace("Iterator not complete and there are results object is null, advancing");
+ }
advance();
}