[39/39] git commit: Merge branch 'master' into 0.2.0-newtypesystem

[amccurry]

Merge branch 'master' into 0.2.0-newtypesystem

Conflicts:
        
blur-core/src/test/java/org/apache/blur/manager/writer/BlurIndexReaderTest.java


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

Branch: refs/heads/0.2.0-newtypesystem
Commit: 430c6ac3b4c934eb14b5cf6da2f198dee2a22a61
Parents: 015c681 05bb056
Author: Aaron McCurry <amccu...@gmail.com>
Authored: Mon Aug 12 11:16:12 2013 -0400
Committer: Aaron McCurry <amccu...@gmail.com>
Committed: Mon Aug 12 11:16:12 2013 -0400

----------------------------------------------------------------------
 .../java/org/apache/blur/utils/BlurUtil.java    | 81 +++++++++++---------
 .../manager/writer/BlurIndexReaderTest.java     | 11 ++-
 .../apache/blur/thrift/generated/Selector.java  |  4 +-
 .../apache/blur/thrift/generated/Selector.java  |  4 +-
 4 files changed, 56 insertions(+), 44 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/430c6ac3/blur-core/src/test/java/org/apache/blur/manager/writer/BlurIndexReaderTest.java
----------------------------------------------------------------------
diff --cc 
blur-core/src/test/java/org/apache/blur/manager/writer/BlurIndexReaderTest.java
index 97d872b,bda57d5..a04c300
--- 
a/blur-core/src/test/java/org/apache/blur/manager/writer/BlurIndexReaderTest.java
+++ 
b/blur-core/src/test/java/org/apache/blur/manager/writer/BlurIndexReaderTest.java
@@@ -79,10 -82,13 +81,11 @@@ public class BlurIndexReaderTest 
  
    }
  
-   private void setupWriter(Configuration configuration, long refresh) throws 
IOException {
+   private void setupWriter(Configuration configuration, long refresh) throws 
IOException, URISyntaxException {
+     String tableUri = new File(base, "table-store-" + 
UUID.randomUUID().toString()).toURI().toString();
 -    System.out.println("TableURI " + tableUri);
      TableDescriptor tableDescriptor = new TableDescriptor();
      tableDescriptor.setName("test-table");
-     tableDescriptor.setTableUri(new File(base, "table-store-" + 
UUID.randomUUID().toString()).toURI().toString());
+     tableDescriptor.setTableUri(tableUri);
 -    tableDescriptor.setAnalyzerDefinition(new AnalyzerDefinition());
      tableDescriptor.putToTableProperties("blur.shard.time.between.refreshs", 
Long.toString(refresh));
      tableDescriptor.putToTableProperties("blur.shard.time.between.commits", 
Long.toString(1000));