You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2020/07/27 14:24:34 UTC
[shardingsphere] branch master updated: refactor scaling (#6471)
This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 0fe096f refactor scaling (#6471)
0fe096f is described below
commit 0fe096f364e184de095813afa2e4fe70013af15c
Author: kimmking <ki...@163.com>
AuthorDate: Mon Jul 27 22:24:18 2020 +0800
refactor scaling (#6471)
---
shardingsphere-scaling/.gitignore | 6 -
shardingsphere-scaling/LICENSE | 201 ----------------
shardingsphere-scaling/checkstyle.xml | 261 ---------------------
.../scaling/mysql/MySQLBinlogDumper.java | 1 +
.../scaling/mysql/MySQLPositionManager.java | 1 +
.../scaling/mysql/{ => binlog}/BinlogPosition.java | 2 +-
.../scaling/mysql/BinlogPositionTest.java | 1 +
.../scaling/mysql/MySQLPositionManagerTest.java | 1 +
.../postgresql/PostgreSQLPositionManager.java | 1 +
.../scaling/postgresql/PostgreSQLWalDumper.java | 1 +
.../scaling/postgresql/wal/WalEventConverter.java | 1 -
.../scaling/postgresql/{ => wal}/WalPosition.java | 2 +-
.../postgresql/PostgreSQLPositionManagerTest.java | 1 +
13 files changed, 9 insertions(+), 471 deletions(-)
diff --git a/shardingsphere-scaling/.gitignore b/shardingsphere-scaling/.gitignore
deleted file mode 100644
index 460b80f..0000000
--- a/shardingsphere-scaling/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-# maven ignore
-target/
-*.iml
-
-# idea ignore
-.idea/
\ No newline at end of file
diff --git a/shardingsphere-scaling/LICENSE b/shardingsphere-scaling/LICENSE
deleted file mode 100644
index 8dada3e..0000000
--- a/shardingsphere-scaling/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "{}"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright {yyyy} {name of copyright owner}
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/shardingsphere-scaling/checkstyle.xml b/shardingsphere-scaling/checkstyle.xml
deleted file mode 100644
index 25964ac..0000000
--- a/shardingsphere-scaling/checkstyle.xml
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
-<module name = "Checker">
- <property name="charset" value="UTF-8"/>
- <property name="severity" value="warning"/>
- <property name="fileExtensions" value="java, properties, xml"/>
- <module name="Header">
- <property name="headerFile" value="copyright.txt"/>
- <property name="fileExtensions" value="java"/>
- </module>
- <module name="FileTabCharacter">
- <property name="eachLine" value="true"/>
- </module>
- <module name="FileLength"/>
- <module name="NewlineAtEndOfFile">
- <property name="lineSeparator" value="lf"/>
- </module>
- <module name="Translation"/>
- <module name="UniqueProperties"/>
- <module name="SeverityMatchFilter"/>
-
- <module name="TreeWalker">
-
- <!-- Naming Conventions -->
- <module name="PackageName">
- <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
- </module>
- <module name="TypeName"/>
- <module name="MethodName"/>
- <module name="InterfaceTypeParameterName"/>
- <module name="ClassTypeParameterName"/>
- <module name="MethodTypeParameterName"/>
- <module name="ConstantName"/>
- <module name="StaticVariableName"/>
- <module name="MemberName"/>
- <module name="LocalVariableName"/>
- <module name="LocalFinalVariableName"/>
- <module name="ParameterName"/>
- <module name="CatchParameterName"/>
- <module name="AbbreviationAsWordInName">
- <property name="allowedAbbreviationLength" value="6"/>
- </module>
-
- <!-- Size Violations -->
- <module name="AnonInnerLength"/>
- <module name="MethodLength"/>
- <module name="LineLength">
- <property name="max" value="200"/>
- </module>
- <module name="MethodCount"/>
- <module name="ExecutableStatementCount">
- <property name="max" value="50"/>
- </module>
- <module name="OuterTypeNumber"/>
- <module name="ParameterNumber"/>
-
- <!-- Whitespace -->
- <module name="EmptyForInitializerPad"/>
- <module name="EmptyForIteratorPad"/>
- <module name="MethodParamPad"/>
- <module name="ParenPad"/>
- <module name="TypecastParenPad"/>
- <module name="NoLineWrap"/>
- <module name="OperatorWrap"/>
- <module name="SeparatorWrap">
- <property name="id" value="SeparatorWrapDot"/>
- <property name="tokens" value="DOT"/>
- <property name="option" value="nl"/>
- </module>
- <module name="SeparatorWrap">
- <property name="id" value="SeparatorWrapComma"/>
- <property name="tokens" value="COMMA"/>
- <property name="option" value="EOL"/>
- </module>
- <module name="SeparatorWrap">
- <property name="id" value="SeparatorWrapEllipsis"/>
- <property name="tokens" value="ELLIPSIS"/>
- <property name="option" value="EOL"/>
- </module>
- <module name="SeparatorWrap">
- <property name="id" value="SeparatorWrapArrayDeclarator"/>
- <property name="tokens" value="ARRAY_DECLARATOR"/>
- <property name="option" value="EOL"/>
- </module>
- <module name="SeparatorWrap">
- <property name="id" value="SeparatorWrapMethodRef"/>
- <property name="tokens" value="METHOD_REF"/>
- <property name="option" value="nl"/>
- </module>
- <module name="GenericWhitespace"/>
- <module name="NoWhitespaceBefore"/>
- <module name="NoWhitespaceAfter"/>
- <module name="WhitespaceAround"/>
- <module name="WhitespaceAfter"/>
- <module name="SingleSpaceSeparator"/>
- <module name="EmptyLineSeparator">
- <property name="allowMultipleEmptyLines" value="false"/>
- <property name="allowMultipleEmptyLinesInsideClassMembers" value="false"/>
- </module>
-
- <!-- Imports -->
- <module name="AvoidStarImport"/>
- <module name="AvoidStaticImport">
- <property name="excludes" value="org.junit.Assert.*,org.hamcrest.CoreMatchers.*,org.mockito.Mockito.*,org.mockito.ArgumentMatchers.*"/>
- </module>
- <module name="IllegalImport"/>
- <module name="RedundantImport"/>
- <module name="UnusedImports"/>
- <module name="CustomImportOrder"/>
-
- <!-- Annotations -->
- <module name="AnnotationLocation">
- <property name="id" value="AnnotationLocationMostCases"/>
- <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/>
- </module>
- <module name="AnnotationLocation">
- <property name="id" value="AnnotationLocationVariables"/>
- <property name="tokens" value="VARIABLE_DEF"/>
- <property name="allowSamelineMultipleAnnotations" value="true"/>
- </module>
- <module name="AnnotationUseStyle"/>
- <module name="MissingOverride"/>
- <module name="SuppressWarnings"/>
- <module name="MissingDeprecated"/>
- <module name="SuppressWarningsHolder"/>
-
- <!-- Modifiers -->
- <module name="ModifierOrder"/>
- <module name="RedundantModifier"/>
-
- <!-- Coding -->
- <module name="ArrayTrailingComma"/>
- <module name="CovariantEquals"/>
- <module name="DefaultComesLast"/>
- <module name="DeclarationOrder"/>
- <module name="EmptyStatement"/>
- <module name="EqualsAvoidNull"/>
- <module name="EqualsHashCode"/>
- <module name="ExplicitInitialization"/>
- <module name="FallThrough"/>
- <module name="IllegalInstantiation"/>
- <module name="IllegalCatch"/>
- <module name="IllegalThrows"/>
- <module name="IllegalType">
- <property name="tokens" value="METHOD_DEF,PARAMETER_DEF,VARIABLE_DEF"/>
- </module>
- <module name="IllegalTokenText">
- <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
- <property name="format" value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
- <property name="message" value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
- </module>
- <module name="MissingSwitchDefault"/>
- <module name="ModifiedControlVariable"/>
- <module name="MultipleVariableDeclarations"/>
- <module name="NestedForDepth"/>
- <module name="NestedIfDepth"/>
- <module name="NestedTryDepth"/>
- <module name="NoClone"/>
- <module name="NoFinalizer"/>
- <module name="SuperClone"/>
- <module name="SuperFinalize"/>
- <module name="OneStatementPerLine"/>
- <module name="OverloadMethodsDeclarationOrder"/>
- <module name="PackageDeclaration"/>
- <module name="ParameterAssignment"/>
- <module name="SimplifyBooleanExpression"/>
- <module name="SimplifyBooleanReturn"/>
- <module name="StringLiteralEquality"/>
- <module name="UnnecessaryParentheses"/>
- <module name="VariableDeclarationUsageDistance"/>
-
- <!-- Block Checks -->
- <module name="EmptyBlock"/>
- <module name="EmptyCatchBlock">
- <property name="exceptionVariableName" value="expected|ignore"/>
- </module>
- <module name="AvoidNestedBlocks"/>
- <module name="NeedBraces"/>
- <module name="LeftCurly"/>
- <module name="RightCurly"/>
-
- <!-- Class Design -->
- <module name="DesignForExtension"/>
- <module name="FinalClass"/>
- <!-- cannot recognize for lombok @NoArgsConstructor(access = AccessLevel.PRIVATE), just ignore -->
- <!--<module name="HideUtilityClassConstructor"/>-->
- <module name="OneTopLevelClass"/>
- <module name="InterfaceIsType"/>
- <module name="InnerTypeLast"/>
- <module name="VisibilityModifier"/>
- <module name="MutableException"/>
- <module name="ThrowsCount"/>
-
- <!-- Metrics -->
- <module name="BooleanExpressionComplexity"/>
- <module name="ClassDataAbstractionCoupling">
- <property name="max" value="10"/>
- </module>
- <module name="ClassFanOutComplexity"/>
- <module name="CyclomaticComplexity"/>
- <module name="NPathComplexity"/>
- <module name="JavaNCSS"/>
-
- <!-- Miscellaneous -->
- <module name="ArrayTypeStyle"/>
- <module name="UpperEll"/>
- <module name="AvoidEscapedUnicodeCharacters"/>
- <module name="DescendantToken"/>
- <module name="FinalParameters"/>
- <module name="Indentation"/>
- <module name="OuterTypeFilename"/>
- <module name="TodoComment"/>
- <module name="TrailingComment"/>
- <module name="UncommentedMain">
- <property name="excludedClasses" value="\.Bootstrap"/>
- </module>
-
- <!-- Javadoc Comments -->
- <module name="AtclauseOrder">
- <property name="tagOrder" value="@author, @param, @return, @throws, @deprecated"/>
- </module>
- <module name="NonEmptyAtclauseDescription"/>
- <module name="JavadocParagraph"/>
- <module name="JavadocStyle"/>
- <module name="JavadocTagContinuationIndentation"/>
- <module name="SingleLineJavadoc"/>
- <module name="SummaryJavadoc"/>
- <!--
- <module name="JavadocType">
- <property name="scope" value="public"/>
- </module>
- -->
- <module name="JavadocMethod">
- <property name="scope" value="public"/>
- <property name="allowedAnnotations" value="Override, Test, Before, After, BeforeClass, AfterClass, Parameterized, Parameters"/>
- <property name="ignoreMethodNamesRegex" value="^assert.*$|^verify.*$"/>
- <property name="tokens" value="METHOD_DEF, ANNOTATION_FIELD_DEF"/>
- </module>
-
- <!-- Filters -->
- <module name="SuppressionCommentFilter"/>
- <module name="SuppressWithNearbyCommentFilter"/>
- </module>
-</module>
diff --git a/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLBinlogDumper.java b/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLBinlogDumper.java
index aaadbba..cfcdbcb 100755
--- a/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLBinlogDumper.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLBinlogDumper.java
@@ -32,6 +32,7 @@ import org.apache.shardingsphere.scaling.core.execute.executor.record.Placeholde
import org.apache.shardingsphere.scaling.core.execute.executor.record.Record;
import org.apache.shardingsphere.scaling.core.metadata.JdbcUri;
import org.apache.shardingsphere.scaling.core.metadata.MetaDataManager;
+import org.apache.shardingsphere.scaling.mysql.binlog.BinlogPosition;
import org.apache.shardingsphere.scaling.mysql.client.ConnectInfo;
import org.apache.shardingsphere.scaling.mysql.client.MySQLClient;
import org.apache.shardingsphere.scaling.mysql.binlog.event.AbstractBinlogEvent;
diff --git a/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLPositionManager.java b/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLPositionManager.java
index c55859c..a8cfc89 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLPositionManager.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLPositionManager.java
@@ -19,6 +19,7 @@ package org.apache.shardingsphere.scaling.mysql;
import com.google.gson.Gson;
import org.apache.shardingsphere.scaling.core.job.position.PositionManager;
+import org.apache.shardingsphere.scaling.mysql.binlog.BinlogPosition;
import javax.sql.DataSource;
import java.sql.Connection;
diff --git a/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/BinlogPosition.java b/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/binlog/BinlogPosition.java
similarity index 97%
rename from shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/BinlogPosition.java
rename to shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/binlog/BinlogPosition.java
index 3549079..6c94772 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/BinlogPosition.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/binlog/BinlogPosition.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.scaling.mysql;
+package org.apache.shardingsphere.scaling.mysql.binlog;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
diff --git a/shardingsphere-scaling/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/BinlogPositionTest.java b/shardingsphere-scaling/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/BinlogPositionTest.java
index 7a77b57..b4a118c 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/BinlogPositionTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/BinlogPositionTest.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.scaling.mysql;
+import org.apache.shardingsphere.scaling.mysql.binlog.BinlogPosition;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
diff --git a/shardingsphere-scaling/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/MySQLPositionManagerTest.java b/shardingsphere-scaling/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/MySQLPositionManagerTest.java
index 9b0c753..49ab8b0 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/MySQLPositionManagerTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-mysql/src/test/java/org/apache/shardingsphere/scaling/mysql/MySQLPositionManagerTest.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.scaling.mysql;
+import org.apache.shardingsphere.scaling.mysql.binlog.BinlogPosition;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLPositionManager.java b/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLPositionManager.java
index df3193f..4252743 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLPositionManager.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLPositionManager.java
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.scaling.postgresql;
import org.apache.shardingsphere.scaling.core.job.position.PositionManager;
+import org.apache.shardingsphere.scaling.postgresql.wal.WalPosition;
import org.postgresql.replication.LogSequenceNumber;
import org.postgresql.util.PSQLException;
diff --git a/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLWalDumper.java b/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLWalDumper.java
index 4811a9a..d331cb8 100755
--- a/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLWalDumper.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLWalDumper.java
@@ -29,6 +29,7 @@ import org.apache.shardingsphere.scaling.core.execute.executor.dumper.LogDumper;
import org.apache.shardingsphere.scaling.core.execute.executor.record.Record;
import org.apache.shardingsphere.scaling.postgresql.wal.LogicalReplication;
import org.apache.shardingsphere.scaling.postgresql.wal.WalEventConverter;
+import org.apache.shardingsphere.scaling.postgresql.wal.WalPosition;
import org.apache.shardingsphere.scaling.postgresql.wal.decode.DecodingPlugin;
import org.apache.shardingsphere.scaling.postgresql.wal.decode.TestDecodingPlugin;
import org.apache.shardingsphere.scaling.postgresql.wal.event.AbstractWalEvent;
diff --git a/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/wal/WalEventConverter.java b/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/wal/WalEventConverter.java
index 1732c43..ca47412 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/wal/WalEventConverter.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/wal/WalEventConverter.java
@@ -26,7 +26,6 @@ import org.apache.shardingsphere.scaling.core.execute.executor.record.Placeholde
import org.apache.shardingsphere.scaling.core.execute.executor.record.Record;
import org.apache.shardingsphere.scaling.core.metadata.JdbcUri;
import org.apache.shardingsphere.scaling.core.metadata.MetaDataManager;
-import org.apache.shardingsphere.scaling.postgresql.WalPosition;
import org.apache.shardingsphere.scaling.postgresql.wal.event.AbstractRowEvent;
import org.apache.shardingsphere.scaling.postgresql.wal.event.AbstractWalEvent;
import org.apache.shardingsphere.scaling.postgresql.wal.event.DeleteRowEvent;
diff --git a/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/WalPosition.java b/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/wal/WalPosition.java
similarity index 96%
rename from shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/WalPosition.java
rename to shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/wal/WalPosition.java
index 39eabec..1e051b7 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/WalPosition.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/main/java/org/apache/shardingsphere/scaling/postgresql/wal/WalPosition.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.scaling.postgresql;
+package org.apache.shardingsphere.scaling.postgresql.wal;
import com.google.gson.Gson;
import com.google.gson.JsonElement;
diff --git a/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLPositionManagerTest.java b/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLPositionManagerTest.java
index 2e6356b..a924740 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLPositionManagerTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-postgresql/src/test/java/org/apache/shardingsphere/scaling/postgresql/PostgreSQLPositionManagerTest.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.scaling.postgresql;
+import org.apache.shardingsphere.scaling.postgresql.wal.WalPosition;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;