Merge branch 'apache-blur-0.2' of https://git-wip-us.apache.org/repos/asf/incubator-blur into apache-blur-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/885604e3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/885604e3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/885604e3 Branch: refs/heads/apache-blur-0.2 Commit: 885604e3b13c7ee794cd0e6be4b771c1126c7f16 Parents: 8bf8013 2b8f22c Author: twilliams <[email protected]> Authored: Mon Mar 3 18:49:06 2014 -0500 Committer: twilliams <[email protected]> Committed: Mon Mar 3 18:49:06 2014 -0500 ---------------------------------------------------------------------- .../blur/manager/writer/IndexImporter.java | 218 +++++++++++++------ .../blur/utils/TableShardCountCollapser.java | 5 +- .../blur/manager/writer/IndexImporterTest.java | 79 +++++-- .../lib/BlurOutputFormatMiniClusterTest.java | 2 +- .../apache/blur/store/hdfs/HdfsDirectory.java | 142 ++++++++---- .../apache/blur/store/hdfs/HdfsQuickMove.java | 23 -- .../org/apache/blur/store/hdfs/HdfsSymlink.java | 23 ++ .../blur/store/hdfs/SoftlinkHdfsDirectory.java | 201 ----------------- .../hdfs_v2/FastHdfsKeyValueDirectory.java | 21 +- .../blur/store/hdfs_v2/JoinDirectory.java | 6 +- .../store/SoftlinkHdfsDirectoryTestSuite.java | 49 ----- .../store/hdfs/HdfsDirectorySymlinkTest.java | 124 +++++++++++ .../hdfs_v2/FastHdfsKeyValueDirectoryTest.java | 2 +- 13 files changed, 473 insertions(+), 422 deletions(-) ----------------------------------------------------------------------
