From 80da64e4ae8f9956138941b7943b6c418b4c2d91 Mon Sep 17 00:00:00 2001
From: clevertension <zdan0803@gmail.com>
Date: Wed, 18 Oct 2017 09:48:38 +0800
Subject: [PATCH] update autcommit and remove rollback to storage data as much
 as possible

---
 .../org/skywalking/apm/collector/client/h2/H2Client.java  | 3 +--
 .../apm/collector/storage/h2/dao/BatchH2DAO.java          | 8 +-------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/h2/H2Client.java b/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/h2/H2Client.java
index 60441b97e..8ab7c47d8 100644
--- a/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/h2/H2Client.java
+++ b/apm-collector/apm-collector-client/src/main/java/org/skywalking/apm/collector/client/h2/H2Client.java
@@ -105,14 +105,13 @@ public class H2Client implements Client {
         boolean flag;
         Connection conn = getConnection();
         try (PreparedStatement statement = conn.prepareStatement(sql)) {
-            conn.setAutoCommit(false);
+            conn.setAutoCommit(true);
             if (params != null) {
                 for (int i = 0; i < params.length; i++) {
                     statement.setObject(i + 1, params[i]);
                 }
             }
             flag = statement.execute();
-            conn.commit();
         } catch (SQLException e) {
             throw new H2ClientException(e.getMessage(), e);
         }
diff --git a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/BatchH2DAO.java b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/BatchH2DAO.java
index 44c96664d..ac0989f42 100644
--- a/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/BatchH2DAO.java
+++ b/apm-collector/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/BatchH2DAO.java
@@ -45,7 +45,7 @@ public class BatchH2DAO extends H2DAO implements IBatchDAO {
             final Map<String, PreparedStatement> batchSqls = new HashMap<>();
             try {
                 conn = getClient().getConnection();
-                conn.setAutoCommit(false);
+                conn.setAutoCommit(true);
                 PreparedStatement ps;
                 for (Object entity : batchCollection) {
                     H2SqlEntity e = getH2SqlEntity(entity);
@@ -70,14 +70,8 @@ public class BatchH2DAO extends H2DAO implements IBatchDAO {
                 for (String k : batchSqls.keySet()) {
                     batchSqls.get(k).executeBatch();
                 }
-                conn.commit();
             } catch (SQLException | H2ClientException e) {
                 logger.error(e.getMessage(), e);
-                try {
-                    conn.rollback();
-                } catch (SQLException e1) {
-                    logger.error(e.getMessage(), e1);
-                }
             }
             batchSqls.clear();
         }