From eafcd7e541dcacbc7dceb312456839fecb7d7f7a Mon Sep 17 00:00:00 2001 From: cjw Date: Tue, 7 Jul 2020 00:11:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9java=20package(=E5=8C=85?= =?UTF-8?q?=E5=90=8D=E5=A4=A7=E5=B0=8F=E5=86=99=E9=97=AE=E9=A2=98)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +++--- common/src/main/java/io/mycat/SessionOpt.java | 2 +- .../BinaryResultSetTransforCollector.java | 2 -- .../mycat/api/collector/OneResultSetCollector.java | 3 --- .../io/mycat/beans/mycat/JdbcRowBaseIterator.java | 3 --- .../io/mycat/beans/mysql/packet/ProxyBuffer.java | 3 --- .../{bindThread => bindthread}/BindThread.java | 2 +- .../BindThreadCallback.java | 2 +- .../{bindThread => bindthread}/BindThreadKey.java | 2 +- .../{bindThread => bindthread}/BindThreadPool.java | 2 +- .../io/mycat/{logTip => logtip}/MycatLogger.java | 2 +- .../{logTip => logtip}/MycatLoggerFactory.java | 2 +- .../java/io/mycat/{logTip => logtip}/ScanDoc.java | 2 +- .../ModifyCallback.java | 2 +- .../SequenceModifier.java | 2 +- .../io/mycat/util/CachingSha2PasswordPlugin.java | 3 --- .../src/main/java/io/mycat/util/CharsetUtil.java | 3 --- common/src/main/java/io/mycat/util/DumpUtil.java | 2 -- .../main/java/io/mycat/util/DynaClassLoader.java | 2 -- common/src/main/java/io/mycat/util/JavaUtils.java | 2 -- .../mycat/util/MysqlNativePasswordPluginUtil.java | 2 -- common/src/main/java/io/mycat/util/StringUtil.java | 2 -- .../main/java/io/mycat/util/nio/SelectorUtil.java | 3 --- .../java/io/mycat/datasource/jdbc/JdbcRuntime.java | 2 +- .../AtomikosDatasourceProvider.java | 2 +- .../DruidDatasourceProvider.java | 2 +- .../JTATransactionSession.java | 2 +- .../TransactionSessionTemplate.java | 2 +- doc/22-mycat-jdbc.md | 6 +++--- .../CustomRuleExample.java | 2 +- .../CustomRuleExample.java | 2 +- .../ReadWriteSeparationExample.java | 2 +- .../ShardingLocalExample.java | 2 +- .../ShardingLocalFailExample.java | 5 +---- .../ShardingRwExample.java | 2 +- .../ShardingXAExample.java | 2 +- .../ShardingXAFailExample.java | 2 +- .../resources/io/mycat/example/booster/mycat.yml | 2 +- .../globalVariables.json | 0 .../example/{customRule => customrule}/mycat.yml | 2 +- .../globalVariables.json | 0 .../mycat.yml | 2 +- .../resources/io/mycat/example/manager/mycat.yml | 2 +- .../resources/io/mycat/example/pstmt/mycat.yml | 2 +- .../globalVariables.json | 0 .../mycat.yml | 2 +- .../resources/io/mycat/example/sharding/mycat.yml | 2 +- .../globalVariables.json | 0 .../{shardingLocalFail => shardinglocal}/mycat.yml | 2 +- .../globalVariables.json | 0 .../{shardingLocal => shardinglocalfail}/mycat.yml | 2 +- .../globalVariables.json | 0 .../example/{shardingRw => shardingrw}/mycat.yml | 2 +- .../globalVariables.json | 0 .../{shardingXAFail => shardingxa}/mycat.yml | 2 +- .../globalVariables.json | 0 .../{shardingXA => shardingxafail}/mycat.yml | 2 +- .../main/java/io/mycat/calcite/CalciteUtls.java | 2 +- .../java/io/mycat/metadata/MetadataManager.java | 2 +- .../ColumnRangeValue.java | 2 +- .../ColumnValue.java | 2 +- .../ConditionCollector.java | 2 +- .../Converters.java | 2 +- .../DataMapping.java | 2 +- .../DataMappingEvaluator.java | 2 +- .../DataMappingEvaluatorImpl.java | 0 .../QueryDataRange.java | 2 +- mycat2/src/main/java/io/mycat/GRuntimeTest.java | 2 +- mycat2/src/main/java/io/mycat/MySQLTaskUtil.java | 9 --------- mycat2/src/main/java/io/mycat/MycatCore.java | 6 ++---- .../java/io/mycat/commands/MycatdbCommand.java | 14 +++++++------- .../java/io/mycat/lib/impl/ResultSetCacheImpl.java | 4 ---- .../AbstractSQLHandler.java | 2 +- .../{sqlHandler => sqlhandler}/ExecuteCode.java | 2 +- .../{sqlHandler => sqlhandler}/SQLHandler.java | 2 +- .../{sqlHandler => sqlhandler}/SQLRequest.java | 2 +- .../dcl/CommitSQLHandler.java | 8 ++++---- .../dcl/KillSQLHandler.java | 8 ++++---- .../dcl/RollbackSQLHandler.java | 8 ++++---- .../dcl/SetTransactionSQLHandler.java | 10 ++++------ .../dcl/StartTransactionSQLHandler.java | 8 ++++---- .../dcl/UseSQLHandler.java | 8 ++++---- .../ddl/AlterDatabaseSQLHandler.java | 8 ++++---- .../ddl/AlterTableSQLHandler.java | 8 ++++---- .../ddl/CreateDatabaseSQLHandler.java | 8 ++++---- .../ddl/CreateIndexSQLHandler.java | 8 ++++---- .../ddl/CreateTableSQLHandler.java | 8 ++++---- .../ddl/CreateViewSQLHandler.java | 8 ++++---- .../ddl/DropDatabaseSQLHandler.java | 8 ++++---- .../ddl/DropTableSQLHandler.java | 8 ++++---- .../ddl/DropViewSQLHandler.java | 8 ++++---- .../ddl/RenameTableSQLHandler.java | 8 ++++---- .../dml/DeleteSQLHandler.java | 10 +++++----- .../dml/InsertSQLHandler.java | 10 +++++----- .../dml/LoadDataInFileSQLHandler.java | 8 ++++---- .../dml/ReplaceSQLHandler.java | 10 +++++----- .../dml/SetSQLHandler.java | 8 ++++---- .../dml/TruncateSQLHandler.java | 10 +++++----- .../dml/UpdateSQLHandler.java | 8 ++++---- .../dql/AnalyzeHanlder.java | 8 ++++---- .../dql/ExplainSQLHandler.java | 8 ++++---- .../dql/HintSQLHandler.java | 8 ++++---- .../dql/SelectSQLHandler.java | 8 ++++---- .../dql/ShowCharacterSetSQLHandler.java | 8 ++++---- .../dql/ShowCollationSQLHandler.java | 8 ++++---- .../dql/ShowColumnsSQLHandler.java | 8 ++++---- .../dql/ShowCreateFunctionHanlder.java | 8 ++++---- .../dql/ShowCreateTableSQLHandler.java | 8 ++++---- .../dql/ShowDatabaseSQLHandler.java | 8 ++++---- .../dql/ShowDatabaseStatusSQLHandler.java | 8 ++++---- .../dql/ShowDatabasesHanlder.java | 8 ++++---- .../dql/ShowEnginesSQLHandler.java | 8 ++++---- .../dql/ShowErrorsSQLHandler.java | 8 ++++---- .../dql/ShowIndexesSQLHandler.java | 8 ++++---- .../dql/ShowProcedureStatusSQLHandler.java | 8 ++++---- .../dql/ShowProcessListSQLHandler.java | 8 ++++---- .../dql/ShowStatusSQLHandler.java | 8 ++++---- .../dql/ShowTableStatusSQLHandler.java | 8 ++++---- .../dql/ShowTablesSQLHandler.java | 8 ++++---- .../dql/ShowVariantsSQLHandler.java | 8 ++++---- .../dql/ShowWarningsSQLHandler.java | 8 ++++---- mycat2/src/main/resources/mycat.yml | 2 +- mycat2/src/main/resources/version.txt | 4 ++-- mycat2/src/test/java/io/mycat/sql/HBTChecker.java | 2 +- .../main/java/io/mycat/pattern/TableCollector.java | 2 -- .../SequenceTimeHandler.java | 2 +- .../SequenceFileHandler.java | 2 +- .../SequenceFileImpl.java | 4 ++-- .../SequenceMySQLHandler.java | 2 +- .../proxy/buffer/CrossSwapThreadBufferPool.java | 3 --- .../mycat/proxy/handler/MySQLPacketExchanger.java | 2 -- .../java/io/mycat/proxy/handler/MycatHandler.java | 3 --- .../handler/backend/BackendConCreateHandler.java | 3 --- .../mycat/proxy/handler/backend/IdleHandler.java | 2 -- .../proxy/handler/backend/RequestHandler.java | 2 -- .../proxy/handler/backend/ResultSetHandler.java | 2 -- .../handler/front/MySQLClientAuthHandler.java | 3 --- .../proxy/monitor/MycatMonitorLogCallback.java | 4 ---- .../io/mycat/proxy/packet/MySQLPacketResolver.java | 3 --- .../io/mycat/proxy/reactor/ProxyReactorThread.java | 3 --- .../io/mycat/proxy/reactor/ReactorEnvThread.java | 2 -- .../proxy/session/MySQLProxyServerSession.java | 3 --- .../mycat/proxy/session/MycatSessionManager.java | 3 --- .../session/ServerTransactionSessionRunner.java | 6 +++--- .../main/java/io/mycat/proxy/session/Session.java | 4 ---- .../io/mycat/runtime/LocalTransactionSession.java | 3 +-- proxy/src/main/java/io/mycat/thread/GProcess.java | 4 ++-- proxy/src/main/java/io/mycat/thread/GThread.java | 7 ++----- .../src/main/java/io/mycat/thread/GThreadPool.java | 7 +++---- .../router/function/ConsistentHashPreSlot.java | 2 +- .../router/function/PartitionByCRC32PreSlot.java | 2 +- .../HashFunction.java | 2 +- .../MD5MessageDigest.java | 2 +- .../MessageDigestHashFunction.java | 2 +- .../PureJavaCrc32HashFunction.java | 2 +- .../router/sequence/MySQLSequenceHandlerImpl.java | 3 --- .../router/sequence/SequenceModifierImpl.java | 6 ++---- .../main/java/io/mycat/router/util/RouterUtil.java | 3 --- .../main/java/io/mycat/router/util/StringUtil.java | 2 -- 159 files changed, 276 insertions(+), 385 deletions(-) rename common/src/main/java/io/mycat/{bindThread => bindthread}/BindThread.java (99%) rename common/src/main/java/io/mycat/{bindThread => bindthread}/BindThreadCallback.java (96%) rename common/src/main/java/io/mycat/{bindThread => bindthread}/BindThreadKey.java (96%) rename common/src/main/java/io/mycat/{bindThread => bindthread}/BindThreadPool.java (99%) rename common/src/main/java/io/mycat/{logTip => logtip}/MycatLogger.java (99%) rename common/src/main/java/io/mycat/{logTip => logtip}/MycatLoggerFactory.java (97%) rename common/src/main/java/io/mycat/{logTip => logtip}/ScanDoc.java (98%) rename common/src/main/java/io/mycat/{sequenceModifier => sequencemodifier}/ModifyCallback.java (95%) rename common/src/main/java/io/mycat/{sequenceModifier => sequencemodifier}/SequenceModifier.java (96%) rename datasource/src/main/java/io/mycat/datasource/jdbc/{datasourceProvider => datasourceprovider}/AtomikosDatasourceProvider.java (98%) rename datasource/src/main/java/io/mycat/datasource/jdbc/{datasourceProvider => datasourceprovider}/DruidDatasourceProvider.java (97%) rename datasource/src/main/java/io/mycat/datasource/jdbc/{transactionSession => transactionsession}/JTATransactionSession.java (98%) rename datasource/src/main/java/io/mycat/datasource/jdbc/{transactionSession => transactionsession}/TransactionSessionTemplate.java (99%) rename example/src/test/java/io/mycat/example/{customRule => customrule}/CustomRuleExample.java (98%) rename example/src/test/java/io/mycat/example/{customRuleSegmentQuery => customrulesegmentquery}/CustomRuleExample.java (98%) rename example/src/test/java/io/mycat/example/{readWriteSeparation => readwriteseparation}/ReadWriteSeparationExample.java (99%) rename example/src/test/java/io/mycat/example/{shardingLocal => shardinglocal}/ShardingLocalExample.java (99%) rename example/src/test/java/io/mycat/example/{shardingLocalFail => shardinglocalfail}/ShardingLocalFailExample.java (96%) rename example/src/test/java/io/mycat/example/{shardingRw => shardingrw}/ShardingRwExample.java (99%) rename example/src/test/java/io/mycat/example/{shardingXA => shardingxa}/ShardingXAExample.java (99%) rename example/src/test/java/io/mycat/example/{shardingXAFail => shardingxafail}/ShardingXAFailExample.java (98%) rename example/src/test/resources/io/mycat/example/{customRule => customrule}/globalVariables.json (100%) rename example/src/test/resources/io/mycat/example/{customRule => customrule}/mycat.yml (98%) rename example/src/test/resources/io/mycat/example/{customRuleSegmentQuery => customrulesegmentquery}/globalVariables.json (100%) rename example/src/test/resources/io/mycat/example/{customRuleSegmentQuery => customrulesegmentquery}/mycat.yml (98%) rename example/src/test/resources/io/mycat/example/{readWriteSeparation => readwriteseparation}/globalVariables.json (100%) rename example/src/test/resources/io/mycat/example/{readWriteSeparation => readwriteseparation}/mycat.yml (98%) rename example/src/test/resources/io/mycat/example/{shardingLocal => shardinglocal}/globalVariables.json (100%) rename example/src/test/resources/io/mycat/example/{shardingLocalFail => shardinglocal}/mycat.yml (98%) rename example/src/test/resources/io/mycat/example/{shardingLocalFail => shardinglocalfail}/globalVariables.json (100%) rename example/src/test/resources/io/mycat/example/{shardingLocal => shardinglocalfail}/mycat.yml (98%) rename example/src/test/resources/io/mycat/example/{shardingRw => shardingrw}/globalVariables.json (100%) rename example/src/test/resources/io/mycat/example/{shardingRw => shardingrw}/mycat.yml (99%) rename example/src/test/resources/io/mycat/example/{shardingXA => shardingxa}/globalVariables.json (100%) rename example/src/test/resources/io/mycat/example/{shardingXAFail => shardingxa}/mycat.yml (98%) rename example/src/test/resources/io/mycat/example/{shardingXAFail => shardingxafail}/globalVariables.json (100%) rename example/src/test/resources/io/mycat/example/{shardingXA => shardingxafail}/mycat.yml (98%) rename hbt/src/main/java/io/mycat/{queryCondition => querycondition}/ColumnRangeValue.java (97%) rename hbt/src/main/java/io/mycat/{queryCondition => querycondition}/ColumnValue.java (98%) rename hbt/src/main/java/io/mycat/{queryCondition => querycondition}/ConditionCollector.java (99%) rename hbt/src/main/java/io/mycat/{queryCondition => querycondition}/Converters.java (98%) rename hbt/src/main/java/io/mycat/{queryCondition => querycondition}/DataMapping.java (92%) rename hbt/src/main/java/io/mycat/{queryCondition => querycondition}/DataMappingEvaluator.java (99%) rename hbt/src/main/java/io/mycat/{queryCondition => querycondition}/DataMappingEvaluatorImpl.java (100%) rename hbt/src/main/java/io/mycat/{queryCondition => querycondition}/QueryDataRange.java (98%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/AbstractSQLHandler.java (98%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/ExecuteCode.java (96%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/SQLHandler.java (97%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/SQLRequest.java (92%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dcl/CommitSQLHandler.java (72%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dcl/KillSQLHandler.java (73%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dcl/RollbackSQLHandler.java (73%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dcl/SetTransactionSQLHandler.java (84%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dcl/StartTransactionSQLHandler.java (74%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dcl/UseSQLHandler.java (80%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/ddl/AlterDatabaseSQLHandler.java (74%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/ddl/AlterTableSQLHandler.java (73%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/ddl/CreateDatabaseSQLHandler.java (74%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/ddl/CreateIndexSQLHandler.java (73%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/ddl/CreateTableSQLHandler.java (98%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/ddl/CreateViewSQLHandler.java (73%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/ddl/DropDatabaseSQLHandler.java (74%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/ddl/DropTableSQLHandler.java (73%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/ddl/DropViewSQLHandler.java (73%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/ddl/RenameTableSQLHandler.java (74%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dml/DeleteSQLHandler.java (82%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dml/InsertSQLHandler.java (82%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dml/LoadDataInFileSQLHandler.java (75%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dml/ReplaceSQLHandler.java (82%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dml/SetSQLHandler.java (88%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dml/TruncateSQLHandler.java (82%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dml/UpdateSQLHandler.java (97%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dql/AnalyzeHanlder.java (94%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dql/ExplainSQLHandler.java (88%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dql/HintSQLHandler.java (85%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dql/SelectSQLHandler.java (98%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dql/ShowCharacterSetSQLHandler.java (76%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dql/ShowCollationSQLHandler.java (75%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dql/ShowColumnsSQLHandler.java (96%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dql/ShowCreateFunctionHanlder.java (76%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dql/ShowCreateTableSQLHandler.java (93%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dql/ShowDatabaseSQLHandler.java (74%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dql/ShowDatabaseStatusSQLHandler.java (76%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dql/ShowDatabasesHanlder.java (87%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dql/ShowEnginesSQLHandler.java (92%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dql/ShowErrorsSQLHandler.java (75%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dql/ShowIndexesSQLHandler.java (74%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dql/ShowProcedureStatusSQLHandler.java (75%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dql/ShowProcessListSQLHandler.java (76%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dql/ShowStatusSQLHandler.java (75%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dql/ShowTableStatusSQLHandler.java (98%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dql/ShowTablesSQLHandler.java (96%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dql/ShowVariantsSQLHandler.java (96%) rename mycat2/src/main/java/io/mycat/{sqlHandler => sqlhandler}/dql/ShowWarningsSQLHandler.java (75%) rename plug/src/main/java/io/mycat/plug/sequence/{SequenceTime => sequenceTime}/SequenceTimeHandler.java (96%) rename plug/src/main/java/io/mycat/plug/sequence/{sequenceFile => sequencefile}/SequenceFileHandler.java (98%) rename plug/src/main/java/io/mycat/plug/sequence/{sequenceFile => sequencefile}/SequenceFileImpl.java (96%) rename plug/src/main/java/io/mycat/plug/sequence/{sequenceMySQL => sequencemysql}/SequenceMySQLHandler.java (98%) rename router/src/main/java/io/mycat/router/{hashFunction => hashfunction}/HashFunction.java (92%) rename router/src/main/java/io/mycat/router/{hashFunction => hashfunction}/MD5MessageDigest.java (87%) rename router/src/main/java/io/mycat/router/{hashFunction => hashfunction}/MessageDigestHashFunction.java (93%) rename router/src/main/java/io/mycat/router/{hashFunction => hashfunction}/PureJavaCrc32HashFunction.java (91%) diff --git a/README.md b/README.md index e1fa5c902..dded6cb96 100644 --- a/README.md +++ b/README.md @@ -952,7 +952,7 @@ xa 当数据源提供者为 ```yaml -datasourceProviderClass: io.mycat.datasource.jdbc.datasourceProvider.AtomikosDatasourceProvider +datasourceProviderClass: io.mycat.datasource.jdbc.datasourceprovider.AtomikosDatasourceProvider ``` @@ -968,7 +968,7 @@ datasourceProviderClass: io.mycat.datasource.jdbc.datasourceProvider.AtomikosDat 例如 ```yaml -datasourceProviderClass: io.mycat.datasource.jdbc.datasourceProvider.DruidDatasourceProvider +datasourceProviderClass: io.mycat.datasource.jdbc.datasourceprovider.DruidDatasourceProvider ``` 当使用此数据源提供者的时候使用workerPool线程池,当设置xa事务的时候,是使用此DruidDatasourceProvider实现的事务是本地事务,多个连接commit在阶段失败,已经commit的连接不能回滚 @@ -1032,7 +1032,7 @@ datasource: initSqlsGetConnection: false } ] - datasourceProviderClass: io.mycat.datasource.jdbc.datasourceProvider.AtomikosDatasourceProvider + datasourceProviderClass: io.mycat.datasource.jdbc.datasourceprovider.AtomikosDatasourceProvider timer: {initialDelay: 1000, period: 5, timeUnit: SECONDS} ``` diff --git a/common/src/main/java/io/mycat/SessionOpt.java b/common/src/main/java/io/mycat/SessionOpt.java index d74b91725..9993ce791 100644 --- a/common/src/main/java/io/mycat/SessionOpt.java +++ b/common/src/main/java/io/mycat/SessionOpt.java @@ -1,7 +1,7 @@ package io.mycat; import io.mycat.beans.mycat.TransactionType; -import io.mycat.bindThread.BindThreadKey; +import io.mycat.bindthread.BindThreadKey; /** * @author Junwen Chen **/ diff --git a/common/src/main/java/io/mycat/api/collector/BinaryResultSetTransforCollector.java b/common/src/main/java/io/mycat/api/collector/BinaryResultSetTransforCollector.java index 4850a1b78..8b99c84e0 100644 --- a/common/src/main/java/io/mycat/api/collector/BinaryResultSetTransforCollector.java +++ b/common/src/main/java/io/mycat/api/collector/BinaryResultSetTransforCollector.java @@ -17,8 +17,6 @@ import io.mycat.beans.mysql.packet.ColumnDefPacket; import io.mycat.beans.mysql.packet.MySQLPacket; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/io/mycat/api/collector/OneResultSetCollector.java b/common/src/main/java/io/mycat/api/collector/OneResultSetCollector.java index 81a49ed4c..5061adc93 100644 --- a/common/src/main/java/io/mycat/api/collector/OneResultSetCollector.java +++ b/common/src/main/java/io/mycat/api/collector/OneResultSetCollector.java @@ -17,9 +17,6 @@ package io.mycat.api.collector; import io.mycat.beans.mysql.packet.ColumnDefPacket; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; -import io.mycat.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/io/mycat/beans/mycat/JdbcRowBaseIterator.java b/common/src/main/java/io/mycat/beans/mycat/JdbcRowBaseIterator.java index 31e401e0d..5bcf52d14 100644 --- a/common/src/main/java/io/mycat/beans/mycat/JdbcRowBaseIterator.java +++ b/common/src/main/java/io/mycat/beans/mycat/JdbcRowBaseIterator.java @@ -15,10 +15,7 @@ package io.mycat.beans.mycat; import io.mycat.MycatException; -import io.mycat.api.collector.OneResultSetCollector; import io.mycat.api.collector.RowBaseIterator; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; import lombok.SneakyThrows; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/io/mycat/beans/mysql/packet/ProxyBuffer.java b/common/src/main/java/io/mycat/beans/mysql/packet/ProxyBuffer.java index 86eed77da..f4c0e16b4 100644 --- a/common/src/main/java/io/mycat/beans/mysql/packet/ProxyBuffer.java +++ b/common/src/main/java/io/mycat/beans/mysql/packet/ProxyBuffer.java @@ -14,10 +14,7 @@ */ package io.mycat.beans.mysql.packet; -import io.mycat.beans.mycat.JdbcRowBaseIterator; import io.mycat.buffer.BufferPool; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/io/mycat/bindThread/BindThread.java b/common/src/main/java/io/mycat/bindthread/BindThread.java similarity index 99% rename from common/src/main/java/io/mycat/bindThread/BindThread.java rename to common/src/main/java/io/mycat/bindthread/BindThread.java index 3477852ca..ae8dab3f3 100644 --- a/common/src/main/java/io/mycat/bindThread/BindThread.java +++ b/common/src/main/java/io/mycat/bindthread/BindThread.java @@ -13,7 +13,7 @@ * not, see . */ -package io.mycat.bindThread; +package io.mycat.bindthread; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/io/mycat/bindThread/BindThreadCallback.java b/common/src/main/java/io/mycat/bindthread/BindThreadCallback.java similarity index 96% rename from common/src/main/java/io/mycat/bindThread/BindThreadCallback.java rename to common/src/main/java/io/mycat/bindthread/BindThreadCallback.java index a0c446a51..ef4dcdb6d 100644 --- a/common/src/main/java/io/mycat/bindThread/BindThreadCallback.java +++ b/common/src/main/java/io/mycat/bindthread/BindThreadCallback.java @@ -13,7 +13,7 @@ * not, see . */ -package io.mycat.bindThread; +package io.mycat.bindthread; public interface BindThreadCallback { diff --git a/common/src/main/java/io/mycat/bindThread/BindThreadKey.java b/common/src/main/java/io/mycat/bindthread/BindThreadKey.java similarity index 96% rename from common/src/main/java/io/mycat/bindThread/BindThreadKey.java rename to common/src/main/java/io/mycat/bindthread/BindThreadKey.java index f2a21dba6..f742ff0e7 100644 --- a/common/src/main/java/io/mycat/bindThread/BindThreadKey.java +++ b/common/src/main/java/io/mycat/bindthread/BindThreadKey.java @@ -13,7 +13,7 @@ * not, see . */ -package io.mycat.bindThread; +package io.mycat.bindthread; public interface BindThreadKey { diff --git a/common/src/main/java/io/mycat/bindThread/BindThreadPool.java b/common/src/main/java/io/mycat/bindthread/BindThreadPool.java similarity index 99% rename from common/src/main/java/io/mycat/bindThread/BindThreadPool.java rename to common/src/main/java/io/mycat/bindthread/BindThreadPool.java index cf062c710..c38170409 100644 --- a/common/src/main/java/io/mycat/bindThread/BindThreadPool.java +++ b/common/src/main/java/io/mycat/bindthread/BindThreadPool.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with this program. If * not, see . */ -package io.mycat.bindThread; +package io.mycat.bindthread; import io.mycat.MycatException; import io.mycat.MycatWorkerProcessor; diff --git a/common/src/main/java/io/mycat/logTip/MycatLogger.java b/common/src/main/java/io/mycat/logtip/MycatLogger.java similarity index 99% rename from common/src/main/java/io/mycat/logTip/MycatLogger.java rename to common/src/main/java/io/mycat/logtip/MycatLogger.java index ef6e1b800..392aaf30a 100644 --- a/common/src/main/java/io/mycat/logTip/MycatLogger.java +++ b/common/src/main/java/io/mycat/logtip/MycatLogger.java @@ -13,7 +13,7 @@ * not, see . */ -package io.mycat.logTip; +package io.mycat.logtip; import io.mycat.beans.mysql.packet.ErrorPacketImpl; import org.slf4j.Logger; diff --git a/common/src/main/java/io/mycat/logTip/MycatLoggerFactory.java b/common/src/main/java/io/mycat/logtip/MycatLoggerFactory.java similarity index 97% rename from common/src/main/java/io/mycat/logTip/MycatLoggerFactory.java rename to common/src/main/java/io/mycat/logtip/MycatLoggerFactory.java index 5a9e43337..5d52a7351 100644 --- a/common/src/main/java/io/mycat/logTip/MycatLoggerFactory.java +++ b/common/src/main/java/io/mycat/logtip/MycatLoggerFactory.java @@ -13,7 +13,7 @@ * not, see . */ -package io.mycat.logTip; +package io.mycat.logtip; public class MycatLoggerFactory { diff --git a/common/src/main/java/io/mycat/logTip/ScanDoc.java b/common/src/main/java/io/mycat/logtip/ScanDoc.java similarity index 98% rename from common/src/main/java/io/mycat/logTip/ScanDoc.java rename to common/src/main/java/io/mycat/logtip/ScanDoc.java index 7cd36788d..166bc352b 100644 --- a/common/src/main/java/io/mycat/logTip/ScanDoc.java +++ b/common/src/main/java/io/mycat/logtip/ScanDoc.java @@ -13,7 +13,7 @@ * not, see . */ -package io.mycat.logTip; +package io.mycat.logtip; import java.io.IOException; import java.nio.file.Files; diff --git a/common/src/main/java/io/mycat/sequenceModifier/ModifyCallback.java b/common/src/main/java/io/mycat/sequencemodifier/ModifyCallback.java similarity index 95% rename from common/src/main/java/io/mycat/sequenceModifier/ModifyCallback.java rename to common/src/main/java/io/mycat/sequencemodifier/ModifyCallback.java index 39b7b9d4a..0a811d1ef 100644 --- a/common/src/main/java/io/mycat/sequenceModifier/ModifyCallback.java +++ b/common/src/main/java/io/mycat/sequencemodifier/ModifyCallback.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with this program. If * not, see . */ -package io.mycat.sequenceModifier; +package io.mycat.sequencemodifier; public interface ModifyCallback { diff --git a/common/src/main/java/io/mycat/sequenceModifier/SequenceModifier.java b/common/src/main/java/io/mycat/sequencemodifier/SequenceModifier.java similarity index 96% rename from common/src/main/java/io/mycat/sequenceModifier/SequenceModifier.java rename to common/src/main/java/io/mycat/sequencemodifier/SequenceModifier.java index 1811553bd..ddaec8050 100644 --- a/common/src/main/java/io/mycat/sequenceModifier/SequenceModifier.java +++ b/common/src/main/java/io/mycat/sequencemodifier/SequenceModifier.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with this program. If * not, see . */ -package io.mycat.sequenceModifier; +package io.mycat.sequencemodifier; import java.util.Map; diff --git a/common/src/main/java/io/mycat/util/CachingSha2PasswordPlugin.java b/common/src/main/java/io/mycat/util/CachingSha2PasswordPlugin.java index bd01a22f5..54c120f22 100644 --- a/common/src/main/java/io/mycat/util/CachingSha2PasswordPlugin.java +++ b/common/src/main/java/io/mycat/util/CachingSha2PasswordPlugin.java @@ -31,9 +31,6 @@ import io.mycat.MycatException; import io.mycat.beans.mysql.ServerVersion; -import io.mycat.beans.mysql.packet.ProxyBuffer; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/io/mycat/util/CharsetUtil.java b/common/src/main/java/io/mycat/util/CharsetUtil.java index c341b2b29..f2b1d18a8 100644 --- a/common/src/main/java/io/mycat/util/CharsetUtil.java +++ b/common/src/main/java/io/mycat/util/CharsetUtil.java @@ -23,9 +23,6 @@ */ package io.mycat.util; -import io.mycat.beans.mysql.packet.ProxyBuffer; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/io/mycat/util/DumpUtil.java b/common/src/main/java/io/mycat/util/DumpUtil.java index 4514b03eb..48d972e4a 100644 --- a/common/src/main/java/io/mycat/util/DumpUtil.java +++ b/common/src/main/java/io/mycat/util/DumpUtil.java @@ -16,8 +16,6 @@ */ package io.mycat.util; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/io/mycat/util/DynaClassLoader.java b/common/src/main/java/io/mycat/util/DynaClassLoader.java index 5ccdd4d26..0ab760a8f 100644 --- a/common/src/main/java/io/mycat/util/DynaClassLoader.java +++ b/common/src/main/java/io/mycat/util/DynaClassLoader.java @@ -1,7 +1,5 @@ package io.mycat.util; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/io/mycat/util/JavaUtils.java b/common/src/main/java/io/mycat/util/JavaUtils.java index 728cbf8de..e6664f2b1 100644 --- a/common/src/main/java/io/mycat/util/JavaUtils.java +++ b/common/src/main/java/io/mycat/util/JavaUtils.java @@ -19,8 +19,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/io/mycat/util/MysqlNativePasswordPluginUtil.java b/common/src/main/java/io/mycat/util/MysqlNativePasswordPluginUtil.java index 0b92ddc96..c91dadc96 100644 --- a/common/src/main/java/io/mycat/util/MysqlNativePasswordPluginUtil.java +++ b/common/src/main/java/io/mycat/util/MysqlNativePasswordPluginUtil.java @@ -17,8 +17,6 @@ package io.mycat.util; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/io/mycat/util/StringUtil.java b/common/src/main/java/io/mycat/util/StringUtil.java index b2157c2b0..20b92c190 100644 --- a/common/src/main/java/io/mycat/util/StringUtil.java +++ b/common/src/main/java/io/mycat/util/StringUtil.java @@ -23,8 +23,6 @@ */ package io.mycat.util; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/main/java/io/mycat/util/nio/SelectorUtil.java b/common/src/main/java/io/mycat/util/nio/SelectorUtil.java index cee021fa9..7435e8368 100644 --- a/common/src/main/java/io/mycat/util/nio/SelectorUtil.java +++ b/common/src/main/java/io/mycat/util/nio/SelectorUtil.java @@ -1,8 +1,5 @@ package io.mycat.util.nio; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; -import io.mycat.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/datasource/src/main/java/io/mycat/datasource/jdbc/JdbcRuntime.java b/datasource/src/main/java/io/mycat/datasource/jdbc/JdbcRuntime.java index 55fc97177..ccc8cd4b2 100644 --- a/datasource/src/main/java/io/mycat/datasource/jdbc/JdbcRuntime.java +++ b/datasource/src/main/java/io/mycat/datasource/jdbc/JdbcRuntime.java @@ -25,7 +25,7 @@ import io.mycat.datasource.jdbc.datasource.DefaultConnection; import io.mycat.datasource.jdbc.datasource.JdbcConnectionManager; import io.mycat.datasource.jdbc.datasource.JdbcDataSource; -import io.mycat.datasource.jdbc.datasourceProvider.AtomikosDatasourceProvider; +import io.mycat.datasource.jdbc.datasourceprovider.AtomikosDatasourceProvider; import io.mycat.plug.PlugRuntime; import io.mycat.replica.ReplicaSelectorRuntime; import io.mycat.replica.heartbeat.HeartBeatStrategy; diff --git a/datasource/src/main/java/io/mycat/datasource/jdbc/datasourceProvider/AtomikosDatasourceProvider.java b/datasource/src/main/java/io/mycat/datasource/jdbc/datasourceprovider/AtomikosDatasourceProvider.java similarity index 98% rename from datasource/src/main/java/io/mycat/datasource/jdbc/datasourceProvider/AtomikosDatasourceProvider.java rename to datasource/src/main/java/io/mycat/datasource/jdbc/datasourceprovider/AtomikosDatasourceProvider.java index d80ebc0e4..b8ccb217a 100644 --- a/datasource/src/main/java/io/mycat/datasource/jdbc/datasourceProvider/AtomikosDatasourceProvider.java +++ b/datasource/src/main/java/io/mycat/datasource/jdbc/datasourceprovider/AtomikosDatasourceProvider.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with this program. If * not, see . */ -package io.mycat.datasource.jdbc.datasourceProvider; +package io.mycat.datasource.jdbc.datasourceprovider; import com.atomikos.icatch.jta.UserTransactionImp; import com.atomikos.jdbc.AtomikosDataSourceBean; diff --git a/datasource/src/main/java/io/mycat/datasource/jdbc/datasourceProvider/DruidDatasourceProvider.java b/datasource/src/main/java/io/mycat/datasource/jdbc/datasourceprovider/DruidDatasourceProvider.java similarity index 97% rename from datasource/src/main/java/io/mycat/datasource/jdbc/datasourceProvider/DruidDatasourceProvider.java rename to datasource/src/main/java/io/mycat/datasource/jdbc/datasourceprovider/DruidDatasourceProvider.java index ae9e62dfb..a4391fa73 100644 --- a/datasource/src/main/java/io/mycat/datasource/jdbc/datasourceProvider/DruidDatasourceProvider.java +++ b/datasource/src/main/java/io/mycat/datasource/jdbc/datasourceprovider/DruidDatasourceProvider.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with this program. If * not, see . */ -package io.mycat.datasource.jdbc.datasourceProvider; +package io.mycat.datasource.jdbc.datasourceprovider; import com.alibaba.druid.pool.DruidDataSource; import io.mycat.config.DatasourceRootConfig; diff --git a/datasource/src/main/java/io/mycat/datasource/jdbc/transactionSession/JTATransactionSession.java b/datasource/src/main/java/io/mycat/datasource/jdbc/transactionsession/JTATransactionSession.java similarity index 98% rename from datasource/src/main/java/io/mycat/datasource/jdbc/transactionSession/JTATransactionSession.java rename to datasource/src/main/java/io/mycat/datasource/jdbc/transactionsession/JTATransactionSession.java index 54e410e85..4e2fa2f87 100644 --- a/datasource/src/main/java/io/mycat/datasource/jdbc/transactionSession/JTATransactionSession.java +++ b/datasource/src/main/java/io/mycat/datasource/jdbc/transactionsession/JTATransactionSession.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with this program. If * not, see . */ -package io.mycat.datasource.jdbc.transactionSession; +package io.mycat.datasource.jdbc.transactionsession; import io.mycat.MycatDataContext; import io.mycat.ThreadUsageEnum; diff --git a/datasource/src/main/java/io/mycat/datasource/jdbc/transactionSession/TransactionSessionTemplate.java b/datasource/src/main/java/io/mycat/datasource/jdbc/transactionsession/TransactionSessionTemplate.java similarity index 99% rename from datasource/src/main/java/io/mycat/datasource/jdbc/transactionSession/TransactionSessionTemplate.java rename to datasource/src/main/java/io/mycat/datasource/jdbc/transactionsession/TransactionSessionTemplate.java index bf2c1c944..68eaa99bc 100644 --- a/datasource/src/main/java/io/mycat/datasource/jdbc/transactionSession/TransactionSessionTemplate.java +++ b/datasource/src/main/java/io/mycat/datasource/jdbc/transactionsession/TransactionSessionTemplate.java @@ -1,4 +1,4 @@ -package io.mycat.datasource.jdbc.transactionSession; +package io.mycat.datasource.jdbc.transactionsession; import io.mycat.DataSourceNearness; import io.mycat.MycatConnection; diff --git a/doc/22-mycat-jdbc.md b/doc/22-mycat-jdbc.md index 4d69d40ba..28bb79fa0 100644 --- a/doc/22-mycat-jdbc.md +++ b/doc/22-mycat-jdbc.md @@ -7,7 +7,7 @@ author:junwen 2019-7-22 ## jdbcDriver.yml配置 ```yaml -datasourceProviderClass: io.mycat.datasource.jdbc.datasourceProvider.AtomikosDatasourceProvider +datasourceProviderClass: io.mycat.datasource.jdbc.datasourceprovider.AtomikosDatasourceProvider maxPengdingLimit: -1 waitTaskTimeout: 5 timeUnit: SECONDS @@ -53,11 +53,11 @@ datasourceProviderClass更改即可变更事务实现 Atomikos XA事务,其中这个事务实现可能会针对一些场景使用优化尽量使用本地事务 -io.mycat.datasource.jdbc.datasourceProvider.AtomikosDatasourceProvider +io.mycat.datasource.jdbc.datasourceprovider.AtomikosDatasourceProvider 本地事务 -io.mycat.datasource.jdbc.datasourceProvider.DruidDatasourceProvider +io.mycat.datasource.jdbc.datasourceprovider.DruidDatasourceProvider diff --git a/example/src/test/java/io/mycat/example/customRule/CustomRuleExample.java b/example/src/test/java/io/mycat/example/customrule/CustomRuleExample.java similarity index 98% rename from example/src/test/java/io/mycat/example/customRule/CustomRuleExample.java rename to example/src/test/java/io/mycat/example/customrule/CustomRuleExample.java index 8c6bfa4cd..b84efcecf 100644 --- a/example/src/test/java/io/mycat/example/customRule/CustomRuleExample.java +++ b/example/src/test/java/io/mycat/example/customrule/CustomRuleExample.java @@ -1,4 +1,4 @@ -package io.mycat.example.customRule; +package io.mycat.example.customrule; import io.mycat.ConfigProvider; import io.mycat.MycatCore; diff --git a/example/src/test/java/io/mycat/example/customRuleSegmentQuery/CustomRuleExample.java b/example/src/test/java/io/mycat/example/customrulesegmentquery/CustomRuleExample.java similarity index 98% rename from example/src/test/java/io/mycat/example/customRuleSegmentQuery/CustomRuleExample.java rename to example/src/test/java/io/mycat/example/customrulesegmentquery/CustomRuleExample.java index 54b459180..065c7b4e7 100644 --- a/example/src/test/java/io/mycat/example/customRuleSegmentQuery/CustomRuleExample.java +++ b/example/src/test/java/io/mycat/example/customrulesegmentquery/CustomRuleExample.java @@ -1,4 +1,4 @@ -package io.mycat.example.customRuleSegmentQuery; +package io.mycat.example.customrulesegmentquery; import io.mycat.ConfigProvider; import io.mycat.MycatCore; diff --git a/example/src/test/java/io/mycat/example/readWriteSeparation/ReadWriteSeparationExample.java b/example/src/test/java/io/mycat/example/readwriteseparation/ReadWriteSeparationExample.java similarity index 99% rename from example/src/test/java/io/mycat/example/readWriteSeparation/ReadWriteSeparationExample.java rename to example/src/test/java/io/mycat/example/readwriteseparation/ReadWriteSeparationExample.java index 6f6a2fba2..d559120c1 100644 --- a/example/src/test/java/io/mycat/example/readWriteSeparation/ReadWriteSeparationExample.java +++ b/example/src/test/java/io/mycat/example/readwriteseparation/ReadWriteSeparationExample.java @@ -1,4 +1,4 @@ -package io.mycat.example.readWriteSeparation; +package io.mycat.example.readwriteseparation; import io.mycat.ConfigProvider; import io.mycat.MycatCore; diff --git a/example/src/test/java/io/mycat/example/shardingLocal/ShardingLocalExample.java b/example/src/test/java/io/mycat/example/shardinglocal/ShardingLocalExample.java similarity index 99% rename from example/src/test/java/io/mycat/example/shardingLocal/ShardingLocalExample.java rename to example/src/test/java/io/mycat/example/shardinglocal/ShardingLocalExample.java index 9d203cea7..4f5782f65 100644 --- a/example/src/test/java/io/mycat/example/shardingLocal/ShardingLocalExample.java +++ b/example/src/test/java/io/mycat/example/shardinglocal/ShardingLocalExample.java @@ -1,4 +1,4 @@ -package io.mycat.example.shardingLocal; +package io.mycat.example.shardinglocal; import io.mycat.ConfigProvider; import io.mycat.MycatCore; diff --git a/example/src/test/java/io/mycat/example/shardingLocalFail/ShardingLocalFailExample.java b/example/src/test/java/io/mycat/example/shardinglocalfail/ShardingLocalFailExample.java similarity index 96% rename from example/src/test/java/io/mycat/example/shardingLocalFail/ShardingLocalFailExample.java rename to example/src/test/java/io/mycat/example/shardinglocalfail/ShardingLocalFailExample.java index d0277d6cb..c599dccd7 100644 --- a/example/src/test/java/io/mycat/example/shardingLocalFail/ShardingLocalFailExample.java +++ b/example/src/test/java/io/mycat/example/shardinglocalfail/ShardingLocalFailExample.java @@ -1,4 +1,4 @@ -package io.mycat.example.shardingLocalFail; +package io.mycat.example.shardinglocalfail; import io.mycat.ConfigProvider; import io.mycat.MycatCore; @@ -11,10 +11,7 @@ import java.nio.file.Paths; import java.sql.Connection; -import java.sql.ResultSet; import java.sql.Statement; -import java.util.HashSet; -import java.util.Set; import java.util.concurrent.TimeUnit; public class ShardingLocalFailExample { diff --git a/example/src/test/java/io/mycat/example/shardingRw/ShardingRwExample.java b/example/src/test/java/io/mycat/example/shardingrw/ShardingRwExample.java similarity index 99% rename from example/src/test/java/io/mycat/example/shardingRw/ShardingRwExample.java rename to example/src/test/java/io/mycat/example/shardingrw/ShardingRwExample.java index cfa636f08..c139b03ef 100644 --- a/example/src/test/java/io/mycat/example/shardingRw/ShardingRwExample.java +++ b/example/src/test/java/io/mycat/example/shardingrw/ShardingRwExample.java @@ -1,4 +1,4 @@ -package io.mycat.example.shardingRw; +package io.mycat.example.shardingrw; import io.mycat.ConfigProvider; import io.mycat.MycatCore; diff --git a/example/src/test/java/io/mycat/example/shardingXA/ShardingXAExample.java b/example/src/test/java/io/mycat/example/shardingxa/ShardingXAExample.java similarity index 99% rename from example/src/test/java/io/mycat/example/shardingXA/ShardingXAExample.java rename to example/src/test/java/io/mycat/example/shardingxa/ShardingXAExample.java index e58ce1bb4..980ef2bb9 100644 --- a/example/src/test/java/io/mycat/example/shardingXA/ShardingXAExample.java +++ b/example/src/test/java/io/mycat/example/shardingxa/ShardingXAExample.java @@ -1,4 +1,4 @@ -package io.mycat.example.shardingXA; +package io.mycat.example.shardingxa; import io.mycat.ConfigProvider; import io.mycat.MycatCore; diff --git a/example/src/test/java/io/mycat/example/shardingXAFail/ShardingXAFailExample.java b/example/src/test/java/io/mycat/example/shardingxafail/ShardingXAFailExample.java similarity index 98% rename from example/src/test/java/io/mycat/example/shardingXAFail/ShardingXAFailExample.java rename to example/src/test/java/io/mycat/example/shardingxafail/ShardingXAFailExample.java index 3bae578dc..d07ac57ba 100644 --- a/example/src/test/java/io/mycat/example/shardingXAFail/ShardingXAFailExample.java +++ b/example/src/test/java/io/mycat/example/shardingxafail/ShardingXAFailExample.java @@ -1,4 +1,4 @@ -package io.mycat.example.shardingXAFail; +package io.mycat.example.shardingxafail; import io.mycat.ConfigProvider; import io.mycat.MycatCore; diff --git a/example/src/test/resources/io/mycat/example/booster/mycat.yml b/example/src/test/resources/io/mycat/example/booster/mycat.yml index 8cec10bec..beb9a01ef 100644 --- a/example/src/test/resources/io/mycat/example/booster/mycat.yml +++ b/example/src/test/resources/io/mycat/example/booster/mycat.yml @@ -49,7 +49,7 @@ datasource: initSqlsGetConnection: true } ] - datasourceProviderClass: io.mycat.datasource.jdbc.datasourceProvider.AtomikosDatasourceProvider + datasourceProviderClass: io.mycat.datasource.jdbc.datasourceprovider.AtomikosDatasourceProvider timer: {initialDelay: 10, period: 5, timeUnit: SECONDS} cluster: #集群,数据源选择器,既可以mycat自行检查数据源可用也可以通过mycat提供的外部接口设置设置数据源可用信息影响如何使用数据源 close: true #关闭集群心跳,此时集群认为所有数据源都是可用的,可以通过mycat提供的外部接口设置数据源可用信息达到相同效果 diff --git a/example/src/test/resources/io/mycat/example/customRule/globalVariables.json b/example/src/test/resources/io/mycat/example/customrule/globalVariables.json similarity index 100% rename from example/src/test/resources/io/mycat/example/customRule/globalVariables.json rename to example/src/test/resources/io/mycat/example/customrule/globalVariables.json diff --git a/example/src/test/resources/io/mycat/example/customRule/mycat.yml b/example/src/test/resources/io/mycat/example/customrule/mycat.yml similarity index 98% rename from example/src/test/resources/io/mycat/example/customRule/mycat.yml rename to example/src/test/resources/io/mycat/example/customrule/mycat.yml index edb66623a..ddc65a18b 100644 --- a/example/src/test/resources/io/mycat/example/customRule/mycat.yml +++ b/example/src/test/resources/io/mycat/example/customrule/mycat.yml @@ -43,7 +43,7 @@ datasource: initSqlsGetConnection: true } ] - datasourceProviderClass: io.mycat.datasource.jdbc.datasourceProvider.AtomikosDatasourceProvider + datasourceProviderClass: io.mycat.datasource.jdbc.datasourceprovider.AtomikosDatasourceProvider timer: {initialDelay: 10, period: 5, timeUnit: SECONDS} cluster: #集群,数据源选择器,既可以mycat自行检查数据源可用也可以通过mycat提供的外部接口设置设置数据源可用信息影响如何使用数据源 close: true #关闭集群心跳,此时集群认为所有数据源都是可用的,可以通过mycat提供的外部接口设置数据源可用信息达到相同效果 diff --git a/example/src/test/resources/io/mycat/example/customRuleSegmentQuery/globalVariables.json b/example/src/test/resources/io/mycat/example/customrulesegmentquery/globalVariables.json similarity index 100% rename from example/src/test/resources/io/mycat/example/customRuleSegmentQuery/globalVariables.json rename to example/src/test/resources/io/mycat/example/customrulesegmentquery/globalVariables.json diff --git a/example/src/test/resources/io/mycat/example/customRuleSegmentQuery/mycat.yml b/example/src/test/resources/io/mycat/example/customrulesegmentquery/mycat.yml similarity index 98% rename from example/src/test/resources/io/mycat/example/customRuleSegmentQuery/mycat.yml rename to example/src/test/resources/io/mycat/example/customrulesegmentquery/mycat.yml index 8d05b2554..051276cf4 100644 --- a/example/src/test/resources/io/mycat/example/customRuleSegmentQuery/mycat.yml +++ b/example/src/test/resources/io/mycat/example/customrulesegmentquery/mycat.yml @@ -43,7 +43,7 @@ datasource: initSqlsGetConnection: true } ] - datasourceProviderClass: io.mycat.datasource.jdbc.datasourceProvider.AtomikosDatasourceProvider + datasourceProviderClass: io.mycat.datasource.jdbc.datasourceprovider.AtomikosDatasourceProvider timer: {initialDelay: 10, period: 5, timeUnit: SECONDS} cluster: #集群,数据源选择器,既可以mycat自行检查数据源可用也可以通过mycat提供的外部接口设置设置数据源可用信息影响如何使用数据源 close: true #关闭集群心跳,此时集群认为所有数据源都是可用的,可以通过mycat提供的外部接口设置数据源可用信息达到相同效果 diff --git a/example/src/test/resources/io/mycat/example/manager/mycat.yml b/example/src/test/resources/io/mycat/example/manager/mycat.yml index 465b44467..ddd56593a 100644 --- a/example/src/test/resources/io/mycat/example/manager/mycat.yml +++ b/example/src/test/resources/io/mycat/example/manager/mycat.yml @@ -51,7 +51,7 @@ datasource: initSqlsGetConnection: true } ] - datasourceProviderClass: io.mycat.datasource.jdbc.datasourceProvider.DruidDatasourceProvider + datasourceProviderClass: io.mycat.datasource.jdbc.datasourceprovider.DruidDatasourceProvider timer: {initialDelay: 10, period: 15, timeUnit: SECONDS} cluster: #集群,数据源选择器,既可以mycat自行检查数据源可用也可以通过mycat提供的外部接口设置设置数据源可用信息影响如何使用数据源 close: true #关闭集群心跳,此时集群认为所有数据源都是可用的,可以通过mycat提供的外部接口设置数据源可用信息达到相同效果 diff --git a/example/src/test/resources/io/mycat/example/pstmt/mycat.yml b/example/src/test/resources/io/mycat/example/pstmt/mycat.yml index 2411d1e02..8e23317d5 100644 --- a/example/src/test/resources/io/mycat/example/pstmt/mycat.yml +++ b/example/src/test/resources/io/mycat/example/pstmt/mycat.yml @@ -51,7 +51,7 @@ datasource: initSqlsGetConnection: true } ] - datasourceProviderClass: io.mycat.datasource.jdbc.datasourceProvider.AtomikosDatasourceProvider + datasourceProviderClass: io.mycat.datasource.jdbc.datasourceprovider.AtomikosDatasourceProvider timer: {initialDelay: 10, period: 5, timeUnit: SECONDS} cluster: #集群,数据源选择器,既可以mycat自行检查数据源可用也可以通过mycat提供的外部接口设置设置数据源可用信息影响如何使用数据源 close: true #关闭集群心跳,此时集群认为所有数据源都是可用的,可以通过mycat提供的外部接口设置数据源可用信息达到相同效果 diff --git a/example/src/test/resources/io/mycat/example/readWriteSeparation/globalVariables.json b/example/src/test/resources/io/mycat/example/readwriteseparation/globalVariables.json similarity index 100% rename from example/src/test/resources/io/mycat/example/readWriteSeparation/globalVariables.json rename to example/src/test/resources/io/mycat/example/readwriteseparation/globalVariables.json diff --git a/example/src/test/resources/io/mycat/example/readWriteSeparation/mycat.yml b/example/src/test/resources/io/mycat/example/readwriteseparation/mycat.yml similarity index 98% rename from example/src/test/resources/io/mycat/example/readWriteSeparation/mycat.yml rename to example/src/test/resources/io/mycat/example/readwriteseparation/mycat.yml index b90fb6dfa..2554af09a 100644 --- a/example/src/test/resources/io/mycat/example/readWriteSeparation/mycat.yml +++ b/example/src/test/resources/io/mycat/example/readwriteseparation/mycat.yml @@ -22,7 +22,7 @@ datasource: initSqlsGetConnection: true } ] - datasourceProviderClass: io.mycat.datasource.jdbc.datasourceProvider.AtomikosDatasourceProvider + datasourceProviderClass: io.mycat.datasource.jdbc.datasourceprovider.AtomikosDatasourceProvider timer: {initialDelay: 10, period: 5, timeUnit: SECONDS} cluster: #集群,数据源选择器,既可以mycat自行检查数据源可用也可以通过mycat提供的外部接口设置设置数据源可用信息影响如何使用数据源 close: true #关闭集群心跳,此时集群认为所有数据源都是可用的,可以通过mycat提供的外部接口设置数据源可用信息达到相同效果 diff --git a/example/src/test/resources/io/mycat/example/sharding/mycat.yml b/example/src/test/resources/io/mycat/example/sharding/mycat.yml index c649eab08..00ad166d2 100644 --- a/example/src/test/resources/io/mycat/example/sharding/mycat.yml +++ b/example/src/test/resources/io/mycat/example/sharding/mycat.yml @@ -51,7 +51,7 @@ datasource: initSqlsGetConnection: true } ] - datasourceProviderClass: io.mycat.datasource.jdbc.datasourceProvider.AtomikosDatasourceProvider + datasourceProviderClass: io.mycat.datasource.jdbc.datasourceprovider.AtomikosDatasourceProvider timer: {initialDelay: 10, period: 5, timeUnit: SECONDS} cluster: #集群,数据源选择器,既可以mycat自行检查数据源可用也可以通过mycat提供的外部接口设置设置数据源可用信息影响如何使用数据源 close: true #关闭集群心跳,此时集群认为所有数据源都是可用的,可以通过mycat提供的外部接口设置数据源可用信息达到相同效果 diff --git a/example/src/test/resources/io/mycat/example/shardingLocal/globalVariables.json b/example/src/test/resources/io/mycat/example/shardinglocal/globalVariables.json similarity index 100% rename from example/src/test/resources/io/mycat/example/shardingLocal/globalVariables.json rename to example/src/test/resources/io/mycat/example/shardinglocal/globalVariables.json diff --git a/example/src/test/resources/io/mycat/example/shardingLocalFail/mycat.yml b/example/src/test/resources/io/mycat/example/shardinglocal/mycat.yml similarity index 98% rename from example/src/test/resources/io/mycat/example/shardingLocalFail/mycat.yml rename to example/src/test/resources/io/mycat/example/shardinglocal/mycat.yml index 07a697904..8708b345d 100644 --- a/example/src/test/resources/io/mycat/example/shardingLocalFail/mycat.yml +++ b/example/src/test/resources/io/mycat/example/shardinglocal/mycat.yml @@ -54,7 +54,7 @@ datasource: type: 'JDBC' } ] - datasourceProviderClass: io.mycat.datasource.jdbc.datasourceProvider.DruidDatasourceProvider + datasourceProviderClass: io.mycat.datasource.jdbc.datasourceprovider.DruidDatasourceProvider timer: {initialDelay: 10, period: 5, timeUnit: SECONDS} cluster: #集群,数据源选择器,既可以mycat自行检查数据源可用也可以通过mycat提供的外部接口设置设置数据源可用信息影响如何使用数据源 close: true #关闭集群心跳,此时集群认为所有数据源都是可用的,可以通过mycat提供的外部接口设置数据源可用信息达到相同效果 diff --git a/example/src/test/resources/io/mycat/example/shardingLocalFail/globalVariables.json b/example/src/test/resources/io/mycat/example/shardinglocalfail/globalVariables.json similarity index 100% rename from example/src/test/resources/io/mycat/example/shardingLocalFail/globalVariables.json rename to example/src/test/resources/io/mycat/example/shardinglocalfail/globalVariables.json diff --git a/example/src/test/resources/io/mycat/example/shardingLocal/mycat.yml b/example/src/test/resources/io/mycat/example/shardinglocalfail/mycat.yml similarity index 98% rename from example/src/test/resources/io/mycat/example/shardingLocal/mycat.yml rename to example/src/test/resources/io/mycat/example/shardinglocalfail/mycat.yml index 07a697904..8708b345d 100644 --- a/example/src/test/resources/io/mycat/example/shardingLocal/mycat.yml +++ b/example/src/test/resources/io/mycat/example/shardinglocalfail/mycat.yml @@ -54,7 +54,7 @@ datasource: type: 'JDBC' } ] - datasourceProviderClass: io.mycat.datasource.jdbc.datasourceProvider.DruidDatasourceProvider + datasourceProviderClass: io.mycat.datasource.jdbc.datasourceprovider.DruidDatasourceProvider timer: {initialDelay: 10, period: 5, timeUnit: SECONDS} cluster: #集群,数据源选择器,既可以mycat自行检查数据源可用也可以通过mycat提供的外部接口设置设置数据源可用信息影响如何使用数据源 close: true #关闭集群心跳,此时集群认为所有数据源都是可用的,可以通过mycat提供的外部接口设置数据源可用信息达到相同效果 diff --git a/example/src/test/resources/io/mycat/example/shardingRw/globalVariables.json b/example/src/test/resources/io/mycat/example/shardingrw/globalVariables.json similarity index 100% rename from example/src/test/resources/io/mycat/example/shardingRw/globalVariables.json rename to example/src/test/resources/io/mycat/example/shardingrw/globalVariables.json diff --git a/example/src/test/resources/io/mycat/example/shardingRw/mycat.yml b/example/src/test/resources/io/mycat/example/shardingrw/mycat.yml similarity index 99% rename from example/src/test/resources/io/mycat/example/shardingRw/mycat.yml rename to example/src/test/resources/io/mycat/example/shardingrw/mycat.yml index baa416be6..459ebca0c 100644 --- a/example/src/test/resources/io/mycat/example/shardingRw/mycat.yml +++ b/example/src/test/resources/io/mycat/example/shardingrw/mycat.yml @@ -54,7 +54,7 @@ datasource: initSqlsGetConnection: true } ] - datasourceProviderClass: io.mycat.datasource.jdbc.datasourceProvider.AtomikosDatasourceProvider + datasourceProviderClass: io.mycat.datasource.jdbc.datasourceprovider.AtomikosDatasourceProvider timer: {initialDelay: 10, period: 5, timeUnit: SECONDS} cluster: #集群,数据源选择器,既可以mycat自行检查数据源可用也可以通过mycat提供的外部接口设置设置数据源可用信息影响如何使用数据源 close: true #关闭集群心跳,此时集群认为所有数据源都是可用的,可以通过mycat提供的外部接口设置数据源可用信息达到相同效果 diff --git a/example/src/test/resources/io/mycat/example/shardingXA/globalVariables.json b/example/src/test/resources/io/mycat/example/shardingxa/globalVariables.json similarity index 100% rename from example/src/test/resources/io/mycat/example/shardingXA/globalVariables.json rename to example/src/test/resources/io/mycat/example/shardingxa/globalVariables.json diff --git a/example/src/test/resources/io/mycat/example/shardingXAFail/mycat.yml b/example/src/test/resources/io/mycat/example/shardingxa/mycat.yml similarity index 98% rename from example/src/test/resources/io/mycat/example/shardingXAFail/mycat.yml rename to example/src/test/resources/io/mycat/example/shardingxa/mycat.yml index 0fd8ec2d5..73991363e 100644 --- a/example/src/test/resources/io/mycat/example/shardingXAFail/mycat.yml +++ b/example/src/test/resources/io/mycat/example/shardingxa/mycat.yml @@ -54,7 +54,7 @@ datasource: type: 'JDBC' } ] - datasourceProviderClass: io.mycat.datasource.jdbc.datasourceProvider.AtomikosDatasourceProvider + datasourceProviderClass: io.mycat.datasource.jdbc.datasourceprovider.AtomikosDatasourceProvider timer: {initialDelay: 10, period: 5, timeUnit: SECONDS} cluster: #集群,数据源选择器,既可以mycat自行检查数据源可用也可以通过mycat提供的外部接口设置设置数据源可用信息影响如何使用数据源 close: true #关闭集群心跳,此时集群认为所有数据源都是可用的,可以通过mycat提供的外部接口设置数据源可用信息达到相同效果 diff --git a/example/src/test/resources/io/mycat/example/shardingXAFail/globalVariables.json b/example/src/test/resources/io/mycat/example/shardingxafail/globalVariables.json similarity index 100% rename from example/src/test/resources/io/mycat/example/shardingXAFail/globalVariables.json rename to example/src/test/resources/io/mycat/example/shardingxafail/globalVariables.json diff --git a/example/src/test/resources/io/mycat/example/shardingXA/mycat.yml b/example/src/test/resources/io/mycat/example/shardingxafail/mycat.yml similarity index 98% rename from example/src/test/resources/io/mycat/example/shardingXA/mycat.yml rename to example/src/test/resources/io/mycat/example/shardingxafail/mycat.yml index 0fd8ec2d5..73991363e 100644 --- a/example/src/test/resources/io/mycat/example/shardingXA/mycat.yml +++ b/example/src/test/resources/io/mycat/example/shardingxafail/mycat.yml @@ -54,7 +54,7 @@ datasource: type: 'JDBC' } ] - datasourceProviderClass: io.mycat.datasource.jdbc.datasourceProvider.AtomikosDatasourceProvider + datasourceProviderClass: io.mycat.datasource.jdbc.datasourceprovider.AtomikosDatasourceProvider timer: {initialDelay: 10, period: 5, timeUnit: SECONDS} cluster: #集群,数据源选择器,既可以mycat自行检查数据源可用也可以通过mycat提供的外部接口设置设置数据源可用信息影响如何使用数据源 close: true #关闭集群心跳,此时集群认为所有数据源都是可用的,可以通过mycat提供的外部接口设置数据源可用信息达到相同效果 diff --git a/hbt/src/main/java/io/mycat/calcite/CalciteUtls.java b/hbt/src/main/java/io/mycat/calcite/CalciteUtls.java index 776b57de8..af893109f 100644 --- a/hbt/src/main/java/io/mycat/calcite/CalciteUtls.java +++ b/hbt/src/main/java/io/mycat/calcite/CalciteUtls.java @@ -17,7 +17,7 @@ import com.google.common.collect.ImmutableList; import io.mycat.*; import io.mycat.router.ShardingTableHandler; -import io.mycat.queryCondition.DataMappingEvaluator; +import io.mycat.querycondition.DataMappingEvaluator; import org.apache.calcite.DataContext; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.core.Union; diff --git a/hbt/src/main/java/io/mycat/metadata/MetadataManager.java b/hbt/src/main/java/io/mycat/metadata/MetadataManager.java index d8429cc02..ad8794d86 100644 --- a/hbt/src/main/java/io/mycat/metadata/MetadataManager.java +++ b/hbt/src/main/java/io/mycat/metadata/MetadataManager.java @@ -40,7 +40,7 @@ import io.mycat.plug.PlugRuntime; import io.mycat.plug.loadBalance.LoadBalanceStrategy; import io.mycat.plug.sequence.SequenceGenerator; -import io.mycat.queryCondition.*; +import io.mycat.querycondition.*; import io.mycat.replica.ReplicaSelectorRuntime; import io.mycat.router.ShardingTableHandler; import lombok.SneakyThrows; diff --git a/hbt/src/main/java/io/mycat/queryCondition/ColumnRangeValue.java b/hbt/src/main/java/io/mycat/querycondition/ColumnRangeValue.java similarity index 97% rename from hbt/src/main/java/io/mycat/queryCondition/ColumnRangeValue.java rename to hbt/src/main/java/io/mycat/querycondition/ColumnRangeValue.java index 29a825046..90cdadf66 100644 --- a/hbt/src/main/java/io/mycat/queryCondition/ColumnRangeValue.java +++ b/hbt/src/main/java/io/mycat/querycondition/ColumnRangeValue.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with this program. If * not, see . */ -package io.mycat.queryCondition; +package io.mycat.querycondition; import com.alibaba.fastsql.sql.ast.statement.SQLColumnDefinition; import com.alibaba.fastsql.sql.ast.statement.SQLTableSource; diff --git a/hbt/src/main/java/io/mycat/queryCondition/ColumnValue.java b/hbt/src/main/java/io/mycat/querycondition/ColumnValue.java similarity index 98% rename from hbt/src/main/java/io/mycat/queryCondition/ColumnValue.java rename to hbt/src/main/java/io/mycat/querycondition/ColumnValue.java index 6ed6b998b..65a6536b5 100644 --- a/hbt/src/main/java/io/mycat/queryCondition/ColumnValue.java +++ b/hbt/src/main/java/io/mycat/querycondition/ColumnValue.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with this program. If * not, see . */ -package io.mycat.queryCondition; +package io.mycat.querycondition; import com.alibaba.fastsql.sql.ast.expr.SQLBinaryOperator; import com.alibaba.fastsql.sql.ast.statement.SQLColumnDefinition; diff --git a/hbt/src/main/java/io/mycat/queryCondition/ConditionCollector.java b/hbt/src/main/java/io/mycat/querycondition/ConditionCollector.java similarity index 99% rename from hbt/src/main/java/io/mycat/queryCondition/ConditionCollector.java rename to hbt/src/main/java/io/mycat/querycondition/ConditionCollector.java index 31115af2a..ed5a9645b 100644 --- a/hbt/src/main/java/io/mycat/queryCondition/ConditionCollector.java +++ b/hbt/src/main/java/io/mycat/querycondition/ConditionCollector.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with this program. If * not, see . */ -package io.mycat.queryCondition; +package io.mycat.querycondition; import com.alibaba.fastsql.sql.ast.SQLExpr; import com.alibaba.fastsql.sql.ast.SQLName; diff --git a/hbt/src/main/java/io/mycat/queryCondition/Converters.java b/hbt/src/main/java/io/mycat/querycondition/Converters.java similarity index 98% rename from hbt/src/main/java/io/mycat/queryCondition/Converters.java rename to hbt/src/main/java/io/mycat/querycondition/Converters.java index ef0d62ad2..2da2e1694 100644 --- a/hbt/src/main/java/io/mycat/queryCondition/Converters.java +++ b/hbt/src/main/java/io/mycat/querycondition/Converters.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with this program. If * not, see . */ -package io.mycat.queryCondition; +package io.mycat.querycondition; import com.alibaba.fastsql.sql.ast.SQLExpr; import com.alibaba.fastsql.sql.ast.expr.SQLIdentifierExpr; diff --git a/hbt/src/main/java/io/mycat/queryCondition/DataMapping.java b/hbt/src/main/java/io/mycat/querycondition/DataMapping.java similarity index 92% rename from hbt/src/main/java/io/mycat/queryCondition/DataMapping.java rename to hbt/src/main/java/io/mycat/querycondition/DataMapping.java index 016c6628c..174323c27 100644 --- a/hbt/src/main/java/io/mycat/queryCondition/DataMapping.java +++ b/hbt/src/main/java/io/mycat/querycondition/DataMapping.java @@ -1,4 +1,4 @@ -package io.mycat.queryCondition; +package io.mycat.querycondition; import io.mycat.BackendTableInfo; import io.mycat.router.ShardingTableHandler; diff --git a/hbt/src/main/java/io/mycat/queryCondition/DataMappingEvaluator.java b/hbt/src/main/java/io/mycat/querycondition/DataMappingEvaluator.java similarity index 99% rename from hbt/src/main/java/io/mycat/queryCondition/DataMappingEvaluator.java rename to hbt/src/main/java/io/mycat/querycondition/DataMappingEvaluator.java index 9749a49fe..c181a6a63 100644 --- a/hbt/src/main/java/io/mycat/queryCondition/DataMappingEvaluator.java +++ b/hbt/src/main/java/io/mycat/querycondition/DataMappingEvaluator.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with this program. If * not, see . */ -package io.mycat.queryCondition; +package io.mycat.querycondition; import io.mycat.*; import io.mycat.router.CustomRuleFunction; diff --git a/hbt/src/main/java/io/mycat/queryCondition/DataMappingEvaluatorImpl.java b/hbt/src/main/java/io/mycat/querycondition/DataMappingEvaluatorImpl.java similarity index 100% rename from hbt/src/main/java/io/mycat/queryCondition/DataMappingEvaluatorImpl.java rename to hbt/src/main/java/io/mycat/querycondition/DataMappingEvaluatorImpl.java diff --git a/hbt/src/main/java/io/mycat/queryCondition/QueryDataRange.java b/hbt/src/main/java/io/mycat/querycondition/QueryDataRange.java similarity index 98% rename from hbt/src/main/java/io/mycat/queryCondition/QueryDataRange.java rename to hbt/src/main/java/io/mycat/querycondition/QueryDataRange.java index bc944a9a3..6eaa40565 100644 --- a/hbt/src/main/java/io/mycat/queryCondition/QueryDataRange.java +++ b/hbt/src/main/java/io/mycat/querycondition/QueryDataRange.java @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with this program. If * not, see . */ -package io.mycat.queryCondition; +package io.mycat.querycondition; import com.alibaba.fastsql.sql.ast.statement.SQLExprTableSource; import com.alibaba.fastsql.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; diff --git a/mycat2/src/main/java/io/mycat/GRuntimeTest.java b/mycat2/src/main/java/io/mycat/GRuntimeTest.java index 5e75ce9b3..0c9589f1f 100644 --- a/mycat2/src/main/java/io/mycat/GRuntimeTest.java +++ b/mycat2/src/main/java/io/mycat/GRuntimeTest.java @@ -14,7 +14,7 @@ */ package io.mycat; -import io.mycat.bindThread.BindThreadKey; +import io.mycat.bindthread.BindThreadKey; import io.mycat.datasource.jdbc.JdbcRuntime; import io.mycat.plug.PlugRuntime; import io.mycat.replica.ReplicaSelectorRuntime; diff --git a/mycat2/src/main/java/io/mycat/MySQLTaskUtil.java b/mycat2/src/main/java/io/mycat/MySQLTaskUtil.java index e86c37b9b..18eb0fc08 100644 --- a/mycat2/src/main/java/io/mycat/MySQLTaskUtil.java +++ b/mycat2/src/main/java/io/mycat/MySQLTaskUtil.java @@ -19,19 +19,13 @@ import io.mycat.beans.mysql.MySQLCommandType; import io.mycat.beans.mysql.MySQLIsolation; import io.mycat.beans.mysql.packet.ErrorPacketImpl; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; import io.mycat.proxy.MySQLPacketUtil; import io.mycat.proxy.callback.ResultSetCallBack; import io.mycat.proxy.callback.SessionCallBack; import io.mycat.proxy.handler.MySQLPacketExchanger; import io.mycat.proxy.handler.ResponseType; -import io.mycat.proxy.handler.backend.MySQLDataSourceQuery; -import io.mycat.proxy.handler.backend.MySQLSynContextImpl; import io.mycat.proxy.handler.backend.ResultSetHandler; -import io.mycat.proxy.handler.backend.SessionSyncCallback; import io.mycat.proxy.monitor.MycatMonitor; -import io.mycat.proxy.packet.MySQLPacketCallback; import io.mycat.proxy.reactor.MycatReactorThread; import io.mycat.proxy.reactor.NIOJob; import io.mycat.proxy.reactor.ReactorEnvThread; @@ -39,13 +33,10 @@ import io.mycat.proxy.session.MySQLSessionManager; import io.mycat.proxy.session.MycatSession; import io.mycat.proxy.session.SessionManager.PartialType; -import io.mycat.proxy.session.SessionManager.SessionIdAble; -import io.mycat.replica.ReplicaSelectorRuntime; import lombok.ToString; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.List; import java.util.Objects; import java.util.function.BiConsumer; diff --git a/mycat2/src/main/java/io/mycat/MycatCore.java b/mycat2/src/main/java/io/mycat/MycatCore.java index 65633270a..0b63bfe10 100644 --- a/mycat2/src/main/java/io/mycat/MycatCore.java +++ b/mycat2/src/main/java/io/mycat/MycatCore.java @@ -29,9 +29,8 @@ import io.mycat.config.*; import io.mycat.datasource.jdbc.DatasourceProvider; import io.mycat.datasource.jdbc.JdbcRuntime; -import io.mycat.datasource.jdbc.datasourceProvider.AtomikosDatasourceProvider; -import io.mycat.datasource.jdbc.transactionSession.JTATransactionSession; -import io.mycat.exporter.PrometheusExporter; +import io.mycat.datasource.jdbc.datasourceprovider.AtomikosDatasourceProvider; +import io.mycat.datasource.jdbc.transactionsession.JTATransactionSession; import io.mycat.ext.MySQLAPIImpl; import io.mycat.manager.ManagerCommandDispatcher; import io.mycat.metadata.MetadataManager; @@ -49,7 +48,6 @@ import io.mycat.runtime.ProxyTransactionSession; import io.mycat.util.ApplicationContext; import io.mycat.util.CharsetUtil; -import io.mycat.util.ClassUtil; import lombok.Getter; import lombok.NonNull; import lombok.SneakyThrows; diff --git a/mycat2/src/main/java/io/mycat/commands/MycatdbCommand.java b/mycat2/src/main/java/io/mycat/commands/MycatdbCommand.java index 6d9730e07..b5c72c40e 100644 --- a/mycat2/src/main/java/io/mycat/commands/MycatdbCommand.java +++ b/mycat2/src/main/java/io/mycat/commands/MycatdbCommand.java @@ -9,13 +9,13 @@ import io.mycat.MycatDataContext; import io.mycat.MycatException; import io.mycat.client.MycatRequest; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLHandler; -import io.mycat.sqlHandler.SQLRequest; -import io.mycat.sqlHandler.dcl.*; -import io.mycat.sqlHandler.ddl.*; -import io.mycat.sqlHandler.dml.*; -import io.mycat.sqlHandler.dql.*; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLHandler; +import io.mycat.sqlhandler.SQLRequest; +import io.mycat.sqlhandler.dcl.*; +import io.mycat.sqlhandler.ddl.*; +import io.mycat.sqlhandler.dml.*; +import io.mycat.sqlhandler.dql.*; import io.mycat.upondb.MycatDBClientMediator; import io.mycat.upondb.MycatDBs; import io.mycat.util.ContextExecuter; diff --git a/mycat2/src/main/java/io/mycat/lib/impl/ResultSetCacheImpl.java b/mycat2/src/main/java/io/mycat/lib/impl/ResultSetCacheImpl.java index 2c4f8fb4b..35807613a 100644 --- a/mycat2/src/main/java/io/mycat/lib/impl/ResultSetCacheImpl.java +++ b/mycat2/src/main/java/io/mycat/lib/impl/ResultSetCacheImpl.java @@ -4,11 +4,7 @@ import io.mycat.ScheduleUtil; import io.mycat.beans.resultset.MycatResultSetResponse; import io.mycat.beans.resultset.MycatResultSetType; -import io.mycat.client.InterceptorRuntime; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; import lombok.SneakyThrows; -import lombok.extern.log4j.Log4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/AbstractSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/AbstractSQLHandler.java similarity index 98% rename from mycat2/src/main/java/io/mycat/sqlHandler/AbstractSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/AbstractSQLHandler.java index 64f305e76..27536e477 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/AbstractSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/AbstractSQLHandler.java @@ -1,4 +1,4 @@ -package io.mycat.sqlHandler; +package io.mycat.sqlhandler; import com.alibaba.fastsql.sql.ast.SQLStatement; import io.mycat.MycatDataContext; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/ExecuteCode.java b/mycat2/src/main/java/io/mycat/sqlhandler/ExecuteCode.java similarity index 96% rename from mycat2/src/main/java/io/mycat/sqlHandler/ExecuteCode.java rename to mycat2/src/main/java/io/mycat/sqlhandler/ExecuteCode.java index 8d17fae11..f3c738487 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/ExecuteCode.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/ExecuteCode.java @@ -1,4 +1,4 @@ -package io.mycat.sqlHandler; +package io.mycat.sqlhandler; import lombok.Getter; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/SQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/SQLHandler.java similarity index 97% rename from mycat2/src/main/java/io/mycat/sqlHandler/SQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/SQLHandler.java index d58d1c04e..07e74f89f 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/SQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/SQLHandler.java @@ -1,4 +1,4 @@ -package io.mycat.sqlHandler; +package io.mycat.sqlhandler; import com.alibaba.fastsql.sql.ast.SQLStatement; import io.mycat.MycatDataContext; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/SQLRequest.java b/mycat2/src/main/java/io/mycat/sqlhandler/SQLRequest.java similarity index 92% rename from mycat2/src/main/java/io/mycat/sqlHandler/SQLRequest.java rename to mycat2/src/main/java/io/mycat/sqlhandler/SQLRequest.java index 5f8325535..a196e434e 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/SQLRequest.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/SQLRequest.java @@ -1,4 +1,4 @@ -package io.mycat.sqlHandler; +package io.mycat.sqlhandler; import io.mycat.client.MycatRequest; import io.mycat.util.SQLContext; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dcl/CommitSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/dcl/CommitSQLHandler.java similarity index 72% rename from mycat2/src/main/java/io/mycat/sqlHandler/dcl/CommitSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dcl/CommitSQLHandler.java index cf973c06c..20590d978 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dcl/CommitSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dcl/CommitSQLHandler.java @@ -1,10 +1,10 @@ -package io.mycat.sqlHandler.dcl; +package io.mycat.sqlhandler.dcl; import com.alibaba.fastsql.sql.ast.statement.SQLCommitStatement; import io.mycat.MycatDataContext; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dcl/KillSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/dcl/KillSQLHandler.java similarity index 73% rename from mycat2/src/main/java/io/mycat/sqlHandler/dcl/KillSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dcl/KillSQLHandler.java index a8b959711..2bfb0894b 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dcl/KillSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dcl/KillSQLHandler.java @@ -1,10 +1,10 @@ -package io.mycat.sqlHandler.dcl; +package io.mycat.sqlhandler.dcl; import com.alibaba.fastsql.sql.dialect.mysql.ast.statement.MySqlKillStatement; import io.mycat.MycatDataContext; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dcl/RollbackSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/dcl/RollbackSQLHandler.java similarity index 73% rename from mycat2/src/main/java/io/mycat/sqlHandler/dcl/RollbackSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dcl/RollbackSQLHandler.java index c00ec9290..3169aa906 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dcl/RollbackSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dcl/RollbackSQLHandler.java @@ -1,10 +1,10 @@ -package io.mycat.sqlHandler.dcl; +package io.mycat.sqlhandler.dcl; import com.alibaba.fastsql.sql.ast.statement.SQLRollbackStatement; import io.mycat.MycatDataContext; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dcl/SetTransactionSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/dcl/SetTransactionSQLHandler.java similarity index 84% rename from mycat2/src/main/java/io/mycat/sqlHandler/dcl/SetTransactionSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dcl/SetTransactionSQLHandler.java index e8772b175..7f956cc07 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dcl/SetTransactionSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dcl/SetTransactionSQLHandler.java @@ -1,13 +1,11 @@ -package io.mycat.sqlHandler.dcl; +package io.mycat.sqlhandler.dcl; import com.alibaba.fastsql.sql.dialect.mysql.ast.statement.MySqlSetTransactionStatement; -import io.mycat.DefaultCommandHandler; import io.mycat.MycatDataContext; -import io.mycat.MycatException; import io.mycat.beans.mysql.MySQLIsolation; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.upondb.MycatDBs; import io.mycat.util.Response; import org.slf4j.Logger; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dcl/StartTransactionSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/dcl/StartTransactionSQLHandler.java similarity index 74% rename from mycat2/src/main/java/io/mycat/sqlHandler/dcl/StartTransactionSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dcl/StartTransactionSQLHandler.java index ed271661b..211f1ee0f 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dcl/StartTransactionSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dcl/StartTransactionSQLHandler.java @@ -1,10 +1,10 @@ -package io.mycat.sqlHandler.dcl; +package io.mycat.sqlhandler.dcl; import com.alibaba.fastsql.sql.ast.statement.SQLStartTransactionStatement; import io.mycat.MycatDataContext; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dcl/UseSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/dcl/UseSQLHandler.java similarity index 80% rename from mycat2/src/main/java/io/mycat/sqlHandler/dcl/UseSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dcl/UseSQLHandler.java index 3a7d53fe7..56101ee02 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dcl/UseSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dcl/UseSQLHandler.java @@ -1,10 +1,10 @@ -package io.mycat.sqlHandler.dcl; +package io.mycat.sqlhandler.dcl; import com.alibaba.fastsql.sql.ast.statement.SQLUseStatement; import io.mycat.MycatDataContext; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; public class UseSQLHandler extends AbstractSQLHandler { diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/ddl/AlterDatabaseSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/ddl/AlterDatabaseSQLHandler.java similarity index 74% rename from mycat2/src/main/java/io/mycat/sqlHandler/ddl/AlterDatabaseSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/ddl/AlterDatabaseSQLHandler.java index 8427e1a68..01df05a19 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/ddl/AlterDatabaseSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/ddl/AlterDatabaseSQLHandler.java @@ -1,10 +1,10 @@ -package io.mycat.sqlHandler.ddl; +package io.mycat.sqlhandler.ddl; import com.alibaba.fastsql.sql.ast.statement.SQLAlterDatabaseStatement; import io.mycat.MycatDataContext; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/ddl/AlterTableSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/ddl/AlterTableSQLHandler.java similarity index 73% rename from mycat2/src/main/java/io/mycat/sqlHandler/ddl/AlterTableSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/ddl/AlterTableSQLHandler.java index ea46d78a2..19cb0c6e3 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/ddl/AlterTableSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/ddl/AlterTableSQLHandler.java @@ -1,10 +1,10 @@ -package io.mycat.sqlHandler.ddl; +package io.mycat.sqlhandler.ddl; import com.alibaba.fastsql.sql.ast.statement.SQLAlterTableStatement; import io.mycat.MycatDataContext; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/ddl/CreateDatabaseSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/ddl/CreateDatabaseSQLHandler.java similarity index 74% rename from mycat2/src/main/java/io/mycat/sqlHandler/ddl/CreateDatabaseSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/ddl/CreateDatabaseSQLHandler.java index 32b369fad..ed4687b0b 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/ddl/CreateDatabaseSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/ddl/CreateDatabaseSQLHandler.java @@ -1,10 +1,10 @@ -package io.mycat.sqlHandler.ddl; +package io.mycat.sqlhandler.ddl; import com.alibaba.fastsql.sql.ast.statement.SQLCreateDatabaseStatement; import io.mycat.MycatDataContext; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/ddl/CreateIndexSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/ddl/CreateIndexSQLHandler.java similarity index 73% rename from mycat2/src/main/java/io/mycat/sqlHandler/ddl/CreateIndexSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/ddl/CreateIndexSQLHandler.java index 9680a320b..c88fd41e9 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/ddl/CreateIndexSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/ddl/CreateIndexSQLHandler.java @@ -1,10 +1,10 @@ -package io.mycat.sqlHandler.ddl; +package io.mycat.sqlhandler.ddl; import com.alibaba.fastsql.sql.ast.statement.SQLCreateIndexStatement; import io.mycat.MycatDataContext; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/ddl/CreateTableSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/ddl/CreateTableSQLHandler.java similarity index 98% rename from mycat2/src/main/java/io/mycat/sqlHandler/ddl/CreateTableSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/ddl/CreateTableSQLHandler.java index 9d8bc943d..586c8119f 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/ddl/CreateTableSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/ddl/CreateTableSQLHandler.java @@ -1,4 +1,4 @@ -package io.mycat.sqlHandler.ddl; +package io.mycat.sqlhandler.ddl; import com.alibaba.fastsql.sql.SQLUtils; import com.alibaba.fastsql.sql.ast.statement.SQLCreateTableStatement; @@ -10,9 +10,9 @@ import io.mycat.router.ShardingTableHandler; import io.mycat.replica.ReplicaDataSourceSelector; import io.mycat.replica.ReplicaSelectorRuntime; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/ddl/CreateViewSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/ddl/CreateViewSQLHandler.java similarity index 73% rename from mycat2/src/main/java/io/mycat/sqlHandler/ddl/CreateViewSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/ddl/CreateViewSQLHandler.java index 10264567a..d15862041 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/ddl/CreateViewSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/ddl/CreateViewSQLHandler.java @@ -1,10 +1,10 @@ -package io.mycat.sqlHandler.ddl; +package io.mycat.sqlhandler.ddl; import com.alibaba.fastsql.sql.ast.statement.SQLCreateViewStatement; import io.mycat.MycatDataContext; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/ddl/DropDatabaseSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/ddl/DropDatabaseSQLHandler.java similarity index 74% rename from mycat2/src/main/java/io/mycat/sqlHandler/ddl/DropDatabaseSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/ddl/DropDatabaseSQLHandler.java index dc09cddf7..d31ad1003 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/ddl/DropDatabaseSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/ddl/DropDatabaseSQLHandler.java @@ -1,10 +1,10 @@ -package io.mycat.sqlHandler.ddl; +package io.mycat.sqlhandler.ddl; import com.alibaba.fastsql.sql.ast.statement.SQLDropDatabaseStatement; import io.mycat.MycatDataContext; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/ddl/DropTableSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/ddl/DropTableSQLHandler.java similarity index 73% rename from mycat2/src/main/java/io/mycat/sqlHandler/ddl/DropTableSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/ddl/DropTableSQLHandler.java index 5f092f623..b1b2471fd 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/ddl/DropTableSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/ddl/DropTableSQLHandler.java @@ -1,10 +1,10 @@ -package io.mycat.sqlHandler.ddl; +package io.mycat.sqlhandler.ddl; import com.alibaba.fastsql.sql.ast.statement.SQLDropTableStatement; import io.mycat.MycatDataContext; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/ddl/DropViewSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/ddl/DropViewSQLHandler.java similarity index 73% rename from mycat2/src/main/java/io/mycat/sqlHandler/ddl/DropViewSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/ddl/DropViewSQLHandler.java index 0416944d2..4dfb04338 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/ddl/DropViewSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/ddl/DropViewSQLHandler.java @@ -1,10 +1,10 @@ -package io.mycat.sqlHandler.ddl; +package io.mycat.sqlhandler.ddl; import com.alibaba.fastsql.sql.ast.statement.SQLDropViewStatement; import io.mycat.MycatDataContext; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/ddl/RenameTableSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/ddl/RenameTableSQLHandler.java similarity index 74% rename from mycat2/src/main/java/io/mycat/sqlHandler/ddl/RenameTableSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/ddl/RenameTableSQLHandler.java index c6466c1ca..159a0619f 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/ddl/RenameTableSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/ddl/RenameTableSQLHandler.java @@ -1,10 +1,10 @@ -package io.mycat.sqlHandler.ddl; +package io.mycat.sqlhandler.ddl; import com.alibaba.fastsql.sql.dialect.mysql.ast.statement.MySqlRenameTableStatement; import io.mycat.MycatDataContext; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dml/DeleteSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/dml/DeleteSQLHandler.java similarity index 82% rename from mycat2/src/main/java/io/mycat/sqlHandler/dml/DeleteSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dml/DeleteSQLHandler.java index fbd9f1e35..b2877d881 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dml/DeleteSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dml/DeleteSQLHandler.java @@ -1,15 +1,15 @@ -package io.mycat.sqlHandler.dml; +package io.mycat.sqlhandler.dml; import com.alibaba.fastsql.sql.ast.statement.SQLExprTableSource; import com.alibaba.fastsql.sql.dialect.mysql.ast.statement.MySqlDeleteStatement; import io.mycat.MycatDataContext; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; -import static io.mycat.sqlHandler.dml.UpdateSQLHandler.updateHandler; +import static io.mycat.sqlhandler.dml.UpdateSQLHandler.updateHandler; public class DeleteSQLHandler extends AbstractSQLHandler { diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dml/InsertSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/dml/InsertSQLHandler.java similarity index 82% rename from mycat2/src/main/java/io/mycat/sqlHandler/dml/InsertSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dml/InsertSQLHandler.java index b4912b0f0..94f537487 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dml/InsertSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dml/InsertSQLHandler.java @@ -1,16 +1,16 @@ -package io.mycat.sqlHandler.dml; +package io.mycat.sqlhandler.dml; import com.alibaba.fastsql.sql.ast.statement.SQLExprTableSource; import com.alibaba.fastsql.sql.dialect.mysql.ast.statement.MySqlInsertStatement; import io.mycat.MycatDataContext; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; -import static io.mycat.sqlHandler.dml.UpdateSQLHandler.updateHandler; +import static io.mycat.sqlhandler.dml.UpdateSQLHandler.updateHandler; public class InsertSQLHandler extends AbstractSQLHandler { diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dml/LoadDataInFileSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/dml/LoadDataInFileSQLHandler.java similarity index 75% rename from mycat2/src/main/java/io/mycat/sqlHandler/dml/LoadDataInFileSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dml/LoadDataInFileSQLHandler.java index 3d1384cee..5e42dc5ad 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dml/LoadDataInFileSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dml/LoadDataInFileSQLHandler.java @@ -1,10 +1,10 @@ -package io.mycat.sqlHandler.dml; +package io.mycat.sqlhandler.dml; import com.alibaba.fastsql.sql.dialect.mysql.ast.statement.MySqlLoadDataInFileStatement; import io.mycat.MycatDataContext; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dml/ReplaceSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/dml/ReplaceSQLHandler.java similarity index 82% rename from mycat2/src/main/java/io/mycat/sqlHandler/dml/ReplaceSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dml/ReplaceSQLHandler.java index 02e7653f5..a9dbdc073 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dml/ReplaceSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dml/ReplaceSQLHandler.java @@ -1,16 +1,16 @@ -package io.mycat.sqlHandler.dml; +package io.mycat.sqlhandler.dml; import com.alibaba.fastsql.sql.ast.statement.SQLExprTableSource; import com.alibaba.fastsql.sql.ast.statement.SQLReplaceStatement; import io.mycat.MycatDataContext; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; -import static io.mycat.sqlHandler.dml.UpdateSQLHandler.updateHandler; +import static io.mycat.sqlhandler.dml.UpdateSQLHandler.updateHandler; public class ReplaceSQLHandler extends AbstractSQLHandler { diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dml/SetSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/dml/SetSQLHandler.java similarity index 88% rename from mycat2/src/main/java/io/mycat/sqlHandler/dml/SetSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dml/SetSQLHandler.java index 3d07d96b4..eaa257c06 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dml/SetSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dml/SetSQLHandler.java @@ -1,11 +1,11 @@ -package io.mycat.sqlHandler.dml; +package io.mycat.sqlhandler.dml; import com.alibaba.fastsql.sql.ast.statement.SQLAssignItem; import com.alibaba.fastsql.sql.ast.statement.SQLSetStatement; import io.mycat.MycatDataContext; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.upondb.MycatDBClientMediator; import io.mycat.upondb.MycatDBs; import io.mycat.util.Response; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dml/TruncateSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/dml/TruncateSQLHandler.java similarity index 82% rename from mycat2/src/main/java/io/mycat/sqlHandler/dml/TruncateSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dml/TruncateSQLHandler.java index 4a4420438..068e4a841 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dml/TruncateSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dml/TruncateSQLHandler.java @@ -1,16 +1,16 @@ -package io.mycat.sqlHandler.dml; +package io.mycat.sqlhandler.dml; import com.alibaba.fastsql.sql.ast.statement.SQLExprTableSource; import com.alibaba.fastsql.sql.ast.statement.SQLTruncateStatement; import io.mycat.MycatDataContext; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; -import static io.mycat.sqlHandler.dml.UpdateSQLHandler.updateHandler; +import static io.mycat.sqlhandler.dml.UpdateSQLHandler.updateHandler; public class TruncateSQLHandler extends AbstractSQLHandler { diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dml/UpdateSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/dml/UpdateSQLHandler.java similarity index 97% rename from mycat2/src/main/java/io/mycat/sqlHandler/dml/UpdateSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dml/UpdateSQLHandler.java index c71d2edde..804adf33e 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dml/UpdateSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dml/UpdateSQLHandler.java @@ -1,4 +1,4 @@ -package io.mycat.sqlHandler.dml; +package io.mycat.sqlhandler.dml; import com.alibaba.fastsql.sql.SQLUtils; import com.alibaba.fastsql.sql.ast.SQLStatement; @@ -7,9 +7,9 @@ import com.alibaba.fastsql.sql.dialect.mysql.ast.statement.MySqlUpdateStatement; import io.mycat.*; import io.mycat.metadata.SchemaHandler; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.upondb.MycatDBClientMediator; import io.mycat.upondb.MycatDBs; import io.mycat.util.Response; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dql/AnalyzeHanlder.java b/mycat2/src/main/java/io/mycat/sqlhandler/dql/AnalyzeHanlder.java similarity index 94% rename from mycat2/src/main/java/io/mycat/sqlHandler/dql/AnalyzeHanlder.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dql/AnalyzeHanlder.java index e28aca4e6..e138ce076 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dql/AnalyzeHanlder.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dql/AnalyzeHanlder.java @@ -1,4 +1,4 @@ -package io.mycat.sqlHandler.dql; +package io.mycat.sqlhandler.dql; import com.alibaba.fastsql.sql.SQLUtils; import com.alibaba.fastsql.sql.ast.statement.SQLExprTableSource; @@ -8,9 +8,9 @@ import io.mycat.beans.mycat.ResultSetBuilder; import io.mycat.metadata.MetadataManager; import io.mycat.TableHandler; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.statistic.StatisticCenter; import io.mycat.util.Response; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ExplainSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ExplainSQLHandler.java similarity index 88% rename from mycat2/src/main/java/io/mycat/sqlHandler/dql/ExplainSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dql/ExplainSQLHandler.java index d7721f02c..b79c0a0ad 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ExplainSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ExplainSQLHandler.java @@ -1,13 +1,13 @@ -package io.mycat.sqlHandler.dql; +package io.mycat.sqlhandler.dql; import com.alibaba.fastsql.sql.ast.SQLStatement; import com.alibaba.fastsql.sql.dialect.mysql.ast.statement.MySqlExplainStatement; import io.mycat.MycatDataContext; import io.mycat.client.MycatRequest; import io.mycat.commands.MycatdbCommand; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dql/HintSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/dql/HintSQLHandler.java similarity index 85% rename from mycat2/src/main/java/io/mycat/sqlHandler/dql/HintSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dql/HintSQLHandler.java index 8de12fac2..02fc03010 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dql/HintSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dql/HintSQLHandler.java @@ -1,12 +1,12 @@ -package io.mycat.sqlHandler.dql; +package io.mycat.sqlhandler.dql; import com.alibaba.fastsql.sql.dialect.mysql.ast.statement.MySqlHintStatement; import io.mycat.MycatDataContext; import io.mycat.client.MycatRequest; import io.mycat.commands.MycatdbCommand; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; public class HintSQLHandler extends AbstractSQLHandler { diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dql/SelectSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/dql/SelectSQLHandler.java similarity index 98% rename from mycat2/src/main/java/io/mycat/sqlHandler/dql/SelectSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dql/SelectSQLHandler.java index 6abd02838..4970e6d53 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dql/SelectSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dql/SelectSQLHandler.java @@ -1,4 +1,4 @@ -package io.mycat.sqlHandler.dql; +package io.mycat.sqlhandler.dql; import com.alibaba.fastsql.DbType; import com.alibaba.fastsql.interpreter.TypeCalculation; @@ -26,9 +26,9 @@ import io.mycat.route.InputHandler; import io.mycat.route.ParseContext; import io.mycat.route.ResultHandler; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.upondb.MycatDBContext; import io.mycat.upondb.MycatDBSharedServer; import io.mycat.upondb.ProxyInfo; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowCharacterSetSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowCharacterSetSQLHandler.java similarity index 76% rename from mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowCharacterSetSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowCharacterSetSQLHandler.java index c79f63329..24c38fa79 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowCharacterSetSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowCharacterSetSQLHandler.java @@ -1,10 +1,10 @@ -package io.mycat.sqlHandler.dql; +package io.mycat.sqlhandler.dql; import com.alibaba.fastsql.sql.dialect.mysql.ast.statement.MySqlShowCharacterSetStatement; import io.mycat.MycatDataContext; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowCollationSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowCollationSQLHandler.java similarity index 75% rename from mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowCollationSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowCollationSQLHandler.java index 9391663d7..e5b7b248f 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowCollationSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowCollationSQLHandler.java @@ -1,10 +1,10 @@ -package io.mycat.sqlHandler.dql; +package io.mycat.sqlhandler.dql; import com.alibaba.fastsql.sql.dialect.mysql.ast.statement.MySqlShowCollationStatement; import io.mycat.MycatDataContext; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowColumnsSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowColumnsSQLHandler.java similarity index 96% rename from mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowColumnsSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowColumnsSQLHandler.java index 5e237dd93..42f05d480 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowColumnsSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowColumnsSQLHandler.java @@ -1,10 +1,10 @@ -package io.mycat.sqlHandler.dql; +package io.mycat.sqlhandler.dql; import com.alibaba.fastsql.sql.ast.statement.SQLShowColumnsStatement; import io.mycat.MycatDataContext; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowCreateFunctionHanlder.java b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowCreateFunctionHanlder.java similarity index 76% rename from mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowCreateFunctionHanlder.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowCreateFunctionHanlder.java index f13e0b2e7..aa23211bf 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowCreateFunctionHanlder.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowCreateFunctionHanlder.java @@ -1,9 +1,9 @@ -package io.mycat.sqlHandler.dql; +package io.mycat.sqlhandler.dql; import io.mycat.MycatDataContext; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowCreateTableSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowCreateTableSQLHandler.java similarity index 93% rename from mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowCreateTableSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowCreateTableSQLHandler.java index b04e8d264..203abe8c9 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowCreateTableSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowCreateTableSQLHandler.java @@ -1,4 +1,4 @@ -package io.mycat.sqlHandler.dql; +package io.mycat.sqlhandler.dql; import com.alibaba.fastsql.sql.SQLUtils; import com.alibaba.fastsql.sql.ast.SQLName; @@ -10,9 +10,9 @@ import io.mycat.beans.mycat.ResultSetBuilder; import io.mycat.metadata.MetadataManager; import io.mycat.TableHandler; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowDatabaseSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowDatabaseSQLHandler.java similarity index 74% rename from mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowDatabaseSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowDatabaseSQLHandler.java index dff0bccfd..20b988685 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowDatabaseSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowDatabaseSQLHandler.java @@ -1,10 +1,10 @@ -package io.mycat.sqlHandler.dql; +package io.mycat.sqlhandler.dql; import com.alibaba.fastsql.sql.ast.statement.SQLShowDatabasesStatement; import io.mycat.MycatDataContext; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowDatabaseStatusSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowDatabaseStatusSQLHandler.java similarity index 76% rename from mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowDatabaseStatusSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowDatabaseStatusSQLHandler.java index 670459063..01a689f76 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowDatabaseStatusSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowDatabaseStatusSQLHandler.java @@ -1,10 +1,10 @@ -package io.mycat.sqlHandler.dql; +package io.mycat.sqlhandler.dql; import com.alibaba.fastsql.sql.dialect.mysql.ast.statement.MySqlShowDatabaseStatusStatement; import io.mycat.MycatDataContext; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowDatabasesHanlder.java b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowDatabasesHanlder.java similarity index 87% rename from mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowDatabasesHanlder.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowDatabasesHanlder.java index 8bb74ab84..0ddc58dd7 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowDatabasesHanlder.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowDatabasesHanlder.java @@ -1,12 +1,12 @@ -package io.mycat.sqlHandler.dql; +package io.mycat.sqlhandler.dql; import io.mycat.MycatDataContext; import io.mycat.api.collector.RowBaseIterator; import io.mycat.beans.mycat.ResultSetBuilder; import io.mycat.metadata.MetadataManager; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowEnginesSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowEnginesSQLHandler.java similarity index 92% rename from mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowEnginesSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowEnginesSQLHandler.java index 9efded4b1..33e5dd72e 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowEnginesSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowEnginesSQLHandler.java @@ -1,11 +1,11 @@ -package io.mycat.sqlHandler.dql; +package io.mycat.sqlhandler.dql; import com.alibaba.fastsql.sql.dialect.mysql.ast.statement.MySqlShowEnginesStatement; import io.mycat.MycatDataContext; import io.mycat.beans.mycat.ResultSetBuilder; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowErrorsSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowErrorsSQLHandler.java similarity index 75% rename from mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowErrorsSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowErrorsSQLHandler.java index 8a1b0fda3..b966a42c5 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowErrorsSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowErrorsSQLHandler.java @@ -1,10 +1,10 @@ -package io.mycat.sqlHandler.dql; +package io.mycat.sqlhandler.dql; import com.alibaba.fastsql.sql.dialect.mysql.ast.statement.MySqlShowErrorsStatement; import io.mycat.MycatDataContext; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowIndexesSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowIndexesSQLHandler.java similarity index 74% rename from mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowIndexesSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowIndexesSQLHandler.java index 712d3be58..d5eedaae5 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowIndexesSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowIndexesSQLHandler.java @@ -1,10 +1,10 @@ -package io.mycat.sqlHandler.dql; +package io.mycat.sqlhandler.dql; import com.alibaba.fastsql.sql.ast.statement.SQLShowIndexesStatement; import io.mycat.MycatDataContext; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowProcedureStatusSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowProcedureStatusSQLHandler.java similarity index 75% rename from mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowProcedureStatusSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowProcedureStatusSQLHandler.java index 89a8d22d4..40a0bf631 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowProcedureStatusSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowProcedureStatusSQLHandler.java @@ -1,10 +1,10 @@ -package io.mycat.sqlHandler.dql; +package io.mycat.sqlhandler.dql; import com.alibaba.fastsql.sql.dialect.mysql.ast.statement.MySqlShowProcedureStatusStatement; import io.mycat.MycatDataContext; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowProcessListSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowProcessListSQLHandler.java similarity index 76% rename from mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowProcessListSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowProcessListSQLHandler.java index f3d99d05b..fcf5e7333 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowProcessListSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowProcessListSQLHandler.java @@ -1,10 +1,10 @@ -package io.mycat.sqlHandler.dql; +package io.mycat.sqlhandler.dql; import com.alibaba.fastsql.sql.dialect.mysql.ast.statement.MySqlShowProcessListStatement; import io.mycat.MycatDataContext; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowStatusSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowStatusSQLHandler.java similarity index 75% rename from mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowStatusSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowStatusSQLHandler.java index dc2ef82f7..3f0f4113e 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowStatusSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowStatusSQLHandler.java @@ -1,10 +1,10 @@ -package io.mycat.sqlHandler.dql; +package io.mycat.sqlhandler.dql; import com.alibaba.fastsql.sql.dialect.mysql.ast.statement.MySqlShowStatusStatement; import io.mycat.MycatDataContext; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowTableStatusSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowTableStatusSQLHandler.java similarity index 98% rename from mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowTableStatusSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowTableStatusSQLHandler.java index 35647ab61..04a0f595c 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowTableStatusSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowTableStatusSQLHandler.java @@ -1,4 +1,4 @@ -package io.mycat.sqlHandler.dql; +package io.mycat.sqlhandler.dql; import com.alibaba.fastsql.sql.SQLUtils; import com.alibaba.fastsql.sql.ast.SQLName; @@ -10,9 +10,9 @@ import io.mycat.metadata.MetadataManager; import io.mycat.metadata.SchemaHandler; import io.mycat.replica.ReplicaSelectorRuntime; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowTablesSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowTablesSQLHandler.java similarity index 96% rename from mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowTablesSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowTablesSQLHandler.java index cae8a1aee..fe46db536 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowTablesSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowTablesSQLHandler.java @@ -1,4 +1,4 @@ -package io.mycat.sqlHandler.dql; +package io.mycat.sqlhandler.dql; import com.alibaba.fastsql.sql.SQLUtils; import com.alibaba.fastsql.sql.ast.SQLName; @@ -13,9 +13,9 @@ import io.mycat.metadata.MetadataManager; import io.mycat.metadata.SchemaHandler; import io.mycat.replica.ReplicaSelectorRuntime; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowVariantsSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowVariantsSQLHandler.java similarity index 96% rename from mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowVariantsSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowVariantsSQLHandler.java index 3b5f59c9d..3c0a05ce2 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowVariantsSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowVariantsSQLHandler.java @@ -1,4 +1,4 @@ -package io.mycat.sqlHandler.dql; +package io.mycat.sqlhandler.dql; import com.alibaba.fastsql.sql.dialect.mysql.ast.statement.MySqlShowVariantsStatement; import io.mycat.MycatDataContext; @@ -8,9 +8,9 @@ import io.mycat.beans.mysql.InformationSchemaRuntime; import io.mycat.metadata.MetadataManager; import io.mycat.router.ShowStatementRewriter; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.upondb.MycatDBClientBasedConfig; import io.mycat.upondb.MycatDBClientMediator; import io.mycat.upondb.MycatDBs; diff --git a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowWarningsSQLHandler.java b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowWarningsSQLHandler.java similarity index 75% rename from mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowWarningsSQLHandler.java rename to mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowWarningsSQLHandler.java index 9ad7d5ecd..efa264059 100644 --- a/mycat2/src/main/java/io/mycat/sqlHandler/dql/ShowWarningsSQLHandler.java +++ b/mycat2/src/main/java/io/mycat/sqlhandler/dql/ShowWarningsSQLHandler.java @@ -1,10 +1,10 @@ -package io.mycat.sqlHandler.dql; +package io.mycat.sqlhandler.dql; import com.alibaba.fastsql.sql.dialect.mysql.ast.statement.MySqlShowWarningsStatement; import io.mycat.MycatDataContext; -import io.mycat.sqlHandler.AbstractSQLHandler; -import io.mycat.sqlHandler.ExecuteCode; -import io.mycat.sqlHandler.SQLRequest; +import io.mycat.sqlhandler.AbstractSQLHandler; +import io.mycat.sqlhandler.ExecuteCode; +import io.mycat.sqlhandler.SQLRequest; import io.mycat.util.Response; diff --git a/mycat2/src/main/resources/mycat.yml b/mycat2/src/main/resources/mycat.yml index 3f2efa617..9532a8373 100644 --- a/mycat2/src/main/resources/mycat.yml +++ b/mycat2/src/main/resources/mycat.yml @@ -24,7 +24,7 @@ datasource: initSqlsGetConnection: true } ] - datasourceProviderClass: io.mycat.datasource.jdbc.datasourceProvider.AtomikosDatasourceProvider + datasourceProviderClass: io.mycat.datasource.jdbc.datasourceprovider.AtomikosDatasourceProvider timer: {initialDelay: 10, period: 5, timeUnit: SECONDS} cluster: #集群,数据源选择器,既可以mycat自行检查数据源可用也可以通过mycat提供的外部接口设置设置数据源可用信息影响如何使用数据源 close: true #关闭集群心跳,此时集群认为所有数据源都是可用的,可以通过mycat提供的外部接口设置数据源可用信息达到相同效果 diff --git a/mycat2/src/main/resources/version.txt b/mycat2/src/main/resources/version.txt index 2277c1d94..2303dc6ce 100644 --- a/mycat2/src/main/resources/version.txt +++ b/mycat2/src/main/resources/version.txt @@ -1,5 +1,5 @@ -BuildTime 2020-07-04 16:46:21 -GitVersion 2e90ca01b7f041c7b5ffb23a1308a8f2da93d727 +BuildTime 2020-07-06 06:50:08 +GitVersion f4ae7a7eda8921b455eb0778b623d9ecc891666a MavenVersion 1.11-05 GitUrl https://github.com/MyCATApache/Mycat2.git MyCatSite http://www.mycat.io/ diff --git a/mycat2/src/test/java/io/mycat/sql/HBTChecker.java b/mycat2/src/test/java/io/mycat/sql/HBTChecker.java index 450e2f1fb..fc37a1981 100644 --- a/mycat2/src/test/java/io/mycat/sql/HBTChecker.java +++ b/mycat2/src/test/java/io/mycat/sql/HBTChecker.java @@ -121,7 +121,7 @@ public void run() { "(1,999,null,null,null,null,1,999,null,null,null,null,1,Intel,1)(999999999,999,null,null,null,null,999999999,999,null,null,null,null,null,null,null)"); checkHbt("filterFromTable(`id` = 1,db1,travelrecord)", "(1,999,null,null,null,null)"); checkHbt("fromRelToSql(defaultDs,fromTable('db1','travelrecord').filter(`id` = 1).map(`id`))", "(1)"); - checkHbt("modifyFromSql(defaultDs,'delete from db1.travelrecord3')", "(0,0)"); + checkHbt("modifyFromSql(defaultDs,'delete from db1.travelrecord3')", "");//todo } @SneakyThrows diff --git a/pattern/src/main/java/io/mycat/pattern/TableCollector.java b/pattern/src/main/java/io/mycat/pattern/TableCollector.java index 8d12e0719..64a507f40 100644 --- a/pattern/src/main/java/io/mycat/pattern/TableCollector.java +++ b/pattern/src/main/java/io/mycat/pattern/TableCollector.java @@ -14,8 +14,6 @@ */ package io.mycat.pattern; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; import lombok.AllArgsConstructor; import lombok.Getter; import org.eclipse.collections.impl.map.mutable.primitive.IntObjectHashMap; diff --git a/plug/src/main/java/io/mycat/plug/sequence/SequenceTime/SequenceTimeHandler.java b/plug/src/main/java/io/mycat/plug/sequence/sequenceTime/SequenceTimeHandler.java similarity index 96% rename from plug/src/main/java/io/mycat/plug/sequence/SequenceTime/SequenceTimeHandler.java rename to plug/src/main/java/io/mycat/plug/sequence/sequenceTime/SequenceTimeHandler.java index cbc26e277..67d612751 100644 --- a/plug/src/main/java/io/mycat/plug/sequence/SequenceTime/SequenceTimeHandler.java +++ b/plug/src/main/java/io/mycat/plug/sequence/sequenceTime/SequenceTimeHandler.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.mycat.plug.sequence.SequenceTime; +package io.mycat.plug.sequence.sequenceTime; import io.mycat.plug.sequence.SequenceCallback; import io.mycat.plug.sequence.SequenceHandler; diff --git a/plug/src/main/java/io/mycat/plug/sequence/sequenceFile/SequenceFileHandler.java b/plug/src/main/java/io/mycat/plug/sequence/sequencefile/SequenceFileHandler.java similarity index 98% rename from plug/src/main/java/io/mycat/plug/sequence/sequenceFile/SequenceFileHandler.java rename to plug/src/main/java/io/mycat/plug/sequence/sequencefile/SequenceFileHandler.java index 08918495d..a3be5ef9f 100644 --- a/plug/src/main/java/io/mycat/plug/sequence/sequenceFile/SequenceFileHandler.java +++ b/plug/src/main/java/io/mycat/plug/sequence/sequencefile/SequenceFileHandler.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.mycat.plug.sequence.sequenceFile; +package io.mycat.plug.sequence.sequencefile; import io.mycat.plug.sequence.SequenceCallback; import io.mycat.plug.sequence.SequenceHandler; diff --git a/plug/src/main/java/io/mycat/plug/sequence/sequenceFile/SequenceFileImpl.java b/plug/src/main/java/io/mycat/plug/sequence/sequencefile/SequenceFileImpl.java similarity index 96% rename from plug/src/main/java/io/mycat/plug/sequence/sequenceFile/SequenceFileImpl.java rename to plug/src/main/java/io/mycat/plug/sequence/sequencefile/SequenceFileImpl.java index d3a4c566d..884b2ee85 100644 --- a/plug/src/main/java/io/mycat/plug/sequence/sequenceFile/SequenceFileImpl.java +++ b/plug/src/main/java/io/mycat/plug/sequence/sequencefile/SequenceFileImpl.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.mycat.plug.sequence.sequenceFile; +package io.mycat.plug.sequence.sequencefile; -import io.mycat.plug.sequence.sequenceFile.SequenceFileHandler.SequenceFile; +import io.mycat.plug.sequence.sequencefile.SequenceFileHandler.SequenceFile; import java.io.IOException; import java.io.RandomAccessFile; diff --git a/plug/src/main/java/io/mycat/plug/sequence/sequenceMySQL/SequenceMySQLHandler.java b/plug/src/main/java/io/mycat/plug/sequence/sequencemysql/SequenceMySQLHandler.java similarity index 98% rename from plug/src/main/java/io/mycat/plug/sequence/sequenceMySQL/SequenceMySQLHandler.java rename to plug/src/main/java/io/mycat/plug/sequence/sequencemysql/SequenceMySQLHandler.java index 7c7aa93a8..3a3c2eb73 100644 --- a/plug/src/main/java/io/mycat/plug/sequence/sequenceMySQL/SequenceMySQLHandler.java +++ b/plug/src/main/java/io/mycat/plug/sequence/sequencemysql/SequenceMySQLHandler.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.mycat.plug.sequence.sequenceMySQL; +package io.mycat.plug.sequence.sequencemysql; import io.mycat.plug.sequence.SequenceCallback; import io.mycat.plug.sequence.SequenceHandler; diff --git a/proxy/src/main/java/io/mycat/proxy/buffer/CrossSwapThreadBufferPool.java b/proxy/src/main/java/io/mycat/proxy/buffer/CrossSwapThreadBufferPool.java index ca6469988..a767b939f 100644 --- a/proxy/src/main/java/io/mycat/proxy/buffer/CrossSwapThreadBufferPool.java +++ b/proxy/src/main/java/io/mycat/proxy/buffer/CrossSwapThreadBufferPool.java @@ -15,10 +15,7 @@ package io.mycat.proxy.buffer; import io.mycat.MycatException; -import io.mycat.beans.MySQLDatasource; import io.mycat.buffer.BufferPool; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; import io.mycat.proxy.reactor.SessionThread; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/proxy/src/main/java/io/mycat/proxy/handler/MySQLPacketExchanger.java b/proxy/src/main/java/io/mycat/proxy/handler/MySQLPacketExchanger.java index b05924646..ebdba74e1 100644 --- a/proxy/src/main/java/io/mycat/proxy/handler/MySQLPacketExchanger.java +++ b/proxy/src/main/java/io/mycat/proxy/handler/MySQLPacketExchanger.java @@ -19,8 +19,6 @@ import io.mycat.beans.mysql.packet.ErrorPacketImpl; import io.mycat.beans.mysql.packet.MySQLPacket; import io.mycat.beans.mysql.packet.ProxyBuffer; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; import io.mycat.proxy.callback.TaskCallBack; import io.mycat.proxy.monitor.MycatMonitor; import io.mycat.proxy.packet.MySQLPacketCallback; diff --git a/proxy/src/main/java/io/mycat/proxy/handler/MycatHandler.java b/proxy/src/main/java/io/mycat/proxy/handler/MycatHandler.java index a4814690f..b073407f5 100644 --- a/proxy/src/main/java/io/mycat/proxy/handler/MycatHandler.java +++ b/proxy/src/main/java/io/mycat/proxy/handler/MycatHandler.java @@ -16,9 +16,6 @@ import io.mycat.command.CommandResolver; import io.mycat.command.ThreadModeCommandHanlderImpl; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; -import io.mycat.proxy.buffer.CrossSwapThreadBufferPool; import io.mycat.proxy.monitor.MycatMonitor; import io.mycat.proxy.packet.FrontMySQLPacketResolver; import io.mycat.proxy.session.MycatSession; diff --git a/proxy/src/main/java/io/mycat/proxy/handler/backend/BackendConCreateHandler.java b/proxy/src/main/java/io/mycat/proxy/handler/backend/BackendConCreateHandler.java index e5957d0f9..a6fecf785 100644 --- a/proxy/src/main/java/io/mycat/proxy/handler/backend/BackendConCreateHandler.java +++ b/proxy/src/main/java/io/mycat/proxy/handler/backend/BackendConCreateHandler.java @@ -18,12 +18,9 @@ import io.mycat.MycatException; import io.mycat.beans.MySQLDatasource; import io.mycat.beans.mysql.packet.*; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; import io.mycat.proxy.buffer.ProxyBufferImpl; import io.mycat.proxy.callback.CommandCallBack; import io.mycat.proxy.handler.BackendNIOHandler; -import io.mycat.proxy.handler.MySQLPacketExchanger; import io.mycat.proxy.monitor.MycatMonitor; import io.mycat.proxy.packet.MySQLPacketResolver; import io.mycat.proxy.packet.MySQLPacketResolver.ComQueryState; diff --git a/proxy/src/main/java/io/mycat/proxy/handler/backend/IdleHandler.java b/proxy/src/main/java/io/mycat/proxy/handler/backend/IdleHandler.java index 020cd9946..d5059399e 100644 --- a/proxy/src/main/java/io/mycat/proxy/handler/backend/IdleHandler.java +++ b/proxy/src/main/java/io/mycat/proxy/handler/backend/IdleHandler.java @@ -16,8 +16,6 @@ import io.mycat.MycatException; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; import io.mycat.proxy.handler.NIOHandler; import io.mycat.proxy.monitor.MycatMonitor; import io.mycat.proxy.session.MySQLClientSession; diff --git a/proxy/src/main/java/io/mycat/proxy/handler/backend/RequestHandler.java b/proxy/src/main/java/io/mycat/proxy/handler/backend/RequestHandler.java index 8149eb623..a82978753 100644 --- a/proxy/src/main/java/io/mycat/proxy/handler/backend/RequestHandler.java +++ b/proxy/src/main/java/io/mycat/proxy/handler/backend/RequestHandler.java @@ -15,8 +15,6 @@ package io.mycat.proxy.handler.backend; import io.mycat.MycatException; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; import io.mycat.proxy.buffer.ProxyBufferImpl; import io.mycat.proxy.callback.RequestCallback; import io.mycat.proxy.handler.NIOHandler; diff --git a/proxy/src/main/java/io/mycat/proxy/handler/backend/ResultSetHandler.java b/proxy/src/main/java/io/mycat/proxy/handler/backend/ResultSetHandler.java index 8e4fe279d..8bcc32b24 100644 --- a/proxy/src/main/java/io/mycat/proxy/handler/backend/ResultSetHandler.java +++ b/proxy/src/main/java/io/mycat/proxy/handler/backend/ResultSetHandler.java @@ -19,8 +19,6 @@ import io.mycat.beans.mysql.packet.MySQLPacket; import io.mycat.beans.mysql.packet.MySQLPacketSplitter; import io.mycat.beans.mysql.packet.ProxyBuffer; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; import io.mycat.proxy.buffer.ProxyBufferImpl; import io.mycat.proxy.callback.ResultSetCallBack; import io.mycat.proxy.handler.BackendNIOHandler; diff --git a/proxy/src/main/java/io/mycat/proxy/handler/front/MySQLClientAuthHandler.java b/proxy/src/main/java/io/mycat/proxy/handler/front/MySQLClientAuthHandler.java index 2335323de..90bdfb8ff 100644 --- a/proxy/src/main/java/io/mycat/proxy/handler/front/MySQLClientAuthHandler.java +++ b/proxy/src/main/java/io/mycat/proxy/handler/front/MySQLClientAuthHandler.java @@ -23,11 +23,8 @@ import io.mycat.beans.mysql.packet.HandshakePacket; import io.mycat.beans.mysql.packet.MySQLPacket; import io.mycat.config.MySQLServerCapabilityFlags; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; import io.mycat.proxy.handler.MycatHandler; import io.mycat.proxy.handler.NIOHandler; -import io.mycat.proxy.handler.backend.ResultSetHandler; import io.mycat.proxy.monitor.MycatMonitor; import io.mycat.proxy.session.Authenticator; import io.mycat.proxy.session.MycatSession; diff --git a/proxy/src/main/java/io/mycat/proxy/monitor/MycatMonitorLogCallback.java b/proxy/src/main/java/io/mycat/proxy/monitor/MycatMonitorLogCallback.java index 42e0b8efd..e5cab4ed6 100644 --- a/proxy/src/main/java/io/mycat/proxy/monitor/MycatMonitorLogCallback.java +++ b/proxy/src/main/java/io/mycat/proxy/monitor/MycatMonitorLogCallback.java @@ -14,17 +14,13 @@ */ package io.mycat.proxy.monitor; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; import io.mycat.proxy.handler.backend.MySQLSynContext; -import io.mycat.proxy.handler.front.MySQLClientAuthHandler; import io.mycat.proxy.packet.MySQLPacketResolver; import io.mycat.proxy.packet.MySQLPayloadType; import io.mycat.proxy.session.MySQLClientSession; import io.mycat.proxy.session.MycatSession; import io.mycat.proxy.session.Session; import io.mycat.util.DumpUtil; -import io.mycat.util.DynaClassLoader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/proxy/src/main/java/io/mycat/proxy/packet/MySQLPacketResolver.java b/proxy/src/main/java/io/mycat/proxy/packet/MySQLPacketResolver.java index 094010fab..ab369794e 100644 --- a/proxy/src/main/java/io/mycat/proxy/packet/MySQLPacketResolver.java +++ b/proxy/src/main/java/io/mycat/proxy/packet/MySQLPacketResolver.java @@ -18,9 +18,6 @@ import io.mycat.beans.mysql.MySQLServerStatusFlags; import io.mycat.beans.mysql.packet.*; import io.mycat.config.MySQLServerCapabilityFlags; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; -import io.mycat.proxy.monitor.MycatMonitorLogCallback; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/proxy/src/main/java/io/mycat/proxy/reactor/ProxyReactorThread.java b/proxy/src/main/java/io/mycat/proxy/reactor/ProxyReactorThread.java index 0a868c24f..9d9877a3b 100644 --- a/proxy/src/main/java/io/mycat/proxy/reactor/ProxyReactorThread.java +++ b/proxy/src/main/java/io/mycat/proxy/reactor/ProxyReactorThread.java @@ -15,11 +15,8 @@ package io.mycat.proxy.reactor; import io.mycat.buffer.BufferPool; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; import io.mycat.proxy.handler.BackendNIOHandler; import io.mycat.proxy.handler.NIOHandler; -import io.mycat.proxy.packet.MySQLPacketResolver; import io.mycat.proxy.session.Session; import io.mycat.proxy.session.SessionManager.FrontSessionManager; import io.mycat.util.nio.SelectorUtil; diff --git a/proxy/src/main/java/io/mycat/proxy/reactor/ReactorEnvThread.java b/proxy/src/main/java/io/mycat/proxy/reactor/ReactorEnvThread.java index 8f780599e..a2a61fdfb 100644 --- a/proxy/src/main/java/io/mycat/proxy/reactor/ReactorEnvThread.java +++ b/proxy/src/main/java/io/mycat/proxy/reactor/ReactorEnvThread.java @@ -14,8 +14,6 @@ */ package io.mycat.proxy.reactor; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/proxy/src/main/java/io/mycat/proxy/session/MySQLProxyServerSession.java b/proxy/src/main/java/io/mycat/proxy/session/MySQLProxyServerSession.java index b79162a1d..98ef70bed 100644 --- a/proxy/src/main/java/io/mycat/proxy/session/MySQLProxyServerSession.java +++ b/proxy/src/main/java/io/mycat/proxy/session/MySQLProxyServerSession.java @@ -4,8 +4,6 @@ import io.mycat.beans.mysql.packet.MySQLPacket; import io.mycat.beans.mysql.packet.MySQLPacketSplitter; import io.mycat.buffer.BufferPool; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; import io.mycat.proxy.MySQLPacketUtil; import io.mycat.proxy.buffer.CrossSwapThreadBufferPool; import io.mycat.proxy.handler.MycatSessionWriteHandler; @@ -13,7 +11,6 @@ import io.mycat.proxy.reactor.MycatReactorThread; import io.mycat.proxy.reactor.NIOJob; import io.mycat.proxy.reactor.ReactorEnvThread; -import io.mycat.replica.heartbeat.HeartbeatFlow; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/proxy/src/main/java/io/mycat/proxy/session/MycatSessionManager.java b/proxy/src/main/java/io/mycat/proxy/session/MycatSessionManager.java index 63ccde012..bfb7a06e9 100644 --- a/proxy/src/main/java/io/mycat/proxy/session/MycatSessionManager.java +++ b/proxy/src/main/java/io/mycat/proxy/session/MycatSessionManager.java @@ -16,11 +16,8 @@ import io.mycat.buffer.BufferPool; import io.mycat.command.CommandDispatcher; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; import io.mycat.proxy.handler.front.MySQLClientAuthHandler; import io.mycat.proxy.monitor.MycatMonitor; -import io.mycat.proxy.reactor.ReactorEnvThread; import io.mycat.proxy.reactor.SessionThread; import io.mycat.proxy.session.SessionManager.FrontSessionManager; import org.slf4j.Logger; diff --git a/proxy/src/main/java/io/mycat/proxy/session/ServerTransactionSessionRunner.java b/proxy/src/main/java/io/mycat/proxy/session/ServerTransactionSessionRunner.java index 363e65658..99c3256cb 100644 --- a/proxy/src/main/java/io/mycat/proxy/session/ServerTransactionSessionRunner.java +++ b/proxy/src/main/java/io/mycat/proxy/session/ServerTransactionSessionRunner.java @@ -2,9 +2,9 @@ import io.mycat.*; import io.mycat.beans.mycat.TransactionType; -import io.mycat.bindThread.BindThread; -import io.mycat.bindThread.BindThreadCallback; -import io.mycat.bindThread.BindThreadKey; +import io.mycat.bindthread.BindThread; +import io.mycat.bindthread.BindThreadCallback; +import io.mycat.bindthread.BindThreadKey; import io.mycat.proxy.reactor.ReactorEnvThread; import io.mycat.thread.GThreadPool; import org.jetbrains.annotations.NotNull; diff --git a/proxy/src/main/java/io/mycat/proxy/session/Session.java b/proxy/src/main/java/io/mycat/proxy/session/Session.java index 771d11809..6aa781312 100644 --- a/proxy/src/main/java/io/mycat/proxy/session/Session.java +++ b/proxy/src/main/java/io/mycat/proxy/session/Session.java @@ -15,13 +15,10 @@ package io.mycat.proxy.session; import io.mycat.Wrapper; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; import io.mycat.proxy.handler.NIOHandler; import io.mycat.proxy.reactor.MycatReactorThread; import io.mycat.proxy.reactor.NIOJob; import io.mycat.proxy.reactor.ReactorEnvThread; -import io.mycat.router.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,7 +26,6 @@ import java.io.PrintWriter; import java.io.StringWriter; import java.nio.channels.SocketChannel; -import java.text.MessageFormat; /** * @author jamie12221 chen junwen date 2019-05-10 21:13 Session diff --git a/proxy/src/main/java/io/mycat/runtime/LocalTransactionSession.java b/proxy/src/main/java/io/mycat/runtime/LocalTransactionSession.java index 637d83e26..1d5111f5d 100644 --- a/proxy/src/main/java/io/mycat/runtime/LocalTransactionSession.java +++ b/proxy/src/main/java/io/mycat/runtime/LocalTransactionSession.java @@ -7,14 +7,13 @@ import io.mycat.beans.mycat.TransactionType; import io.mycat.datasource.jdbc.JdbcRuntime; import io.mycat.datasource.jdbc.datasource.DefaultConnection; -import io.mycat.datasource.jdbc.transactionSession.TransactionSessionTemplate; +import io.mycat.datasource.jdbc.transactionsession.TransactionSessionTemplate; import io.mycat.util.Dumper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.sql.SQLException; import java.util.ArrayList; -import java.util.Arrays; import java.util.Objects; import java.util.stream.Collectors; diff --git a/proxy/src/main/java/io/mycat/thread/GProcess.java b/proxy/src/main/java/io/mycat/thread/GProcess.java index e6c460a1f..e94849853 100644 --- a/proxy/src/main/java/io/mycat/thread/GProcess.java +++ b/proxy/src/main/java/io/mycat/thread/GProcess.java @@ -14,8 +14,8 @@ */ package io.mycat.thread; -import io.mycat.bindThread.BindThreadCallback; -import io.mycat.bindThread.BindThreadKey; +import io.mycat.bindthread.BindThreadCallback; +import io.mycat.bindthread.BindThreadKey; import io.mycat.proxy.session.Session; /** diff --git a/proxy/src/main/java/io/mycat/thread/GThread.java b/proxy/src/main/java/io/mycat/thread/GThread.java index 58bb11e5e..a16796abe 100644 --- a/proxy/src/main/java/io/mycat/thread/GThread.java +++ b/proxy/src/main/java/io/mycat/thread/GThread.java @@ -14,12 +14,9 @@ */ package io.mycat.thread; -import io.mycat.bindThread.BindThread; -import io.mycat.bindThread.BindThreadPool; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; +import io.mycat.bindthread.BindThread; +import io.mycat.bindthread.BindThreadPool; import io.mycat.proxy.reactor.SessionThread; -import io.mycat.proxy.session.MySQLSessionManager; import io.mycat.proxy.session.Session; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/proxy/src/main/java/io/mycat/thread/GThreadPool.java b/proxy/src/main/java/io/mycat/thread/GThreadPool.java index 84dd8529f..0ba70b888 100644 --- a/proxy/src/main/java/io/mycat/thread/GThreadPool.java +++ b/proxy/src/main/java/io/mycat/thread/GThreadPool.java @@ -14,11 +14,10 @@ */ package io.mycat.thread; -import io.mycat.bindThread.BindThread; -import io.mycat.bindThread.BindThreadKey; -import io.mycat.bindThread.BindThreadPool; +import io.mycat.bindthread.BindThread; +import io.mycat.bindthread.BindThreadKey; +import io.mycat.bindthread.BindThreadPool; import io.mycat.config.ServerConfig; -import io.mycat.datasource.jdbc.JdbcRuntime; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/router/src/main/java/io/mycat/router/function/ConsistentHashPreSlot.java b/router/src/main/java/io/mycat/router/function/ConsistentHashPreSlot.java index e6670b071..7b1d80099 100644 --- a/router/src/main/java/io/mycat/router/function/ConsistentHashPreSlot.java +++ b/router/src/main/java/io/mycat/router/function/ConsistentHashPreSlot.java @@ -3,7 +3,7 @@ import io.mycat.router.NodeIndexRange; import io.mycat.router.ShardingTableHandler; import io.mycat.router.SingleValueRuleFunction; -import io.mycat.router.hashFunction.HashFunction; +import io.mycat.router.hashfunction.HashFunction; import io.mycat.router.migrate.ConsistentHashBalanceExpandResult; import io.mycat.router.migrate.MigrateTask; import io.mycat.router.migrate.MigrateUtils; diff --git a/router/src/main/java/io/mycat/router/function/PartitionByCRC32PreSlot.java b/router/src/main/java/io/mycat/router/function/PartitionByCRC32PreSlot.java index 9c9be4daf..00cc3208d 100644 --- a/router/src/main/java/io/mycat/router/function/PartitionByCRC32PreSlot.java +++ b/router/src/main/java/io/mycat/router/function/PartitionByCRC32PreSlot.java @@ -1,6 +1,6 @@ package io.mycat.router.function; -import io.mycat.router.hashFunction.PureJavaCrc32HashFunction; +import io.mycat.router.hashfunction.PureJavaCrc32HashFunction; /** * 自动迁移御用分片算法，预分slot 102400个，映射到dn上，再conf下会保存映射文件，请不要修改 diff --git a/router/src/main/java/io/mycat/router/hashFunction/HashFunction.java b/router/src/main/java/io/mycat/router/hashfunction/HashFunction.java similarity index 92% rename from router/src/main/java/io/mycat/router/hashFunction/HashFunction.java rename to router/src/main/java/io/mycat/router/hashfunction/HashFunction.java index 544f07362..e55e18475 100644 --- a/router/src/main/java/io/mycat/router/hashFunction/HashFunction.java +++ b/router/src/main/java/io/mycat/router/hashfunction/HashFunction.java @@ -1,4 +1,4 @@ -package io.mycat.router.hashFunction; +package io.mycat.router.hashfunction; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; diff --git a/router/src/main/java/io/mycat/router/hashFunction/MD5MessageDigest.java b/router/src/main/java/io/mycat/router/hashfunction/MD5MessageDigest.java similarity index 87% rename from router/src/main/java/io/mycat/router/hashFunction/MD5MessageDigest.java rename to router/src/main/java/io/mycat/router/hashfunction/MD5MessageDigest.java index 9876c749f..0a4adc351 100644 --- a/router/src/main/java/io/mycat/router/hashFunction/MD5MessageDigest.java +++ b/router/src/main/java/io/mycat/router/hashfunction/MD5MessageDigest.java @@ -1,4 +1,4 @@ -package io.mycat.router.hashFunction; +package io.mycat.router.hashfunction; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/router/src/main/java/io/mycat/router/hashFunction/MessageDigestHashFunction.java b/router/src/main/java/io/mycat/router/hashfunction/MessageDigestHashFunction.java similarity index 93% rename from router/src/main/java/io/mycat/router/hashFunction/MessageDigestHashFunction.java rename to router/src/main/java/io/mycat/router/hashfunction/MessageDigestHashFunction.java index 3dead4ccc..ce1e5d909 100644 --- a/router/src/main/java/io/mycat/router/hashFunction/MessageDigestHashFunction.java +++ b/router/src/main/java/io/mycat/router/hashfunction/MessageDigestHashFunction.java @@ -1,4 +1,4 @@ -package io.mycat.router.hashFunction; +package io.mycat.router.hashfunction; import java.security.MessageDigest; diff --git a/router/src/main/java/io/mycat/router/hashFunction/PureJavaCrc32HashFunction.java b/router/src/main/java/io/mycat/router/hashfunction/PureJavaCrc32HashFunction.java similarity index 91% rename from router/src/main/java/io/mycat/router/hashFunction/PureJavaCrc32HashFunction.java rename to router/src/main/java/io/mycat/router/hashfunction/PureJavaCrc32HashFunction.java index 8f932f5c0..4f487a89f 100644 --- a/router/src/main/java/io/mycat/router/hashFunction/PureJavaCrc32HashFunction.java +++ b/router/src/main/java/io/mycat/router/hashfunction/PureJavaCrc32HashFunction.java @@ -1,4 +1,4 @@ -package io.mycat.router.hashFunction; +package io.mycat.router.hashfunction; public class PureJavaCrc32HashFunction implements HashFunction { private final io.mycat.router.function.PureJavaCrc32 crc32; diff --git a/router/src/main/java/io/mycat/router/sequence/MySQLSequenceHandlerImpl.java b/router/src/main/java/io/mycat/router/sequence/MySQLSequenceHandlerImpl.java index de644f1c0..2ed49976b 100644 --- a/router/src/main/java/io/mycat/router/sequence/MySQLSequenceHandlerImpl.java +++ b/router/src/main/java/io/mycat/router/sequence/MySQLSequenceHandlerImpl.java @@ -22,9 +22,6 @@ import io.mycat.api.callback.MySQLJobCallback; import io.mycat.api.collector.OneResultSetCollector; import io.mycat.beans.mysql.packet.ErrorPacket; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; -import io.mycat.router.function.PartitionByFileMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/router/src/main/java/io/mycat/router/sequence/SequenceModifierImpl.java b/router/src/main/java/io/mycat/router/sequence/SequenceModifierImpl.java index 3e404a339..ee1f4f1b5 100644 --- a/router/src/main/java/io/mycat/router/sequence/SequenceModifierImpl.java +++ b/router/src/main/java/io/mycat/router/sequence/SequenceModifierImpl.java @@ -16,10 +16,8 @@ package io.mycat.router.sequence; import io.mycat.api.MySQLAPIRuntime; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; -import io.mycat.sequenceModifier.ModifyCallback; -import io.mycat.sequenceModifier.SequenceModifier; +import io.mycat.sequencemodifier.ModifyCallback; +import io.mycat.sequencemodifier.SequenceModifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/router/src/main/java/io/mycat/router/util/RouterUtil.java b/router/src/main/java/io/mycat/router/util/RouterUtil.java index 638692401..34d698639 100644 --- a/router/src/main/java/io/mycat/router/util/RouterUtil.java +++ b/router/src/main/java/io/mycat/router/util/RouterUtil.java @@ -1,8 +1,5 @@ package io.mycat.router.util; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; -import io.mycat.router.sequence.SequenceModifierImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/router/src/main/java/io/mycat/router/util/StringUtil.java b/router/src/main/java/io/mycat/router/util/StringUtil.java index d2cc4bd39..6d0d07ecf 100644 --- a/router/src/main/java/io/mycat/router/util/StringUtil.java +++ b/router/src/main/java/io/mycat/router/util/StringUtil.java @@ -23,8 +23,6 @@ */ package io.mycat.router.util; -import io.mycat.logTip.MycatLogger; -import io.mycat.logTip.MycatLoggerFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory;