Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lijianghuflute
canal
提交
bd974e3d
canal
项目概览
lijianghuflute
/
canal
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
canal
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
bd974e3d
编写于
8月 22, 2019
作者:
A
agapple
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
upgrade fastjson 1.2.58
上级
86cd805a
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
47 addition
and
7 deletion
+47
-7
common/src/main/java/com/alibaba/otter/canal/common/utils/JsonUtils.java
.../java/com/alibaba/otter/canal/common/utils/JsonUtils.java
+4
-1
parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/MemoryTableMeta_DDL_Test.java
...al/parse/inbound/mysql/tsdb/MemoryTableMeta_DDL_Test.java
+23
-0
parse/src/test/resources/ddl/ddl_any.sql
parse/src/test/resources/ddl/ddl_any.sql
+12
-0
pom.xml
pom.xml
+3
-1
store/src/test/java/com/alibaba/otter/canal/store/memory/buffer/MemoryEventStoreBase.java
...otter/canal/store/memory/buffer/MemoryEventStoreBase.java
+1
-1
store/src/test/java/com/alibaba/otter/canal/store/memory/buffer/MemoryEventStoreMemBatchTest.java
...nal/store/memory/buffer/MemoryEventStoreMemBatchTest.java
+1
-1
store/src/test/java/com/alibaba/otter/canal/store/memory/buffer/MemoryEventStoreMultiThreadTest.java
.../store/memory/buffer/MemoryEventStoreMultiThreadTest.java
+1
-1
store/src/test/java/com/alibaba/otter/canal/store/memory/buffer/MemoryEventStorePutAndGetTest.java
...al/store/memory/buffer/MemoryEventStorePutAndGetTest.java
+1
-1
store/src/test/java/com/alibaba/otter/canal/store/memory/buffer/MemoryEventStoreRollbackAndAckTest.java
...ore/memory/buffer/MemoryEventStoreRollbackAndAckTest.java
+1
-1
未找到文件。
common/src/main/java/com/alibaba/otter/canal/common/utils/JsonUtils.java
浏览文件 @
bd974e3d
...
...
@@ -29,7 +29,10 @@ public class JsonUtils {
SerializeConfig
.
getGlobalInstance
().
put
(
InetAddress
.
class
,
InetAddressSerializer
.
instance
);
SerializeConfig
.
getGlobalInstance
().
put
(
Inet4Address
.
class
,
InetAddressSerializer
.
instance
);
SerializeConfig
.
getGlobalInstance
().
put
(
Inet6Address
.
class
,
InetAddressSerializer
.
instance
);
ParserConfig
.
getGlobalInstance
().
setAutoTypeSupport
(
true
);
// ParserConfig.getGlobalInstance().setAutoTypeSupport(true);
ParserConfig
.
getGlobalInstance
().
addAccept
(
"com.alibaba.otter."
);
ParserConfig
.
getGlobalInstance
().
addAccept
(
"com.taobao.tddl.dbsync."
);
}
public
static
<
T
>
T
unmarshalFromByte
(
byte
[]
bytes
,
Class
<
T
>
targetClass
)
{
...
...
parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/MemoryTableMeta_DDL_Test.java
浏览文件 @
bd974e3d
...
...
@@ -3,6 +3,7 @@ package com.alibaba.otter.canal.parse.inbound.mysql.tsdb;
import
java.io.File
;
import
java.io.FileInputStream
;
import
java.net.URL
;
import
java.util.List
;
import
org.apache.commons.io.IOUtils
;
import
org.apache.commons.lang.StringUtils
;
...
...
@@ -12,7 +13,9 @@ import org.junit.runner.RunWith;
import
org.springframework.test.context.ContextConfiguration
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
com.alibaba.fastsql.sql.repository.Schema
;
import
com.alibaba.otter.canal.parse.inbound.TableMeta
;
import
com.google.common.collect.Lists
;
/**
* @author agapple 2017年8月1日 下午7:15:54
...
...
@@ -66,4 +69,24 @@ public class MemoryTableMeta_DDL_Test {
System
.
out
.
println
(
meta
);
Assert
.
assertTrue
(
meta
.
getFields
().
get
(
0
).
getColumnName
().
equalsIgnoreCase
(
"id"
));
}
@Test
public
void
test_any
()
throws
Throwable
{
MemoryTableMeta
memoryTableMeta
=
new
MemoryTableMeta
();
URL
url
=
Thread
.
currentThread
().
getContextClassLoader
().
getResource
(
"dummy.txt"
);
File
dummyFile
=
new
File
(
url
.
getFile
());
File
create
=
new
File
(
dummyFile
.
getParent
()
+
"/ddl"
,
"ddl_any.sql"
);
String
sql
=
StringUtils
.
join
(
IOUtils
.
readLines
(
new
FileInputStream
(
create
)),
"\n"
);
memoryTableMeta
.
apply
(
null
,
"test"
,
sql
,
null
);
List
<
String
>
tableNames
=
Lists
.
newArrayList
();
for
(
Schema
schema
:
memoryTableMeta
.
getRepository
().
getSchemas
())
{
tableNames
.
addAll
(
schema
.
showTables
());
}
for
(
String
table
:
tableNames
)
{
TableMeta
sourceMeta
=
memoryTableMeta
.
find
(
"test"
,
table
);
System
.
out
.
println
(
sourceMeta
.
toString
());
}
}
}
parse/src/test/resources/ddl/ddl_any.sql
0 → 100644
浏览文件 @
bd974e3d
CREATE
TABLE
procs_priv
(
Host
char
(
60
)
COLLATE
utf8_bin
NOT
NULL
DEFAULT
''
,
Db
char
(
64
)
COLLATE
utf8_bin
NOT
NULL
DEFAULT
''
,
User
char
(
16
)
COLLATE
utf8_bin
NOT
NULL
DEFAULT
''
,
Routine_name
char
(
64
)
CHARACTER
SET
utf8
NOT
NULL
DEFAULT
''
,
Routine_type
enum
(
'FUNCTION'
,
'PROCEDURE'
)
COLLATE
utf8_bin
NOT
NULL
,
Grantor
char
(
77
)
COLLATE
utf8_bin
NOT
NULL
DEFAULT
''
,
Proc_priv
set
(
'Execute'
,
'Alter Routine'
,
'Grant'
)
CHARACTER
SET
utf8
NOT
NULL
DEFAULT
''
,
Timestamp
timestamp
NOT
NULL
DEFAULT
CURRENT_TIMESTAMP
ON
UPDATE
CURRENT_TIMESTAMP
,
PRIMARY
KEY
(
Host
,
Db
,
User
,
Routine_name
,
Routine_type
),
KEY
Grantor
(
Grantor
)
)
ENGINE
=
MyISAM
DEFAULT
CHARSET
=
utf8
COLLATE
=
utf8_bin
COMMENT
=
'Procedure privileges'
\ No newline at end of file
pom.xml
浏览文件 @
bd974e3d
...
...
@@ -98,6 +98,7 @@
<java_source_version>
1.8
</java_source_version>
<java_target_version>
1.8
</java_target_version>
<file_encoding>
UTF-8
</file_encoding>
<javadoc_skip>
true
</javadoc_skip>
<spring_version>
3.2.18.RELEASE
</spring_version>
<rocketmq_version>
4.5.2
</rocketmq_version>
<maven-jacoco-plugin.version>
0.8.3
</maven-jacoco-plugin.version>
...
...
@@ -221,7 +222,7 @@
<dependency>
<groupId>
com.alibaba
</groupId>
<artifactId>
fastjson
</artifactId>
<version>
1.2.
2
8
</version>
<version>
1.2.
5
8
</version>
</dependency>
<dependency>
<groupId>
com.google.guava
</groupId>
...
...
@@ -417,6 +418,7 @@
</execution>
</executions>
<configuration>
<skip>
${javadoc_skip}
</skip>
<!-- workaround for https://bugs.openjdk.java.net/browse/JDK-8212233 -->
<javaApiLinks>
<property>
...
...
store/src/test/java/com/alibaba/otter/can
ce
l/store/memory/buffer/MemoryEventStoreBase.java
→
store/src/test/java/com/alibaba/otter/can
a
l/store/memory/buffer/MemoryEventStoreBase.java
浏览文件 @
bd974e3d
package
com.alibaba.otter.can
ce
l.store.memory.buffer
;
package
com.alibaba.otter.can
a
l.store.memory.buffer
;
import
java.net.InetSocketAddress
;
...
...
store/src/test/java/com/alibaba/otter/can
ce
l/store/memory/buffer/MemoryEventStoreMemBatchTest.java
→
store/src/test/java/com/alibaba/otter/can
a
l/store/memory/buffer/MemoryEventStoreMemBatchTest.java
浏览文件 @
bd974e3d
package
com.alibaba.otter.can
ce
l.store.memory.buffer
;
package
com.alibaba.otter.can
a
l.store.memory.buffer
;
import
java.util.ArrayList
;
import
java.util.List
;
...
...
store/src/test/java/com/alibaba/otter/can
ce
l/store/memory/buffer/MemoryEventStoreMultiThreadTest.java
→
store/src/test/java/com/alibaba/otter/can
a
l/store/memory/buffer/MemoryEventStoreMultiThreadTest.java
浏览文件 @
bd974e3d
package
com.alibaba.otter.can
ce
l.store.memory.buffer
;
package
com.alibaba.otter.can
a
l.store.memory.buffer
;
import
java.util.ArrayList
;
import
java.util.List
;
...
...
store/src/test/java/com/alibaba/otter/can
ce
l/store/memory/buffer/MemoryEventStorePutAndGetTest.java
→
store/src/test/java/com/alibaba/otter/can
a
l/store/memory/buffer/MemoryEventStorePutAndGetTest.java
浏览文件 @
bd974e3d
package
com.alibaba.otter.can
ce
l.store.memory.buffer
;
package
com.alibaba.otter.can
a
l.store.memory.buffer
;
import
java.util.concurrent.ExecutorService
;
import
java.util.concurrent.Executors
;
...
...
store/src/test/java/com/alibaba/otter/can
ce
l/store/memory/buffer/MemoryEventStoreRollbackAndAckTest.java
→
store/src/test/java/com/alibaba/otter/can
a
l/store/memory/buffer/MemoryEventStoreRollbackAndAckTest.java
浏览文件 @
bd974e3d
package
com.alibaba.otter.can
ce
l.store.memory.buffer
;
package
com.alibaba.otter.can
a
l.store.memory.buffer
;
import
java.util.ArrayList
;
import
java.util.List
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录