Repository: incubator-blur Updated Branches: refs/heads/master 89e415622 -> 4052727b3
Package rename. Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/4052727b Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/4052727b Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/4052727b Branch: refs/heads/master Commit: 4052727b37fc93d569140f242261718dfd2fd1ee Parents: 89e4156 Author: Aaron McCurry <[email protected]> Authored: Fri Aug 29 07:51:51 2014 -0400 Committer: Aaron McCurry <[email protected]> Committed: Fri Aug 29 07:51:51 2014 -0400 ---------------------------------------------------------------------- .../manager/command/BaseCommandManager.java | 6 +- .../command/ControllerCommandManager.java | 2 +- .../manager/command/ShardCommandManager.java | 2 +- .../blur/manager/command/cmds/BaseCommand.java | 35 +++++++++++ .../manager/command/cmds/DocumentCount.java | 39 ++++++++++++ .../command/cmds/DocumentCountAggregator.java | 65 ++++++++++++++++++++ .../manager/command/primitive/BaseCommand.java | 35 ----------- .../command/primitive/DocumentCount.java | 39 ------------ .../primitive/DocumentCountAggregator.java | 65 -------------------- 9 files changed, 144 insertions(+), 144 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/4052727b/blur-core/src/main/java/org/apache/blur/manager/command/BaseCommandManager.java ---------------------------------------------------------------------- diff --git a/blur-core/src/main/java/org/apache/blur/manager/command/BaseCommandManager.java b/blur-core/src/main/java/org/apache/blur/manager/command/BaseCommandManager.java index c2183b6..26f20f9 100644 --- a/blur-core/src/main/java/org/apache/blur/manager/command/BaseCommandManager.java +++ b/blur-core/src/main/java/org/apache/blur/manager/command/BaseCommandManager.java @@ -7,9 +7,9 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; import org.apache.blur.concurrent.Executors; -import org.apache.blur.manager.command.primitive.BaseCommand; -import org.apache.blur.manager.command.primitive.DocumentCount; -import org.apache.blur.manager.command.primitive.DocumentCountAggregator; +import org.apache.blur.manager.command.cmds.BaseCommand; +import org.apache.blur.manager.command.cmds.DocumentCount; +import org.apache.blur.manager.command.cmds.DocumentCountAggregator; /** * Licensed to the Apache Software Foundation (ASF) under one or more http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/4052727b/blur-core/src/main/java/org/apache/blur/manager/command/ControllerCommandManager.java ---------------------------------------------------------------------- diff --git a/blur-core/src/main/java/org/apache/blur/manager/command/ControllerCommandManager.java b/blur-core/src/main/java/org/apache/blur/manager/command/ControllerCommandManager.java index 8f93445..29609ca 100644 --- a/blur-core/src/main/java/org/apache/blur/manager/command/ControllerCommandManager.java +++ b/blur-core/src/main/java/org/apache/blur/manager/command/ControllerCommandManager.java @@ -3,7 +3,7 @@ package org.apache.blur.manager.command; import java.io.IOException; import java.util.Map; -import org.apache.blur.manager.command.primitive.BaseCommand; +import org.apache.blur.manager.command.cmds.BaseCommand; import org.apache.blur.server.TableContext; /** http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/4052727b/blur-core/src/main/java/org/apache/blur/manager/command/ShardCommandManager.java ---------------------------------------------------------------------- diff --git a/blur-core/src/main/java/org/apache/blur/manager/command/ShardCommandManager.java b/blur-core/src/main/java/org/apache/blur/manager/command/ShardCommandManager.java index 573fde9..b266aea 100644 --- a/blur-core/src/main/java/org/apache/blur/manager/command/ShardCommandManager.java +++ b/blur-core/src/main/java/org/apache/blur/manager/command/ShardCommandManager.java @@ -25,7 +25,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import org.apache.blur.manager.IndexServer; -import org.apache.blur.manager.command.primitive.BaseCommand; +import org.apache.blur.manager.command.cmds.BaseCommand; import org.apache.blur.manager.writer.BlurIndex; import org.apache.blur.server.IndexSearcherClosable; import org.apache.blur.server.TableContext; http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/4052727b/blur-core/src/main/java/org/apache/blur/manager/command/cmds/BaseCommand.java ---------------------------------------------------------------------- diff --git a/blur-core/src/main/java/org/apache/blur/manager/command/cmds/BaseCommand.java b/blur-core/src/main/java/org/apache/blur/manager/command/cmds/BaseCommand.java new file mode 100644 index 0000000..8c227d8 --- /dev/null +++ b/blur-core/src/main/java/org/apache/blur/manager/command/cmds/BaseCommand.java @@ -0,0 +1,35 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.blur.manager.command.cmds; + +import java.io.Serializable; + +@SuppressWarnings("serial") +public abstract class BaseCommand implements Serializable, Cloneable { + + public abstract String getName(); + + @Override + public BaseCommand clone() { + try { + return (BaseCommand) super.clone(); + } catch (CloneNotSupportedException e) { + throw new RuntimeException(e); + } + } + +} http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/4052727b/blur-core/src/main/java/org/apache/blur/manager/command/cmds/DocumentCount.java ---------------------------------------------------------------------- diff --git a/blur-core/src/main/java/org/apache/blur/manager/command/cmds/DocumentCount.java b/blur-core/src/main/java/org/apache/blur/manager/command/cmds/DocumentCount.java new file mode 100644 index 0000000..48357e1 --- /dev/null +++ b/blur-core/src/main/java/org/apache/blur/manager/command/cmds/DocumentCount.java @@ -0,0 +1,39 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.blur.manager.command.cmds; + +import java.io.IOException; + +import org.apache.blur.manager.command.IndexContext; +import org.apache.blur.manager.command.IndexReadCommand; + +@SuppressWarnings("serial") +public class DocumentCount extends BaseCommand implements IndexReadCommand<Integer> { + + private static final String DOC_COUNT = "docCount"; + + @Override + public String getName() { + return DOC_COUNT; + } + + @Override + public Integer execute(IndexContext context) throws IOException { + return context.getIndexReader().numDocs(); + } + +} http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/4052727b/blur-core/src/main/java/org/apache/blur/manager/command/cmds/DocumentCountAggregator.java ---------------------------------------------------------------------- diff --git a/blur-core/src/main/java/org/apache/blur/manager/command/cmds/DocumentCountAggregator.java b/blur-core/src/main/java/org/apache/blur/manager/command/cmds/DocumentCountAggregator.java new file mode 100644 index 0000000..2a7c17b --- /dev/null +++ b/blur-core/src/main/java/org/apache/blur/manager/command/cmds/DocumentCountAggregator.java @@ -0,0 +1,65 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.blur.manager.command.cmds; + +import java.io.IOException; +import java.util.Map; +import java.util.Map.Entry; + +import org.apache.blur.manager.command.ClusterCommand; +import org.apache.blur.manager.command.ClusterContext; +import org.apache.blur.manager.command.IndexContext; +import org.apache.blur.manager.command.IndexReadCombiningCommand; +import org.apache.blur.manager.command.Server; +import org.apache.blur.manager.command.Shard; + +@SuppressWarnings("serial") +public class DocumentCountAggregator extends BaseCommand implements ClusterCommand<Long>, + IndexReadCombiningCommand<Integer, Long> { + + private static final String DOC_COUNT_AGGREGATE = "docCountAggregate"; + + @Override + public String getName() { + return DOC_COUNT_AGGREGATE; + } + + @Override + public Integer execute(IndexContext context) throws IOException { + return context.getIndexReader().numDocs(); + } + + @Override + public Long combine(Map<Shard, Integer> results) throws IOException { + long total = 0; + for (Integer i : results.values()) { + total += i; + } + return total; + } + + @Override + public Long clusterExecute(ClusterContext context) { + Map<Server, Long> results = context.readServers(null, DocumentCountAggregator.class); + long total = 0; + for (Entry<Server, Long> e : results.entrySet()) { + total += e.getValue(); + } + return total; + } + +} http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/4052727b/blur-core/src/main/java/org/apache/blur/manager/command/primitive/BaseCommand.java ---------------------------------------------------------------------- diff --git a/blur-core/src/main/java/org/apache/blur/manager/command/primitive/BaseCommand.java b/blur-core/src/main/java/org/apache/blur/manager/command/primitive/BaseCommand.java deleted file mode 100644 index 3cb19ab..0000000 --- a/blur-core/src/main/java/org/apache/blur/manager/command/primitive/BaseCommand.java +++ /dev/null @@ -1,35 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.blur.manager.command.primitive; - -import java.io.Serializable; - -@SuppressWarnings("serial") -public abstract class BaseCommand implements Serializable, Cloneable { - - public abstract String getName(); - - @Override - public BaseCommand clone() { - try { - return (BaseCommand) super.clone(); - } catch (CloneNotSupportedException e) { - throw new RuntimeException(e); - } - } - -} http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/4052727b/blur-core/src/main/java/org/apache/blur/manager/command/primitive/DocumentCount.java ---------------------------------------------------------------------- diff --git a/blur-core/src/main/java/org/apache/blur/manager/command/primitive/DocumentCount.java b/blur-core/src/main/java/org/apache/blur/manager/command/primitive/DocumentCount.java deleted file mode 100644 index f1cd904..0000000 --- a/blur-core/src/main/java/org/apache/blur/manager/command/primitive/DocumentCount.java +++ /dev/null @@ -1,39 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.blur.manager.command.primitive; - -import java.io.IOException; - -import org.apache.blur.manager.command.IndexContext; -import org.apache.blur.manager.command.IndexReadCommand; - -@SuppressWarnings("serial") -public class DocumentCount extends BaseCommand implements IndexReadCommand<Integer> { - - private static final String DOC_COUNT = "docCount"; - - @Override - public String getName() { - return DOC_COUNT; - } - - @Override - public Integer execute(IndexContext context) throws IOException { - return context.getIndexReader().numDocs(); - } - -} http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/4052727b/blur-core/src/main/java/org/apache/blur/manager/command/primitive/DocumentCountAggregator.java ---------------------------------------------------------------------- diff --git a/blur-core/src/main/java/org/apache/blur/manager/command/primitive/DocumentCountAggregator.java b/blur-core/src/main/java/org/apache/blur/manager/command/primitive/DocumentCountAggregator.java deleted file mode 100644 index 5739f1b..0000000 --- a/blur-core/src/main/java/org/apache/blur/manager/command/primitive/DocumentCountAggregator.java +++ /dev/null @@ -1,65 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.blur.manager.command.primitive; - -import java.io.IOException; -import java.util.Map; -import java.util.Map.Entry; - -import org.apache.blur.manager.command.ClusterCommand; -import org.apache.blur.manager.command.ClusterContext; -import org.apache.blur.manager.command.IndexContext; -import org.apache.blur.manager.command.IndexReadCombiningCommand; -import org.apache.blur.manager.command.Server; -import org.apache.blur.manager.command.Shard; - -@SuppressWarnings("serial") -public class DocumentCountAggregator extends BaseCommand implements ClusterCommand<Long>, - IndexReadCombiningCommand<Integer, Long> { - - private static final String DOC_COUNT_AGGREGATE = "docCountAggregate"; - - @Override - public String getName() { - return DOC_COUNT_AGGREGATE; - } - - @Override - public Integer execute(IndexContext context) throws IOException { - return context.getIndexReader().numDocs(); - } - - @Override - public Long combine(Map<Shard, Integer> results) throws IOException { - long total = 0; - for (Integer i : results.values()) { - total += i; - } - return total; - } - - @Override - public Long clusterExecute(ClusterContext context) { - Map<Server, Long> results = context.readServers(null, DocumentCountAggregator.class); - long total = 0; - for (Entry<Server, Long> e : results.entrySet()) { - total += e.getValue(); - } - return total; - } - -}
