From 8c718f69b477addba269a795fd09ce60c4844093 Mon Sep 17 00:00:00 2001 From: Pierre Lambert Date: Fri, 6 Nov 2020 11:46:34 +0100 Subject: [PATCH] add getters/setters to all Resultset classes and dependencies - issue #89 --- .../java/com/redislabs/redisgraph/ResultSet.java | 3 +++ .../java/com/redislabs/redisgraph/Statistics.java | 6 ++++++ .../redisgraph/graph_entities/GraphEntity.java | 4 ++++ .../redisgraph/impl/resultset/RecordImpl.java | 14 +++++++++++--- .../redisgraph/impl/resultset/ResultSetImpl.java | 4 ++++ .../redisgraph/impl/resultset/StatisticsImpl.java | 15 ++++++++++++--- 6 files changed, 40 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/redislabs/redisgraph/ResultSet.java b/src/main/java/com/redislabs/redisgraph/ResultSet.java index a901594..3925aa8 100644 --- a/src/main/java/com/redislabs/redisgraph/ResultSet.java +++ b/src/main/java/com/redislabs/redisgraph/ResultSet.java @@ -1,6 +1,7 @@ package com.redislabs.redisgraph; import java.util.Iterator; +import java.util.List; /** * Hold a query result @@ -13,4 +14,6 @@ public interface ResultSet extends Iterator { Header getHeader(); + List getResults(); + } \ No newline at end of file diff --git a/src/main/java/com/redislabs/redisgraph/Statistics.java b/src/main/java/com/redislabs/redisgraph/Statistics.java index 9d7453f..aaf2e44 100644 --- a/src/main/java/com/redislabs/redisgraph/Statistics.java +++ b/src/main/java/com/redislabs/redisgraph/Statistics.java @@ -41,6 +41,10 @@ public static Label getEnum(String value) { } return null; } + + public String getText() { + return text; + } } /** @@ -67,5 +71,7 @@ public static Label getEnum(String value) { int propertiesSet(); + String queryExecutionTime(); + boolean cachedExecution(); } diff --git a/src/main/java/com/redislabs/redisgraph/graph_entities/GraphEntity.java b/src/main/java/com/redislabs/redisgraph/graph_entities/GraphEntity.java index e86e302..734431a 100644 --- a/src/main/java/com/redislabs/redisgraph/graph_entities/GraphEntity.java +++ b/src/main/java/com/redislabs/redisgraph/graph_entities/GraphEntity.java @@ -15,6 +15,10 @@ public abstract class GraphEntity { //setters & getters + public Map> getPropertyMap() { + return propertyMap; + } + /** * @return entity id */ diff --git a/src/main/java/com/redislabs/redisgraph/impl/resultset/RecordImpl.java b/src/main/java/com/redislabs/redisgraph/impl/resultset/RecordImpl.java index adf68ad..d54e019 100644 --- a/src/main/java/com/redislabs/redisgraph/impl/resultset/RecordImpl.java +++ b/src/main/java/com/redislabs/redisgraph/impl/resultset/RecordImpl.java @@ -7,14 +7,22 @@ public class RecordImpl implements Record { - private final List header; - private final List values; + private final List header; + private final List values; - RecordImpl(List header, List values){ + public RecordImpl(List header, List values){ this.header=header; this.values = values; } + public List getHeader() { + return header; + } + + public List getValues() { + return values; + } + @Override public T getValue(int index) { return (T)this.values.get(index); diff --git a/src/main/java/com/redislabs/redisgraph/impl/resultset/ResultSetImpl.java b/src/main/java/com/redislabs/redisgraph/impl/resultset/ResultSetImpl.java index b852c5b..380e923 100644 --- a/src/main/java/com/redislabs/redisgraph/impl/resultset/ResultSetImpl.java +++ b/src/main/java/com/redislabs/redisgraph/impl/resultset/ResultSetImpl.java @@ -132,6 +132,10 @@ public Header getHeader() { return header; } + @Override + public List getResults() { + return results; + } /** * @param rawNodeData - raw node object in the form of list of object diff --git a/src/main/java/com/redislabs/redisgraph/impl/resultset/StatisticsImpl.java b/src/main/java/com/redislabs/redisgraph/impl/resultset/StatisticsImpl.java index 5075c69..5c8aa94 100644 --- a/src/main/java/com/redislabs/redisgraph/impl/resultset/StatisticsImpl.java +++ b/src/main/java/com/redislabs/redisgraph/impl/resultset/StatisticsImpl.java @@ -26,7 +26,7 @@ public StatisticsImpl(){} * @param raw a raw representation of the query execution statistics */ public StatisticsImpl(List raw){ - this.raw = raw; + this.raw = raw; } @@ -43,10 +43,10 @@ public String getStringValue(Statistics.Label label) { /** * Lazy parse statistics on first call */ - private Map getStatistics(){ + public Map getStatistics(){ if(statistics.size() == 0 && this.raw != null) { for(byte[] tuple : this.raw) { - String text = SafeEncoder.encode(tuple); + String text = SafeEncoder.encode(tuple); String[] rowTuple = text.split(":"); if(rowTuple.length == 2) { Statistics.Label label = Statistics.Label.getEnum(rowTuple[0]); @@ -145,6 +145,15 @@ public boolean cachedExecution() { return getIntValue(Label.CACHED_EXECUTION) == 1; } + /** + * + * @return The execution time for the Query. + */ + @Override + public String queryExecutionTime() { + return getStringValue(Label.QUERY_INTERNAL_EXECUTION_TIME); + } + @Override public boolean equals(Object o) { if (this == o) return true;