incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [3/7] git commit: Merge branch '0.1.5' into 0.1.5-sessions
Date Wed, 22 May 2013 23:46:31 GMT
Merge branch '0.1.5' into 0.1.5-sessions


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

Branch: refs/heads/0.1.5
Commit: eee3a9c8d35feff0e51ee6d3cf1ca7d121d2dfe9
Parents: aa49cf4 d61255c
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Wed May 22 10:10:14 2013 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Wed May 22 10:10:14 2013 -0400

----------------------------------------------------------------------
 .../blur/manager/writer/TransactionRecorder.java   |   16 +-
 .../main/java/org/apache/blur/gui/HeapMetrics.java |   86 -----
 .../org/apache/blur/gui/LiveMetricsServlet.java    |   19 +-
 .../java/org/apache/blur/gui/QueryMetrics.java     |  180 ----------
 .../org/apache/blur/gui/SystemLoadMetrics.java     |   72 ----
 src/blur-gui/src/main/webapp/footer.jsp            |    2 +-
 src/blur-gui/src/main/webapp/metrics.jsp           |  242 ++++++++------
 src/blur-gui/src/main/webapp/style.css             |   15 +
 .../blur/mapreduce/lib/BlurOutputFormat.java       |  134 +++++++-
 .../blur/mapreduce/lib/BlurOutputFormatTest.java   |    3 +
 .../blur/store/blockcache/BlockDirectory.java      |    2 +
 .../apache/blur/store/blockcache/LastModified.java |   30 ++
 .../blur/blur-core/0.1.3/blur-core-0.1.3-tests.jar |  Bin 75541 -> 0 bytes
 .../blur/blur-core/0.1.3/blur-core-0.1.3.jar       |  Bin 328261 -> 0 bytes
 .../blur/blur-core/0.1.3/blur-core-0.1.3.pom       |   79 -----
 .../blur/blur-store/0.1.3/blur-store-0.1.3.jar     |  Bin 79226 -> 0 bytes
 .../blur/blur-store/0.1.3/blur-store-0.1.3.pom     |  115 -------
 .../blur/blur-thrift/0.1.3/blur-thrift-0.1.3.jar   |  Bin 685308 -> 0 bytes
 .../blur/blur-thrift/0.1.3/blur-thrift-0.1.3.pom   |   73 ----
 .../blur/blur-util/0.1.3/blur-util-0.1.3.jar       |  Bin 49248 -> 0 bytes
 .../blur/blur-util/0.1.3/blur-util-0.1.3.pom       |  101 ------
 src/contrib/blur-console/blur-agent/pom.xml        |   48 ++--
 .../main/java/com/nearinfinity/agent/Agent.java    |  189 -----------
 .../nearinfinity/agent/cleaners/AgentCleaners.java |   39 ---
 .../agent/cleaners/HdfsStatsCleaner.java           |   28 --
 .../agent/cleaners/QueriesCleaner.java             |   32 --
 .../agent/collectors/blur/BlurCollector.java       |  119 -------
 .../collectors/blur/query/QueryCollector.java      |   89 -----
 .../collectors/blur/table/SchemaCollector.java     |  143 --------
 .../collectors/blur/table/ServerCollector.java     |   69 ----
 .../collectors/blur/table/StatsCollector.java      |   49 ---
 .../collectors/blur/table/TableCollector.java      |   50 ---
 .../agent/collectors/hdfs/HdfsCollector.java       |   62 ----
 .../agent/collectors/hdfs/HdfsStatsCollector.java  |   93 -----
 .../collectors/zookeeper/ClusterCollector.java     |   70 ----
 .../collectors/zookeeper/ControllerCollector.java  |   55 ---
 .../agent/collectors/zookeeper/ShardCollector.java |   56 ---
 .../agent/collectors/zookeeper/TableCollector.java |   50 ---
 .../collectors/zookeeper/ZookeeperCollector.java   |  145 --------
 .../agent/connections/JdbcConnection.java          |   26 --
 .../connections/blur/BlurDatabaseConnection.java   |  149 ---------
 .../blur/interfaces/BlurDatabaseInterface.java     |   21 --
 .../blur/interfaces/QueryDatabaseInterface.java    |   21 --
 .../blur/interfaces/TableDatabaseInterface.java    |   12 -
 .../cleaners/CleanerDatabaseConnection.java        |   43 ---
 .../interfaces/CleanerDatabaseInterface.java       |    5 -
 .../interfaces/HdfsDatabaseCleanerInterface.java   |    5 -
 .../interfaces/QueryDatabaseCleanerInterface.java  |    8 -
 .../connections/hdfs/HdfsDatabaseConnection.java   |   49 ---
 .../hdfs/interfaces/HdfsDatabaseInterface.java     |   15 -
 .../zookeeper/ZookeeperDatabaseConnection.java     |  162 ---------
 .../interfaces/ClusterDatabaseInterface.java       |    7 -
 .../interfaces/ControllerDatabaseInterface.java    |   12 -
 .../interfaces/ShardsDatabaseInterface.java        |   13 -
 .../interfaces/TableDatabaseInterface.java         |   11 -
 .../interfaces/ZookeeperDatabaseInterface.java     |   17 -
 .../agent/exceptions/CollisionException.java       |    8 -
 .../agent/exceptions/HdfsThreadException.java      |   12 -
 .../agent/exceptions/InvalidLicenseException.java  |   13 -
 .../agent/exceptions/MissingException.java         |    8 -
 .../agent/exceptions/NullReturnedException.java    |   12 -
 .../agent/exceptions/TableCollisionException.java  |    8 -
 .../agent/exceptions/TableMissingException.java    |    8 -
 .../ZookeeperNameCollisionException.java           |    8 -
 .../exceptions/ZookeeperNameMissingException.java  |    8 -
 .../agent/monitor/ThreadController.java            |   29 --
 .../notifications/AgentMailerAuthenticator.java    |   16 -
 .../nearinfinity/agent/notifications/Mailer.java   |   78 -----
 .../agent/notifications/Messenger.java             |   83 -----
 .../nearinfinity/agent/notifications/Notifier.java |   62 ----
 .../java/com/nearinfinity/agent/types/Column.java  |   73 ----
 .../java/com/nearinfinity/agent/types/Family.java  |   50 ---
 .../com/nearinfinity/agent/types/TimeHelper.java   |   25 --
 .../src/main/java/org/apache/blur/agent/Agent.java |  189 +++++++++++
 .../apache/blur/agent/cleaners/AgentCleaners.java  |   40 +++
 .../blur/agent/cleaners/HdfsStatsCleaner.java      |   28 ++
 .../apache/blur/agent/cleaners/QueriesCleaner.java |   32 ++
 .../blur/agent/collectors/blur/BlurCollector.java  |  119 +++++++
 .../collectors/blur/query/QueryCollector.java      |   89 +++++
 .../collectors/blur/table/SchemaCollector.java     |  143 ++++++++
 .../collectors/blur/table/ServerCollector.java     |   69 ++++
 .../collectors/blur/table/StatsCollector.java      |   49 +++
 .../collectors/blur/table/TableCollector.java      |   50 +++
 .../blur/agent/collectors/hdfs/HdfsCollector.java  |   63 ++++
 .../agent/collectors/hdfs/HdfsStatsCollector.java  |   94 ++++++
 .../collectors/zookeeper/ClusterCollector.java     |   71 ++++
 .../collectors/zookeeper/ControllerCollector.java  |   55 +++
 .../agent/collectors/zookeeper/ShardCollector.java |   56 +++
 .../agent/collectors/zookeeper/TableCollector.java |   50 +++
 .../collectors/zookeeper/ZookeeperCollector.java   |  145 ++++++++
 .../blur/agent/connections/JdbcConnection.java     |   26 ++
 .../connections/blur/BlurDatabaseConnection.java   |  149 +++++++++
 .../blur/interfaces/BlurDatabaseInterface.java     |   22 ++
 .../blur/interfaces/QueryDatabaseInterface.java    |   21 ++
 .../blur/interfaces/TableDatabaseInterface.java    |   12 +
 .../cleaners/CleanerDatabaseConnection.java        |   44 +++
 .../interfaces/CleanerDatabaseInterface.java       |    5 +
 .../interfaces/HdfsDatabaseCleanerInterface.java   |    5 +
 .../interfaces/QueryDatabaseCleanerInterface.java  |    8 +
 .../connections/hdfs/HdfsDatabaseConnection.java   |   49 +++
 .../hdfs/interfaces/HdfsDatabaseInterface.java     |   16 +
 .../zookeeper/ZookeeperDatabaseConnection.java     |  163 +++++++++
 .../interfaces/ClusterDatabaseInterface.java       |    7 +
 .../interfaces/ControllerDatabaseInterface.java    |   12 +
 .../interfaces/ShardsDatabaseInterface.java        |   13 +
 .../interfaces/TableDatabaseInterface.java         |   11 +
 .../interfaces/ZookeeperDatabaseInterface.java     |   17 +
 .../blur/agent/exceptions/CollisionException.java  |    8 +
 .../blur/agent/exceptions/HdfsThreadException.java |   12 +
 .../agent/exceptions/InvalidLicenseException.java  |   13 +
 .../blur/agent/exceptions/MissingException.java    |    8 +
 .../agent/exceptions/NullReturnedException.java    |   12 +
 .../agent/exceptions/TableCollisionException.java  |    8 +
 .../agent/exceptions/TableMissingException.java    |    8 +
 .../ZookeeperNameCollisionException.java           |    8 +
 .../exceptions/ZookeeperNameMissingException.java  |    8 +
 .../blur/agent/monitor/ThreadController.java       |   29 ++
 .../notifications/AgentMailerAuthenticator.java    |   16 +
 .../apache/blur/agent/notifications/Mailer.java    |   78 +++++
 .../apache/blur/agent/notifications/Messenger.java |   83 +++++
 .../apache/blur/agent/notifications/Notifier.java  |   62 ++++
 .../java/org/apache/blur/agent/types/Column.java   |   73 ++++
 .../java/org/apache/blur/agent/types/Family.java   |   50 +++
 .../org/apache/blur/agent/types/TimeHelper.java    |   25 ++
 .../java/com/nearinfinity/AgentBaseTestClass.java  |   46 ---
 .../com/nearinfinity/BlurAgentBaseTestClass.java   |   23 --
 .../agent/cleaners/AgentCleanerTest.java           |   75 -----
 .../agent/cleaners/HdfsStatsCleanerTest.java       |   51 ---
 .../agent/cleaners/QueryCleanerTest.java           |  104 ------
 .../collectors/blur/query/QueryCollectorTest.java  |   49 ---
 .../agent/collectors/hdfs/HdfsCollectorTest.java   |   66 ----
 .../collectors/hdfs/HdfsStatCollectorTest.java     |   54 ---
 .../agent/notifications/MailerTest.java            |  259 ---------------
 .../agent/notifications/MessengerTest.java         |  100 ------
 .../agent/notifications/NotifierTest.java          |    5 -
 .../agent/notifications/XMPPEmbeddedServer.java    |   95 ------
 .../blur/agent/cleaners/AgentCleanerTest.java      |   77 +++++
 .../blur/agent/cleaners/HdfsStatsCleanerTest.java  |   52 +++
 .../blur/agent/cleaners/QueryCleanerTest.java      |  105 ++++++
 .../collectors/blur/query/QueryCollectorTest.java  |   54 +++
 .../agent/collectors/hdfs/HdfsCollectorTest.java   |   68 ++++
 .../collectors/hdfs/HdfsStatCollectorTest.java     |   54 +++
 .../blur/agent/notifications/MailerTest.java       |  259 +++++++++++++++
 .../blur/agent/notifications/MessengerTest.java    |  102 ++++++
 .../blur/agent/notifications/NotifierTest.java     |    5 +
 .../agent/notifications/XMPPEmbeddedServer.java    |   95 ++++++
 .../apache/blur/agent/test/AgentBaseTestClass.java |   46 +++
 .../blur/agent/test/BlurAgentBaseTestClass.java    |   23 ++
 .../src/test/resources/invalid_matching.lic        |   22 --
 .../blur-agent/src/test/resources/invalid_type.lic |   22 --
 .../blur-agent/src/test/resources/valid_yearly.lic |   22 --
 151 files changed, 3717 insertions(+), 4271 deletions(-)
----------------------------------------------------------------------



Mime
View raw message