[
https://issues.apache.org/jira/browse/DRILL-4956?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15724498#comment-15724498
]
ASF GitHub Bot commented on DRILL-4956:
---------------------------------------
Github user paul-rogers commented on a diff in the pull request:
https://github.com/apache/drill/pull/666#discussion_r90697492
--- Diff:
exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DropTableHandler.java
---
@@ -55,35 +57,48 @@ public DropTableHandler(SqlHandlerConfig config) {
*/
@Override
public PhysicalPlan getPlan(SqlNode sqlNode) throws ValidationException,
RelConversionException, IOException {
-
SqlDropTable dropTableNode = ((SqlDropTable) sqlNode);
- SqlIdentifier tableIdentifier = dropTableNode.getTableIdentifier();
-
+ String originalTableName = dropTableNode.getName();
SchemaPlus defaultSchema = config.getConverter().getDefaultSchema();
- AbstractSchema drillSchema = null;
+ List<String> tableSchema = dropTableNode.getSchema();
- if (tableIdentifier != null) {
- drillSchema =
SchemaUtilites.resolveToMutableDrillSchema(defaultSchema,
dropTableNode.getSchema());
- }
-
- String tableName = dropTableNode.getName();
- if (drillSchema == null) {
- throw UserException.validationError()
- .message("Invalid table_name [%s]", tableName)
- .build(logger);
- }
+ boolean removedTemporaryTable = removeTemporaryTable(tableSchema,
originalTableName);
+ if (!removedTemporaryTable) {
+ AbstractSchema drillSchema =
SchemaUtilites.resolveToMutableDrillSchema(defaultSchema, tableSchema);
+ if (drillSchema == null) {
+ throw UserException.validationError().message("Invalid table_name
[%s]", originalTableName).build(logger);
+ }
- if (dropTableNode.checkTableExistence()) {
- final Table tableToDrop =
SqlHandlerUtil.getTableFromSchema(drillSchema, tableName);
+ final Table tableToDrop =
SqlHandlerUtil.getTableFromSchema(drillSchema, originalTableName);
if (tableToDrop == null || tableToDrop.getJdbcTableType() !=
Schema.TableType.TABLE) {
- return DirectPlan.createDirectPlan(context, true,
- String.format("Table [%s] not found", tableName));
+ if (dropTableNode.checkTableExistence()) {
+ return DirectPlan.createDirectPlan(context, false,
String.format("Table [%s] not found", originalTableName));
+ } else {
+ throw UserException.validationError().message("Table [%s] not
found", originalTableName).build(logger);
+ }
}
+ drillSchema.dropTable(originalTableName);
}
- drillSchema.dropTable(tableName);
+ String message = String.format("%s [%s] dropped",
+ removedTemporaryTable ? "Temporary table" : "Table",
originalTableName);
+ logger.info(message);
+ return DirectPlan.createDirectPlan(context, true, message);
+ }
- return DirectPlan.createDirectPlan(context, true,
- String.format("Table [%s] %s", tableName, "dropped"));
+ /**
+ * Checks if table aimed to be dropped is temporary table.
+ * If table is temporary table, it is dropped from schema
+ * and removed from temporary tables session cache.
+ *
+ * @param tableSchema table schema indicated in drop statement
+ * @param tableName table name to drop
+ * @return true if temporary table existed and was dropped, false
otherwise
+ */
+ private boolean removeTemporaryTable(List<String> tableSchema, String
tableName) {
--- End diff --
What happens if some other query is running against the table when we
attempt to delete it? Will this delete fail (because the file is open) or will
the other query fail (because the data disappears out from under the reader)?
Anything special we have to check to handle the race condition case?
> Temporary tables support
> ------------------------
>
> Key: DRILL-4956
> URL: https://issues.apache.org/jira/browse/DRILL-4956
> Project: Apache Drill
> Issue Type: Improvement
> Affects Versions: 1.8.0
> Reporter: Arina Ielchiieva
> Assignee: Paul Rogers
> Labels: doc-impacting
> Fix For: Future
>
>
> Link to design doc -
> https://docs.google.com/document/d/1gSRo_w6q2WR5fPx7SsQ5IaVmJXJ6xCOJfYGyqpVOC-g/edit
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
