|
42 | 42 | import org.apache.drill.exec.rpc.user.UserServer; |
43 | 43 | import org.apache.drill.exec.rpc.user.UserServer.BitToUserConnection; |
44 | 44 | import org.apache.drill.exec.rpc.user.UserServer.BitToUserConnectionConfig; |
45 | | -import org.apache.drill.exec.schema.daffodil.DaffodilSchemaRegistry; |
| 45 | +import org.apache.drill.exec.schema.daffodil.DaffodilSchemaProvider; |
46 | 46 | import org.apache.drill.exec.server.options.SystemOptionManager; |
47 | 47 | import org.apache.drill.exec.store.SchemaFactory; |
48 | 48 | import org.apache.drill.exec.store.StoragePluginRegistry; |
@@ -83,7 +83,7 @@ public class DrillbitContext implements AutoCloseable { |
83 | 83 | private ResourceManager resourceManager; |
84 | 84 | private final MetastoreRegistry metastoreRegistry; |
85 | 85 | private final DrillCounters counters; |
86 | | - private final DaffodilSchemaRegistry daffodilSchemaRegistry; |
| 86 | + private final DaffodilSchemaProvider daffodilSchemaProvider; |
87 | 87 |
|
88 | 88 | public DrillbitContext( |
89 | 89 | DrillbitEndpoint endpoint, |
@@ -136,7 +136,7 @@ public DrillbitContext( |
136 | 136 | this.oAuthTokenProvider = new OAuthTokenProvider(this); |
137 | 137 |
|
138 | 138 | // TODO Start here and complete the initialization process |
139 | | - this.daffodilSchemaRegistry = new DaffodilSchemaRegistry(config, classpathScan, systemOptions); |
| 139 | + this.daffodilSchemaProvider = new DaffodilSchemaProvider(config, classpathScan, systemOptions); |
140 | 140 |
|
141 | 141 | this.counters = DrillCounters.getInstance(); |
142 | 142 | } |
@@ -289,8 +289,8 @@ public RemoteFunctionRegistry getRemoteFunctionRegistry() { |
289 | 289 | return functionRegistry.getRemoteFunctionRegistry(); |
290 | 290 | } |
291 | 291 |
|
292 | | - public DaffodilSchemaRegistry getDaffodilSchemaRegistry() { |
293 | | - return daffodilSchemaRegistry; |
| 292 | + public DaffodilSchemaProvider getDaffodilSchemaProvider() { |
| 293 | + return daffodilSchemaProvider; |
294 | 294 | } |
295 | 295 |
|
296 | 296 | /** |
@@ -327,6 +327,7 @@ public void close() throws Exception { |
327 | 327 | getMetastoreRegistry().close(); |
328 | 328 | getAliasRegistryProvider().close(); |
329 | 329 | getOauthTokenProvider().close(); |
| 330 | + getDaffodilSchemaProvider().close(); |
330 | 331 | } |
331 | 332 |
|
332 | 333 | public ResourceManager getResourceManager() { |
|
0 commit comments