Updates for latest Optiq version
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/a4a2c533 Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/a4a2c533 Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/a4a2c533 Branch: refs/heads/master Commit: a4a2c533c571f6c0e1b1de82bc4ad1aa299b1cae Parents: 62a7866 Author: Jacques Nadeau <[email protected]> Authored: Mon Mar 31 10:06:30 2014 -0700 Committer: Jacques Nadeau <[email protected]> Committed: Sat Apr 19 18:07:08 2014 -0700 ---------------------------------------------------------------------- .../exec/store/hbase/HBaseSchemaFactory.java | 16 +++--- .../apache/drill/exec/store/AbstractSchema.java | 22 +++------ .../apache/drill/exec/store/SchemaHolder.java | 44 ----------------- .../drill/exec/store/StoragePluginRegistry.java | 52 ++++++-------------- .../exec/store/dfs/FileSystemSchemaFactory.java | 18 +++---- .../exec/store/dfs/WorkspaceSchemaFactory.java | 9 ++-- .../store/hive/schema/HiveDatabaseSchema.java | 4 +- .../store/hive/schema/HiveSchemaFactory.java | 18 +++---- .../store/ischema/InfoSchemaStoragePlugin.java | 8 ++- .../drill/exec/store/ischema/OptiqProvider.java | 2 +- pom.xml | 14 ++++++ .../org/apache/drill/exec/proto/UserProtos.java | 29 +++++++++-- protocol/src/main/protobuf/User.proto | 2 - 13 files changed, 88 insertions(+), 150 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a4a2c533/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseSchemaFactory.java ---------------------------------------------------------------------- diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseSchemaFactory.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseSchemaFactory.java index d97f3d0..1376210 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseSchemaFactory.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseSchemaFactory.java @@ -21,17 +21,18 @@ import java.io.IOException; import java.util.Collections; import java.util.Set; -import com.google.common.collect.Sets; import net.hydromatic.optiq.Schema; import net.hydromatic.optiq.SchemaPlus; + import org.apache.drill.exec.planner.logical.DrillTable; import org.apache.drill.exec.planner.logical.DynamicDrillTable; import org.apache.drill.exec.store.AbstractSchema; import org.apache.drill.exec.store.SchemaFactory; -import org.apache.drill.exec.store.SchemaHolder; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.client.HBaseAdmin; +import com.google.common.collect.Sets; + public class HBaseSchemaFactory implements SchemaFactory { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(HBaseSchemaFactory.class); @@ -45,22 +46,19 @@ public class HBaseSchemaFactory implements SchemaFactory { @Override public Schema add(SchemaPlus parent) { - HBaseSchema schema = new HBaseSchema(new SchemaHolder(parent), schemaName); - SchemaPlus hPlus = parent.add(schema); + HBaseSchema schema = new HBaseSchema(schemaName); + SchemaPlus hPlus = parent.add(schemaName, schema); schema.setHolder(hPlus); return schema; } class HBaseSchema extends AbstractSchema { - private final SchemaHolder holder = new SchemaHolder(); - - public HBaseSchema(SchemaHolder parentSchema, String name) { - super(parentSchema, name); + public HBaseSchema(String name) { + super(name); } public void setHolder(SchemaPlus plusOfThis) { - holder.setSchema(plusOfThis); } @Override http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a4a2c533/exec/java-exec/src/main/java/org/apache/drill/exec/store/AbstractSchema.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/AbstractSchema.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/AbstractSchema.java index 6aad394..64087f5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/AbstractSchema.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/AbstractSchema.java @@ -32,24 +32,14 @@ import org.apache.drill.exec.planner.logical.DrillTable; public abstract class AbstractSchema implements Schema{ static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(AbstractSchema.class); - private final SchemaHolder parentSchema; - protected final String name; private static final Expression EXPRESSION = new DefaultExpression(Object.class); - public AbstractSchema(SchemaHolder parentSchema, String name) { + public AbstractSchema(String name) { super(); - this.parentSchema = parentSchema; this.name = name; } - - @Override - public SchemaPlus getParentSchema() { - return parentSchema.getSchema(); - } - - @Override public String getName() { return name; } @@ -75,11 +65,6 @@ public abstract class AbstractSchema implements Schema{ } @Override - public Expression getExpression() { - return EXPRESSION; - } - - @Override public boolean isMutable() { return false; } @@ -93,6 +78,11 @@ public abstract class AbstractSchema implements Schema{ public Set<String> getTableNames() { return Collections.emptySet(); } + + @Override + public Expression getExpression(SchemaPlus parentSchema, String name) { + return EXPRESSION; + } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a4a2c533/exec/java-exec/src/main/java/org/apache/drill/exec/store/SchemaHolder.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/SchemaHolder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/SchemaHolder.java deleted file mode 100644 index faaca2a..0000000 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/SchemaHolder.java +++ /dev/null @@ -1,44 +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.drill.exec.store; - -import net.hydromatic.optiq.SchemaPlus; - -/** - * Helper class to provide parent schema after initialization given Optiq's backwards schema build model. - */ -public class SchemaHolder { - static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(SchemaHolder.class); - - private SchemaPlus schema; - - public SchemaHolder(){} - - public SchemaHolder(SchemaPlus schema){ - this.schema = schema; - } - - public SchemaPlus getSchema() { - return schema; - } - - public void setSchema(SchemaPlus schema) { - this.schema = schema; - } - -} http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a4a2c533/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginRegistry.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginRegistry.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginRegistry.java index b9d8f33..3594028 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginRegistry.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginRegistry.java @@ -51,6 +51,7 @@ import org.apache.drill.exec.store.ischema.InfoSchemaStoragePlugin; import com.google.common.base.Charsets; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; import com.google.common.io.Resources; @@ -63,6 +64,8 @@ public class StoragePluginRegistry implements Iterable<Map.Entry<String, Storage private DrillbitContext context; private final DrillSchemaFactory schemaFactory = new DrillSchemaFactory(); + private static final Expression EXPRESSION = new DefaultExpression(Object.class); + public StoragePluginRegistry(DrillbitContext context) { try{ this.context = context; @@ -201,16 +204,6 @@ public class StoragePluginRegistry implements Iterable<Map.Entry<String, Storage } @Override - public SchemaPlus getParentSchema() { - return inner.getParentSchema(); - } - - @Override - public String getName() { - return inner.getName(); - } - - @Override public Table getTable(String name) { return inner.getTable(name); } @@ -234,24 +227,12 @@ public class StoragePluginRegistry implements Iterable<Map.Entry<String, Storage public Set<String> getSubSchemaNames() { return inner.getSubSchemaNames(); } - - @Override - public Expression getExpression() { - return inner.getExpression(); - } - - @Override - public SchemaPlus addRecursive(Schema schema) { - return schema.getParentSchema().add(schema); - } - - } private class OrphanPlus implements SchemaPlus{ - private HashMap<String, SchemaPlus> schemas = new HashMap(); + private HashMap<String, SchemaPlus> schemas = Maps.newHashMap(); @Override public SchemaPlus getParentSchema() { @@ -289,23 +270,11 @@ public class StoragePluginRegistry implements Iterable<Map.Entry<String, Storage } @Override - public Expression getExpression() { - return new DefaultExpression(Object.class); - } - - @Override public SchemaPlus getSubSchema(String name) { return schemas.get(name); } @Override - public SchemaPlus add(Schema schema) { - OrphanPlusWrap plus = new OrphanPlusWrap(schema); - schemas.put(schema.getName(), plus); - return plus; - } - - @Override public void add(String name, Table table) { throw new UnsupportedOperationException(); } @@ -326,10 +295,17 @@ public class StoragePluginRegistry implements Iterable<Map.Entry<String, Storage } @Override - public SchemaPlus addRecursive(Schema schema) { - return schema.getParentSchema().add(schema); + public Expression getExpression(SchemaPlus parentSchema, String name) { + return EXPRESSION; } - + + @Override + public SchemaPlus add(String name, Schema schema) { + OrphanPlusWrap plus = new OrphanPlusWrap(schema); + schemas.put(name, plus); + return plus; + } + } } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a4a2c533/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemSchemaFactory.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemSchemaFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemSchemaFactory.java index b150cc1..f569098 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemSchemaFactory.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FileSystemSchemaFactory.java @@ -29,7 +29,6 @@ import net.hydromatic.optiq.SchemaPlus; import org.apache.drill.exec.planner.logical.DrillTable; import org.apache.drill.exec.store.AbstractSchema; import org.apache.drill.exec.store.SchemaFactory; -import org.apache.drill.exec.store.SchemaHolder; import org.apache.drill.exec.store.dfs.WorkspaceSchemaFactory.WorkspaceSchema; import com.google.common.collect.Maps; @@ -53,8 +52,9 @@ public class FileSystemSchemaFactory implements SchemaFactory{ @Override public Schema add(SchemaPlus parent) { - FileSystemSchema schema = new FileSystemSchema(parent, schemaName); - schema.setHolder(parent.add(schema)); + FileSystemSchema schema = new FileSystemSchema(schemaName); + SchemaPlus plusOfThis = parent.add(schema.getName(), schema); + schema.setPlus(plusOfThis); return schema; } @@ -62,22 +62,20 @@ public class FileSystemSchemaFactory implements SchemaFactory{ private final WorkspaceSchema defaultSchema; private final Map<String, WorkspaceSchema> schemaMap = Maps.newHashMap(); - final SchemaHolder selfHolder = new SchemaHolder(); - public FileSystemSchema(SchemaPlus parentSchema, String name) { - super(new SchemaHolder(parentSchema), name); + public FileSystemSchema(String name) { + super(name); for(WorkspaceSchemaFactory f : factories){ - WorkspaceSchema s = f.create(selfHolder); + WorkspaceSchema s = f.createSchema(); schemaMap.put(s.getName(), s); } defaultSchema = schemaMap.get("default"); } - void setHolder(SchemaPlus plusOfThis){ - selfHolder.setSchema(plusOfThis); + void setPlus(SchemaPlus plusOfThis){ for(WorkspaceSchema s : schemaMap.values()){ - plusOfThis.add(s); + plusOfThis.add(s.getName(), s); } } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a4a2c533/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/WorkspaceSchemaFactory.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/WorkspaceSchemaFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/WorkspaceSchemaFactory.java index 2ce7648..0ea3231 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/WorkspaceSchemaFactory.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/WorkspaceSchemaFactory.java @@ -26,7 +26,6 @@ import org.apache.drill.exec.planner.logical.DrillTable; import org.apache.drill.exec.planner.logical.DynamicDrillTable; import org.apache.drill.exec.planner.sql.ExpandingConcurrentMap; import org.apache.drill.exec.store.AbstractSchema; -import org.apache.drill.exec.store.SchemaHolder; import org.apache.drill.exec.store.dfs.shim.DrillFileSystem; import org.apache.hadoop.fs.Path; @@ -62,8 +61,8 @@ public class WorkspaceSchemaFactory implements ExpandingConcurrentMap.MapValueFa this.schemaName = schemaName; } - public WorkspaceSchema create(SchemaHolder holder) { - return new WorkspaceSchema(holder, schemaName); + public WorkspaceSchema createSchema() { + return new WorkspaceSchema(schemaName); } @Override @@ -106,8 +105,8 @@ public class WorkspaceSchemaFactory implements ExpandingConcurrentMap.MapValueFa public class WorkspaceSchema extends AbstractSchema { - public WorkspaceSchema(SchemaHolder parentSchema, String name) { - super(parentSchema, name); + public WorkspaceSchema(String name) { + super(name); } @Override http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a4a2c533/exec/java-exec/src/main/java/org/apache/drill/exec/store/hive/schema/HiveDatabaseSchema.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/hive/schema/HiveDatabaseSchema.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/hive/schema/HiveDatabaseSchema.java index e4ff372..3608ea7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/hive/schema/HiveDatabaseSchema.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/hive/schema/HiveDatabaseSchema.java @@ -22,7 +22,6 @@ import java.util.Set; import org.apache.drill.exec.planner.logical.DrillTable; import org.apache.drill.exec.store.AbstractSchema; -import org.apache.drill.exec.store.SchemaHolder; import org.apache.drill.exec.store.hive.schema.HiveSchemaFactory.HiveSchema; import com.google.common.collect.Sets; @@ -36,9 +35,8 @@ public class HiveDatabaseSchema extends AbstractSchema{ public HiveDatabaseSchema( // List<String> tableList, // HiveSchema hiveSchema, // - SchemaHolder parentSchema, // String name) { - super(parentSchema, name); + super(name); this.hiveSchema = hiveSchema; this.tables = Sets.newHashSet(tableList); } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a4a2c533/exec/java-exec/src/main/java/org/apache/drill/exec/store/hive/schema/HiveSchemaFactory.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/hive/schema/HiveSchemaFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/hive/schema/HiveSchemaFactory.java index 4e80afc..29eda92 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/hive/schema/HiveSchemaFactory.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/hive/schema/HiveSchemaFactory.java @@ -30,11 +30,8 @@ import org.apache.drill.common.exceptions.ExecutionSetupException; import org.apache.drill.exec.planner.logical.DrillTable; import org.apache.drill.exec.store.AbstractSchema; import org.apache.drill.exec.store.SchemaFactory; -import org.apache.drill.exec.store.SchemaHolder; -import org.apache.drill.exec.store.dfs.WorkspaceSchemaFactory.WorkspaceSchema; import org.apache.drill.exec.store.hive.HiveReadEntry; import org.apache.drill.exec.store.hive.HiveStoragePlugin; -import org.apache.drill.exec.store.hive.HiveStoragePluginConfig; import org.apache.drill.exec.store.hive.HiveTable; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.HiveMetaStoreClient; @@ -174,20 +171,18 @@ public class HiveSchemaFactory implements SchemaFactory { @Override public Schema add(SchemaPlus parent) { - HiveSchema schema = new HiveSchema(new SchemaHolder(parent), schemaName); - SchemaPlus hPlus = parent.add(schema); + HiveSchema schema = new HiveSchema(schemaName); + SchemaPlus hPlus = parent.add(schemaName, schema); schema.setHolder(hPlus); return schema; } class HiveSchema extends AbstractSchema { - private final SchemaHolder holder = new SchemaHolder(); - private HiveDatabaseSchema defaultSchema; - public HiveSchema(SchemaHolder parentSchema, String name) { - super(parentSchema, name); + public HiveSchema(String name) { + super(name); getSubSchema("default"); } @@ -196,7 +191,7 @@ public class HiveSchemaFactory implements SchemaFactory { List<String> tables; try { tables = tableNameLoader.get(name); - HiveDatabaseSchema schema = new HiveDatabaseSchema(tables, this, holder, name); + HiveDatabaseSchema schema = new HiveDatabaseSchema(tables, this, name); if(name.equals("default")){ this.defaultSchema = schema; } @@ -210,9 +205,8 @@ public class HiveSchemaFactory implements SchemaFactory { void setHolder(SchemaPlus plusOfThis){ - holder.setSchema(plusOfThis); for(String s : getSubSchemaNames()){ - plusOfThis.add(getSubSchema(s)); + plusOfThis.add(s, getSubSchema(s)); } } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a4a2c533/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaStoragePlugin.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaStoragePlugin.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaStoragePlugin.java index a7d7c5c..9cc17bd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaStoragePlugin.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaStoragePlugin.java @@ -26,12 +26,10 @@ import net.hydromatic.optiq.SchemaPlus; import org.apache.drill.common.JSONOptions; import org.apache.drill.common.logical.StoragePluginConfig; -import org.apache.drill.common.logical.data.Scan; import org.apache.drill.exec.planner.logical.DrillTable; import org.apache.drill.exec.server.DrillbitContext; import org.apache.drill.exec.store.AbstractSchema; import org.apache.drill.exec.store.AbstractStoragePlugin; -import org.apache.drill.exec.store.SchemaHolder; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; @@ -67,15 +65,15 @@ public class InfoSchemaStoragePlugin extends AbstractStoragePlugin{ @Override public Schema createAndAddSchema(SchemaPlus parent) { - Schema s = new ISchema(parent, this); - parent.add(s); + ISchema s = new ISchema(parent, this); + parent.add(s.getName(), s); return s; } private class ISchema extends AbstractSchema{ private Map<String, InfoSchemaDrillTable> tables; public ISchema(SchemaPlus parent, InfoSchemaStoragePlugin plugin){ - super(new SchemaHolder(parent), "INFORMATION_SCHEMA"); + super("INFORMATION_SCHEMA"); Map<String, InfoSchemaDrillTable> tbls = Maps.newHashMap(); for(SelectedTable tbl : SelectedTable.values()){ tbls.put(tbl.name(), new InfoSchemaDrillTable(plugin, "INFORMATION_SCHEMA", tbl, config)); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a4a2c533/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/OptiqProvider.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/OptiqProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/OptiqProvider.java index 795b92c..bead67b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/OptiqProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/OptiqProvider.java @@ -184,7 +184,7 @@ public class OptiqProvider { * Start scanning an Optiq Schema. * @param root - where to start */ - protected void scanSchema(Schema root) { + protected void scanSchema(SchemaPlus root) { scanSchema(root.getName(), root); } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a4a2c533/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 97cf61d..a6200cd 100644 --- a/pom.xml +++ b/pom.xml @@ -57,6 +57,20 @@ </repository> <repository> + <!-- Keep until we move back to released optiq versions. --> + <id>mapr-drill-optiq-snapshots</id> + <name>MapR Drill Optiq Snapshots</name> + <url>http://repository.mapr.com/nexus/content/repositories/drill-optiq/</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + + + <repository> <id>pentaho</id> <name>Pentaho</name> <url>http://repo.pentaho.org/artifactory/repo</url> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a4a2c533/protocol/src/main/java/org/apache/drill/exec/proto/UserProtos.java ---------------------------------------------------------------------- diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/UserProtos.java b/protocol/src/main/java/org/apache/drill/exec/proto/UserProtos.java index 8d4fc60..b8efa84 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/UserProtos.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/UserProtos.java @@ -74,6 +74,14 @@ public final class UserProtos { * <code>QUERY_HANDLE = 7;</code> */ QUERY_HANDLE(7, 7), + /** + * <code>REQ_META_FUNCTIONS = 8;</code> + */ + REQ_META_FUNCTIONS(8, 8), + /** + * <code>RESP_FUNCTION_LIST = 9;</code> + */ + RESP_FUNCTION_LIST(9, 9), ; /** @@ -116,6 +124,14 @@ public final class UserProtos { * <code>QUERY_HANDLE = 7;</code> */ public static final int QUERY_HANDLE_VALUE = 7; + /** + * <code>REQ_META_FUNCTIONS = 8;</code> + */ + public static final int REQ_META_FUNCTIONS_VALUE = 8; + /** + * <code>RESP_FUNCTION_LIST = 9;</code> + */ + public static final int RESP_FUNCTION_LIST_VALUE = 9; public final int getNumber() { return value; } @@ -130,6 +146,8 @@ public final class UserProtos { case 5: return REQUEST_RESULTS; case 6: return QUERY_RESULT; case 7: return QUERY_HANDLE; + case 8: return REQ_META_FUNCTIONS; + case 9: return RESP_FUNCTION_LIST; default: return null; } } @@ -5211,14 +5229,15 @@ public final class UserProtos { "2\033.exec.shared.RecordBatchDef\022\026\n\016schema_" + "changed\030\013 \001(\010\"b\n\nQueryState\022\013\n\007PENDING\020\000" + "\022\013\n\007RUNNING\020\001\022\r\n\tCOMPLETED\020\002\022\014\n\010CANCELED" + - "\020\003\022\n\n\006FAILED\020\004\022\021\n\rUNKNOWN_QUERY\020\005*\210\001\n\007Rp" + + "\020\003\022\n\n\006FAILED\020\004\022\021\n\rUNKNOWN_QUERY\020\005*\270\001\n\007Rp" + "cType\022\r\n\tHANDSHAKE\020\000\022\007\n\003ACK\020\001\022\013\n\007GOODBYE" + "\020\002\022\r\n\tRUN_QUERY\020\003\022\020\n\014CANCEL_QUERY\020\004\022\023\n\017R" + "EQUEST_RESULTS\020\005\022\020\n\014QUERY_RESULT\020\006\022\020\n\014QU" + - "ERY_HANDLE\020\007*/\n\tQueryType\022\007\n\003SQL\020\001\022\013\n\007LO" + - "GICAL\020\002\022\014\n\010PHYSICAL\020\003*#\n\020QueryResultsMod" + - "e\022\017\n\013STREAM_FULL\020\001B+\n\033org.apache.drill.e", - "xec.protoB\nUserProtosH\001" + "ERY_HANDLE\020\007\022\026\n\022REQ_META_FUNCTIONS\020\010\022\026\n\022" + + "RESP_FUNCTION_LIST\020\t*/\n\tQueryType\022\007\n\003SQL" + + "\020\001\022\013\n\007LOGICAL\020\002\022\014\n\010PHYSICAL\020\003*#\n\020QueryRe", + "sultsMode\022\017\n\013STREAM_FULL\020\001B+\n\033org.apache" + + ".drill.exec.protoB\nUserProtosH\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/a4a2c533/protocol/src/main/protobuf/User.proto ---------------------------------------------------------------------- diff --git a/protocol/src/main/protobuf/User.proto b/protocol/src/main/protobuf/User.proto index fb4e093..3bbe039 100644 --- a/protocol/src/main/protobuf/User.proto +++ b/protocol/src/main/protobuf/User.proto @@ -48,8 +48,6 @@ message RunQuery { optional string plan = 3; } -message - enum QueryType { SQL = 1; LOGICAL = 2;
