Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -50,29 +50,22 @@ public void refresh(final MetaDataManagerPersistService metaDataManagerPersistSe
final String schemaName, final DatabaseType databaseType, final AlterViewStatement sqlStatement, final ConfigurationProperties props) throws SQLException {
String viewName = TableRefreshUtils.getTableName(sqlStatement.getView().getTableName().getIdentifier(), databaseType);
Collection<ShardingSphereTable> alteredTables = new LinkedList<>();
Collection<ShardingSphereView> alteredViews = new LinkedList<>();
Collection<String> droppedTables = new LinkedList<>();
Collection<String> droppedViews = new LinkedList<>();
Optional<SimpleTableSegment> renameView = sqlStatement.getRenameView();
if (renameView.isPresent()) {
String renameViewName = renameView.get().getTableName().getIdentifier().getValue();
String originalView = database.getSchema(schemaName).getView(viewName).getViewDefinition();
ShardingSphereSchema schema = getSchema(database, logicDataSourceName, schemaName, renameViewName, originalView, props);
alteredTables.add(schema.getTable(renameViewName));
alteredViews.add(schema.getView(renameViewName));
droppedTables.add(viewName);
droppedViews.add(viewName);
}
Optional<String> viewDefinition = sqlStatement.getViewDefinition();
if (viewDefinition.isPresent()) {
ShardingSphereSchema schema = getSchema(database, logicDataSourceName, schemaName, viewName, viewDefinition.get(), props);
alteredTables.add(schema.getTable(viewName));
alteredViews.add(schema.getView(viewName));
}
metaDataManagerPersistService.alterTables(database, schemaName, alteredTables);
metaDataManagerPersistService.alterViews(database, schemaName, alteredViews);
metaDataManagerPersistService.dropTables(database, schemaName, droppedTables);
metaDataManagerPersistService.dropViews(database, schemaName, droppedViews);
}

private ShardingSphereSchema getSchema(final ShardingSphereDatabase database, final String logicDataSourceName,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import org.apache.shardingsphere.infra.metadata.database.schema.builder.GenericSchemaBuilderMaterial;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereView;
import org.apache.shardingsphere.infra.rule.attribute.datanode.MutableDataNodeRuleAttribute;
import org.apache.shardingsphere.mode.metadata.refresher.pushdown.PushDownMetaDataRefresher;
import org.apache.shardingsphere.mode.metadata.refresher.util.TableRefreshUtils;
Expand Down Expand Up @@ -57,7 +56,6 @@ public void refresh(final MetaDataManagerPersistService metaDataManagerPersistSe
Optional<ShardingSphereTable> actualTableMetaData = Optional.ofNullable(schemas.get(schemaName)).map(optional -> optional.getTable(viewName));
Preconditions.checkState(actualTableMetaData.isPresent(), "Load actual view metadata '%s' failed.", viewName);
metaDataManagerPersistService.alterTables(database, schemaName, Collections.singleton(actualTableMetaData.get()));
metaDataManagerPersistService.alterViews(database, schemaName, Collections.singleton(new ShardingSphereView(viewName, sqlStatement.getViewDefinition())));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,10 @@ private void assertExecute(final SQLE2EITContext context) throws SQLException {
try (Connection connection = environmentEngine.getTargetDataSource().getConnection()) {
try (Statement statement = connection.createStatement()) {
statement.execute(context.getSQL());
Thread.sleep(1000L);
assertExecuteResult(context, statement);
} catch (final InterruptedException ignore) {
Thread.currentThread().interrupt();
}
}
}
Expand Down