incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject git commit: Fixed BLUR-99
Date Thu, 23 May 2013 00:39:36 GMT
Updated Branches:
  refs/heads/0.1.5 9b89a5ba3 -> 79a8fe0cc


Fixed BLUR-99

Signed-off-by: Aaron McCurry <amccurry@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/79a8fe0c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/79a8fe0c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/79a8fe0c

Branch: refs/heads/0.1.5
Commit: 79a8fe0ccf8b19eaee3de44f8447d540fb55409c
Parents: 9b89a5b
Author: Chris Rohr <crohr@nearinfinity.com>
Authored: Wed May 22 19:43:24 2013 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Wed May 22 20:38:50 2013 -0400

----------------------------------------------------------------------
 .../collectors/blur/query/QueryCollector.java      |    2 +-
 .../connections/blur/BlurDatabaseConnection.java   |    4 ++--
 .../blur/interfaces/QueryDatabaseInterface.java    |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/79a8fe0c/src/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/collectors/blur/query/QueryCollector.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/collectors/blur/query/QueryCollector.java
b/src/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/collectors/blur/query/QueryCollector.java
index f300379..20d6254 100644
--- a/src/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/collectors/blur/query/QueryCollector.java
+++ b/src/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/collectors/blur/query/QueryCollector.java
@@ -44,7 +44,7 @@ public class QueryCollector implements Runnable {
 		}
 		
 		// Mark running queries that can't be found as complete - unknown
-		this.database.markOrphanedRunningQueriesComplete(CollectionUtils.subtract(this.database.getRunningQueries(),
currentQueries));
+		this.database.markOrphanedRunningQueriesComplete(CollectionUtils.subtract(this.database.getRunningQueries((long)tableId),
currentQueries));
 		
 
 		for (Long queryUUID : currentQueries) {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/79a8fe0c/src/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/connections/blur/BlurDatabaseConnection.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/connections/blur/BlurDatabaseConnection.java
b/src/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/connections/blur/BlurDatabaseConnection.java
index 9b433ae..e668da1 100644
--- a/src/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/connections/blur/BlurDatabaseConnection.java
+++ b/src/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/connections/blur/BlurDatabaseConnection.java
@@ -135,8 +135,8 @@ public class BlurDatabaseConnection implements BlurDatabaseInterface {
 	}
 
 	@Override
-	public List<Long> getRunningQueries() {
-		return this.jdbc.queryForList("select uuid from blur_queries where state = 0", Long.class);
+	public List<Long> getRunningQueries(Long tableId) {
+		return this.jdbc.queryForList("select uuid from blur_queries where state = 0 and blur_table_id
= ?", new Object[]{tableId}, Long.class);
 	}
 
 	@Override

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/79a8fe0c/src/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/connections/blur/interfaces/QueryDatabaseInterface.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/connections/blur/interfaces/QueryDatabaseInterface.java
b/src/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/connections/blur/interfaces/QueryDatabaseInterface.java
index 6025350..d367b80 100644
--- a/src/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/connections/blur/interfaces/QueryDatabaseInterface.java
+++ b/src/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/connections/blur/interfaces/QueryDatabaseInterface.java
@@ -11,7 +11,7 @@ import org.apache.blur.thrift.generated.SimpleQuery;
 public interface QueryDatabaseInterface {
 	Map<String, Object> getQuery(int tableId, long UUID);
 
-	List<Long> getRunningQueries();
+	List<Long> getRunningQueries(Long tableId);
 
 	void createQuery(BlurQueryStatus status, SimpleQuery query, String times, Date startTime,
int tableId);
 


Mime
View raw message