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: Starting to remove the table from the command platform arguments call.
Date Thu, 11 Sep 2014 12:12:02 GMT
Starting to remove the table from the command platform arguments call.


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

Branch: refs/heads/removing_table_from_args
Commit: 2c2e8702a195cfc21006eb17570d716f916b3389
Parents: 96145e1
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Thu Sep 11 08:11:20 2014 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Thu Sep 11 08:11:20 2014 -0400

----------------------------------------------------------------------
 .../org/apache/blur/command/ClusterContext.java |   5 +-
 .../blur/command/ControllerClusterContext.java  |   7 +-
 .../blur/command/ShardCommandManager.java       |  64 ++++++-
 .../org/apache/blur/command/ShardRoute.java     |  26 +++
 .../org/apache/blur/command/TableRoute.java     |  26 +++
 .../apache/blur/server/FilteredBlurServer.java  |   4 +-
 .../apache/blur/server/TableContextFactory.java |  26 +++
 .../blur/thrift/BlurControllerServer.java       |   4 +-
 .../org/apache/blur/thrift/BlurShardServer.java |   4 +-
 .../apache/blur/thrift/generated/Arguments.java |   4 +-
 .../org/apache/blur/thrift/generated/Blur.java  | 173 ++++---------------
 .../blur/thrift/generated/BlurQueryStatus.java  |   4 +-
 .../blur/thrift/generated/BlurResults.java      |   4 +-
 .../blur/thrift/generated/ColumnDefinition.java |   4 +-
 .../apache/blur/thrift/generated/Metric.java    |  12 +-
 .../apache/blur/thrift/generated/Response.java  |   8 +-
 .../blur/thrift/generated/SafeClientGen.java    |   8 +-
 .../apache/blur/thrift/generated/Schema.java    |   8 +-
 .../apache/blur/thrift/generated/Selector.java  |   4 +-
 .../blur/thrift/generated/TableDescriptor.java  |   8 +-
 .../org/apache/blur/thrift/generated/User.java  |   8 +-
 .../apache/blur/thrift/util/CommandExample.java |   2 +-
 .../src/main/scripts/interface/Blur.thrift      |   2 +-
 .../main/scripts/interface/gen-html/Blur.html   |   3 +-
 .../apache/blur/thrift/generated/Arguments.java |   4 +-
 .../org/apache/blur/thrift/generated/Blur.java  | 173 ++++---------------
 .../blur/thrift/generated/BlurQueryStatus.java  |   4 +-
 .../blur/thrift/generated/BlurResults.java      |   4 +-
 .../blur/thrift/generated/ColumnDefinition.java |   4 +-
 .../apache/blur/thrift/generated/Metric.java    |  12 +-
 .../apache/blur/thrift/generated/Response.java  |   8 +-
 .../apache/blur/thrift/generated/Schema.java    |   8 +-
 .../apache/blur/thrift/generated/Selector.java  |   4 +-
 .../blur/thrift/generated/TableDescriptor.java  |   8 +-
 .../org/apache/blur/thrift/generated/User.java  |   8 +-
 .../src/main/scripts/interface/gen-js/Blur.js   |  29 +---
 .../scripts/interface/gen-perl/Blur/Blur.pm     |  34 +---
 .../src/main/scripts/interface/gen-rb/blur.rb   |  16 +-
 docs/Blur.html                                  |   3 +-
 39 files changed, 310 insertions(+), 427 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/blur-core/src/main/java/org/apache/blur/command/ClusterContext.java
----------------------------------------------------------------------
diff --git a/blur-core/src/main/java/org/apache/blur/command/ClusterContext.java b/blur-core/src/main/java/org/apache/blur/command/ClusterContext.java
index ce9038b..10d0126 100644
--- a/blur-core/src/main/java/org/apache/blur/command/ClusterContext.java
+++ b/blur-core/src/main/java/org/apache/blur/command/ClusterContext.java
@@ -41,10 +41,9 @@ public abstract class ClusterContext {
   public abstract <T> Map<Shard, Future<T>> readIndexesAsync(Args args, Class<? extends IndexReadCommand<T>> clazz)
       throws IOException;
 
-  public abstract <T> T readIndex(Shard shard, Args args, Class<? extends IndexReadCommand<T>> clazz)
-      throws IOException;
+  public abstract <T> T readIndex(Args args, Class<? extends IndexReadCommand<T>> clazz) throws IOException;
 
-  public abstract <T> Future<T> readIndexAsync(Shard shard, Args args, Class<? extends IndexReadCommand<T>> clazz)
+  public abstract <T> Future<T> readIndexAsync(Args args, Class<? extends IndexReadCommand<T>> clazz)
       throws IOException;
 
   public abstract <T> Map<Server, T> readServers(Args args, Class<? extends IndexReadCombiningCommand<?, T>> clazz)

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/blur-core/src/main/java/org/apache/blur/command/ControllerClusterContext.java
----------------------------------------------------------------------
diff --git a/blur-core/src/main/java/org/apache/blur/command/ControllerClusterContext.java b/blur-core/src/main/java/org/apache/blur/command/ControllerClusterContext.java
index c14e8af..7a20f17 100644
--- a/blur-core/src/main/java/org/apache/blur/command/ControllerClusterContext.java
+++ b/blur-core/src/main/java/org/apache/blur/command/ControllerClusterContext.java
@@ -233,8 +233,8 @@ public class ControllerClusterContext extends ClusterContext implements Closeabl
   }
 
   @Override
-  public <T> T readIndex(Shard shard, Args args, Class<? extends IndexReadCommand<T>> clazz) throws IOException {
-    Future<T> future = readIndexAsync(shard, args, clazz);
+  public <T> T readIndex(Args args, Class<? extends IndexReadCommand<T>> clazz) throws IOException {
+    Future<T> future = readIndexAsync(args, clazz);
     try {
       return future.get();
     } catch (InterruptedException e) {
@@ -245,8 +245,7 @@ public class ControllerClusterContext extends ClusterContext implements Closeabl
   }
 
   @Override
-  public <T> Future<T> readIndexAsync(Shard shard, Args args, Class<? extends IndexReadCommand<T>> clazz)
-      throws IOException {
+  public <T> Future<T> readIndexAsync(Args args, Class<? extends IndexReadCommand<T>> clazz) throws IOException {
     throw new RuntimeException("Not Implemented.");
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/blur-core/src/main/java/org/apache/blur/command/ShardCommandManager.java
----------------------------------------------------------------------
diff --git a/blur-core/src/main/java/org/apache/blur/command/ShardCommandManager.java b/blur-core/src/main/java/org/apache/blur/command/ShardCommandManager.java
index eb6caf0..40d00a1 100644
--- a/blur-core/src/main/java/org/apache/blur/command/ShardCommandManager.java
+++ b/blur-core/src/main/java/org/apache/blur/command/ShardCommandManager.java
@@ -17,9 +17,13 @@
 package org.apache.blur.command;
 
 import java.io.IOException;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -30,6 +34,7 @@ import org.apache.blur.manager.writer.BlurIndex;
 import org.apache.blur.server.IndexSearcherClosable;
 import org.apache.blur.server.ShardServerContext;
 import org.apache.blur.server.TableContext;
+import org.apache.blur.server.TableContextFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.search.IndexSearcher;
@@ -43,7 +48,7 @@ public class ShardCommandManager extends BaseCommandManager {
     _indexServer = indexServer;
   }
 
-  public Response execute(final TableContext tableContext, final String commandName, final Args args)
+  public Response execute(final TableContextFactory tableContextFactory, final String commandName, final Args args)
       throws IOException, TimeoutException {
     final ShardServerContext shardServerContext = getShardServerContext();
     Callable<Response> callable = new Callable<Response>() {
@@ -54,7 +59,7 @@ public class ShardCommandManager extends BaseCommandManager {
           throw new IOException("Command with name [" + commandName + "] not found.");
         }
         if (command instanceof IndexReadCommand || command instanceof IndexReadCombiningCommand) {
-          return toResponse(executeReadCommand(shardServerContext, command, tableContext, args), command);
+          return toResponse(executeReadCommand(shardServerContext, command, tableContextFactory, args), command);
         }
         throw new IOException("Command type of [" + command.getClass() + "] not supported.");
       }
@@ -81,7 +86,13 @@ public class ShardCommandManager extends BaseCommandManager {
   }
 
   private Map<Shard, Object> executeReadCommand(ShardServerContext shardServerContext, Command command,
-      final TableContext tableContext, final Args args) throws IOException {
+      final TableContextFactory tableContextFactory, final Args args) throws IOException {
+    Set<String> tables = getTables(command, args);
+    if (tables.isEmpty()) {
+      throw new IOException("At least one table needs to specified.");
+    }
+    Map<String, Set<Shard>> shardMap = getShards(command, args, tables);
+    
     Map<String, BlurIndex> indexes = _indexServer.getIndexes(tableContext.getTable());
     Map<String, Future<?>> futureMap = new HashMap<String, Future<?>>();
     for (Entry<String, BlurIndex> e : indexes.entrySet()) {
@@ -117,6 +128,53 @@ public class ShardCommandManager extends BaseCommandManager {
     return resultMap;
   }
 
+  private Map<String, Set<Shard>> getShards(Command command, final Args args, Set<String> tables) throws IOException {
+    Map<String, Set<Shard>> shardMap = new TreeMap<String, Set<Shard>>();
+    if (command instanceof ShardRoute) {
+      ShardRoute shardRoute = (ShardRoute) command;
+      for (String table : tables) {
+        shardMap.put(table, shardRoute.resolveShards(table, args));
+      }
+    } else {
+      if (tables.size() > 1) {
+        throw new IOException(
+            "Cannot route to single shard when multiple tables are specified.  Implement ShardRoute on your command.");
+      }
+      Set<Shard> shardSet = new TreeSet<Shard>();
+      String shard = args.get("shard");
+      if (shard == null) {
+        BlurArray shardArray = args.get("shards");
+        for (int i = 0; i < shardArray.length(); i++) {
+          shardSet.add(new Shard(shardArray.getString(i)));
+        }
+      } else {
+        shardSet.add(new Shard(shard));
+      }
+      String singleTable = tables.iterator().next();
+      shardMap.put(singleTable, shardSet);
+    }
+    return shardMap;
+  }
+
+  private Set<String> getTables(Command command, final Args args) {
+    Set<String> tables = new TreeSet<String>();
+    if (command instanceof TableRoute) {
+      TableRoute tableRoute = (TableRoute) command;
+      tables.addAll(tableRoute.resolveTables(args));
+    } else {
+      String table = args.get("table");
+      if (table == null) {
+        BlurArray tableArray = args.get("tables");
+        for (int i = 0; i < tableArray.length(); i++) {
+          tables.add(tableArray.getString(i));
+        }
+      } else {
+        tables.add(table);
+      }
+    }
+    return tables;
+  }
+
   private Callable<Object> getCallable(final ShardServerContext shardServerContext, final TableContext tableContext,
       final Args args, final Shard shard, final BlurIndex blurIndex,
       final IndexReadCombiningCommand<?, ?> readCombiningCommand) {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/blur-core/src/main/java/org/apache/blur/command/ShardRoute.java
----------------------------------------------------------------------
diff --git a/blur-core/src/main/java/org/apache/blur/command/ShardRoute.java b/blur-core/src/main/java/org/apache/blur/command/ShardRoute.java
new file mode 100644
index 0000000..ce38b59
--- /dev/null
+++ b/blur-core/src/main/java/org/apache/blur/command/ShardRoute.java
@@ -0,0 +1,26 @@
+package org.apache.blur.command;
+
+import java.util.Set;
+
+/**
+ * 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.
+ */
+
+public interface ShardRoute {
+
+  Set<Shard> resolveShards(String table, Args args);
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/blur-core/src/main/java/org/apache/blur/command/TableRoute.java
----------------------------------------------------------------------
diff --git a/blur-core/src/main/java/org/apache/blur/command/TableRoute.java b/blur-core/src/main/java/org/apache/blur/command/TableRoute.java
new file mode 100644
index 0000000..bc3e7eb
--- /dev/null
+++ b/blur-core/src/main/java/org/apache/blur/command/TableRoute.java
@@ -0,0 +1,26 @@
+package org.apache.blur.command;
+
+import java.util.Set;
+
+/**
+ * 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.
+ */
+
+public interface TableRoute {
+
+  Set<String> resolveTables(Args args);
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/blur-core/src/main/java/org/apache/blur/server/FilteredBlurServer.java
----------------------------------------------------------------------
diff --git a/blur-core/src/main/java/org/apache/blur/server/FilteredBlurServer.java b/blur-core/src/main/java/org/apache/blur/server/FilteredBlurServer.java
index 46680a5..6c5106a 100644
--- a/blur-core/src/main/java/org/apache/blur/server/FilteredBlurServer.java
+++ b/blur-core/src/main/java/org/apache/blur/server/FilteredBlurServer.java
@@ -250,8 +250,8 @@ public class FilteredBlurServer implements Iface {
   }
 
   @Override
-  public Response execute(String table, String commandName, Arguments arguments) throws BlurException, TException {
-    return _iface.execute(table, commandName, arguments);
+  public Response execute(String commandName, Arguments arguments) throws BlurException, TException {
+    return _iface.execute(commandName, arguments);
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/blur-core/src/main/java/org/apache/blur/server/TableContextFactory.java
----------------------------------------------------------------------
diff --git a/blur-core/src/main/java/org/apache/blur/server/TableContextFactory.java b/blur-core/src/main/java/org/apache/blur/server/TableContextFactory.java
new file mode 100644
index 0000000..5d8806d
--- /dev/null
+++ b/blur-core/src/main/java/org/apache/blur/server/TableContextFactory.java
@@ -0,0 +1,26 @@
+package org.apache.blur.server;
+
+import java.io.IOException;
+
+/**
+ * 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.
+ */
+
+public interface TableContextFactory {
+
+  TableContext getTableContext(String table) throws IOException;
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java
----------------------------------------------------------------------
diff --git a/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java b/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java
index 28a46cd..4328b2c 100644
--- a/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java
+++ b/blur-core/src/main/java/org/apache/blur/thrift/BlurControllerServer.java
@@ -1506,7 +1506,7 @@ public class BlurControllerServer extends TableAdmin implements Iface {
   }
 
   @Override
-  public org.apache.blur.thrift.generated.Response execute(String table, String commandName, Arguments arguments)
+  public org.apache.blur.thrift.generated.Response execute(String commandName, Arguments arguments)
       throws BlurException, TException {
     try {
       TableContext tableContext = getTableContext(table);
@@ -1518,7 +1518,7 @@ public class BlurControllerServer extends TableAdmin implements Iface {
       if (e instanceof org.apache.blur.command.TimeoutException) {
         throw new TimeoutException(((org.apache.blur.command.TimeoutException) e).getExecutionId().getId());
       }
-      LOG.error("Unknown error while trying to execute command [{0}] for table [{1}]", e, commandName, table);
+      LOG.error("Unknown error while trying to execute command [{0}]", e, commandName);
       if (e instanceof BlurException) {
         throw (BlurException) e;
       }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/blur-core/src/main/java/org/apache/blur/thrift/BlurShardServer.java
----------------------------------------------------------------------
diff --git a/blur-core/src/main/java/org/apache/blur/thrift/BlurShardServer.java b/blur-core/src/main/java/org/apache/blur/thrift/BlurShardServer.java
index 5af713d..8cfc96f 100644
--- a/blur-core/src/main/java/org/apache/blur/thrift/BlurShardServer.java
+++ b/blur-core/src/main/java/org/apache/blur/thrift/BlurShardServer.java
@@ -594,7 +594,7 @@ public class BlurShardServer extends TableAdmin implements Iface {
   }
 
   @Override
-  public org.apache.blur.thrift.generated.Response execute(String table, String commandName, Arguments arguments)
+  public org.apache.blur.thrift.generated.Response execute(String commandName, Arguments arguments)
       throws BlurException, TException {
     try {
       Response response = _commandManager.execute(getTableContext(table), commandName, CommandUtil.toArgs(arguments));
@@ -603,7 +603,7 @@ public class BlurShardServer extends TableAdmin implements Iface {
       if (e instanceof org.apache.blur.command.TimeoutException) {
         throw new TimeoutException(((org.apache.blur.command.TimeoutException) e).getExecutionId().getId());
       }
-      LOG.error("Unknown error while trying to execute command [{0}] for table [{1}]", e, commandName, table);
+      LOG.error("Unknown error while trying to execute command [{0}] for table [{1}]", e, commandName);
       if (e instanceof BlurException) {
         throw (BlurException) e;
       }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Arguments.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Arguments.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Arguments.java
index 53a01a0..3d58218 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Arguments.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Arguments.java
@@ -367,7 +367,7 @@ public class Arguments implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
                 struct.values = new HashMap<String,ValueObject>(2*_map260.size);
                 for (int _i261 = 0; _i261 < _map260.size; ++_i261)
                 {
-                  String _key262; // optional
+                  String _key262; // required
                   ValueObject _val263; // required
                   _key262 = iprot.readString();
                   _val263 = new ValueObject();
@@ -453,7 +453,7 @@ public class Arguments implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
           struct.values = new HashMap<String,ValueObject>(2*_map266.size);
           for (int _i267 = 0; _i267 < _map266.size; ++_i267)
           {
-            String _key268; // optional
+            String _key268; // required
             ValueObject _val269; // required
             _key268 = iprot.readString();
             _val269 = new ValueObject();

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Blur.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Blur.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Blur.java
index 285c697..d0dd35d 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Blur.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Blur.java
@@ -60,11 +60,10 @@ public class Blur {
     /**
      * Executes the given command by name on the table with the provided arguments.
      * 
-     * @param table
      * @param commandName
      * @param arguments
      */
-    public Response execute(String table, String commandName, Arguments arguments) throws BlurException, TimeoutException, org.apache.blur.thirdparty.thrift_0_9_0.TException;
+    public Response execute(String commandName, Arguments arguments) throws BlurException, TimeoutException, org.apache.blur.thirdparty.thrift_0_9_0.TException;
 
     /**
      * If the execute command times out due to command taking longer than the configured
@@ -490,7 +489,7 @@ public class Blur {
 
   public interface AsyncIface {
 
-    public void execute(String table, String commandName, Arguments arguments, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<AsyncClient.execute_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException;
+    public void execute(String commandName, Arguments arguments, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<AsyncClient.execute_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException;
 
     public void reconnect(String executionId, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<AsyncClient.reconnect_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException;
 
@@ -612,16 +611,15 @@ public class Blur {
       super(iprot, oprot);
     }
 
-    public Response execute(String table, String commandName, Arguments arguments) throws BlurException, TimeoutException, org.apache.blur.thirdparty.thrift_0_9_0.TException
+    public Response execute(String commandName, Arguments arguments) throws BlurException, TimeoutException, org.apache.blur.thirdparty.thrift_0_9_0.TException
     {
-      send_execute(table, commandName, arguments);
+      send_execute(commandName, arguments);
       return recv_execute();
     }
 
-    public void send_execute(String table, String commandName, Arguments arguments) throws org.apache.blur.thirdparty.thrift_0_9_0.TException
+    public void send_execute(String commandName, Arguments arguments) throws org.apache.blur.thirdparty.thrift_0_9_0.TException
     {
       execute_args args = new execute_args();
-      args.setTable(table);
       args.setCommandName(commandName);
       args.setArguments(arguments);
       sendBase("execute", args);
@@ -1857,20 +1855,18 @@ public class Blur {
       super(protocolFactory, clientManager, transport);
     }
 
-    public void execute(String table, String commandName, Arguments arguments, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<execute_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
+    public void execute(String commandName, Arguments arguments, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<execute_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
       checkReady();
-      execute_call method_call = new execute_call(table, commandName, arguments, resultHandler, this, ___protocolFactory, ___transport);
+      execute_call method_call = new execute_call(commandName, arguments, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class execute_call extends org.apache.blur.thirdparty.thrift_0_9_0.async.TAsyncMethodCall {
-      private String table;
       private String commandName;
       private Arguments arguments;
-      public execute_call(String table, String commandName, Arguments arguments, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<execute_call> resultHandler, org.apache.blur.thirdparty.thrift_0_9_0.async.TAsyncClient client, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolFactory protocolFactory, org.apache.blur.thirdparty.thrift_0_9_0.transport.TNonblockingTransport transport) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
+      public execute_call(String commandName, Arguments arguments, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<execute_call> resultHandler, org.apache.blur.thirdparty.thrift_0_9_0.async.TAsyncClient client, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolFactory protocolFactory, org.apache.blur.thirdparty.thrift_0_9_0.transport.TNonblockingTransport transport) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
         super(client, protocolFactory, transport, resultHandler, false);
-        this.table = table;
         this.commandName = commandName;
         this.arguments = arguments;
       }
@@ -1878,7 +1874,6 @@ public class Blur {
       public void write_args(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
         prot.writeMessageBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMessage("execute", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMessageType.CALL, 0));
         execute_args args = new execute_args();
-        args.setTable(table);
         args.setCommandName(commandName);
         args.setArguments(arguments);
         args.write(prot);
@@ -3587,7 +3582,7 @@ public class Blur {
       public execute_result getResult(I iface, execute_args args) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
         execute_result result = new execute_result();
         try {
-          result.success = iface.execute(args.table, args.commandName, args.arguments);
+          result.success = iface.execute(args.commandName, args.arguments);
         } catch (BlurException bex) {
           result.bex = bex;
         } catch (TimeoutException tex) {
@@ -4764,9 +4759,8 @@ public class Blur {
   public static class execute_args implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<execute_args, execute_args._Fields>, java.io.Serializable, Cloneable   {
     private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TStruct STRUCT_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TStruct("execute_args");
 
-    private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField TABLE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("table", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)1);
-    private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField COMMAND_NAME_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("commandName", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)2);
-    private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField ARGUMENTS_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("arguments", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, (short)3);
+    private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField COMMAND_NAME_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("commandName", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)1);
+    private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField ARGUMENTS_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("arguments", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, (short)2);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
@@ -4774,15 +4768,13 @@ public class Blur {
       schemes.put(TupleScheme.class, new execute_argsTupleSchemeFactory());
     }
 
-    public String table; // required
     public String commandName; // required
     public Arguments arguments; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.blur.thirdparty.thrift_0_9_0.TFieldIdEnum {
-      TABLE((short)1, "table"),
-      COMMAND_NAME((short)2, "commandName"),
-      ARGUMENTS((short)3, "arguments");
+      COMMAND_NAME((short)1, "commandName"),
+      ARGUMENTS((short)2, "arguments");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -4797,11 +4789,9 @@ public class Blur {
        */
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
-          case 1: // TABLE
-            return TABLE;
-          case 2: // COMMAND_NAME
+          case 1: // COMMAND_NAME
             return COMMAND_NAME;
-          case 3: // ARGUMENTS
+          case 2: // ARGUMENTS
             return ARGUMENTS;
           default:
             return null;
@@ -4846,8 +4836,6 @@ public class Blur {
     public static final Map<_Fields, org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData> metaDataMap;
     static {
       Map<_Fields, org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.TABLE, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("table", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
-          new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING)));
       tmpMap.put(_Fields.COMMAND_NAME, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("commandName", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
           new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING)));
       tmpMap.put(_Fields.ARGUMENTS, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("arguments", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
@@ -4860,12 +4848,10 @@ public class Blur {
     }
 
     public execute_args(
-      String table,
       String commandName,
       Arguments arguments)
     {
       this();
-      this.table = table;
       this.commandName = commandName;
       this.arguments = arguments;
     }
@@ -4874,9 +4860,6 @@ public class Blur {
      * Performs a deep copy on <i>other</i>.
      */
     public execute_args(execute_args other) {
-      if (other.isSetTable()) {
-        this.table = other.table;
-      }
       if (other.isSetCommandName()) {
         this.commandName = other.commandName;
       }
@@ -4891,35 +4874,10 @@ public class Blur {
 
     @Override
     public void clear() {
-      this.table = null;
       this.commandName = null;
       this.arguments = null;
     }
 
-    public String getTable() {
-      return this.table;
-    }
-
-    public execute_args setTable(String table) {
-      this.table = table;
-      return this;
-    }
-
-    public void unsetTable() {
-      this.table = null;
-    }
-
-    /** Returns true if field table is set (has been assigned a value) and false otherwise */
-    public boolean isSetTable() {
-      return this.table != null;
-    }
-
-    public void setTableIsSet(boolean value) {
-      if (!value) {
-        this.table = null;
-      }
-    }
-
     public String getCommandName() {
       return this.commandName;
     }
@@ -4970,14 +4928,6 @@ public class Blur {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case TABLE:
-        if (value == null) {
-          unsetTable();
-        } else {
-          setTable((String)value);
-        }
-        break;
-
       case COMMAND_NAME:
         if (value == null) {
           unsetCommandName();
@@ -4999,9 +4949,6 @@ public class Blur {
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
-      case TABLE:
-        return getTable();
-
       case COMMAND_NAME:
         return getCommandName();
 
@@ -5019,8 +4966,6 @@ public class Blur {
       }
 
       switch (field) {
-      case TABLE:
-        return isSetTable();
       case COMMAND_NAME:
         return isSetCommandName();
       case ARGUMENTS:
@@ -5042,15 +4987,6 @@ public class Blur {
       if (that == null)
         return false;
 
-      boolean this_present_table = true && this.isSetTable();
-      boolean that_present_table = true && that.isSetTable();
-      if (this_present_table || that_present_table) {
-        if (!(this_present_table && that_present_table))
-          return false;
-        if (!this.table.equals(that.table))
-          return false;
-      }
-
       boolean this_present_commandName = true && this.isSetCommandName();
       boolean that_present_commandName = true && that.isSetCommandName();
       if (this_present_commandName || that_present_commandName) {
@@ -5085,16 +5021,6 @@ public class Blur {
       int lastComparison = 0;
       execute_args typedOther = (execute_args)other;
 
-      lastComparison = Boolean.valueOf(isSetTable()).compareTo(typedOther.isSetTable());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetTable()) {
-        lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.table, typedOther.table);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
       lastComparison = Boolean.valueOf(isSetCommandName()).compareTo(typedOther.isSetCommandName());
       if (lastComparison != 0) {
         return lastComparison;
@@ -5135,14 +5061,6 @@ public class Blur {
       StringBuilder sb = new StringBuilder("execute_args(");
       boolean first = true;
 
-      sb.append("table:");
-      if (this.table == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.table);
-      }
-      first = false;
-      if (!first) sb.append(", ");
       sb.append("commandName:");
       if (this.commandName == null) {
         sb.append("null");
@@ -5204,15 +5122,7 @@ public class Blur {
             break;
           }
           switch (schemeField.id) {
-            case 1: // TABLE
-              if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING) {
-                struct.table = iprot.readString();
-                struct.setTableIsSet(true);
-              } else { 
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
-            case 2: // COMMAND_NAME
+            case 1: // COMMAND_NAME
               if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING) {
                 struct.commandName = iprot.readString();
                 struct.setCommandNameIsSet(true);
@@ -5220,7 +5130,7 @@ public class Blur {
                 org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 3: // ARGUMENTS
+            case 2: // ARGUMENTS
               if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT) {
                 struct.arguments = new Arguments();
                 struct.arguments.read(iprot);
@@ -5244,11 +5154,6 @@ public class Blur {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
-        if (struct.table != null) {
-          oprot.writeFieldBegin(TABLE_FIELD_DESC);
-          oprot.writeString(struct.table);
-          oprot.writeFieldEnd();
-        }
         if (struct.commandName != null) {
           oprot.writeFieldBegin(COMMAND_NAME_FIELD_DESC);
           oprot.writeString(struct.commandName);
@@ -5277,19 +5182,13 @@ public class Blur {
       public void write(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, execute_args struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         BitSet optionals = new BitSet();
-        if (struct.isSetTable()) {
-          optionals.set(0);
-        }
         if (struct.isSetCommandName()) {
-          optionals.set(1);
+          optionals.set(0);
         }
         if (struct.isSetArguments()) {
-          optionals.set(2);
-        }
-        oprot.writeBitSet(optionals, 3);
-        if (struct.isSetTable()) {
-          oprot.writeString(struct.table);
+          optionals.set(1);
         }
+        oprot.writeBitSet(optionals, 2);
         if (struct.isSetCommandName()) {
           oprot.writeString(struct.commandName);
         }
@@ -5301,16 +5200,12 @@ public class Blur {
       @Override
       public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, execute_args struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
-          struct.table = iprot.readString();
-          struct.setTableIsSet(true);
-        }
-        if (incoming.get(1)) {
           struct.commandName = iprot.readString();
           struct.setCommandNameIsSet(true);
         }
-        if (incoming.get(2)) {
+        if (incoming.get(1)) {
           struct.arguments = new Arguments();
           struct.arguments.read(iprot);
           struct.setArgumentsIsSet(true);
@@ -21830,7 +21725,7 @@ public class Blur {
                   struct.success = new HashMap<String,List<String>>(2*_map294.size);
                   for (int _i295 = 0; _i295 < _map294.size; ++_i295)
                   {
-                    String _key296; // optional
+                    String _key296; // required
                     List<String> _val297; // required
                     _key296 = iprot.readString();
                     {
@@ -21958,7 +21853,7 @@ public class Blur {
             struct.success = new HashMap<String,List<String>>(2*_map305.size);
             for (int _i306 = 0; _i306 < _map305.size; ++_i306)
             {
-              String _key307; // optional
+              String _key307; // required
               List<String> _val308; // required
               _key307 = iprot.readString();
               {
@@ -36561,7 +36456,7 @@ public class Blur {
                   struct.success = new HashMap<String,String>(2*_map384.size);
                   for (int _i385 = 0; _i385 < _map384.size; ++_i385)
                   {
-                    String _key386; // optional
+                    String _key386; // required
                     String _val387; // required
                     _key386 = iprot.readString();
                     _val387 = iprot.readString();
@@ -36666,7 +36561,7 @@ public class Blur {
             struct.success = new HashMap<String,String>(2*_map390.size);
             for (int _i391 = 0; _i391 < _map390.size; ++_i391)
             {
-              String _key392; // optional
+              String _key392; // required
               String _val393; // required
               _key392 = iprot.readString();
               _val393 = iprot.readString();
@@ -37459,7 +37354,7 @@ public class Blur {
                   struct.success = new HashMap<String,Map<String,ShardState>>(2*_map394.size);
                   for (int _i395 = 0; _i395 < _map394.size; ++_i395)
                   {
-                    String _key396; // optional
+                    String _key396; // required
                     Map<String,ShardState> _val397; // required
                     _key396 = iprot.readString();
                     {
@@ -37467,7 +37362,7 @@ public class Blur {
                       _val397 = new HashMap<String,ShardState>(2*_map398.size);
                       for (int _i399 = 0; _i399 < _map398.size; ++_i399)
                       {
-                        String _key400; // optional
+                        String _key400; // required
                         ShardState _val401; // required
                         _key400 = iprot.readString();
                         _val401 = ShardState.findByValue(iprot.readI32());
@@ -37591,7 +37486,7 @@ public class Blur {
             struct.success = new HashMap<String,Map<String,ShardState>>(2*_map406.size);
             for (int _i407 = 0; _i407 < _map406.size; ++_i407)
             {
-              String _key408; // optional
+              String _key408; // required
               Map<String,ShardState> _val409; // required
               _key408 = iprot.readString();
               {
@@ -37599,7 +37494,7 @@ public class Blur {
                 _val409 = new HashMap<String,ShardState>(2*_map410.size);
                 for (int _i411 = 0; _i411 < _map410.size; ++_i411)
                 {
-                  String _key412; // optional
+                  String _key412; // required
                   ShardState _val413; // required
                   _key412 = iprot.readString();
                   _val413 = ShardState.findByValue(iprot.readI32());
@@ -39084,7 +38979,7 @@ public class Blur {
                   struct.success = new HashMap<String,String>(2*_map414.size);
                   for (int _i415 = 0; _i415 < _map414.size; ++_i415)
                   {
-                    String _key416; // optional
+                    String _key416; // required
                     String _val417; // required
                     _key416 = iprot.readString();
                     _val417 = iprot.readString();
@@ -39189,7 +39084,7 @@ public class Blur {
             struct.success = new HashMap<String,String>(2*_map420.size);
             for (int _i421 = 0; _i421 < _map420.size; ++_i421)
             {
-              String _key422; // optional
+              String _key422; // required
               String _val423; // required
               _key422 = iprot.readString();
               _val423 = iprot.readString();
@@ -40021,7 +39916,7 @@ public class Blur {
                   struct.success = new HashMap<String,Metric>(2*_map432.size);
                   for (int _i433 = 0; _i433 < _map432.size; ++_i433)
                   {
-                    String _key434; // optional
+                    String _key434; // required
                     Metric _val435; // required
                     _key434 = iprot.readString();
                     _val435 = new Metric();
@@ -40127,7 +40022,7 @@ public class Blur {
             struct.success = new HashMap<String,Metric>(2*_map438.size);
             for (int _i439 = 0; _i439 < _map438.size; ++_i439)
             {
-              String _key440; // optional
+              String _key440; // required
               Metric _val441; // required
               _key440 = iprot.readString();
               _val441 = new Metric();

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurQueryStatus.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurQueryStatus.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurQueryStatus.java
index 6cac5a1..a9caf29 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurQueryStatus.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurQueryStatus.java
@@ -1050,7 +1050,7 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
                 struct.cpuTimes = new HashMap<String,CpuTime>(2*_map126.size);
                 for (int _i127 = 0; _i127 < _map126.size; ++_i127)
                 {
-                  String _key128; // optional
+                  String _key128; // required
                   CpuTime _val129; // required
                   _key128 = iprot.readString();
                   _val129 = new CpuTime();
@@ -1263,7 +1263,7 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
           struct.cpuTimes = new HashMap<String,CpuTime>(2*_map132.size);
           for (int _i133 = 0; _i133 < _map132.size; ++_i133)
           {
-            String _key134; // optional
+            String _key134; // required
             CpuTime _val135; // required
             _key134 = iprot.readString();
             _val135 = new CpuTime();

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurResults.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurResults.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurResults.java
index aa923cc..a7fc566 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurResults.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurResults.java
@@ -900,7 +900,7 @@ public class BlurResults implements org.apache.blur.thirdparty.thrift_0_9_0.TBas
                 struct.shardInfo = new HashMap<String,Long>(2*_map84.size);
                 for (int _i85 = 0; _i85 < _map84.size; ++_i85)
                 {
-                  String _key86; // optional
+                  String _key86; // required
                   long _val87; // required
                   _key86 = iprot.readString();
                   _val87 = iprot.readI64();
@@ -1146,7 +1146,7 @@ public class BlurResults implements org.apache.blur.thirdparty.thrift_0_9_0.TBas
           struct.shardInfo = new HashMap<String,Long>(2*_map105.size);
           for (int _i106 = 0; _i106 < _map105.size; ++_i106)
           {
-            String _key107; // optional
+            String _key107; // required
             long _val108; // required
             _key107 = iprot.readString();
             _val108 = iprot.readI64();

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ColumnDefinition.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ColumnDefinition.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ColumnDefinition.java
index 55d1744..0ebf5a7 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ColumnDefinition.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ColumnDefinition.java
@@ -992,7 +992,7 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
                 struct.properties = new HashMap<String,String>(2*_map136.size);
                 for (int _i137 = 0; _i137 < _map136.size; ++_i137)
                 {
-                  String _key138; // optional
+                  String _key138; // required
                   String _val139; // required
                   _key138 = iprot.readString();
                   _val139 = iprot.readString();
@@ -1167,7 +1167,7 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
           struct.properties = new HashMap<String,String>(2*_map142.size);
           for (int _i143 = 0; _i143 < _map142.size; ++_i143)
           {
-            String _key144; // optional
+            String _key144; // required
             String _val145; // required
             _key144 = iprot.readString();
             _val145 = iprot.readString();

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Metric.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Metric.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Metric.java
index 8e2be42..ccb417c 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Metric.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Metric.java
@@ -707,7 +707,7 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
                 struct.strMap = new HashMap<String,String>(2*_map202.size);
                 for (int _i203 = 0; _i203 < _map202.size; ++_i203)
                 {
-                  String _key204; // optional
+                  String _key204; // required
                   String _val205; // required
                   _key204 = iprot.readString();
                   _val205 = iprot.readString();
@@ -727,7 +727,7 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
                 struct.longMap = new HashMap<String,Long>(2*_map206.size);
                 for (int _i207 = 0; _i207 < _map206.size; ++_i207)
                 {
-                  String _key208; // optional
+                  String _key208; // required
                   long _val209; // required
                   _key208 = iprot.readString();
                   _val209 = iprot.readI64();
@@ -747,7 +747,7 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
                 struct.doubleMap = new HashMap<String,Double>(2*_map210.size);
                 for (int _i211 = 0; _i211 < _map210.size; ++_i211)
                 {
-                  String _key212; // optional
+                  String _key212; // required
                   double _val213; // required
                   _key212 = iprot.readString();
                   _val213 = iprot.readDouble();
@@ -899,7 +899,7 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
           struct.strMap = new HashMap<String,String>(2*_map220.size);
           for (int _i221 = 0; _i221 < _map220.size; ++_i221)
           {
-            String _key222; // optional
+            String _key222; // required
             String _val223; // required
             _key222 = iprot.readString();
             _val223 = iprot.readString();
@@ -914,7 +914,7 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
           struct.longMap = new HashMap<String,Long>(2*_map224.size);
           for (int _i225 = 0; _i225 < _map224.size; ++_i225)
           {
-            String _key226; // optional
+            String _key226; // required
             long _val227; // required
             _key226 = iprot.readString();
             _val227 = iprot.readI64();
@@ -929,7 +929,7 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
           struct.doubleMap = new HashMap<String,Double>(2*_map228.size);
           for (int _i229 = 0; _i229 < _map228.size; ++_i229)
           {
-            String _key230; // optional
+            String _key230; // required
             double _val231; // required
             _key230 = iprot.readString();
             _val231 = iprot.readDouble();

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Response.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Response.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Response.java
index 1e36a12..6354606 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Response.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Response.java
@@ -206,7 +206,7 @@ public class Response extends org.apache.blur.thirdparty.thrift_0_9_0.TUnion<Res
               shardToValue = new HashMap<Shard,ValueObject>(2*_map240.size);
               for (int _i241 = 0; _i241 < _map240.size; ++_i241)
               {
-                Shard _key242; // optional
+                Shard _key242; // required
                 ValueObject _val243; // required
                 _key242 = new Shard();
                 _key242.read(iprot);
@@ -229,7 +229,7 @@ public class Response extends org.apache.blur.thirdparty.thrift_0_9_0.TUnion<Res
               serverToValue = new HashMap<Server,ValueObject>(2*_map244.size);
               for (int _i245 = 0; _i245 < _map244.size; ++_i245)
               {
-                Server _key246; // optional
+                Server _key246; // required
                 ValueObject _val247; // required
                 _key246 = new Server();
                 _key246.read(iprot);
@@ -310,7 +310,7 @@ public class Response extends org.apache.blur.thirdparty.thrift_0_9_0.TUnion<Res
             shardToValue = new HashMap<Shard,ValueObject>(2*_map250.size);
             for (int _i251 = 0; _i251 < _map250.size; ++_i251)
             {
-              Shard _key252; // optional
+              Shard _key252; // required
               ValueObject _val253; // required
               _key252 = new Shard();
               _key252.read(iprot);
@@ -328,7 +328,7 @@ public class Response extends org.apache.blur.thirdparty.thrift_0_9_0.TUnion<Res
             serverToValue = new HashMap<Server,ValueObject>(2*_map254.size);
             for (int _i255 = 0; _i255 < _map254.size; ++_i255)
             {
-              Server _key256; // optional
+              Server _key256; // required
               ValueObject _val257; // required
               _key256 = new Server();
               _key256.read(iprot);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/blur-thrift/src/main/java/org/apache/blur/thrift/generated/SafeClientGen.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/SafeClientGen.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/SafeClientGen.java
index e39461b..20d7def 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/SafeClientGen.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/SafeClientGen.java
@@ -160,9 +160,9 @@ public void enqueueMutateBatch(java.util.List arg0) throws org.apache.blur.thrif
 }
 
 @Override
-public org.apache.blur.thrift.generated.Response execute(java.lang.String arg0, java.lang.String arg1, org.apache.blur.thrift.generated.Arguments arg2) throws org.apache.blur.thrift.generated.BlurException, org.apache.blur.thrift.generated.TimeoutException, org.apache.blur.thirdparty.thrift_0_9_0.TException {
+public org.apache.blur.thrift.generated.Response execute(java.lang.String arg0, org.apache.blur.thrift.generated.Arguments arg1) throws org.apache.blur.thrift.generated.BlurException, org.apache.blur.thrift.generated.TimeoutException, org.apache.blur.thirdparty.thrift_0_9_0.TException {
   _lock.errorFailLock(); try {
-    return super.execute(arg0, arg1, arg2);
+    return super.execute(arg0, arg1);
   } finally {_lock.unlock();}
 }
 
@@ -741,9 +741,9 @@ public void send_enqueueMutateBatch(java.util.List arg0) throws org.apache.blur.
 }
 
 @Override
-public void send_execute(java.lang.String arg0, java.lang.String arg1, org.apache.blur.thrift.generated.Arguments arg2) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
+public void send_execute(java.lang.String arg0, org.apache.blur.thrift.generated.Arguments arg1) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
   _lock.errorFailLock(); try {
-    super.send_execute(arg0, arg1, arg2);
+    super.send_execute(arg0, arg1);
   } finally {_lock.unlock();}
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Schema.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Schema.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Schema.java
index 39e1dbb..ef3191c 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Schema.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Schema.java
@@ -492,7 +492,7 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
                 struct.families = new HashMap<String,Map<String,ColumnDefinition>>(2*_map146.size);
                 for (int _i147 = 0; _i147 < _map146.size; ++_i147)
                 {
-                  String _key148; // optional
+                  String _key148; // required
                   Map<String,ColumnDefinition> _val149; // required
                   _key148 = iprot.readString();
                   {
@@ -500,7 +500,7 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
                     _val149 = new HashMap<String,ColumnDefinition>(2*_map150.size);
                     for (int _i151 = 0; _i151 < _map150.size; ++_i151)
                     {
-                      String _key152; // optional
+                      String _key152; // required
                       ColumnDefinition _val153; // required
                       _key152 = iprot.readString();
                       _val153 = new ColumnDefinition();
@@ -620,7 +620,7 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
           struct.families = new HashMap<String,Map<String,ColumnDefinition>>(2*_map158.size);
           for (int _i159 = 0; _i159 < _map158.size; ++_i159)
           {
-            String _key160; // optional
+            String _key160; // required
             Map<String,ColumnDefinition> _val161; // required
             _key160 = iprot.readString();
             {
@@ -628,7 +628,7 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
               _val161 = new HashMap<String,ColumnDefinition>(2*_map162.size);
               for (int _i163 = 0; _i163 < _map162.size; ++_i163)
               {
-                String _key164; // optional
+                String _key164; // required
                 ColumnDefinition _val165; // required
                 _key164 = iprot.readString();
                 _val165 = new ColumnDefinition();

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Selector.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Selector.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Selector.java
index af622c5..37385d7 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Selector.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Selector.java
@@ -1304,7 +1304,7 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
                 struct.columnsToFetch = new HashMap<String,Set<String>>(2*_map29.size);
                 for (int _i30 = 0; _i30 < _map29.size; ++_i30)
                 {
-                  String _key31; // optional
+                  String _key31; // required
                   Set<String> _val32; // required
                   _key31 = iprot.readString();
                   {
@@ -1603,7 +1603,7 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
           struct.columnsToFetch = new HashMap<String,Set<String>>(2*_map50.size);
           for (int _i51 = 0; _i51 < _map50.size; ++_i51)
           {
-            String _key52; // optional
+            String _key52; // required
             Set<String> _val53; // required
             _key52 = iprot.readString();
             {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java
index 1a08bc0..3793c00 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java
@@ -1799,7 +1799,7 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
                 struct.tableProperties = new HashMap<String,String>(2*_map172.size);
                 for (int _i173 = 0; _i173 < _map172.size; ++_i173)
                 {
-                  String _key174; // optional
+                  String _key174; // required
                   String _val175; // required
                   _key174 = iprot.readString();
                   _val175 = iprot.readString();
@@ -1843,7 +1843,7 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
                 struct.defaultMissingFieldProps = new HashMap<String,String>(2*_map176.size);
                 for (int _i177 = 0; _i177 < _map176.size; ++_i177)
                 {
-                  String _key178; // optional
+                  String _key178; // required
                   String _val179; // required
                   _key178 = iprot.readString();
                   _val179 = iprot.readString();
@@ -2169,7 +2169,7 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
           struct.tableProperties = new HashMap<String,String>(2*_map194.size);
           for (int _i195 = 0; _i195 < _map194.size; ++_i195)
           {
-            String _key196; // optional
+            String _key196; // required
             String _val197; // required
             _key196 = iprot.readString();
             _val197 = iprot.readString();
@@ -2196,7 +2196,7 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
           struct.defaultMissingFieldProps = new HashMap<String,String>(2*_map198.size);
           for (int _i199 = 0; _i199 < _map198.size; ++_i199)
           {
-            String _key200; // optional
+            String _key200; // required
             String _val201; // required
             _key200 = iprot.readString();
             _val201 = iprot.readString();

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/blur-thrift/src/main/java/org/apache/blur/thrift/generated/User.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/User.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/User.java
index 33b0f91..8f152a6 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/User.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/User.java
@@ -480,8 +480,8 @@ public class User implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<User,
                 struct.attributes = new HashMap<String,String>(2*_map0.size);
                 for (int _i1 = 0; _i1 < _map0.size; ++_i1)
                 {
-                  String _key2; // optional
-                  String _val3; // required
+                  String _key2; // required
+                  String _val3; // optional
                   _key2 = iprot.readString();
                   _val3 = iprot.readString();
                   struct.attributes.put(_key2, _val3);
@@ -580,8 +580,8 @@ public class User implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<User,
           struct.attributes = new HashMap<String,String>(2*_map6.size);
           for (int _i7 = 0; _i7 < _map6.size; ++_i7)
           {
-            String _key8; // optional
-            String _val9; // required
+            String _key8; // required
+            String _val9; // optional
             _key8 = iprot.readString();
             _val9 = iprot.readString();
             struct.attributes.put(_key8, _val9);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/blur-thrift/src/main/java/org/apache/blur/thrift/util/CommandExample.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/util/CommandExample.java b/blur-thrift/src/main/java/org/apache/blur/thrift/util/CommandExample.java
index 43a6909..6668766 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/util/CommandExample.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/util/CommandExample.java
@@ -47,7 +47,7 @@ public class CommandExample {
     // }
     // }
 
-    System.out.println(client.execute("test2", "docCount", null));
+    System.out.println(client.execute("docCount", null));
     // System.out.println(client.execute("test", "docCountNoCombine", null));
     // {
     // Response response = client.execute("test", "docCountAggregate", null);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/distribution/src/main/scripts/interface/Blur.thrift
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/Blur.thrift b/distribution/src/main/scripts/interface/Blur.thrift
index 4ba3ce1..99ed2de 100644
--- a/distribution/src/main/scripts/interface/Blur.thrift
+++ b/distribution/src/main/scripts/interface/Blur.thrift
@@ -909,7 +909,7 @@ service Blur {
   /**
    * Executes the given command by name on the table with the provided arguments.
    */
-  Response execute(1:string table, 2:string commandName, 3:Arguments arguments) throws (1:BlurException bex, 2:TimeoutException tex)
+  Response execute(1:string commandName, 2:Arguments arguments) throws (1:BlurException bex, 2:TimeoutException tex)
 
   /**
    * If the execute command times out due to command taking longer than the configured 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/distribution/src/main/scripts/interface/gen-html/Blur.html
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-html/Blur.html b/distribution/src/main/scripts/interface/gen-html/Blur.html
index f883aaf..01e5913 100644
--- a/distribution/src/main/scripts/interface/gen-html/Blur.html
+++ b/distribution/src/main/scripts/interface/gen-html/Blur.html
@@ -656,8 +656,7 @@ be family dot column, "family.column".
 The Blur service API.  This API is the same for both controller servers as well as
 shards servers.  Each of the methods are documented.
 <br/><div class="definition"><h4 id="Fn_Blur_execute">Function: Blur.execute</h4>
-<pre><code><a href="Blur.html#Struct_Response">Response</a></code> execute(<code>string</code> table,
-                 <code>string</code> commandName,
+<pre><code><a href="Blur.html#Struct_Response">Response</a></code> execute(<code>string</code> commandName,
                  <code><a href="Blur.html#Struct_Arguments">Arguments</a></code> arguments)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>, <code><a href="Blur.html#Struct_TimeoutException">TimeoutException</a></code>
 </pre>Executes the given command by name on the table with the provided arguments.

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2c2e8702/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Arguments.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Arguments.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Arguments.java
index 53a01a0..3d58218 100644
--- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Arguments.java
+++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Arguments.java
@@ -367,7 +367,7 @@ public class Arguments implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
                 struct.values = new HashMap<String,ValueObject>(2*_map260.size);
                 for (int _i261 = 0; _i261 < _map260.size; ++_i261)
                 {
-                  String _key262; // optional
+                  String _key262; // required
                   ValueObject _val263; // required
                   _key262 = iprot.readString();
                   _val263 = new ValueObject();
@@ -453,7 +453,7 @@ public class Arguments implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
           struct.values = new HashMap<String,ValueObject>(2*_map266.size);
           for (int _i267 = 0; _i267 < _map266.size; ++_i267)
           {
-            String _key268; // optional
+            String _key268; // required
             ValueObject _val269; // required
             _key268 = iprot.readString();
             _val269 = new ValueObject();


Mime
View raw message