WIP

Author: cgivre

exec/java-exec/src/main/java/org/apache/drill/exec/ops/QueryContext.java

@@ -214,8 +214,8 @@ public SchemaPlus getRootSchema(SchemaConfig schemaConfig) {
   }
 
   /**
-   * Get the user name of the user who issued the query that is managed by this QueryContext.
-   * @return The user name of the user who issued the query that is managed by this QueryContext.
+   * Get the username of the user who issued the query that is managed by this QueryContext.
+   * @return The username of the user who issued the query that is managed by this QueryContext.
    */
   @Override
   public String getQueryUserName() {

exec/java-exec/src/main/java/org/apache/drill/exec/schema/daffodil/DaffodilSchemaProvider.java

@@ -19,6 +19,9 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.drill.common.AutoCloseables;
+import org.apache.drill.common.config.DrillConfig;
+import org.apache.drill.common.scanner.ClassPathScanner;
+import org.apache.drill.common.scanner.persistence.ScanResult;
 import org.apache.drill.exec.oauth.PersistentTokenRegistry;
 import org.apache.drill.exec.oauth.TokenRegistry;
 import org.apache.drill.exec.server.DrillbitContext;
@@ -34,7 +37,15 @@ public class DaffodilSchemaProvider implements AutoCloseable {
   private PersistentTokenRegistry daffodilSchemaRegistry;
 
   public DaffodilSchemaProvider(DrillbitContext context) {
-    this.context = context;
+    this(context.getConfig(), ClassPathScanner.fromPrescan(context.getConfig()));
+  }
+
+  public DaffodilSchemaProvider(DrillConfig config, ScanResult classpathScan) {
+    this(config, classpathScan, null);
+  }
+
+  public DaffodilSchemaProvider(DrillConfig config, ScanResult classpathScan, String username) {
+
   }
 
   public TokenRegistry getDaffodilSchemaRegistry(String username) {

exec/java-exec/src/main/java/org/apache/drill/exec/schema/daffodil/PersistentSchemaTable.java

@@ -21,11 +21,8 @@
 
 import com.fasterxml.jackson.annotation.JacksonInject;
 import com.fasterxml.jackson.annotation.JsonCreator;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.drill.exec.oauth.PersistentTokenRegistry;
-import org.apache.drill.exec.oauth.Tokens;
 import org.apache.drill.exec.record.metadata.TupleMetadata;
 import org.apache.drill.exec.store.sys.PersistentStore;
 
@@ -37,11 +34,8 @@
  */
 public class PersistentSchemaTable implements DaffodilSchemata {
   public final String SCHEMA_KEY = "schema";
-
   private final Map<String, TupleMetadata> schemata;
-
   private final String key;
-
   private final PersistentStore<org.apache.drill.exec.schema.daffodil.PersistentSchemaTable> store;
 
   @JsonCreator
@@ -80,7 +74,7 @@ public TupleMetadata get(String schemaName) {
   @JsonIgnore
   public boolean put(String token, String value, boolean replace) {
     if (replace || ! schemata.containsKey(token)) {
-      schemata.put(token, value);
+      schemata.put(token, TupleMetadata.of(value));
       store.put(key, this);
       return true;
     }