diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IBatchDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IBatchDAO.java index ffc73cdc435fb71d5460ff0c2f36c59a2315a05a..38c7563fcbd578ec124f9789e33dabd86d47865a 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IBatchDAO.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/IBatchDAO.java @@ -31,9 +31,9 @@ public interface IBatchDAO extends DAO { * Push data into the database in async mode. This method is driven by streaming process. This method doesn't * request the data queryable immediately after the method finished. * - * @param prepareRequest data to insert. + * @param insertRequest data to insert. */ - void insert(InsertRequest prepareRequest); + void insert(InsertRequest insertRequest); /** * Push data collection into the database in async mode. This method is driven by streaming process. This method diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/storage/PersistenceTimerTest.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/storage/PersistenceTimerTest.java index 3258dc82a22577311060ae93370336b366b84923..da0b8e6f414d1b04680585c631135f1cf019ecd1 100644 --- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/storage/PersistenceTimerTest.java +++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/storage/PersistenceTimerTest.java @@ -57,7 +57,7 @@ public class PersistenceTimerTest { moduleConfig.setPersistentPeriod(Integer.MAX_VALUE); IBatchDAO iBatchDAO = new IBatchDAO() { @Override - public void insert(InsertRequest prepareRequest) { + public void insert(InsertRequest insertRequest) { } diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/BatchProcessEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/BatchProcessEsDAO.java index 7dea42d497e28f7f21efa0a277d6db5b9b1a9f25..fb8df0201a17e0628d3c72c1d1d1b4639fc4357e 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/BatchProcessEsDAO.java +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/BatchProcessEsDAO.java @@ -47,12 +47,12 @@ public class BatchProcessEsDAO extends EsDAO implements IBatchDAO { } @Override - public void insert(InsertRequest prepareRequest) { + public void insert(InsertRequest insertRequest) { if (bulkProcessor == null) { this.bulkProcessor = getClient().createBulkProcessor(bulkActions, flushInterval, concurrentRequests); } - this.bulkProcessor.add((IndexRequest) prepareRequest); + this.bulkProcessor.add((IndexRequest) insertRequest); } @Override diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2BatchDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2BatchDAO.java index cd390602fcc3377734783fa5726a927ec26267e4..3a799f9398b4ce01c9cf241e203a7aec50d0101c 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2BatchDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2BatchDAO.java @@ -81,8 +81,8 @@ public class H2BatchDAO implements IBatchDAO { } @Override - public void insert(InsertRequest prepareRequest) { - this.dataCarrier.produce(prepareRequest); + public void insert(InsertRequest insertRequest) { + this.dataCarrier.produce(insertRequest); } private class H2BatchConsumer implements IConsumer {