删除测试完成

后续: 修改 删除外键的情况, 修改主键的情况适配

client-adapter/elasticsearch/src/test/java/com/alibaba/otter/canal/client/adapter/es/test/sync/LabelSyncJoinSub2Test.java

@@ -14,7 +14,7 @@ import com.alibaba.otter.canal.client.adapter.support.AdapterConfigs;
 import com.alibaba.otter.canal.client.adapter.support.DatasourceConfig;
 import com.alibaba.otter.canal.client.adapter.support.Dml;
 
-public class RoleSyncJoinSub2Test {
+public class LabelSyncJoinSub2Test {
 
     private ESAdapter esAdapter;
 
@@ -78,6 +78,29 @@ public class RoleSyncJoinSub2Test {
         Assert.assertEquals("aa;b_", response.getSource().get("_labels"));
     }
 
+    @Test
+    public void deleteTest03() {
+        Dml dml = new Dml();
+        dml.setDestination("example");
+        dml.setTs(new Date().getTime());
+        dml.setType("DELETE");
+        dml.setDatabase("mytest");
+        dml.setTable("label");
+        List<Map<String, Object>> dataList = new ArrayList<>();
+        Map<String, Object> data = new LinkedHashMap<>();
+        dataList.add(data);
+        data.put("id", 1L);
+        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("b_", response.getSource().get("_labels"));
+    }
+
     @After
     public void after() {
         esAdapter.destroy();

client-adapter/elasticsearch/src/test/java/com/alibaba/otter/canal/client/adapter/es/test/sync/LabelSyncJoinSubTest.java

@@ -14,7 +14,7 @@ import com.alibaba.otter.canal.client.adapter.support.AdapterConfigs;
 import com.alibaba.otter.canal.client.adapter.support.DatasourceConfig;
 import com.alibaba.otter.canal.client.adapter.support.Dml;
 
-public class RoleSyncJoinSubTest {
+public class LabelSyncJoinSubTest {
 
     private ESAdapter esAdapter;
 
@@ -47,7 +47,7 @@ public class RoleSyncJoinSubTest {
         esAdapter.getEsSyncService().sync(dml);
 
         GetResponse response = esAdapter.getTransportClient().prepareGet("mytest_user", "_doc", "1").get();
-        Assert.assertEquals("a;b", response.getSource().get("_labels"));
+        Assert.assertEquals("b;a", response.getSource().get("_labels"));
     }
 
     @Test
@@ -78,6 +78,29 @@ public class RoleSyncJoinSubTest {
         Assert.assertEquals("aa;b", response.getSource().get("_labels"));
     }
 
+    @Test
+    public void deleteTest03() {
+        Dml dml = new Dml();
+        dml.setDestination("example");
+        dml.setTs(new Date().getTime());
+        dml.setType("DELETE");
+        dml.setDatabase("mytest");
+        dml.setTable("label");
+        List<Map<String, Object>> dataList = new ArrayList<>();
+        Map<String, Object> data = new LinkedHashMap<>();
+        dataList.add(data);
+        data.put("id", 1L);
+        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("b", response.getSource().get("_labels"));
+    }
+
     @After
     public void after() {
         esAdapter.destroy();

client-adapter/elasticsearch/src/test/java/com/alibaba/otter/canal/client/adapter/es/test/sync/RoleSyncJoinOneTest.java

@@ -76,6 +76,28 @@ public class RoleSyncJoinOneTest {
         Assert.assertEquals("admin2", response.getSource().get("_role_name"));
     }
 
+    @Test
+    public void deleteTest03() {
+        Dml dml = new Dml();
+        dml.setDestination("example");
+        dml.setTs(new Date().getTime());
+        dml.setType("DELETE");
+        dml.setDatabase("mytest");
+        dml.setTable("role");
+        List<Map<String, Object>> dataList = new ArrayList<>();
+        Map<String, Object> data = new LinkedHashMap<>();
+        dataList.add(data);
+        data.put("id", 1L);
+        data.put("role_name", "admin");
+
+        dml.setData(dataList);
+
+        esAdapter.getEsSyncService().sync(dml);
+
+        GetResponse response = esAdapter.getTransportClient().prepareGet("mytest_user", "_doc", "1").get();
+        Assert.assertNull(response.getSource().get("_role_name"));
+    }
+
     @After
     public void after() {
         esAdapter.destroy();

client-adapter/elasticsearch/src/test/java/com/alibaba/otter/canal/client/adapter/es/test/sync/UserSyncSingleTest.java

@@ -3,9 +3,6 @@ package com.alibaba.otter.canal.client.adapter.es.test.sync;
 import java.util.*;
 
 import org.elasticsearch.action.get.GetResponse;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.search.SearchHit;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -83,17 +80,31 @@ public class UserSyncSingleTest {
         Assert.assertEquals("Eric2", response.getSource().get("_name"));
     }
 
+    /**
+     * 单表删除
+     */
     @Test
-    public void ttt() {
-        SearchResponse response = esAdapter.getTransportClient()
-            .prepareSearch("mytest_user")
-            .setTypes("_doc")
-            .setQuery(QueryBuilders.termQuery("_id", 1L))
-            .setSize(100)
-            .get();
-        for (SearchHit hit : response.getHits()) {
-            System.out.println(hit.getSourceAsMap().get("name"));
-        }
+    public void deleteTest03() {
+        Dml dml = new Dml();
+        dml.setDestination("example");
+        dml.setTs(new Date().getTime());
+        dml.setType("DELETE");
+        dml.setDatabase("mytest");
+        dml.setTable("user");
+        List<Map<String, Object>> dataList = new ArrayList<>();
+        Map<String, Object> data = new LinkedHashMap<>();
+        dataList.add(data);
+        data.put("id", 1L);
+        data.put("name", "Eric");
+        data.put("role_id", 1L);
+        data.put("c_time", new Date());
+
+        dml.setData(dataList);
+
+        esAdapter.getEsSyncService().sync(dml);
+
+        GetResponse response = esAdapter.getTransportClient().prepareGet("mytest_user", "_doc", "1").get();
+        Assert.assertNull(response.getSource());
     }
 
     @After

client-adapter/elasticsearch/src/test/resources/es/mytest_user_join_sub.yml

@@ -6,6 +6,6 @@ esMapping:
   _id: _id
   sql: "select a.id as _id, concat(a.name,'_') as _name, a.role_id as _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
+        left join (select user_id, group_concat(label order by id desc separator ';') as labels from label
         group by user_id) b on b.user_id=a.id"
   commitBatch: 3000

client-adapter/elasticsearch/src/test/resources/es/mytest_user_join_sub2.yml

@@ -6,6 +6,6 @@ esMapping:
   _id: _id
   sql: "select a.id as _id, concat(a.name,'_') as _name, a.role_id as _role_id,
         concat(b.labels, '_') as _labels, a.c_time as _c_time from user a
-        left join (select user_id, group_concat(label separator ';') as labels from label
+        left join (select user_id, group_concat(label order by id desc separator ';') as labels from label
         group by user_id) b on b.user_id=a.id"
   commitBatch: 3000