incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-blur
Date Tue, 30 Sep 2014 12:47:55 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-blur


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

Branch: refs/heads/master
Commit: 85743200d23d1c489e717d3bbd873a465f98fd66
Parents: 9f0af85 c99a0e1
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Tue Sep 30 08:47:28 2014 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Tue Sep 30 08:47:28 2014 -0400

----------------------------------------------------------------------
 blur-command/pom.xml                            |  7 ++
 .../blur/command/IntegrationTestSuite.java      | 76 ++++++++++++++++++++
 .../blur/command/TermsCommandIntTests.java      | 57 +++++++++++++++
 .../ClusterExecuteReadCombiningCommand.java     | 11 +++
 .../command/ClusterReadCombiningCommand.java    | 11 +++
 .../apache/blur/command/ClusterReadCommand.java | 12 ++++
 .../java/org/apache/blur/command/Command.java   |  3 +
 .../apache/blur/command/IndexReadCommand.java   | 11 +++
 8 files changed, 188 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/85743200/blur-core/src/main/java/org/apache/blur/command/Command.java
----------------------------------------------------------------------
diff --cc blur-core/src/main/java/org/apache/blur/command/Command.java
index e8fa29d,20d824a..44c341d
--- a/blur-core/src/main/java/org/apache/blur/command/Command.java
+++ b/blur-core/src/main/java/org/apache/blur/command/Command.java
@@@ -32,15 -32,9 +33,17 @@@ public abstract class Command<R> implem
    public abstract R run(Args arguments) throws IOException;
  
    public abstract R run(Args arguments, String connectionStr) throws IOException;
+   
+   public abstract R run(Args arguments, Iface client) throws IOException;
  
 +  public Set<Shard> resolveShards(BaseContext context) {
 +    return null;
 +  }
 +
 +  public Set<String> resolveTables(BaseContext context) {
 +    return null;
 +  }
 +
    @SuppressWarnings({ "unchecked", "rawtypes" })
    @Override
    public Command<R> clone() {


Mime
View raw message