Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor package of proxy.backend.handler.distsql.ral.queryable and proxy.backend.handler.distsql.ral.updatable #34982

Merged
merged 1 commit into from
Mar 13, 2025
Merged

Refactor package of proxy.backend.handler.distsql.ral.queryable and proxy.backend.handler.distsql.ral.updatable #34982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...ueryable/ShowComputeNodeInfoExecutor.java → ...putenode/ShowComputeNodeInfoExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable;
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.computenode;

import org.apache.shardingsphere.distsql.handler.engine.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.distsql.statement.ral.queryable.show.ShowComputeNodeInfoStatement;
Expand Down
2 changes: 1 addition & 1 deletion ...ueryable/ShowComputeNodeModeExecutor.java → ...putenode/ShowComputeNodeModeExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable;
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.computenode;

import org.apache.shardingsphere.distsql.handler.engine.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.distsql.statement.ral.queryable.show.ShowComputeNodeModeStatement;
Expand Down
2 changes: 1 addition & 1 deletion ...l/queryable/ShowComputeNodesExecutor.java → ...computenode/ShowComputeNodesExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable;
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.computenode;

import org.apache.shardingsphere.distsql.handler.engine.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.distsql.statement.ral.queryable.show.ShowComputeNodesStatement;
Expand Down
7 changes: 1 addition & 6 deletions .../ExportDatabaseConfigurationExecutor.java → .../ExportDatabaseConfigurationExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable;
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.export;

import lombok.Setter;
import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorDatabaseAware;
Expand Down Expand Up @@ -54,11 +54,6 @@ public Collection<LocalDataQueryResultRow> getRows(final ExportDatabaseConfigura
return Collections.singleton(new LocalDataQueryResultRow(exportedData));
}

@Override
public void setDatabase(final ShardingSphereDatabase database) {
this.database = database;
}

@Override
public Class<ExportDatabaseConfigurationStatement> getType() {
return ExportDatabaseConfigurationStatement.class;
Expand Down
2 changes: 1 addition & 1 deletion ...ral/queryable/ExportMetaDataExecutor.java → ...ryable/export/ExportMetaDataExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable;
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.export;

import org.apache.commons.codec.binary.Base64;
import org.apache.shardingsphere.distsql.handler.engine.query.DistSQLQueryExecutor;
Expand Down
2 changes: 1 addition & 1 deletion ...queryable/ExportStorageNodesExecutor.java → ...le/export/ExportStorageNodesExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable;
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.export;

import org.apache.shardingsphere.distsql.handler.engine.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.distsql.statement.ral.queryable.export.ExportStorageNodesStatement;
Expand Down
2 changes: 1 addition & 1 deletion .../queryable/ShowTableMetaDataExecutor.java → ...ble/export/ShowTableMetaDataExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable;
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.export;

import lombok.Setter;
import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorDatabaseAware;
Expand Down
2 changes: 1 addition & 1 deletion ...l/queryable/ShowDistVariableExecutor.java → ...le/variable/ShowDistVariableExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable;
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.variable;

import lombok.Setter;
import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorConnectionContextAware;
Expand Down
2 changes: 1 addition & 1 deletion .../queryable/ShowDistVariablesExecutor.java → ...e/variable/ShowDistVariablesExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable;
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.variable;

import lombok.Setter;
import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorConnectionContextAware;
Expand Down
6 changes: 3 additions & 3 deletions ...ble/ConvertYamlConfigurationExecutor.java → ...aml/ConvertYamlConfigurationExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable;
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.yaml;

import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
Expand Down Expand Up @@ -74,11 +74,11 @@ public Collection<LocalDataQueryResultRow> getRows(final ConvertYamlConfiguratio
}
Preconditions.checkNotNull(yamlConfig, "Invalid yaml file `%s`", file.getName());
Preconditions.checkNotNull(yamlConfig.getDatabaseName(), "`databaseName` in file `%s` is required.", file.getName());
return Collections.singleton(new LocalDataQueryResultRow(convertYamlConfigToDistSQL(yamlConfig)));
return Collections.singleton(new LocalDataQueryResultRow(convertYamlConfigurationToDistSQL(yamlConfig)));
}

@SuppressWarnings("unchecked")
private String convertYamlConfigToDistSQL(final YamlProxyDatabaseConfiguration yamlConfig) {
private String convertYamlConfigurationToDistSQL(final YamlProxyDatabaseConfiguration yamlConfig) {
StringBuilder result = new StringBuilder();
result.append(convertDatabase(yamlConfig.getDatabaseName()));
result.append(System.lineSeparator()).append(System.lineSeparator());
Expand Down
2 changes: 1 addition & 1 deletion ...pdatable/SetComputeNodeStateExecutor.java → ...putenode/SetComputeNodeStateExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable;
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.computenode;

import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorClusterModeRequired;
import org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecutor;
Expand Down
2 changes: 1 addition & 1 deletion .../ImportDatabaseConfigurationExecutor.java → .../ImportDatabaseConfigurationExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable;
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.imports;

import org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.distsql.statement.ral.updatable.ImportDatabaseConfigurationStatement;
Expand Down
2 changes: 1 addition & 1 deletion ...ral/updatable/ImportMetaDataExecutor.java → ...table/imports/ImportMetaDataExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable;
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.imports;

import org.apache.commons.codec.binary.Base64;
import org.apache.commons.io.FileUtils;
Expand Down
2 changes: 1 addition & 1 deletion ...l/updatable/LabelComputeNodeExecutor.java → ...table/label/LabelComputeNodeExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable;
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.label;

import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorClusterModeRequired;
import org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecutor;
Expand Down
2 changes: 1 addition & 1 deletion ...updatable/UnlabelComputeNodeExecutor.java → ...ble/label/UnlabelComputeNodeExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable;
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.label;

import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorClusterModeRequired;
import org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecutor;
Expand Down
3 changes: 1 addition & 2 deletions ...ql/ral/updatable/LockClusterExecutor.java → ...l/updatable/lock/LockClusterExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable;
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.lock;

import org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorClusterModeRequired;
Expand All @@ -29,7 +29,6 @@
import org.apache.shardingsphere.mode.lock.exception.LockedClusterException;
import org.apache.shardingsphere.mode.lock.global.GlobalLockDefinition;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.lock.ClusterLock;
import org.apache.shardingsphere.proxy.backend.lock.spi.ClusterLockStrategy;

/**
Expand Down
3 changes: 1 addition & 2 deletions .../ral/updatable/UnlockClusterExecutor.java → ...updatable/lock/UnlockClusterExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable;
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.lock;

import org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.distsql.handler.required.DistSQLExecutorClusterModeRequired;
Expand All @@ -26,7 +26,6 @@
import org.apache.shardingsphere.mode.lock.exception.NotLockedClusterException;
import org.apache.shardingsphere.mode.lock.global.GlobalLockDefinition;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.lock.ClusterLock;

/**
* Unlock cluster executor.
Expand Down
2 changes: 1 addition & 1 deletion ...able/RefreshDatabaseMetaDataExecutor.java → ...resh/RefreshDatabaseMetaDataExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable;
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.refresh;

import org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecutor;
import org.apache.shardingsphere.distsql.statement.ral.updatable.RefreshDatabaseMetaDataStatement;
Expand Down
2 changes: 1 addition & 1 deletion ...datable/RefreshTableMetaDataExecutor.java → ...refresh/RefreshTableMetaDataExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable;
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.refresh;

import lombok.Setter;
import org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorDatabaseAware;
Expand Down
2 changes: 1 addition & 1 deletion ...al/updatable/SetDistVariableExecutor.java → ...ble/variable/SetDistVariableExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable;
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.variable;

import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.Logger;
Expand Down
20 changes: 10 additions & 10 deletions ...-INF/services/org.apache.shardingsphere.distsql.handler.engine.query.DistSQLQueryExecutor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@
# limitations under the License.
#

org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.ShowComputeNodesExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.ShowComputeNodeInfoExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.ShowComputeNodeModeExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.ExportDatabaseConfigurationExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.ExportMetaDataExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.ExportStorageNodesExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.ConvertYamlConfigurationExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.ShowDistVariableExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.ShowDistVariablesExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.ShowTableMetaDataExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.computenode.ShowComputeNodesExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.computenode.ShowComputeNodeInfoExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.computenode.ShowComputeNodeModeExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.export.ExportDatabaseConfigurationExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.export.ExportMetaDataExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.export.ExportStorageNodesExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.yaml.ConvertYamlConfigurationExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.variable.ShowDistVariableExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.variable.ShowDistVariablesExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.export.ShowTableMetaDataExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.rul.FormatSQLExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.rul.ParseDistSQLExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.rul.PreviewExecutor
20 changes: 10 additions & 10 deletions ...NF/services/org.apache.shardingsphere.distsql.handler.engine.update.DistSQLUpdateExecutor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
# limitations under the License.
#

org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.LabelComputeNodeExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.UnlabelComputeNodeExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.SetComputeNodeStateExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.ImportDatabaseConfigurationExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.ImportMetaDataExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.SetDistVariableExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.RefreshDatabaseMetaDataExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.LockClusterExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.UnlockClusterExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.RefreshTableMetaDataExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.label.LabelComputeNodeExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.label.UnlabelComputeNodeExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.computenode.SetComputeNodeStateExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.imports.ImportDatabaseConfigurationExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.imports.ImportMetaDataExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.variable.SetDistVariableExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.refresh.RefreshDatabaseMetaDataExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.lock.LockClusterExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.lock.UnlockClusterExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.refresh.RefreshTableMetaDataExecutor
2 changes: 1 addition & 1 deletion ...able/ShowComputeNodeInfoExecutorTest.java → ...node/ShowComputeNodeInfoExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable;
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.computenode;

import org.apache.shardingsphere.distsql.statement.ral.queryable.show.ShowComputeNodeInfoStatement;
import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
Expand Down
2 changes: 1 addition & 1 deletion ...able/ShowComputeNodeModeExecutorTest.java → ...node/ShowComputeNodeModeExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable;
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.computenode;

import org.apache.shardingsphere.distsql.statement.ral.queryable.show.ShowComputeNodeModeStatement;
import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
Expand Down
2 changes: 1 addition & 1 deletion ...eryable/ShowComputeNodesExecutorTest.java → ...utenode/ShowComputeNodesExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable;
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.computenode;

import org.apache.shardingsphere.distsql.statement.ral.queryable.show.ShowComputeNodesStatement;
import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
Expand Down
4 changes: 2 additions & 2 deletions ...ortDatabaseConfigurationExecutorTest.java → ...ortDatabaseConfigurationExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable;
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.export;

import lombok.SneakyThrows;
import org.apache.shardingsphere.distsql.statement.ral.queryable.export.ExportDatabaseConfigurationStatement;
Expand Down Expand Up @@ -138,7 +138,7 @@ private ShardingTableRuleConfiguration createTableRuleConfiguration() {

@SneakyThrows({IOException.class, URISyntaxException.class})
private String loadExpectedRow() {
URL url = Objects.requireNonNull(ConvertYamlConfigurationExecutorTest.class.getResource("/expected/export-database-configuration.yaml"));
URL url = Objects.requireNonNull(ExportDatabaseConfigurationExecutorTest.class.getResource("/expected/export-database-configuration.yaml"));
return Files.readAllLines(Paths.get(url.toURI())).stream().filter(each -> !each.startsWith("#") && !each.trim().isEmpty()).collect(Collectors.joining(System.lineSeparator()))
+ System.lineSeparator();
}
Expand Down
2 changes: 1 addition & 1 deletion ...queryable/ExportMetaDataExecutorTest.java → ...le/export/ExportMetaDataExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable;
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.export;

import org.apache.commons.codec.binary.Base64;
import org.apache.shardingsphere.authority.rule.AuthorityRule;
Expand Down
4 changes: 2 additions & 2 deletions ...yable/ExportStorageNodesExecutorTest.java → ...xport/ExportStorageNodesExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable;
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.export;

import lombok.SneakyThrows;
import org.apache.shardingsphere.authority.rule.AuthorityRule;
Expand Down Expand Up @@ -197,7 +197,7 @@ private ShardingTableRuleConfiguration createTableRuleConfiguration() {

@SneakyThrows({IOException.class, URISyntaxException.class})
private String loadExpectedRow() {
URL url = Objects.requireNonNull(ConvertYamlConfigurationExecutorTest.class.getResource("/expected/export-storage-nodes.json"));
URL url = Objects.requireNonNull(ExportStorageNodesExecutorTest.class.getResource("/expected/export-storage-nodes.json"));
return Files.readAllLines(Paths.get(url.toURI())).stream().filter(each -> !each.startsWith("#") && !each.trim().isEmpty()).collect(Collectors.joining(System.lineSeparator()));
}
}
2 changes: 1 addition & 1 deletion ...ryable/ShowTableMetaDataExecutorTest.java → ...export/ShowTableMetaDataExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable;
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.export;

import org.apache.shardingsphere.distsql.statement.ral.queryable.show.ShowTableMetaDataStatement;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
Expand Down
2 changes: 1 addition & 1 deletion ...eryable/ShowDistVariableExecutorTest.java → ...ariable/ShowDistVariableExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable;
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.variable;

import org.apache.shardingsphere.distsql.handler.engine.DistSQLConnectionContext;
import org.apache.shardingsphere.distsql.statement.ral.queryable.show.ShowDistVariableStatement;
Expand Down
2 changes: 1 addition & 1 deletion ...ryable/ShowDistVariablesExecutorTest.java → ...riable/ShowDistVariablesExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable;
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.variable;

import org.apache.shardingsphere.distsql.handler.engine.DistSQLConnectionContext;
import org.apache.shardingsphere.distsql.statement.ral.queryable.show.ShowDistVariablesStatement;
Expand Down
2 changes: 1 addition & 1 deletion ...ConvertYamlConfigurationExecutorTest.java → ...ConvertYamlConfigurationExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable;
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.yaml;

import com.google.common.base.Splitter;
import lombok.SneakyThrows;
Expand Down
2 changes: 1 addition & 1 deletion ...able/SetComputeNodeStateExecutorTest.java → ...node/SetComputeNodeStateExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable;
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.computenode;

import org.apache.shardingsphere.distsql.statement.ral.updatable.SetComputeNodeStateStatement;
import org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException;
Expand Down
2 changes: 1 addition & 1 deletion ...ortDatabaseConfigurationExecutorTest.java → ...ortDatabaseConfigurationExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable;
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.imports;

import org.apache.shardingsphere.distsql.statement.ral.updatable.ImportDatabaseConfigurationStatement;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
Expand Down
Loading
Loading