This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch h2-storage
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from b5403a8 Merge branch 'master' into h2-storage
add 3492470 Fix H2 compile issue.
No new revisions were added by this update.
Summary of changes:
.../register/worker/RegisterPersistentWorker.java | 8 +--
.../src/main/resources/application.yml | 26 ++++-----
.../elasticsearch/query/TopologyQueryEsDAO.java | 27 ++++++----
.../storage/plugin/jdbc/h2/H2StorageProvider.java | 9 ++++
.../plugin/jdbc/h2/dao/H2HistoryDeleteDAO.java} | 14 ++---
.../storage/plugin/jdbc/h2/dao/H2IndicatorDAO.java | 4 --
.../storage/plugin/jdbc/h2/dao/H2RecordDAO.java | 4 --
.../storage/plugin/jdbc/h2/dao/H2SQLExecutor.java | 2 +-
.../jdbc/h2/dao/H2ServiceInventoryCacheDAO.java | 35 ++++++++++++-
.../plugin/jdbc/h2/dao/H2TableInstaller.java | 2 +-
.../plugin/jdbc/h2/dao/H2TopologyQueryDAO.java | 61 +---------------------
11 files changed, 85 insertions(+), 107 deletions(-)
copy
oap-server/{server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/jdbc/JDBCClientException.java
=>
server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2HistoryDeleteDAO.java}
(72%)
