m-chrzan.xyz
aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMagdalena Grodzińska <mag.grodzinska@gmail.com>2020-01-14 21:54:11 +0100
committerMagdalena Grodzińska <mag.grodzinska@gmail.com>2020-01-14 21:54:11 +0100
commitc4513b4817ec623d026fa35682b4934a211e1b8a (patch)
tree155ebe27406631c264b32eb7ba403e8a0b84ba71 /src
parentb3dd7a505549662d558eec550f210f0d6f0ec547 (diff)
Some small fixes
Diffstat (limited to 'src')
-rw-r--r--src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/Stanik.java4
-rw-r--r--src/main/java/pl/edu/mimuw/cloudatlas/model/ValueQuery.java10
2 files changed, 12 insertions, 2 deletions
diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/Stanik.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/Stanik.java
index 9e2a603..79728b5 100644
--- a/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/Stanik.java
+++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/Stanik.java
@@ -215,8 +215,8 @@ public class Stanik extends Module {
Attribute attribute = entry.getKey();
ValueTime timestamp = new ValueTime(entry.getValue().getTimestamp());
ValueQuery currentTimestampedQuery = queries.get(attribute);
- ValueTime currentQueryTimestamp = new ValueTime(currentTimestampedQuery.getTimestamp());
- if (currentQueryTimestamp == null || ValueUtils.valueLower(currentQueryTimestamp, timestamp)) {
+ if (currentTimestampedQuery == null ||
+ ValueUtils.valueLower(new ValueTime(currentTimestampedQuery.getTimestamp()), timestamp)) {
queries.put(entry.getKey(), entry.getValue());
}
}
diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/model/ValueQuery.java b/src/main/java/pl/edu/mimuw/cloudatlas/model/ValueQuery.java
index 3edda69..f049603 100644
--- a/src/main/java/pl/edu/mimuw/cloudatlas/model/ValueQuery.java
+++ b/src/main/java/pl/edu/mimuw/cloudatlas/model/ValueQuery.java
@@ -56,6 +56,16 @@ public class ValueQuery extends Value {
this.timestamp = System.currentTimeMillis();
}
+ public ValueQuery(String query, long timestamp) throws Exception {
+ this.code = query;
+ if (!query.isEmpty()) {
+ Yylex lex = new Yylex(new ByteArrayInputStream(query.getBytes()));
+ this.query = (new parser(lex)).pProgram();
+ }
+ this.signature = null;
+ this.timestamp = timestamp;
+ }
+
private ValueQuery() {
this.code = null;
this.query = null;