incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [2/3] git commit: Upgraded the console agent to work with 0.1.5 of blur
Date Wed, 22 May 2013 01:06:26 GMT
Upgraded the console agent to work with 0.1.5 of blur

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/620abf38
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/620abf38
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/620abf38

Branch: refs/heads/0.1.5
Commit: 620abf38c6b2a31903a81d744b0f22ac93eb9cc7
Parents: db3d6b1
Author: Chris Rohr <crohr@nearinfinity.com>
Authored: Tue May 21 16:17:20 2013 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Tue May 21 21:04:54 2013 -0400

----------------------------------------------------------------------
 src/contrib/blur-console/blur-agent/pom.xml        |   38 +++++---------
 .../agent/collectors/blur/BlurCollector.java       |    4 +-
 .../collectors/blur/query/QueryCollector.java      |    6 +-
 .../collectors/blur/table/SchemaCollector.java     |   14 +++---
 .../collectors/blur/table/ServerCollector.java     |    4 +-
 .../collectors/blur/table/StatsCollector.java      |    6 +-
 .../collectors/blur/table/TableCollector.java      |    4 +-
 .../agent/collectors/hdfs/HdfsStatsCollector.java  |   11 ++--
 .../connections/blur/BlurDatabaseConnection.java   |    4 +-
 .../blur/interfaces/QueryDatabaseInterface.java    |    4 +-
 .../com/nearinfinity/BlurAgentBaseTestClass.java   |    2 +-
 .../collectors/blur/query/QueryCollectorTest.java  |   14 +++---
 .../agent/collectors/hdfs/HdfsCollectorTest.java   |    3 +-
 .../collectors/hdfs/HdfsStatCollectorTest.java     |    2 +-
 14 files changed, 54 insertions(+), 62 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/620abf38/src/contrib/blur-console/blur-agent/pom.xml
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/pom.xml b/src/contrib/blur-console/blur-agent/pom.xml
index 94fb4aa..6889b9f 100644
--- a/src/contrib/blur-console/blur-agent/pom.xml
+++ b/src/contrib/blur-console/blur-agent/pom.xml
@@ -1,11 +1,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.nearinfinity</groupId>
-	<artifactId>blur-agent</artifactId>
+	<groupId>org.apache.blur</groupId>
+	<artifactId>agent</artifactId>
 	<packaging>jar</packaging>
-	<version>1.4.2</version>
-	<name>blur-agent</name>
+	<version>1.5</version>
+	<name>agent</name>
 	<url>http://maven.apache.org</url>
 
 	<dependencies>
@@ -52,14 +52,14 @@
 			<version>5.1.16</version>
 		</dependency>
 		<dependency>
-			<groupId>com.nearinfinity.blur</groupId>
+			<groupId>org.apache.blur</groupId>
 			<artifactId>blur-thrift</artifactId>
-			<version>0.1.3</version>
+			<version>0.1.5</version>
 		</dependency>
 		<dependency>
-			<groupId>com.nearinfinity.blur</groupId>
+			<groupId>org.apache.blur</groupId>
 			<artifactId>blur-util</artifactId>
-			<version>0.1.3</version>
+			<version>0.1.5</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.thrift</groupId>
@@ -118,28 +118,22 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>com.nearinfinity.blur</groupId>
+			<groupId>org.apache.blur</groupId>
 			<artifactId>blur-core</artifactId>
-			<version>0.1.3</version>
+			<version>0.1.5</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>com.nearinfinity.blur</groupId>
+			<groupId>org.apache.blur</groupId>
 			<artifactId>blur-core</artifactId>
-			<version>0.1.3</version>
+			<version>0.1.5</version>
 			<type>test-jar</type>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>com.nearinfinity.blur</groupId>
+			<groupId>org.apache.blur</groupId>
 			<artifactId>blur-store</artifactId>
-			<version>0.1.3</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.hadoop</groupId>
-			<artifactId>hadoop-test</artifactId>
-			<version>0.20.2-cdh3u2</version>
+			<version>0.1.5</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -162,10 +156,6 @@
 			<id>libdir</id>
 			<url>file://${basedir}/lib</url>
 		</repository>
-		<repository>
-			<id>cloudera</id>
-			<url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
-		</repository>
 	</repositories>
 
 	<build>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/620abf38/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/BlurCollector.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/BlurCollector.java
b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/BlurCollector.java
index f60aefd..8f612dc 100644
--- a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/BlurCollector.java
+++ b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/BlurCollector.java
@@ -3,6 +3,8 @@ package com.nearinfinity.agent.collectors.blur;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.blur.thrift.BlurClient;
+import org.apache.blur.thrift.generated.Blur.Iface;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -14,8 +16,6 @@ import com.nearinfinity.agent.collectors.blur.table.TableCollector;
 import com.nearinfinity.agent.connections.blur.interfaces.BlurDatabaseInterface;
 import com.nearinfinity.agent.exceptions.ZookeeperNameCollisionException;
 import com.nearinfinity.agent.exceptions.ZookeeperNameMissingException;
-import com.nearinfinity.blur.thrift.BlurClient;
-import com.nearinfinity.blur.thrift.generated.Blur.Iface;
 
 public class BlurCollector implements Runnable {
 	private static final Log log = LogFactory.getLog(BlurCollector.class);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/620abf38/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/query/QueryCollector.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/query/QueryCollector.java
b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/query/QueryCollector.java
index dc7cd48..72a36d4 100644
--- a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/query/QueryCollector.java
+++ b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/query/QueryCollector.java
@@ -5,6 +5,9 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.blur.thrift.generated.Blur.Iface;
+import org.apache.blur.thrift.generated.BlurQueryStatus;
+import org.apache.blur.thrift.generated.SimpleQuery;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -12,9 +15,6 @@ import org.codehaus.jackson.map.ObjectMapper;
 
 import com.nearinfinity.agent.connections.blur.interfaces.QueryDatabaseInterface;
 import com.nearinfinity.agent.types.TimeHelper;
-import com.nearinfinity.blur.thrift.generated.Blur.Iface;
-import com.nearinfinity.blur.thrift.generated.BlurQueryStatus;
-import com.nearinfinity.blur.thrift.generated.SimpleQuery;
 
 public class QueryCollector implements Runnable {
 	private static final Log log = LogFactory.getLog(QueryCollector.class);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/620abf38/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/SchemaCollector.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/SchemaCollector.java
b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/SchemaCollector.java
index 029b472..1b15ea8 100644
--- a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/SchemaCollector.java
+++ b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/SchemaCollector.java
@@ -5,6 +5,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.blur.thrift.generated.AnalyzerDefinition;
+import org.apache.blur.thrift.generated.Blur.Iface;
+import org.apache.blur.thrift.generated.BlurException;
+import org.apache.blur.thrift.generated.ColumnDefinition;
+import org.apache.blur.thrift.generated.ColumnFamilyDefinition;
+import org.apache.blur.thrift.generated.Schema;
+import org.apache.blur.thrift.generated.TableDescriptor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.codehaus.jackson.JsonProcessingException;
@@ -15,13 +22,6 @@ import com.nearinfinity.agent.connections.blur.interfaces.TableDatabaseInterface
 import com.nearinfinity.agent.exceptions.NullReturnedException;
 import com.nearinfinity.agent.types.Column;
 import com.nearinfinity.agent.types.Family;
-import com.nearinfinity.blur.thrift.generated.AnalyzerDefinition;
-import com.nearinfinity.blur.thrift.generated.BlurException;
-import com.nearinfinity.blur.thrift.generated.ColumnDefinition;
-import com.nearinfinity.blur.thrift.generated.ColumnFamilyDefinition;
-import com.nearinfinity.blur.thrift.generated.Schema;
-import com.nearinfinity.blur.thrift.generated.TableDescriptor;
-import com.nearinfinity.blur.thrift.generated.Blur.Iface;
 
 public class SchemaCollector implements Runnable {
 	private static final Log log = LogFactory.getLog(SchemaCollector.class);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/620abf38/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/ServerCollector.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/ServerCollector.java
b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/ServerCollector.java
index 31c8fbc..c93433c 100644
--- a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/ServerCollector.java
+++ b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/ServerCollector.java
@@ -5,6 +5,8 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.blur.thrift.generated.Blur.Iface;
+import org.apache.blur.thrift.generated.BlurException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.codehaus.jackson.JsonProcessingException;
@@ -13,8 +15,6 @@ import org.springframework.dao.DataAccessException;
 
 import com.nearinfinity.agent.connections.blur.interfaces.TableDatabaseInterface;
 import com.nearinfinity.agent.exceptions.NullReturnedException;
-import com.nearinfinity.blur.thrift.generated.BlurException;
-import com.nearinfinity.blur.thrift.generated.Blur.Iface;
 
 public class ServerCollector implements Runnable {
 	private static final Log log = LogFactory.getLog(ServerCollector.class);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/620abf38/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/StatsCollector.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/StatsCollector.java
b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/StatsCollector.java
index 3b91f8f..a92ee99 100644
--- a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/StatsCollector.java
+++ b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/StatsCollector.java
@@ -1,14 +1,14 @@
 package com.nearinfinity.agent.collectors.blur.table;
 
+import org.apache.blur.thrift.generated.Blur.Iface;
+import org.apache.blur.thrift.generated.BlurException;
+import org.apache.blur.thrift.generated.TableStats;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.dao.DataAccessException;
 
 import com.nearinfinity.agent.connections.blur.interfaces.TableDatabaseInterface;
 import com.nearinfinity.agent.exceptions.NullReturnedException;
-import com.nearinfinity.blur.thrift.generated.BlurException;
-import com.nearinfinity.blur.thrift.generated.TableStats;
-import com.nearinfinity.blur.thrift.generated.Blur.Iface;
 
 public class StatsCollector implements Runnable {
 	private static final Log log = LogFactory.getLog(StatsCollector.class);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/620abf38/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/TableCollector.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/TableCollector.java
b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/TableCollector.java
index 606092a..f064016 100644
--- a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/TableCollector.java
+++ b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/blur/table/TableCollector.java
@@ -1,11 +1,11 @@
 package com.nearinfinity.agent.collectors.blur.table;
 
+import org.apache.blur.thrift.generated.Blur.Iface;
+import org.apache.blur.thrift.generated.TableDescriptor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import com.nearinfinity.agent.connections.blur.interfaces.TableDatabaseInterface;
-import com.nearinfinity.blur.thrift.generated.Blur.Iface;
-import com.nearinfinity.blur.thrift.generated.TableDescriptor;
 
 public class TableCollector implements Runnable {
 	private static final Log log = LogFactory.getLog(TableCollector.class);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/620abf38/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/hdfs/HdfsStatsCollector.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/hdfs/HdfsStatsCollector.java
b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/hdfs/HdfsStatsCollector.java
index faa5eb3..1e2558a 100644
--- a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/hdfs/HdfsStatsCollector.java
+++ b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/collectors/hdfs/HdfsStatsCollector.java
@@ -2,11 +2,11 @@ package com.nearinfinity.agent.collectors.hdfs;
 
 import java.io.IOException;
 import java.net.URI;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.FsStatus;
 import org.apache.hadoop.hdfs.DistributedFileSystem;
 import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
 import org.apache.hadoop.hdfs.protocol.FSConstants.DatanodeReportType;
@@ -52,11 +52,12 @@ public class HdfsStatsCollector implements Runnable {
 			if (fileSystem instanceof DistributedFileSystem) {
 				DistributedFileSystem dfs = (DistributedFileSystem) fileSystem;
 
-				FsStatus ds = dfs.getStatus();
-				long capacity = ds.getCapacity();
-				long used = ds.getUsed();
+				// TODO: Need to figure out how to do hadoop version check for this information.
+				//FsStatus ds = dfs.getStatus();
+				long capacity = -1;//ds.getCapacity();
+				long used = -1;//ds.getUsed();
 				long logical_used = used / dfs.getDefaultReplication();
-				long remaining = ds.getRemaining();
+				long remaining = -1; //ds.getRemaining();
 				long presentCapacity = used + remaining;
 
 				long liveNodes = -1;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/620abf38/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/connections/blur/BlurDatabaseConnection.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/connections/blur/BlurDatabaseConnection.java
b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/connections/blur/BlurDatabaseConnection.java
index 311fba2..191ee4e 100644
--- a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/connections/blur/BlurDatabaseConnection.java
+++ b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/connections/blur/BlurDatabaseConnection.java
@@ -5,6 +5,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.blur.thrift.generated.BlurQueryStatus;
+import org.apache.blur.thrift.generated.SimpleQuery;
 import org.apache.commons.lang.StringUtils;
 import org.json.simple.JSONValue;
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
@@ -16,8 +18,6 @@ import com.nearinfinity.agent.exceptions.TableMissingException;
 import com.nearinfinity.agent.exceptions.ZookeeperNameCollisionException;
 import com.nearinfinity.agent.exceptions.ZookeeperNameMissingException;
 import com.nearinfinity.agent.types.TimeHelper;
-import com.nearinfinity.blur.thrift.generated.BlurQueryStatus;
-import com.nearinfinity.blur.thrift.generated.SimpleQuery;
 
 public class BlurDatabaseConnection implements BlurDatabaseInterface {
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/620abf38/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/connections/blur/interfaces/QueryDatabaseInterface.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/connections/blur/interfaces/QueryDatabaseInterface.java
b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/connections/blur/interfaces/QueryDatabaseInterface.java
index e9436b1..7a16182 100644
--- a/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/connections/blur/interfaces/QueryDatabaseInterface.java
+++ b/src/contrib/blur-console/blur-agent/src/main/java/com/nearinfinity/agent/connections/blur/interfaces/QueryDatabaseInterface.java
@@ -5,8 +5,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import com.nearinfinity.blur.thrift.generated.BlurQueryStatus;
-import com.nearinfinity.blur.thrift.generated.SimpleQuery;
+import org.apache.blur.thrift.generated.BlurQueryStatus;
+import org.apache.blur.thrift.generated.SimpleQuery;
 
 public interface QueryDatabaseInterface {
 	Map<String, Object> getQuery(int tableId, long UUID);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/620abf38/src/contrib/blur-console/blur-agent/src/test/java/com/nearinfinity/BlurAgentBaseTestClass.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/test/java/com/nearinfinity/BlurAgentBaseTestClass.java
b/src/contrib/blur-console/blur-agent/src/test/java/com/nearinfinity/BlurAgentBaseTestClass.java
index 21f90c2..8095e49 100644
--- a/src/contrib/blur-console/blur-agent/src/test/java/com/nearinfinity/BlurAgentBaseTestClass.java
+++ b/src/contrib/blur-console/blur-agent/src/test/java/com/nearinfinity/BlurAgentBaseTestClass.java
@@ -1,8 +1,8 @@
 package com.nearinfinity;
 
+import org.apache.blur.MiniCluster;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import com.nearinfinity.blur.MiniCluster;
 
 public abstract class BlurAgentBaseTestClass extends AgentBaseTestClass {
 	@BeforeClass

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/620abf38/src/contrib/blur-console/blur-agent/src/test/java/com/nearinfinity/agent/collectors/blur/query/QueryCollectorTest.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/test/java/com/nearinfinity/agent/collectors/blur/query/QueryCollectorTest.java
b/src/contrib/blur-console/blur-agent/src/test/java/com/nearinfinity/agent/collectors/blur/query/QueryCollectorTest.java
index 64e3ca5..f94fdad 100644
--- a/src/contrib/blur-console/blur-agent/src/test/java/com/nearinfinity/agent/collectors/blur/query/QueryCollectorTest.java
+++ b/src/contrib/blur-console/blur-agent/src/test/java/com/nearinfinity/agent/collectors/blur/query/QueryCollectorTest.java
@@ -5,18 +5,18 @@ import static org.junit.Assert.fail;
 
 import java.io.IOException;
 
+import org.apache.blur.MiniCluster;
+import org.apache.blur.thrift.BlurClient;
+import org.apache.blur.thrift.generated.AnalyzerDefinition;
+import org.apache.blur.thrift.generated.Blur.Iface;
+import org.apache.blur.thrift.generated.BlurException;
+import org.apache.blur.thrift.generated.BlurQuery;
+import org.apache.blur.thrift.generated.TableDescriptor;
 import org.apache.thrift.TException;
 import org.junit.Test;
 
 import com.nearinfinity.BlurAgentBaseTestClass;
 import com.nearinfinity.agent.connections.blur.BlurDatabaseConnection;
-import com.nearinfinity.blur.MiniCluster;
-import com.nearinfinity.blur.thrift.BlurClient;
-import com.nearinfinity.blur.thrift.generated.AnalyzerDefinition;
-import com.nearinfinity.blur.thrift.generated.Blur.Iface;
-import com.nearinfinity.blur.thrift.generated.BlurException;
-import com.nearinfinity.blur.thrift.generated.BlurQuery;
-import com.nearinfinity.blur.thrift.generated.TableDescriptor;
 
 public class QueryCollectorTest extends BlurAgentBaseTestClass {
 	private static BlurDatabaseConnection database = new BlurDatabaseConnection(jdbc);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/620abf38/src/contrib/blur-console/blur-agent/src/test/java/com/nearinfinity/agent/collectors/hdfs/HdfsCollectorTest.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/test/java/com/nearinfinity/agent/collectors/hdfs/HdfsCollectorTest.java
b/src/contrib/blur-console/blur-agent/src/test/java/com/nearinfinity/agent/collectors/hdfs/HdfsCollectorTest.java
index 041fbb3..a62de5f 100644
--- a/src/contrib/blur-console/blur-agent/src/test/java/com/nearinfinity/agent/collectors/hdfs/HdfsCollectorTest.java
+++ b/src/contrib/blur-console/blur-agent/src/test/java/com/nearinfinity/agent/collectors/hdfs/HdfsCollectorTest.java
@@ -1,11 +1,13 @@
 package com.nearinfinity.agent.collectors.hdfs;
 
 import static org.junit.Assert.assertEquals;
+
 import java.io.IOException;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.blur.MiniCluster;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -13,7 +15,6 @@ import com.nearinfinity.BlurAgentBaseTestClass;
 import com.nearinfinity.agent.connections.hdfs.HdfsDatabaseConnection;
 import com.nearinfinity.agent.connections.hdfs.interfaces.HdfsDatabaseInterface;
 import com.nearinfinity.agent.exceptions.HdfsThreadException;
-import com.nearinfinity.blur.MiniCluster;
 
 public class HdfsCollectorTest extends BlurAgentBaseTestClass {
 	private static HdfsDatabaseInterface database = new HdfsDatabaseConnection(jdbc);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/620abf38/src/contrib/blur-console/blur-agent/src/test/java/com/nearinfinity/agent/collectors/hdfs/HdfsStatCollectorTest.java
----------------------------------------------------------------------
diff --git a/src/contrib/blur-console/blur-agent/src/test/java/com/nearinfinity/agent/collectors/hdfs/HdfsStatCollectorTest.java
b/src/contrib/blur-console/blur-agent/src/test/java/com/nearinfinity/agent/collectors/hdfs/HdfsStatCollectorTest.java
index 035ec17..cc67fc2 100644
--- a/src/contrib/blur-console/blur-agent/src/test/java/com/nearinfinity/agent/collectors/hdfs/HdfsStatCollectorTest.java
+++ b/src/contrib/blur-console/blur-agent/src/test/java/com/nearinfinity/agent/collectors/hdfs/HdfsStatCollectorTest.java
@@ -6,13 +6,13 @@ import static org.junit.Assert.fail;
 import java.io.IOException;
 import java.net.URI;
 
+import org.apache.blur.MiniCluster;
 import org.junit.Before;
 import org.junit.Test;
 
 import com.nearinfinity.BlurAgentBaseTestClass;
 import com.nearinfinity.agent.connections.hdfs.HdfsDatabaseConnection;
 import com.nearinfinity.agent.connections.hdfs.interfaces.HdfsDatabaseInterface;
-import com.nearinfinity.blur.MiniCluster;
 
 public class HdfsStatCollectorTest extends BlurAgentBaseTestClass {
 	private static HdfsDatabaseInterface database = new HdfsDatabaseConnection(jdbc);


Mime
View raw message