Merge remote-tracking branch 'origin/master'

odbctest/mql/basic/01clear/1_delete_all_test_data.mql

@@ -395,6 +395,18 @@ onerror(continue,`not exist`,`not find`,`not found`)
 **/
 ;
 
+delete from /test/node_memdb with version
+/**
+onerror(continue,`not exist`,`not find`,`not found`)
+**/
+;
+
+delete from /test/node_local with version
+/**
+onerror(continue,`not exist`,`not find`,`not found`)
+**/
+;
+
 delete from /test/movefield with version
 /**
 onerror(continue,`not exist`,`not find`,`not found`)

odbctest/mql/basic/33network/10class.mql

@@ -487,6 +487,662 @@ create class if not exists /test/interface (
 		index( city,classname,ipaddress,nodeid,nodename,state,sysobjid) 
 )with ttl=365 day , autosearch=true , version=true , key=manu, partition=state , alias='nnode' , nickname='nnode' ;
 
+create class if not exists /test/node_memdb ( 
+		city				varchar	"City",
+		classname		varchar	"ClassName",
+		cpu_metric		bucket 		{
+				"crc": ["nodeid", "CPU_ID"],
+				"desc": [
+						"NODE ID",
+						"CPU ID",
+						"SYSCP_WHSC",
+						"User to System CPU(Percent)",
+						"STEAL_WHSC",
+						"Busy CPU(Percent)",
+						"Time Stamp",
+						"I/O Wait(Percent)",
+						"WAITC_WHSC",
+						"System CPU(Percent)",
+						"TMZDIFF",
+						"BUSYC_WHSC",
+						"User CPU(Percent)",
+						"WRITETIME",
+						"Steal CPU(Percent)",
+						"Idle CPU(Percent)",
+						"IDLEC_WHSC",
+						"User Nice CPU(Percent)"
+				],
+				"params": [
+						["nodeid", "string", "", "${desc[0]}"],
+						["CPU_ID", "string", "", "${desc[1]}"],
+						["SYSCP_WHSC", "int", "", "${desc[2]}"],
+						["User_Sys_Pct", "float", "%", "${desc[3]}"],
+						["STEAL_WHSC", "int", "", "${desc[4]}"],
+						["Busy_CPU", "float", "%", "${desc[5]}"],
+						["Timestamp", "string", "", "${desc[6]}"],
+						["Wait_IO_CPU", "float", "%", "${desc[7]}"],
+						["WAITC_WHSC", "int", "", "${desc[8]}"],
+						["System_CPU", "float", "%", "${desc[9]}"],
+						["TMZDIFF", "int", "", "${desc[10]}"],
+						["BUSYC_WHSC", "int", "", "${desc[11]}"],
+						["User_CPU", "float", "%", "${desc[12]}"],
+						["WRITETIME", "string", "", "${desc[13]}"],
+						["Steal_CPU_Percent", "float", "%", "${desc[14]}"],
+						["Idle_CPU", "float", "%", "${desc[15]}"],
+						["IDLEC_WHSC", "int", "", "${desc[16]}"],
+						["User_Nice_CPU", "float", "%", "${desc[17]}"]
+				],
+				"ttl": 365,
+				"type": "tsdb"
+		}	"cpu_metric",
+		disk_metric		bucket 		{
+				"crc": ["nodeid", "Mount_Point"],
+				"desc": [
+						"NODE ID",
+						"Mount Point",
+						"FS Type",
+						"Inodes Used(Percent)",
+						"Timestamp",
+						"Disk_Free(Percent)",
+						"TMZDIFF",
+						"Mount Options",
+						"Total Inodes",
+						"Inodes Free",
+						"WRITETIME",
+						"Inodes Free(Percent)",
+						"Disk Free",
+						"File System Status",
+						"Inodes Used",
+						"Disk Used(Percent)",
+						"Disk Used",
+						"Disk Name",
+						"Size"
+				],
+				"params": [
+						["nodeid", "string", "", "${desc[0]}"],
+						["Mount_Point", "string", "", "${desc[1]}"],
+						["FS_Type", "string", "", "${desc[2]}"],
+						["Inodes_Used_Percent", "float", "%", "${desc[3]}"],
+						["Timestamp", "string", "", "${desc[4]}"],
+						["Disk_Free_Percent", "float", "%", "${desc[5]}"],
+						["TMZDIFF", "string", "", "${desc[6]}"],
+						["Mount_Options", "string", "", "${desc[7]}"],
+						["Total_Inodes", "float", "", "${desc[8]}"],
+						["Inodes_Free", "float", "", "${desc[9]}"],
+						["WRITETIME", "string", "", "${desc[10]}"],
+						["Inodes_Free_Percent", "float", "%", "${desc[11]}"],
+						["Disk_Free", "float", "", "${desc[12]}"],
+						["File_System_Status", "int", "", "${desc[13]}"],
+						["Inodes_Used", "float", "", "${desc[14]}"],
+						["Disk_Used_Percent", "float", "%", "${desc[15]}"],
+						["Disk_Used", "float", "", "${desc[16]}"],
+						["Disk_Name", "string", "", "${desc[16]}"],
+						["Size", "float", "", "${desc[17]}"]
+				],
+				"ttl": 365,
+				"type": "tsdb"
+		}	"disk_metric",
+		diskio_metric		bucket 		{
+				"crc": ["nodeid", "Dev_Name"],
+				"desc": [
+						"NODE ID",
+						"Dev Name",
+						"Bulk Read per second",
+						"Bulks read",
+						"Transfers per second",
+						"Timestamp",
+						"Dev Minor",
+						"TMZDIFF",
+						"Dev Name",
+						"WRITETIME",
+						"Dev Major",
+						"Bulk Write per second",
+						"Bulks written"
+				],
+				"params": [
+						["nodeid", "string", "", "${desc[0]}"],
+						["Dev_Name", "string", "", "${desc[1]}"],
+						["Blk_Rds_per_sec", "float", "", "${desc[2]}"],
+						["Blks_read", "float", "", "${desc[3]}"],
+						["Transfers_per_sec", "float", "", "${desc[4]}"],
+						["Timestamp", "string", "", "${desc[5]}"],
+						["Dev_Minor", "int", "", "${desc[6]}"],
+						["TMZDIFF", "string", "", "${desc[7]}"],
+						["WRITETIME", "string", "", "${desc[8]}"],
+						["Dev_Major", "int", "", "${desc[9]}"],
+						["Blk_wrtn_per_sec", "float", "", "${desc[10]}"],
+						["Blks_wrtn", "float", "", "${desc[11]}"]
+				],
+				"ttl": 365,
+				"type": "tsdb"
+		}	"KLZ_CPU_IO",
+		ipaddress		varchar	"IpAddress",
+		nodeid			varchar	"NodeId",
+		nodename		varchar	"NodeName",
+		state				varchar	"State",
+		swaprate_metric		bucket 		{
+				"crc": ["nodeid"],
+				"desc": [
+						"NODE ID",
+						"Swap Usage Rate",
+						"Timestamp",
+						"Peak Swap Space Used",
+						"Swap Space Used",
+						"TMZDIFF",
+						"WRITETIME",
+						"Days to Swap Space Full",
+						"Days to Peak Space Full",
+						"Low Free Memory",
+						"Moving Total Swap Space"
+				],
+				"params": [
+						["nodeid", "string", "", "${desc[0]}"],
+						["Swap_Usage_Rate", "float", "", "${desc[1]}"],
+						["Timestamp", "string", "", "${desc[2]}"],
+						["Peak_Swap_Space_Used", "float", "", "${desc[3]}"],
+						["Swap_Space_Used", "float", "", "${desc[4]}"],
+						["TMZDIFF", "string", "", "${desc[5]}"],
+						["WRITETIME", "string", "", "${desc[6]}"],
+						["Days_to_Swap_Space_Full", "int", "%", "${desc[7]}"],
+						["Days_to_Peak_Space_Full", "int", "", "${desc[8]}"],
+						["Low_Free_Memory", "float", "%", "${desc[9]}"],
+						["Moving_Total_Swap_Space", "float", "", "${desc[10]}"]
+				],
+				"ttl": 365,
+				"type": "tsdb"
+		}	"KLZ_Swap_Rate",
+		sysobjid		varchar	"SysObjId",
+		systemstats_metric		bucket 		{
+				"crc": ["nodeid"],
+				"desc": [
+						"NODE ID",
+						"Page Faults per second",
+						"System Load 5min",
+						"Number Processes(Percent)",
+						"Processes Zombie Count",
+						"Pages paged in per second",
+						"Pages paged out per second",
+						"Processes per second",
+						"Number of Users",
+						"Open Files",
+						"Pages Swap in per second",
+						"Timestamp",
+						"Total Number Processes",
+						"WRITETIME",
+						"Pages Swap out per second",
+						"Major Faults per second",
+						"System Load 1min",
+						"System Uptime",
+						"Pages Swapped in",
+						"Pct Change Processes",
+						"Pages paged in",
+						"Number Threads Pct",
+						"System Load 15min",
+						"Max Process ID",
+						"Pages paged out",
+						"Max Open Files",
+						"Open Files(Percent)",
+						"TMZDIFF",
+						"Pct Change Ctxt Switches",
+						"Ctxt Switches per second",
+						"Max Number Threads",
+						"Pages Swapped out",
+						"Total Number Threads"
+				],
+				"params": [
+						["nodeid", "string", "", "${desc[0]}"],
+						["Page_Faults_per_sec", "float", "", "${desc[1]}"],
+						["System_Load_5min", "float", "", "${desc[2]}"],
+						["Number_Processes_Pct", "float", "%", "${desc[3]}"],
+						["Processes_Zombie_Count", "int", "", "${desc[4]}"],
+						["Pages_paged_in_per_sec", "float", "", "${desc[5]}"],
+						["Pages_paged_out_per_sec", "float", "", "${desc[6]}"],
+						["Processes_per_sec", "float", "", "${desc[7]}"],
+						["Number_of_Users", "int", "", "${desc[8]}"],
+						["Open_Files", "int", "", "${desc[9]}"],
+						["Pages_Swap_in_per_sec", "float", "", "${desc[10]}"],
+						["Timestamp", "string", "", "${desc[11]}"],
+						["Total_Number_Processes", "int", "", "${desc[12]}"],
+						["WRITETIME", "string", "", "${desc[13]}"],
+						["Pages_Swap_out_per_sec", "float", "", "${desc[14]}"],
+						["Major_Faults_per_sec", "float", "%", "${desc[15]}"],
+						["System_Load_1min", "float", "", "${desc[16]}"],
+						["System_Uptime", "float", "", "${desc[17]}"],
+						["Pages_Swapped_in", "float", "", "${desc[18]}"],
+						["Pct_Change_Processes", "float", "", "${desc[19]}"],
+						["Pages_paged_in", "float", "", "${desc[20]}"],
+						["Number_Threads_Pct", "float", "%", "${desc[21]}"],
+						["System_Load_15min", "float", "", "${desc[22]}"],
+						["Max_Process_ID", "float", "", "${desc[23]}"],
+						["Pages_paged_out", "float", "", "${desc[24]}"],
+						["Max_Open_Files", "float", "", "${desc[25]}"],
+						["Open_Files_Pct", "float", "%", "${desc[26]}"],
+						["TMZDIFF", "string", "", "${desc[27]}"],
+						["Pct_Change_Ctxt_Switches", "float", "", "${desc[28]}"],
+						["Ctxt_Switches_per_sec", "float", "%", "${desc[29]}"],
+						["Max_Number_Threads", "float", "", "${desc[30]}"],
+						["Pages_Swapped_out", "float", "", "${desc[31]}"],
+						["Total_Number_Threads", "float", "", "${desc[32]}"]
+				],
+				"ttl": 365,
+				"type": "tsdb"
+		}	"KLZ_System_Statistics",
+		vmstats_metric		bucket 		{
+				"crc": ["nodeid"],
+				"desc": [
+						"NODE ID",
+						"NETME WHSC",
+						"Memory Cached(Percent)",
+						"Used Virtual Storage(Percent)",
+						"TOTMF WHSC",
+						"Net Memory Used",
+						"NETMP WHSC",
+						"MEMUP WHSC",
+						"Total Memory Free(Percent)",
+						"Used Virtual Storage",
+						"Memory Cached",
+						"Timestamp",
+						"Processes Blocked State",
+						"Swap Space Used",
+						"WRITETIME",
+						"Memory in Buffers",
+						"MEMFR WHSC",
+						"Memory Used",
+						"Total Memory",
+						"Memory Free",
+						"Net Memory Used(Percent)",
+						"TOMFP WHSC",
+						"Memory Free(Percent)",
+						"Processes Waiting RunTime",
+						"Swap Free(Percent)",
+						"Total Swap Space",
+						"Free Virtual Storage",
+						"Swap Space Free",
+						"MEMFP WHSC",
+						"Free Virtual Storage(Percent)",
+						"Memory Used(Percent)",
+						"Swap Used(Percent)",
+						"TMZDIFF",
+						"Shared Memory",
+						"Total Virtual Storage",
+						"Total Memory Free",
+						"MEMUS WHSC"
+				],
+				"params": [
+						["nodeid", "string", "", "${desc[0]}"],
+						["NETME_WHSC", "int", "", "${desc[1]}"],
+						["Memory_Cached_Pct", "float", "%", "${desc[2]}"],
+						["Used_Virtual_Storage_Pct", "float", "%", "${desc[3]}"],
+						["TOTMF_WHSC", "int", "", "${desc[4]}"],
+						["Net_Memory_Used", "float", "", "${desc[5]}"],
+						["NETMP_WHSC", "int", "", "${desc[6]}"],
+						["MEMUP_WHSC", "int", "", "${desc[7]}"],
+						["Total_Memory_Free_Pct", "float", "%", "${desc[8]}"],
+						["Used_Virtual_Storage", "float", "", "${desc[9]}"],
+						["Memory_Cached", "float", "", "${desc[10]}"],
+						["Timestamp", "string", "", "${desc[11]}"],
+						["Processes_Blocked_State", "int", "", "${desc[12]}"],
+						["Swap_Space_Used", "float", "%", "${desc[13]}"],
+						["WRITETIME", "string", "", "${desc[14]}"],
+						["Memory_in_Buffers", "float", "", "${desc[15]}"],
+						["MEMFR_WHSC", "int", "", "${desc[16]}"],
+						["Memory_Used", "float", "", "${desc[17]}"],
+						["Total_Memory", "float", "", "${desc[18]}"],
+						["Memory_Free", "float", "", "${desc[19]}"],
+						["Net_Memory_Used_Pct", "float", "%", "${desc[20]}"],
+						["TOMFP_WHSC", "int", "", "${desc[21]}"],
+						["Memory_Free_Pct", "float", "%", "${desc[22]}"],
+						["Processes_Waiting_RunTime", "int", "", "${desc[23]}"],
+						["Swap_Free_Pct", "float", "%", "${desc[24]}"],
+						["Total_Swap_Space", "float", "", "${desc[25]}"],
+						["Free_Virtual_Storage", "float", "", "${desc[26]}"],
+						["Swap_Space_Free", "float", "", "${desc[27]}"],
+						["MEMFP_WHSC", "int", "", "${desc[28]}"],
+						["Free_Virtual_Storage_Pct", "float", "", "${desc[29]}"],
+						["Memory_Used_Pct", "float", "", "${desc[30]}"],
+						["Swap_Used_Pct", "float", "", "${desc[31]}"],
+						["TMZDIFF", "string", "", "${desc[32]}"],
+						["Shared_Memory", "float", "", "${desc[33]}"],
+						["Total_Virtual_Storage", "float", "", "${desc[34]}"],
+						["Total_Memory_Free", "float", "", "${desc[35]}"],
+						["MEMUS_WHSC", "int", "", "${desc[36]}"]
+				],
+				"ttl": 365,
+				"type": "tsdb"
+		}	"KLZ_VM_Stats",
+		
+		keys( nodeid) ,
+		index( city,classname,ipaddress,nodeid,nodename,state,sysobjid) 
+)with core=memory, ttl=365 day , autosearch=true , version=true , key=manu, partition=state , alias='node_memdb' , nickname='node_memdb' ;
+
+create class if not exists /test/node_local ( 
+		city				varchar	"City",
+		classname		varchar	"ClassName",
+		cpu_metric		bucket 		{
+				"crc": ["nodeid", "CPU_ID"],
+				"desc": [
+						"NODE ID",
+						"CPU ID",
+						"SYSCP_WHSC",
+						"User to System CPU(Percent)",
+						"STEAL_WHSC",
+						"Busy CPU(Percent)",
+						"Time Stamp",
+						"I/O Wait(Percent)",
+						"WAITC_WHSC",
+						"System CPU(Percent)",
+						"TMZDIFF",
+						"BUSYC_WHSC",
+						"User CPU(Percent)",
+						"WRITETIME",
+						"Steal CPU(Percent)",
+						"Idle CPU(Percent)",
+						"IDLEC_WHSC",
+						"User Nice CPU(Percent)"
+				],
+				"params": [
+						["nodeid", "string", "", "${desc[0]}"],
+						["CPU_ID", "string", "", "${desc[1]}"],
+						["SYSCP_WHSC", "int", "", "${desc[2]}"],
+						["User_Sys_Pct", "float", "%", "${desc[3]}"],
+						["STEAL_WHSC", "int", "", "${desc[4]}"],
+						["Busy_CPU", "float", "%", "${desc[5]}"],
+						["Timestamp", "string", "", "${desc[6]}"],
+						["Wait_IO_CPU", "float", "%", "${desc[7]}"],
+						["WAITC_WHSC", "int", "", "${desc[8]}"],
+						["System_CPU", "float", "%", "${desc[9]}"],
+						["TMZDIFF", "int", "", "${desc[10]}"],
+						["BUSYC_WHSC", "int", "", "${desc[11]}"],
+						["User_CPU", "float", "%", "${desc[12]}"],
+						["WRITETIME", "string", "", "${desc[13]}"],
+						["Steal_CPU_Percent", "float", "%", "${desc[14]}"],
+						["Idle_CPU", "float", "%", "${desc[15]}"],
+						["IDLEC_WHSC", "int", "", "${desc[16]}"],
+						["User_Nice_CPU", "float", "%", "${desc[17]}"]
+				],
+				"ttl": 365,
+				"type": "tsdb"
+		}	"cpu_metric",
+		disk_metric		bucket 		{
+				"crc": ["nodeid", "Mount_Point"],
+				"desc": [
+						"NODE ID",
+						"Mount Point",
+						"FS Type",
+						"Inodes Used(Percent)",
+						"Timestamp",
+						"Disk_Free(Percent)",
+						"TMZDIFF",
+						"Mount Options",
+						"Total Inodes",
+						"Inodes Free",
+						"WRITETIME",
+						"Inodes Free(Percent)",
+						"Disk Free",
+						"File System Status",
+						"Inodes Used",
+						"Disk Used(Percent)",
+						"Disk Used",
+						"Disk Name",
+						"Size"
+				],
+				"params": [
+						["nodeid", "string", "", "${desc[0]}"],
+						["Mount_Point", "string", "", "${desc[1]}"],
+						["FS_Type", "string", "", "${desc[2]}"],
+						["Inodes_Used_Percent", "float", "%", "${desc[3]}"],
+						["Timestamp", "string", "", "${desc[4]}"],
+						["Disk_Free_Percent", "float", "%", "${desc[5]}"],
+						["TMZDIFF", "string", "", "${desc[6]}"],
+						["Mount_Options", "string", "", "${desc[7]}"],
+						["Total_Inodes", "float", "", "${desc[8]}"],
+						["Inodes_Free", "float", "", "${desc[9]}"],
+						["WRITETIME", "string", "", "${desc[10]}"],
+						["Inodes_Free_Percent", "float", "%", "${desc[11]}"],
+						["Disk_Free", "float", "", "${desc[12]}"],
+						["File_System_Status", "int", "", "${desc[13]}"],
+						["Inodes_Used", "float", "", "${desc[14]}"],
+						["Disk_Used_Percent", "float", "%", "${desc[15]}"],
+						["Disk_Used", "float", "", "${desc[16]}"],
+						["Disk_Name", "string", "", "${desc[16]}"],
+						["Size", "float", "", "${desc[17]}"]
+				],
+				"ttl": 365,
+				"type": "tsdb"
+		}	"disk_metric",
+		diskio_metric		bucket 		{
+				"crc": ["nodeid", "Dev_Name"],
+				"desc": [
+						"NODE ID",
+						"Dev Name",
+						"Bulk Read per second",
+						"Bulks read",
+						"Transfers per second",
+						"Timestamp",
+						"Dev Minor",
+						"TMZDIFF",
+						"Dev Name",
+						"WRITETIME",
+						"Dev Major",
+						"Bulk Write per second",
+						"Bulks written"
+				],
+				"params": [
+						["nodeid", "string", "", "${desc[0]}"],
+						["Dev_Name", "string", "", "${desc[1]}"],
+						["Blk_Rds_per_sec", "float", "", "${desc[2]}"],
+						["Blks_read", "float", "", "${desc[3]}"],
+						["Transfers_per_sec", "float", "", "${desc[4]}"],
+						["Timestamp", "string", "", "${desc[5]}"],
+						["Dev_Minor", "int", "", "${desc[6]}"],
+						["TMZDIFF", "string", "", "${desc[7]}"],
+						["WRITETIME", "string", "", "${desc[8]}"],
+						["Dev_Major", "int", "", "${desc[9]}"],
+						["Blk_wrtn_per_sec", "float", "", "${desc[10]}"],
+						["Blks_wrtn", "float", "", "${desc[11]}"]
+				],
+				"ttl": 365,
+				"type": "tsdb"
+		}	"KLZ_CPU_IO",
+		ipaddress		varchar	"IpAddress",
+		nodeid			varchar	"NodeId",
+		nodename		varchar	"NodeName",
+		state				varchar	"State",
+		swaprate_metric		bucket 		{
+				"crc": ["nodeid"],
+				"desc": [
+						"NODE ID",
+						"Swap Usage Rate",
+						"Timestamp",
+						"Peak Swap Space Used",
+						"Swap Space Used",
+						"TMZDIFF",
+						"WRITETIME",
+						"Days to Swap Space Full",
+						"Days to Peak Space Full",
+						"Low Free Memory",
+						"Moving Total Swap Space"
+				],
+				"params": [
+						["nodeid", "string", "", "${desc[0]}"],
+						["Swap_Usage_Rate", "float", "", "${desc[1]}"],
+						["Timestamp", "string", "", "${desc[2]}"],
+						["Peak_Swap_Space_Used", "float", "", "${desc[3]}"],
+						["Swap_Space_Used", "float", "", "${desc[4]}"],
+						["TMZDIFF", "string", "", "${desc[5]}"],
+						["WRITETIME", "string", "", "${desc[6]}"],
+						["Days_to_Swap_Space_Full", "int", "%", "${desc[7]}"],
+						["Days_to_Peak_Space_Full", "int", "", "${desc[8]}"],
+						["Low_Free_Memory", "float", "%", "${desc[9]}"],
+						["Moving_Total_Swap_Space", "float", "", "${desc[10]}"]
+				],
+				"ttl": 365,
+				"type": "tsdb"
+		}	"KLZ_Swap_Rate",
+		sysobjid		varchar	"SysObjId",
+		systemstats_metric		bucket 		{
+				"crc": ["nodeid"],
+				"desc": [
+						"NODE ID",
+						"Page Faults per second",
+						"System Load 5min",
+						"Number Processes(Percent)",
+						"Processes Zombie Count",
+						"Pages paged in per second",
+						"Pages paged out per second",
+						"Processes per second",
+						"Number of Users",
+						"Open Files",
+						"Pages Swap in per second",
+						"Timestamp",
+						"Total Number Processes",
+						"WRITETIME",
+						"Pages Swap out per second",
+						"Major Faults per second",
+						"System Load 1min",
+						"System Uptime",
+						"Pages Swapped in",
+						"Pct Change Processes",
+						"Pages paged in",
+						"Number Threads Pct",
+						"System Load 15min",
+						"Max Process ID",
+						"Pages paged out",
+						"Max Open Files",
+						"Open Files(Percent)",
+						"TMZDIFF",
+						"Pct Change Ctxt Switches",
+						"Ctxt Switches per second",
+						"Max Number Threads",
+						"Pages Swapped out",
+						"Total Number Threads"
+				],
+				"params": [
+						["nodeid", "string", "", "${desc[0]}"],
+						["Page_Faults_per_sec", "float", "", "${desc[1]}"],
+						["System_Load_5min", "float", "", "${desc[2]}"],
+						["Number_Processes_Pct", "float", "%", "${desc[3]}"],
+						["Processes_Zombie_Count", "int", "", "${desc[4]}"],
+						["Pages_paged_in_per_sec", "float", "", "${desc[5]}"],
+						["Pages_paged_out_per_sec", "float", "", "${desc[6]}"],
+						["Processes_per_sec", "float", "", "${desc[7]}"],
+						["Number_of_Users", "int", "", "${desc[8]}"],
+						["Open_Files", "int", "", "${desc[9]}"],
+						["Pages_Swap_in_per_sec", "float", "", "${desc[10]}"],
+						["Timestamp", "string", "", "${desc[11]}"],
+						["Total_Number_Processes", "int", "", "${desc[12]}"],
+						["WRITETIME", "string", "", "${desc[13]}"],
+						["Pages_Swap_out_per_sec", "float", "", "${desc[14]}"],
+						["Major_Faults_per_sec", "float", "%", "${desc[15]}"],
+						["System_Load_1min", "float", "", "${desc[16]}"],
+						["System_Uptime", "float", "", "${desc[17]}"],
+						["Pages_Swapped_in", "float", "", "${desc[18]}"],
+						["Pct_Change_Processes", "float", "", "${desc[19]}"],
+						["Pages_paged_in", "float", "", "${desc[20]}"],
+						["Number_Threads_Pct", "float", "%", "${desc[21]}"],
+						["System_Load_15min", "float", "", "${desc[22]}"],
+						["Max_Process_ID", "float", "", "${desc[23]}"],
+						["Pages_paged_out", "float", "", "${desc[24]}"],
+						["Max_Open_Files", "float", "", "${desc[25]}"],
+						["Open_Files_Pct", "float", "%", "${desc[26]}"],
+						["TMZDIFF", "string", "", "${desc[27]}"],
+						["Pct_Change_Ctxt_Switches", "float", "", "${desc[28]}"],
+						["Ctxt_Switches_per_sec", "float", "%", "${desc[29]}"],
+						["Max_Number_Threads", "float", "", "${desc[30]}"],
+						["Pages_Swapped_out", "float", "", "${desc[31]}"],
+						["Total_Number_Threads", "float", "", "${desc[32]}"]
+				],
+				"ttl": 365,
+				"type": "tsdb"
+		}	"KLZ_System_Statistics",
+		vmstats_metric		bucket 		{
+				"crc": ["nodeid"],
+				"desc": [
+						"NODE ID",
+						"NETME WHSC",
+						"Memory Cached(Percent)",
+						"Used Virtual Storage(Percent)",
+						"TOTMF WHSC",
+						"Net Memory Used",
+						"NETMP WHSC",
+						"MEMUP WHSC",
+						"Total Memory Free(Percent)",
+						"Used Virtual Storage",
+						"Memory Cached",
+						"Timestamp",
+						"Processes Blocked State",
+						"Swap Space Used",
+						"WRITETIME",
+						"Memory in Buffers",
+						"MEMFR WHSC",
+						"Memory Used",
+						"Total Memory",
+						"Memory Free",
+						"Net Memory Used(Percent)",
+						"TOMFP WHSC",
+						"Memory Free(Percent)",
+						"Processes Waiting RunTime",
+						"Swap Free(Percent)",
+						"Total Swap Space",
+						"Free Virtual Storage",
+						"Swap Space Free",
+						"MEMFP WHSC",
+						"Free Virtual Storage(Percent)",
+						"Memory Used(Percent)",
+						"Swap Used(Percent)",
+						"TMZDIFF",
+						"Shared Memory",
+						"Total Virtual Storage",
+						"Total Memory Free",
+						"MEMUS WHSC"
+				],
+				"params": [
+						["nodeid", "string", "", "${desc[0]}"],
+						["NETME_WHSC", "int", "", "${desc[1]}"],
+						["Memory_Cached_Pct", "float", "%", "${desc[2]}"],
+						["Used_Virtual_Storage_Pct", "float", "%", "${desc[3]}"],
+						["TOTMF_WHSC", "int", "", "${desc[4]}"],
+						["Net_Memory_Used", "float", "", "${desc[5]}"],
+						["NETMP_WHSC", "int", "", "${desc[6]}"],
+						["MEMUP_WHSC", "int", "", "${desc[7]}"],
+						["Total_Memory_Free_Pct", "float", "%", "${desc[8]}"],
+						["Used_Virtual_Storage", "float", "", "${desc[9]}"],
+						["Memory_Cached", "float", "", "${desc[10]}"],
+						["Timestamp", "string", "", "${desc[11]}"],
+						["Processes_Blocked_State", "int", "", "${desc[12]}"],
+						["Swap_Space_Used", "float", "%", "${desc[13]}"],
+						["WRITETIME", "string", "", "${desc[14]}"],
+						["Memory_in_Buffers", "float", "", "${desc[15]}"],
+						["MEMFR_WHSC", "int", "", "${desc[16]}"],
+						["Memory_Used", "float", "", "${desc[17]}"],
+						["Total_Memory", "float", "", "${desc[18]}"],
+						["Memory_Free", "float", "", "${desc[19]}"],
+						["Net_Memory_Used_Pct", "float", "%", "${desc[20]}"],
+						["TOMFP_WHSC", "int", "", "${desc[21]}"],
+						["Memory_Free_Pct", "float", "%", "${desc[22]}"],
+						["Processes_Waiting_RunTime", "int", "", "${desc[23]}"],
+						["Swap_Free_Pct", "float", "%", "${desc[24]}"],
+						["Total_Swap_Space", "float", "", "${desc[25]}"],
+						["Free_Virtual_Storage", "float", "", "${desc[26]}"],
+						["Swap_Space_Free", "float", "", "${desc[27]}"],
+						["MEMFP_WHSC", "int", "", "${desc[28]}"],
+						["Free_Virtual_Storage_Pct", "float", "", "${desc[29]}"],
+						["Memory_Used_Pct", "float", "", "${desc[30]}"],
+						["Swap_Used_Pct", "float", "", "${desc[31]}"],
+						["TMZDIFF", "string", "", "${desc[32]}"],
+						["Shared_Memory", "float", "", "${desc[33]}"],
+						["Total_Virtual_Storage", "float", "", "${desc[34]}"],
+						["Total_Memory_Free", "float", "", "${desc[35]}"],
+						["MEMUS_WHSC", "int", "", "${desc[36]}"]
+				],
+				"ttl": 365,
+				"type": "tsdb"
+		}	"KLZ_VM_Stats",
+		
+		keys( nodeid) ,
+		index( city,classname,ipaddress,nodeid,nodename,state,sysobjid) 
+)with core=local, ttl=365 day , autosearch=true , version=true , key=manu, partition=state , alias='node_local' , nickname='node_local' ;
+
 create class if not exists /test/interface2 ( 
 		entityname		varchar	"EntityName",
 		ifalias			varchar	"IfAlias",

odbctest/mql/basic/33network/11data.mql

@@ -25,3 +25,20 @@ update /test/node2 set interface = interface + 'interface:REY3328-2210-1_Port 4/
 sleep(1s)
 **/
 ;
+
+insert into /test/node_memdb (id, state) values ('nnode:server3', 'state1'  )
+;
+
+insert into /test/node_memdb (id, state) values ('nnode:EYD206-2210-1', 'state22')
+;
+
+/**
+sleep(1s)
+**/
+;
+
+insert into /test/node_local (id, state) values ('nnode:server3', 'state1'  )
+;
+
+insert into /test/node_local (id, state) values ('nnode:EYD206-2210-1', 'state22')
+;

odbctest/mql/basic/33network/12valid.mql

@@ -11,3 +11,11 @@ select interface from /test/node2  where id= 'node2:DFD291-2210-1'
 count(1)
 **/
 ;
+
+SELECT  _tokens FROM  /test/node where _tokens like '%server3%'
+/**
+count(1)
+**/
+;
+
+

odbctest/mql/problem/20graph_match2.mql

@@ -0,0 +1,13 @@
+match (:/m3graph/entity/sanstorage)-[:connect]->(:/m3graph/entity/sanswitch)
+/**
+output()
+match("graph.nodes.len",3)
+**/
+;
+
+match (:/m3graph/entity/Sanstorage)-[:connect]->(:/m3graph/entity/Sanswitch)
+/**
+output()
+match("graph.nodes.len",3)
+**/
+;