Merge branch 'upgrade_console_to_0.2'
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/04d127ee Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/04d127ee Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/04d127ee Branch: refs/heads/master Commit: 04d127eea68fc0c6ea056555968720afcebcc77a Parents: 5ea9c30 9b82f66 Author: Chris Rohr <[email protected]> Authored: Tue Sep 3 20:05:47 2013 -0400 Committer: Chris Rohr <[email protected]> Committed: Tue Sep 3 20:05:47 2013 -0400 ---------------------------------------------------------------------- contrib/blur-console/blur-admin/Rakefile | 2 +- ...031155_change_blur_queries_uuid_to_string.rb | 9 +++ contrib/blur-console/blur-admin/db/schema.rb | 19 +---- contrib/blur-console/blur-agent/pom.xml | 14 ++-- .../collectors/blur/query/QueryCollector.java | 8 +-- .../collectors/blur/table/SchemaCollector.java | 76 +++----------------- .../collectors/blur/table/StatsCollector.java | 5 +- .../collectors/blur/table/TableCollector.java | 2 +- .../collectors/hdfs/HdfsStatsCollector.java | 6 +- .../blur/BlurDatabaseConnection.java | 20 +++--- .../blur/interfaces/QueryDatabaseInterface.java | 6 +- .../blur/interfaces/TableDatabaseInterface.java | 3 +- .../blur/query/QueryCollectorTest.java | 12 ++-- 13 files changed, 59 insertions(+), 123 deletions(-) ----------------------------------------------------------------------
