Merge pull request #135 from experdb/development

ver12
experdb · Mar 26, 2021 · 0bc6520 · 0bc6520
2 parents 88029bd + 99f7b87
commit 0bc6520
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/build-all.bat b/build-all.bat
@@ -6,8 +6,8 @@ SET "PATH=%PATH%;%PROGRAMFILES%\Git\bin;C:\apache-ant-1.9.9-bin;C:\Program Files
 
 For /F %%g in ('git rev-parse HEAD ^| cut -b 1-7') Do (Set GIT_COMMIT_HASH=%%g)
 
-set BASE_VER=11.7.3
-set BASE_VER_UDERSCORE=11_7_3
+set BASE_VER=12.1.1
+set BASE_VER_UDERSCORE=12_1_1
 For /F %%i in ('git rev-list HEAD ^| find /c /v ""') Do Set GIT_COMMIT_CNT=%%i
 
 

diff --git a/eXperDB_Repository/pgmon_repository_patch_version.txt b/eXperDB_Repository/pgmon_repository_patch_version.txt
@@ -170,4 +170,9 @@ alter table tb_mon_user add column user_empnum varchar(30) default '';
 
 --472++
 
-alter table tb_instance_info add column virtual_ip_stat int4;
+alter table tb_instance_info add column virtual_ip_stat int4;
+
+-- 473++
+
+ALTER TABLE TB_REALTIME_STATEMENTS ALTER COLUMN dbid TYPE int8
+ALTER TABLE TB_REALTIME_STATEMENTS ALTER COLUMN userid TYPE int8
diff --git a/eXperDB_Server/eXperDB_Monitoring_Agent/src/experdb/mnt/task/QueryCollect.java b/eXperDB_Server/eXperDB_Monitoring_Agent/src/experdb/mnt/task/QueryCollect.java
@@ -110,6 +110,7 @@ private void execute() {
 				failed_collect_type = "0";
 				is_collect_ok = "N";
 				log.error("[instanceId ==>> " + instanceId + "]" + " Connection failed]");
+				throw e;
 			}
 
 			sessionAgent = sqlSessionFactory.openSession();
@@ -184,6 +185,7 @@ private void resetReScanStmt() {
 				failed_collect_type = "0";
 				is_collect_ok = "N";
 				log.error("[instanceId ==>> " + instanceId + "]" + " Connection failed]");
+				throw e;
 			}
 
 			sessionAgent = sqlSessionFactory.openSession();