Skip to content

Commit

Permalink
更改java package(包名大小写问题)
Browse files Browse the repository at this point in the history
  • Loading branch information
junwen12221 committed Jul 6, 2020
1 parent e6f7925 commit eafcd7e
Show file tree
Hide file tree
Showing 159 changed files with 276 additions and 385 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -952,7 +952,7 @@ xa
当数据源提供者为

```yaml
datasourceProviderClass: io.mycat.datasource.jdbc.datasourceProvider.AtomikosDatasourceProvider
datasourceProviderClass: io.mycat.datasource.jdbc.datasourceprovider.AtomikosDatasourceProvider
```
Expand All @@ -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的连接不能回滚
Expand Down Expand Up @@ -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}
```
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/io/mycat/SessionOpt.java
Original file line number Diff line number Diff line change
@@ -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
**/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* not, see <http://www.gnu.org/licenses/>.
*/

package io.mycat.bindThread;
package io.mycat.bindthread;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* not, see <http://www.gnu.org/licenses/>.
*/

package io.mycat.bindThread;
package io.mycat.bindthread;

public interface BindThreadCallback<KEY extends BindThreadKey, PROCESS extends BindThread> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* not, see <http://www.gnu.org/licenses/>.
*/

package io.mycat.bindThread;
package io.mycat.bindthread;

public interface BindThreadKey {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with this program. If
* not, see <http://www.gnu.org/licenses/>.
*/
package io.mycat.bindThread;
package io.mycat.bindthread;

import io.mycat.MycatException;
import io.mycat.MycatWorkerProcessor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* not, see <http://www.gnu.org/licenses/>.
*/

package io.mycat.logTip;
package io.mycat.logtip;

import io.mycat.beans.mysql.packet.ErrorPacketImpl;
import org.slf4j.Logger;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* not, see <http://www.gnu.org/licenses/>.
*/

package io.mycat.logTip;
package io.mycat.logtip;

public class MycatLoggerFactory {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* not, see <http://www.gnu.org/licenses/>.
*/

package io.mycat.logTip;
package io.mycat.logtip;

import java.io.IOException;
import java.nio.file.Files;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with this program. If
* not, see <http://www.gnu.org/licenses/>.
*/
package io.mycat.sequenceModifier;
package io.mycat.sequencemodifier;

public interface ModifyCallback {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with this program. If
* not, see <http://www.gnu.org/licenses/>.
*/
package io.mycat.sequenceModifier;
package io.mycat.sequencemodifier;

import java.util.Map;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 0 additions & 3 deletions common/src/main/java/io/mycat/util/CharsetUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 0 additions & 2 deletions common/src/main/java/io/mycat/util/DumpUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 0 additions & 2 deletions common/src/main/java/io/mycat/util/DynaClassLoader.java
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 0 additions & 2 deletions common/src/main/java/io/mycat/util/JavaUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 0 additions & 2 deletions common/src/main/java/io/mycat/util/StringUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 0 additions & 3 deletions common/src/main/java/io/mycat/util/nio/SelectorUtil.java
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with this program. If
* not, see <http://www.gnu.org/licenses/>.
*/
package io.mycat.datasource.jdbc.datasourceProvider;
package io.mycat.datasource.jdbc.datasourceprovider;

import com.atomikos.icatch.jta.UserTransactionImp;
import com.atomikos.jdbc.AtomikosDataSourceBean;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with this program. If
* not, see <http://www.gnu.org/licenses/>.
*/
package io.mycat.datasource.jdbc.datasourceProvider;
package io.mycat.datasource.jdbc.datasourceprovider;

import com.alibaba.druid.pool.DruidDataSource;
import io.mycat.config.DatasourceRootConfig;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* You should have received a copy of the GNU General Public License along with this program. If
* not, see <http://www.gnu.org/licenses/>.
*/
package io.mycat.datasource.jdbc.transactionSession;
package io.mycat.datasource.jdbc.transactionsession;

import io.mycat.MycatDataContext;
import io.mycat.ThreadUsageEnum;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.mycat.datasource.jdbc.transactionSession;
package io.mycat.datasource.jdbc.transactionsession;

import io.mycat.DataSourceNearness;
import io.mycat.MycatConnection;
Expand Down
6 changes: 3 additions & 3 deletions doc/22-mycat-jdbc.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.mycat.example.customRule;
package io.mycat.example.customrule;

import io.mycat.ConfigProvider;
import io.mycat.MycatCore;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.mycat.example.customRuleSegmentQuery;
package io.mycat.example.customrulesegmentquery;

import io.mycat.ConfigProvider;
import io.mycat.MycatCore;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.mycat.example.readWriteSeparation;
package io.mycat.example.readwriteseparation;

import io.mycat.ConfigProvider;
import io.mycat.MycatCore;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.mycat.example.shardingLocal;
package io.mycat.example.shardinglocal;

import io.mycat.ConfigProvider;
import io.mycat.MycatCore;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.mycat.example.shardingLocalFail;
package io.mycat.example.shardinglocalfail;

import io.mycat.ConfigProvider;
import io.mycat.MycatCore;
Expand All @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.mycat.example.shardingRw;
package io.mycat.example.shardingrw;

import io.mycat.ConfigProvider;
import io.mycat.MycatCore;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.mycat.example.shardingXA;
package io.mycat.example.shardingxa;

import io.mycat.ConfigProvider;
import io.mycat.MycatCore;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.mycat.example.shardingXAFail;
package io.mycat.example.shardingxafail;

import io.mycat.ConfigProvider;
import io.mycat.MycatCore;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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提供的外部接口设置数据源可用信息达到相同效果
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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提供的外部接口设置数据源可用信息达到相同效果
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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提供的外部接口设置数据源可用信息达到相同效果
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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提供的外部接口设置数据源可用信息达到相同效果
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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提供的外部接口设置数据源可用信息达到相同效果
Expand Down
Loading

0 comments on commit eafcd7e

Please sign in to comment.