From c9ad18894dc8024ebeb09af571f20d0c324581b9 Mon Sep 17 00:00:00 2001 From: mcy Date: Thu, 1 Nov 2018 11:33:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=8E=E8=A1=A8=E6=8F=92=E5=85=A5,=20?= =?UTF-8?q?=E4=B8=BB=E8=A1=A8=E4=B8=BA=E7=AE=80=E5=8D=95=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/adapter/es/test/sync/RoleSyncJoinSubTest.java | 9 +++++---- .../src/test/resources/es/mytest_user_join_sub.yml | 5 +++-- .../src/test/resources/es/mytest_user_single.yml | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/client-adapter/elasticsearch/src/test/java/com/alibaba/otter/canal/client/adapter/es/test/sync/RoleSyncJoinSubTest.java b/client-adapter/elasticsearch/src/test/java/com/alibaba/otter/canal/client/adapter/es/test/sync/RoleSyncJoinSubTest.java index 31387898..c56d1d3c 100644 --- a/client-adapter/elasticsearch/src/test/java/com/alibaba/otter/canal/client/adapter/es/test/sync/RoleSyncJoinSubTest.java +++ b/client-adapter/elasticsearch/src/test/java/com/alibaba/otter/canal/client/adapter/es/test/sync/RoleSyncJoinSubTest.java @@ -25,7 +25,7 @@ public class RoleSyncJoinSubTest { } /** - * 非子查询从表插入 (确保主表记录必须有数据) + * 子查询从表插入 (确保主表记录必须有数据) */ @Test public void insertTest01() { @@ -34,19 +34,20 @@ public class RoleSyncJoinSubTest { dml.setTs(new Date().getTime()); dml.setType("INSERT"); dml.setDatabase("mytest"); - dml.setTable("role"); + dml.setTable("label"); List> dataList = new ArrayList<>(); Map data = new LinkedHashMap<>(); dataList.add(data); data.put("id", 1L); - data.put("role_name", "admin2"); + data.put("user_id",1L); + data.put("label", "a"); dml.setData(dataList); esAdapter.getEsSyncService().sync(dml); GetResponse response = esAdapter.getTransportClient().prepareGet("mytest_user", "_doc", "1").get(); - Assert.assertEquals("admin2", response.getSource().get("_role_name")); + Assert.assertEquals("a;b", response.getSource().get("_labels")); } @After diff --git a/client-adapter/elasticsearch/src/test/resources/es/mytest_user_join_sub.yml b/client-adapter/elasticsearch/src/test/resources/es/mytest_user_join_sub.yml index bde1139f..2583d40d 100644 --- a/client-adapter/elasticsearch/src/test/resources/es/mytest_user_join_sub.yml +++ b/client-adapter/elasticsearch/src/test/resources/es/mytest_user_join_sub.yml @@ -5,6 +5,7 @@ esMapping: _type: _doc _id: _id sql: "select a.id as _id, concat(a.name,'_') as _name, a.role_id as _role_id, - b.role_name as _role_name, a.c_time as _c_time from user a - left join (select id, role_name from role ) b on b.id=a.role_id" + b.labels _labels, a.c_time as _c_time from user a + left join (select user_id, group_concat(label separator ';') as labels from label + group by user_id) b on b.user_id=a.id" commitBatch: 3000 \ No newline at end of file diff --git a/client-adapter/elasticsearch/src/test/resources/es/mytest_user_single.yml b/client-adapter/elasticsearch/src/test/resources/es/mytest_user_single.yml index 98fad232..23e1b491 100644 --- a/client-adapter/elasticsearch/src/test/resources/es/mytest_user_single.yml +++ b/client-adapter/elasticsearch/src/test/resources/es/mytest_user_single.yml @@ -4,5 +4,5 @@ esMapping: _index: mytest_user _type: _doc _id: _id - sql: "select a.id as _id, a.names as _name, a.role_id as _role_id, a.c_time as _c_time from user a" + sql: "select a.id as _id, a.name as _name, a.role_id as _role_id, a.c_time as _c_time from user a" commitBatch: 3000 \ No newline at end of file