diff --git a/ide/src/base-ui/chart/column/LitChartColumn.ts b/ide/src/base-ui/chart/column/LitChartColumn.ts
index a8071a473ab36b517123ec08265993152158bc50..7aff26a18a59da7fa8e8804b24f27deb168144d3 100644
--- a/ide/src/base-ui/chart/column/LitChartColumn.ts
+++ b/ide/src/base-ui/chart/column/LitChartColumn.ts
@@ -193,6 +193,14 @@ export class LitChartColumn extends BaseElement {
     return this.litChartColumnCfg?.data || [];
   }
 
+  dataSort():void{
+    if (!this.litChartColumnCfg!.notSort) {
+      this.litChartColumnCfg?.data.sort(
+        (a, b) => b[this.litChartColumnCfg!.yField] - a[this.litChartColumnCfg!.yField]
+      );
+    }
+  }
+
   haveSeriesField():void{
     let maxValue = Math.max(...this.litChartColumnCfg!.data.map((it) => it[this.litChartColumnCfg!.yField]));
     maxValue = Math.ceil(maxValue * 0.1) * 10;
@@ -209,11 +217,7 @@ export class LitChartColumn extends BaseElement {
             : `${getProbablyTime(maxValue - valGap * i)}`,
       });
     }
-    if (!this.litChartColumnCfg!.notSort) {
-      this.litChartColumnCfg?.data.sort(
-        (a, b) => b[this.litChartColumnCfg!.yField] - a[this.litChartColumnCfg!.yField]
-      );
-    }
+    this.dataSort();
     this.litChartColumnCfg?.data.forEach((litChartColumnItem, litChartColumnIndex, array) => {
       this.data.push({
         color: this.litChartColumnCfg!.color(litChartColumnItem),
diff --git a/ide/src/base-ui/chart/pagenation/PageNation.ts b/ide/src/base-ui/chart/pagenation/PageNation.ts
index f78ef5db9a3274b81be7d0e347faf00c154ce72f..5c6da0e9b8fa2c8340f924ace127f137cacea61c 100644
--- a/ide/src/base-ui/chart/pagenation/PageNation.ts
+++ b/ide/src/base-ui/chart/pagenation/PageNation.ts
@@ -336,26 +336,7 @@ export class PageNation {
           innerText: number;
         };
       }) => {
-        if (event.target.name === 'first') {
-          if (this.pageInfo.current === 1) return;
-          this.pageInfo.current = 1;
-          this.bindPageHtml();
-        }
-        if (event.target.name === 'prev') {
-          if (this.pageInfo.current === 1) return;
-          this.pageInfo.current--;
-          this.bindPageHtml();
-        }
-        if (event.target.name === 'next') {
-          if (this.pageInfo.current === this.pageInfo.totalpage) return;
-          this.pageInfo.current++;
-          this.bindPageHtml();
-        }
-        if (event.target.name === 'last') {
-          if (this.pageInfo.current === this.pageInfo.totalpage) return;
-          this.pageInfo.current = this.pageInfo.totalpage;
-          this.bindPageHtml();
-        }
+        this.targetName(event);
         if (event.target.name === 'goto') {
           // 拿到你文本的内容
           let page = this.inputBox.value - 0;
@@ -378,4 +359,33 @@ export class PageNation {
       }
     );
   }
+
+  targetName(event:{
+    target: {
+      name: string;
+      dataset: { name: string };
+      innerText: number;
+    };
+  }):void{
+    if (event.target.name === 'first') {
+      if (this.pageInfo.current === 1) return;
+      this.pageInfo.current = 1;
+      this.bindPageHtml();
+    }
+    if (event.target.name === 'prev') {
+      if (this.pageInfo.current === 1) return;
+      this.pageInfo.current--;
+      this.bindPageHtml();
+    }
+    if (event.target.name === 'next') {
+      if (this.pageInfo.current === this.pageInfo.totalpage) return;
+      this.pageInfo.current++;
+      this.bindPageHtml();
+    }
+    if (event.target.name === 'last') {
+      if (this.pageInfo.current === this.pageInfo.totalpage) return;
+      this.pageInfo.current = this.pageInfo.totalpage;
+      this.bindPageHtml();
+    }
+  }
 }
diff --git a/ide/src/base-ui/chart/pie/LitChartPie.ts b/ide/src/base-ui/chart/pie/LitChartPie.ts
index 5910d731476f10cd315ad208a733d0c48d7935ab..ffa1e6c9ca78e511e2831bea45b7519904653d80 100644
--- a/ide/src/base-ui/chart/pie/LitChartPie.ts
+++ b/ide/src/base-ui/chart/pie/LitChartPie.ts
@@ -45,6 +45,97 @@ class Sector {
   };
 }
 
+const initHtmlStyle = `
+    <style>   
+        :host {
+            display: flex;
+            flex-direction: column;
+            overflow: hidden;
+            width: 100%;
+            height: 100%;
+        }
+        .shape.active {
+            animation: color 3.75 both;    
+        }
+        @keyframes color {
+            0% { background-color: white; }
+           100% { background-color: black; }    
+        }
+        #tip{
+            background-color: #f5f5f4;
+            border: 1px solid #fff;
+            border-radius: 5px;
+            color: #333322;
+            font-size: 8pt;
+            position: absolute;
+            display: none;
+            top: 0;
+            left: 0;
+            z-index: 99;
+            pointer-events: none;
+            user-select: none;
+            padding: 5px 10px;
+            box-shadow: 0 0 10px #22ffffff;
+        }
+        #root{
+            position:relative;
+        }
+        .bg_nodata{
+            background-repeat:no-repeat;
+            background-position:center;
+            background-image: url("img/pie_chart_no_data.png");
+        }
+        .bg_hasdata{
+            background-repeat:no-repeat;
+            background-position:center;
+        }
+        
+        #labels{
+            display: grid;
+            grid-template-columns: auto auto auto auto auto;
+            /*justify-content: center;*/
+            /*align-items: center;*/
+            width: 100%;
+            height: 25%;
+            box-sizing: border-box;
+            position: absolute;
+            bottom: 0px;
+            left: 0;
+            /*margin: 0px 10px;*/
+            padding-left: 10px;
+            padding-right: 10px;
+            pointer-events: none    ;
+        }
+        .name{
+            flex: 1;
+            font-size: 9pt;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            /*color: #666;*/
+            color: var(--dark-color1,#252525);
+            pointer-events: painted;
+        }
+        .label{
+            display: flex;
+            align-items: center;
+            max-lines: 1;
+            white-space: nowrap;
+            overflow: hidden;
+            padding-right: 5px;
+        }
+        .tag{
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            width: 10px;
+            height: 10px;
+            border-radius: 5px;
+            margin-right: 5px;
+        }
+        </style>
+    `
+
 @element('lit-chart-pie')
 export class LitChartPie extends BaseElement {
   private eleShape: Element | null | undefined;
@@ -98,10 +189,15 @@ export class LitChartPie extends BaseElement {
     this.render();
   }
 
-  measure() {
-    if (!this.litChartPieConfig) return;
+  measureInitialize():void{
     this.data = [];
     this.radius = (Math.min(this.clientHeight, this.clientWidth) * 0.65) / 2 - 10;
+    this.labelsEL!.textContent = '';
+  }
+
+  measure() {
+    if (!this.litChartPieConfig) return;
+    this.measureInitialize();
     let pieCfg = this.litChartPieConfig!;
     let startAngle = 0;
     let startDegree = 0;
@@ -111,7 +207,6 @@ export class LitChartPie extends BaseElement {
       (previousValue, currentValue) => currentValue[pieCfg.angleField] + previousValue,
       0
     );
-    this.labelsEL!.textContent = '';
     let labelArray: string[] = [];
     this.litChartPieConfig.data.forEach((pieItem, index) => {
       let item: Sector = {
@@ -392,7 +487,7 @@ export class LitChartPie extends BaseElement {
     crossH: number;
   } {
     let cross: boolean;
-    let direction: string;
+    let direction: string = '';
     let crossW: number;
     let crossH: number;
     let maxX = r1.x + r1.w > rect.x + rect.w ? r1.x + r1.w : rect.x + rect.w;
@@ -419,13 +514,7 @@ export class LitChartPie extends BaseElement {
         direction = 'Left-Top';
       }
     } else {
-      if (rect.y > r1.y) {
-        direction = 'Bottom';
-      } else if (rect.y == r1.y) {
-        direction = 'Right'; //superposition default right
-      } else {
-        direction = 'Top';
-      }
+      direction = this.rectSuperposition(rect,r1);
     }
     return {
       cross,
@@ -435,6 +524,16 @@ export class LitChartPie extends BaseElement {
     };
   }
 
+  rectSuperposition(rect: Rectangle,r1: Rectangle):string{
+    if (rect.y > r1.y) {
+      return 'Bottom';
+    } else if (rect.y == r1.y) {
+      return 'Right'; //superposition default right
+    } else {
+      return 'Top';
+    }
+  }
+
   showTip(x: number, y: number, msg: string) {
     this.pieTipEL!.style.display = 'flex';
     this.pieTipEL!.style.top = `${y}px`;
@@ -448,7 +547,7 @@ export class LitChartPie extends BaseElement {
 
   initHtml(): string {
     return `
-        ${this.initHtmlStyle()}
+        ${initHtmlStyle}
         <div id="root">
             <div id="shape" class="shape active"></div>
             <canvas id="canvas" style="top: 0;left: 0;z-index: 21"></canvas>
@@ -456,97 +555,4 @@ export class LitChartPie extends BaseElement {
             <div id="labels"></div>
         </div>`;
   }
-
-  private initHtmlStyle(): string {
-    return `
-    <style>   
-        :host {
-            display: flex;
-            flex-direction: column;
-            overflow: hidden;
-            width: 100%;
-            height: 100%;
-        }
-        .shape.active {
-            animation: color 3.75 both;    
-        }
-        @keyframes color {
-            0% { background-color: white; }
-           100% { background-color: black; }    
-        }
-        #tip{
-            background-color: #f5f5f4;
-            border: 1px solid #fff;
-            border-radius: 5px;
-            color: #333322;
-            font-size: 8pt;
-            position: absolute;
-            display: none;
-            top: 0;
-            left: 0;
-            z-index: 99;
-            pointer-events: none;
-            user-select: none;
-            padding: 5px 10px;
-            box-shadow: 0 0 10px #22ffffff;
-        }
-        #root{
-            position:relative;
-        }
-        .bg_nodata{
-            background-repeat:no-repeat;
-            background-position:center;
-            background-image: url("img/pie_chart_no_data.png");
-        }
-        .bg_hasdata{
-            background-repeat:no-repeat;
-            background-position:center;
-        }
-        
-        #labels{
-            display: grid;
-            grid-template-columns: auto auto auto auto auto;
-            /*justify-content: center;*/
-            /*align-items: center;*/
-            width: 100%;
-            height: 25%;
-            box-sizing: border-box;
-            position: absolute;
-            bottom: 0px;
-            left: 0;
-            /*margin: 0px 10px;*/
-            padding-left: 10px;
-            padding-right: 10px;
-            pointer-events: none    ;
-        }
-        .name{
-            flex: 1;
-            font-size: 9pt;
-            overflow: hidden;
-            white-space: nowrap;
-            text-overflow: ellipsis;
-            /*color: #666;*/
-            color: var(--dark-color1,#252525);
-            pointer-events: painted;
-        }
-        .label{
-            display: flex;
-            align-items: center;
-            max-lines: 1;
-            white-space: nowrap;
-            overflow: hidden;
-            padding-right: 5px;
-        }
-        .tag{
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            width: 10px;
-            height: 10px;
-            border-radius: 5px;
-            margin-right: 5px;
-        }
-        </style>
-    `
-  }
 }
diff --git a/ide/src/base-ui/checkbox/LitCheckBox.ts b/ide/src/base-ui/checkbox/LitCheckBox.ts
index e3ca0ff51866975303381445b9431174306842dd..9a52bf4638513254ea7948a6ab0c30104b1e00c8 100644
--- a/ide/src/base-ui/checkbox/LitCheckBox.ts
+++ b/ide/src/base-ui/checkbox/LitCheckBox.ts
@@ -15,76 +15,9 @@
 
 import { BaseElement, element } from '../BaseElement';
 
-@element('lit-check-box')
-export class LitCheckBox extends BaseElement {
-  private checkbox: HTMLInputElement | undefined;
-
-  static get observedAttributes() {
-    return ['checked', 'value', 'disabled'];
-  }
-
-  set disabled(value) {
-    if (value === null || value === false) {
-      this.removeAttribute('disabled');
-    } else {
-      this.setAttribute('disabled', '');
-    }
-  }
-
-  get indeterminate() {
-    return this.checkbox!.indeterminate;
-  }
-
-  set indeterminate(value) {
-    if (value === null || value === false) {
-      this.checkbox!.indeterminate = false;
-    } else {
-      this.checkbox!.indeterminate = true;
-    }
-  }
-
-  get disabled() {
-    return this.getAttribute('disabled') !== null;
-  }
-
-  get checked() {
-    return this.getAttribute('checked') !== null;
-  }
-
-  set checked(boxCheck: boolean) {
-    if (boxCheck === null || !boxCheck) {
-      this.removeAttribute('checked');
-    } else {
-      this.setAttribute('checked', '');
-    }
-  }
-
-  get value() {
-    return this.getAttribute('value') || '';
-  }
-
-  set value(value: string) {
-    this.setAttribute('value', value);
-  }
-
-  initHtml(): string {
-    return `
-        ${this.initHtmlStyle()}
-        <input type="checkbox" id="checkbox">
-        <label for="checkbox">
-          <span class="chekebox">
-          <lit-icon name="checkmark" class="icon" color="#3391FF" size="15">
-          </lit-icon>
-          </span>
-          <slot id="slot"></slot>
-       </label>
-        `;
-  }
-
-  private initHtmlStyle(): string {
-    return `
+const initHtmlStyle = `
     <style>
-        :host{ 
+        :host{
             display:flex;
             opacity: 0.86;
             font-family: Helvetica;
@@ -124,7 +57,7 @@ export class LitCheckBox extends BaseElement {
             transform:scale(0);
             border-radius: 0.15em;
         }
-        .chekebox{ 
+        .chekebox{
             background:var(--dark-background,#FFFFFF);
         }
         .chekebox::after{
@@ -156,7 +89,72 @@ export class LitCheckBox extends BaseElement {
           pointer-events: none;
         }
         </style>
-    `
+    `;
+
+@element('lit-check-box')
+export class LitCheckBox extends BaseElement {
+  private checkbox: HTMLInputElement | undefined;
+
+  static get observedAttributes() {
+    return ['checked', 'value', 'disabled'];
+  }
+
+  set disabled(value) {
+    if (value === null || value === false) {
+      this.removeAttribute('disabled');
+    } else {
+      this.setAttribute('disabled', '');
+    }
+  }
+
+  get indeterminate() {
+    return this.checkbox!.indeterminate;
+  }
+
+  set indeterminate(value) {
+    if (value === null || value === false) {
+      this.checkbox!.indeterminate = false;
+    } else {
+      this.checkbox!.indeterminate = true;
+    }
+  }
+
+  get disabled() {
+    return this.getAttribute('disabled') !== null;
+  }
+
+  get checked() {
+    return this.getAttribute('checked') !== null;
+  }
+
+  set checked(boxCheck: boolean) {
+    if (boxCheck === null || !boxCheck) {
+      this.removeAttribute('checked');
+    } else {
+      this.setAttribute('checked', '');
+    }
+  }
+
+  get value() {
+    return this.getAttribute('value') || '';
+  }
+
+  set value(value: string) {
+    this.setAttribute('value', value);
+  }
+
+  initHtml(): string {
+    return `
+        ${initHtmlStyle}
+        <input type="checkbox" id="checkbox">
+        <label for="checkbox">
+          <span class="chekebox">
+          <lit-icon name="checkmark" class="icon" color="#3391FF" size="15">
+          </lit-icon>
+          </span>
+          <slot id="slot"></slot>
+       </label>
+        `;
   }
 
   initElements(): void {
diff --git a/ide/src/base-ui/drawer/LitDrawer.ts b/ide/src/base-ui/drawer/LitDrawer.ts
index eefa2c307504def18faa1e2933deb8a70c1c714e..fa9626d5e77420a8722d26bd01e37eadf35f9895 100644
--- a/ide/src/base-ui/drawer/LitDrawer.ts
+++ b/ide/src/base-ui/drawer/LitDrawer.ts
@@ -15,15 +15,9 @@
 
 import { BaseElement, element } from '../BaseElement';
 
-@element('lit-drawer')
-export class LitDrawer extends BaseElement {
-  static get observedAttributes() {
-    return ['title', 'visible', 'placement', 'mask', 'mask-closable', 'closeable', 'content-padding', 'content-width'];
-  }
-
-  initHtml(): string {
-    return `
-        <style>
+const initHtmlStyle = (contentPadding:string, contentWidth:string) => {
+  return `
+  <style>
         :host{
             display: flex;
             position: absolute;
@@ -63,7 +57,7 @@ export class LitDrawer extends BaseElement {
             color: var(--dark-color1,#262626);
          }
          slot{
-            padding: ${this.contentPadding};
+            padding: ${contentPadding};
             display: block;
          }
          :host([visible]) .bg{
@@ -81,7 +75,7 @@ export class LitDrawer extends BaseElement {
          */
          :host(:not([placement])) .drawer,
          :host([placement='right']) .drawer{
-            width: ${this.contentWidth};
+            width: ${contentWidth};
             box-sizing: border-box;
             position: absolute;
             display: flex;
@@ -113,7 +107,7 @@ export class LitDrawer extends BaseElement {
             左边
          */
          :host([placement='left']) .drawer{
-            width: ${this.contentWidth};
+            width: ${contentWidth};
             box-sizing: border-box;
             position: absolute;
             display: flex;
@@ -215,6 +209,18 @@ export class LitDrawer extends BaseElement {
             display: none;
          }
         </style>
+  `;
+}
+
+@element('lit-drawer')
+export class LitDrawer extends BaseElement {
+  static get observedAttributes() {
+    return ['title', 'visible', 'placement', 'mask', 'mask-closable', 'closeable', 'content-padding', 'content-width'];
+  }
+
+  initHtml(): string {
+    return `
+        ${initHtmlStyle(this.contentPadding,this.contentWidth)}
         <div class="bg"></div>
         <div class="drawer">
             <div class="title">
diff --git a/ide/src/base-ui/menu/LitMainMenu.ts b/ide/src/base-ui/menu/LitMainMenu.ts
index 6f6002cc2f3505e4e509fff7bbdbb9d132c76c60..c9f7b4f96862fe06bbe3e028888e2be234ec5864 100644
--- a/ide/src/base-ui/menu/LitMainMenu.ts
+++ b/ide/src/base-ui/menu/LitMainMenu.ts
@@ -19,151 +19,8 @@ import './LitMainMenuGroup';
 import { LitMainMenuGroup } from './LitMainMenuGroup';
 import { LitMainMenuItem } from './LitMainMenuItem';
 
-@element('lit-main-menu')
-export class LitMainMenu extends BaseElement {
-  private slotElements: Element[] | undefined;
-  private _menus: Array<MenuGroup> | undefined;
-
-  static get observedAttributes() {
-    return [];
-  }
-
-  get menus(): Array<MenuGroup> | undefined {
-    return this._menus;
-  }
-
-  set menus(value: Array<MenuGroup> | undefined) {
-    this._menus = value;
-    this.shadowRoot?.querySelectorAll('lit-main-menu-group').forEach((a) => a.remove());
-    let menuBody = this.shadowRoot?.querySelector('.menu-body');
-    if (this.getAttribute('main_menu') === '1' && window.localStorage.getItem('Theme') == 'dark') {
-      this.style.backgroundColor = '#262f3c';
-    } else {
-      this.style.backgroundColor = '#fff';
-    }
-    value?.forEach((it) => {
-      let group = new LitMainMenuGroup();
-      group.setAttribute('title', it.title || '');
-      if (it.describe !== '') {
-        group.setAttribute('describe', it.describe || '');
-      } else {
-        group.removeAttribute('describe');
-      }
-      group.setAttribute('icon', it.icon || '');
-      if (it.collapsed) {
-        group.setAttribute('collapsed', '');
-      } else {
-        group.removeAttribute('collapsed');
-      }
-      let groupName = group!.shadowRoot!.querySelector('.group-name') as LitMainMenuGroup;
-      let groupDescribe = group!.shadowRoot!.querySelector('.group-describe') as LitMainMenuGroup;
-      menuBody?.appendChild(group);
-      it.children?.forEach((item: any) => {
-        if (item.children && item.children.length > 0) {
-          let secondGroup = new LitMainMenuGroup();
-          secondGroup.setAttribute('title', item.title || '');
-          if (item.describe !== '') {
-            secondGroup.setAttribute('describe', item.describe || '');
-          } else {
-            secondGroup.removeAttribute('describe');
-          }
-          secondGroup.setAttribute('icon', item.icon || '');
-          if (item.second) {
-            secondGroup.setAttribute('second', '');
-          } else {
-            secondGroup.removeAttribute('second');
-          }
-          if (item.collapsed) {
-            secondGroup.setAttribute('collapsed', '');
-          } else {
-            secondGroup.removeAttribute('collapsed');
-          }
-          group?.appendChild(secondGroup);
-          item.children?.forEach((v: any) => {
-            let th = new LitMainMenuItem();
-            th.setAttribute('icon', v.icon || '');
-            th.setAttribute('title', v.title || '');
-            if (this.getAttribute('main_menu') === '1' && window.localStorage.getItem('Theme') === 'dark') {
-              groupName.style.color = 'white';
-              groupDescribe.style.color = 'white';
-              th!.style.color = 'white';
-            } else {
-              groupName.style.color = 'black';
-              groupDescribe.style.color = 'black';
-              th!.style.color = 'black';
-            }
-            if (v.fileChoose) {
-              th.setAttribute('file', '');
-              th.addEventListener('file-change', (e) => {
-                if (v.fileHandler && !th.disabled) {
-                  v.fileHandler(e);
-                }
-              });
-            } else {
-              th.removeAttribute('file');
-              th.addEventListener('click', (e) => {
-                if (v.clickHandler && !th.disabled) {
-                  v.clickHandler(v);
-                }
-              });
-            }
-            if (v.disabled != undefined) {
-              th.disabled = v.disabled;
-            }
-            secondGroup.appendChild(th);
-          });
-        } else {
-          let th = new LitMainMenuItem();
-          th.setAttribute('icon', item.icon || '');
-          th.setAttribute('title', item.title || '');
-          if (this.getAttribute('main_menu') === '1' && window.localStorage.getItem('Theme') === 'dark') {
-            groupName.style.color = 'white';
-            groupDescribe.style.color = 'white';
-            th!.style.color = 'white';
-          } else {
-            groupName.style.color = 'black';
-            groupDescribe.style.color = 'black';
-            th!.style.color = 'black';
-          }
-          if (item.fileChoose) {
-            th.setAttribute('file', '');
-            th.addEventListener('file-change', (e) => {
-              if (item.fileHandler && !th.disabled) {
-                item.fileHandler(e);
-              }
-            });
-          } else {
-            th.removeAttribute('file');
-            th.addEventListener('click', (e) => {
-              if (item.clickHandler && !th.disabled) {
-                item.clickHandler(item);
-              }
-            });
-          }
-          if (item.disabled != undefined) {
-            th.disabled = item.disabled;
-          }
-          group?.appendChild(th);
-        }
-      });
-    });
-  }
-
-  initElements(): void {
-    let st: HTMLSlotElement | null | undefined = this.shadowRoot?.querySelector('#st');
-    st?.addEventListener('slotchange', (e) => {
-      this.slotElements = st?.assignedElements();
-      this.slotElements?.forEach((it) => {
-        it.querySelectorAll('lit-main-menu-item').forEach((cell) => {});
-      });
-    });
-    let versionDiv: HTMLElement | null | undefined = this.shadowRoot?.querySelector<HTMLElement>('.version');
-    versionDiv!.innerText = (window as any).version || '';
-  }
-
-  initHtml(): string {
-    return `
-        <style>
+const initHtmlStyle:string = `
+    <style>
         :host{
             width: 248px;
             height: 100vh;
@@ -230,6 +87,161 @@ export class LitMainMenu extends BaseElement {
             width: 48px;
         }
         </style>
+    `;
+
+@element('lit-main-menu')
+export class LitMainMenu extends BaseElement {
+  private slotElements: Element[] | undefined;
+  private _menus: Array<MenuGroup> | undefined;
+
+  static get observedAttributes() {
+    return [];
+  }
+
+  get menus(): Array<MenuGroup> | undefined {
+    return this._menus;
+  }
+
+  set menus(value: Array<MenuGroup> | undefined) {
+    this._menus = value;
+    this.shadowRoot?.querySelectorAll('lit-main-menu-group').forEach((a) => a.remove());
+    let menuBody = this.shadowRoot?.querySelector('.menu-body');
+    if (this.getAttribute('main_menu') === '1' && window.localStorage.getItem('Theme') == 'dark') {
+      this.style.backgroundColor = '#262f3c';
+    } else {
+      this.style.backgroundColor = '#fff';
+    }
+    value?.forEach((it) => {
+      let group: LitMainMenuGroup = new LitMainMenuGroup();
+      group.setAttribute('title', it.title || '');
+      if (it.describe !== '') {
+        group.setAttribute('describe', it.describe || '');
+      } else {
+        group.removeAttribute('describe');
+      }
+      group.setAttribute('icon', it.icon || '');
+      if (it.collapsed) {
+        group.setAttribute('collapsed', '');
+      } else {
+        group.removeAttribute('collapsed');
+      }
+      let groupName: LitMainMenuGroup = group!.shadowRoot!.querySelector('.group-name') as LitMainMenuGroup;
+      let groupDescribe: LitMainMenuGroup = group!.shadowRoot!.querySelector('.group-describe') as LitMainMenuGroup;
+      menuBody?.appendChild(group);
+      it.children?.forEach((item: any) => {
+        if (item.children && item.children.length > 0) {
+          let secondGroup: LitMainMenuGroup = new LitMainMenuGroup();
+          secondGroup.setAttribute('title', item.title || '');
+          if (item.describe !== '') {
+            secondGroup.setAttribute('describe', item.describe || '');
+          } else {
+            secondGroup.removeAttribute('describe');
+          }
+          this.setChildren(item,group,groupName,groupDescribe,secondGroup);
+        } else {
+          this.notChildren(item,group,groupName,groupDescribe);
+        }
+      });
+    });
+  }
+
+  setChildren(item:any,group: LitMainMenuGroup,groupName: LitMainMenuGroup,groupDescribe: LitMainMenuGroup,secondGroup: LitMainMenuGroup):void{
+    secondGroup.setAttribute('icon', item.icon || '');
+    if (item.second) {
+      secondGroup.setAttribute('second', '');
+    } else {
+      secondGroup.removeAttribute('second');
+    }
+    if (item.collapsed) {
+      secondGroup.setAttribute('collapsed', '');
+    } else {
+      secondGroup.removeAttribute('collapsed');
+    }
+    group?.appendChild(secondGroup);
+    item.children?.forEach((v: any) => {
+      let th = new LitMainMenuItem();
+      th.setAttribute('icon', v.icon || '');
+      th.setAttribute('title', v.title || '');
+      if (this.getAttribute('main_menu') === '1' && window.localStorage.getItem('Theme') === 'dark') {
+        groupName.style.color = 'white';
+        groupDescribe.style.color = 'white';
+        th!.style.color = 'white';
+      } else {
+        groupName.style.color = 'black';
+        groupDescribe.style.color = 'black';
+        th!.style.color = 'black';
+      }
+      if (v.fileChoose) {
+        th.setAttribute('file', '');
+        th.addEventListener('file-change', (e) => {
+          if (v.fileHandler && !th.disabled) {
+            v.fileHandler(e);
+          }
+        });
+      } else {
+        th.removeAttribute('file');
+        th.addEventListener('click', (e) => {
+          if (v.clickHandler && !th.disabled) {
+            v.clickHandler(v);
+          }
+        });
+      }
+      if (v.disabled != undefined) {
+        th.disabled = v.disabled;
+      }
+      secondGroup.appendChild(th);
+    });
+  }
+
+  notChildren(item:any,group: LitMainMenuGroup,groupName: LitMainMenuGroup,groupDescribe: LitMainMenuGroup):void{
+    let th = new LitMainMenuItem();
+    th.setAttribute('icon', item.icon || '');
+    th.setAttribute('title', item.title || '');
+    if (this.getAttribute('main_menu') === '1' && window.localStorage.getItem('Theme') === 'dark') {
+      groupName.style.color = 'white';
+      groupDescribe.style.color = 'white';
+      th!.style.color = 'white';
+    } else {
+      groupName.style.color = 'black';
+      groupDescribe.style.color = 'black';
+      th!.style.color = 'black';
+    }
+    if (item.fileChoose) {
+      th.setAttribute('file', '');
+      th.addEventListener('file-change', (e) => {
+        if (item.fileHandler && !th.disabled) {
+          item.fileHandler(e);
+        }
+      });
+    } else {
+      th.removeAttribute('file');
+      th.addEventListener('click', (e) => {
+        if (item.clickHandler && !th.disabled) {
+          item.clickHandler(item);
+        }
+      });
+    }
+    if (item.disabled != undefined) {
+      th.disabled = item.disabled;
+    }
+    group?.appendChild(th);
+  }
+
+  initElements(): void {
+    let st: HTMLSlotElement | null | undefined = this.shadowRoot?.querySelector('#st');
+    st?.addEventListener('slotchange', (e) => {
+      this.slotElements = st?.assignedElements();
+      this.slotElements?.forEach((it) => {
+        it.querySelectorAll('lit-main-menu-item').forEach((cell) => {});
+      });
+    });
+    let versionDiv: HTMLElement | null | undefined = this.shadowRoot?.querySelector<HTMLElement>('.version');
+    versionDiv!.innerText = (window as any).version || '';
+  }
+
+  initHtml(): string {
+    return `
+        ${initHtmlStyle}
         <div class="header" name="header">
             <img src="img/logo.png"/>
                 <div class="menu-button">
diff --git a/ide/src/base-ui/menu/LitMainMenuGroup.ts b/ide/src/base-ui/menu/LitMainMenuGroup.ts
index 7c5eeefb1f79e65fe1c9e88362fc7270fcf5d590..17622b31b4ff41326f0b0b14ca80596173529679 100644
--- a/ide/src/base-ui/menu/LitMainMenuGroup.ts
+++ b/ide/src/base-ui/menu/LitMainMenuGroup.ts
@@ -15,74 +15,8 @@
 
 import { BaseElement, element } from '../BaseElement';
 
-@element('lit-main-menu-group')
-export class LitMainMenuGroup extends BaseElement {
-  protected _collapsed: boolean | undefined;
-  private groupNameEl: HTMLElement | null | undefined;
-  private groupDescEl: HTMLElement | null | undefined;
-  private group: HTMLElement | null | undefined;
-  private iconEl: HTMLElement | null | undefined;
-
-  static get observedAttributes() {
-    return ['title', 'describe', 'collapsed', 'nocollapse', 'radius', 'second', 'icon'];
-  }
-
-  get second() {
-    return this.hasAttribute('second');
-  }
-
-  set second(value: boolean) {
-    if (value) {
-      this.setAttribute('second', '');
-    } else {
-      this.removeAttribute('second');
-    }
-  }
-
-  get collapsed(): boolean {
-    return this.hasAttribute('collapsed');
-  }
-
-  set collapsed(value: boolean) {
-    if (value) {
-      this.setAttribute('collapsed', '');
-    } else {
-      this.removeAttribute('collapsed');
-    }
-  }
-
-  get nocollapsed() {
-    return this.hasAttribute('nocollapsed');
-  }
-
-  set nocollapsed(value: boolean) {
-    if (value) {
-      this.setAttribute('nocollapsed', '');
-    } else {
-      this.removeAttribute('nocollapsed');
-    }
-  }
-
-  get radius() {
-    return this.hasAttribute('radius');
-  }
-
-  initElements(): void {
-    this.groupNameEl = this.shadowRoot?.querySelector('.group-title');
-    this.groupDescEl = this.shadowRoot?.querySelector('.group-describe');
-    this.iconEl = this.shadowRoot?.querySelector('.icon');
-    this.group = this.shadowRoot?.querySelector('#group');
-    this.group!.addEventListener('click', (e) => {
-      if (this.nocollapsed) {
-        return;
-      }
-      this.collapsed = !this.collapsed;
-    });
-  }
-
-  initHtml(): string {
-    return `
-        <style>
+const initHtmlStyle:string = `
+    <style>
         :host(:not([collapsed])){ 
             width: 248px;
             display: flex;
@@ -156,6 +90,76 @@ export class LitMainMenuGroup extends BaseElement {
           transform: rotateZ(-90deg);
         }
         </style>
+    `;
+
+@element('lit-main-menu-group')
+export class LitMainMenuGroup extends BaseElement {
+  protected _collapsed: boolean | undefined;
+  private groupNameEl: HTMLElement | null | undefined;
+  private groupDescEl: HTMLElement | null | undefined;
+  private group: HTMLElement | null | undefined;
+  private iconEl: HTMLElement | null | undefined;
+
+  static get observedAttributes() {
+    return ['title', 'describe', 'collapsed', 'nocollapse', 'radius', 'second', 'icon'];
+  }
+
+  get second() {
+    return this.hasAttribute('second');
+  }
+
+  set second(value: boolean) {
+    if (value) {
+      this.setAttribute('second', '');
+    } else {
+      this.removeAttribute('second');
+    }
+  }
+
+  get collapsed(): boolean {
+    return this.hasAttribute('collapsed');
+  }
+
+  set collapsed(value: boolean) {
+    if (value) {
+      this.setAttribute('collapsed', '');
+    } else {
+      this.removeAttribute('collapsed');
+    }
+  }
+
+  get nocollapsed() {
+    return this.hasAttribute('nocollapsed');
+  }
+
+  set nocollapsed(value: boolean) {
+    if (value) {
+      this.setAttribute('nocollapsed', '');
+    } else {
+      this.removeAttribute('nocollapsed');
+    }
+  }
+
+  get radius() {
+    return this.hasAttribute('radius');
+  }
+
+  initElements(): void {
+    this.groupNameEl = this.shadowRoot?.querySelector('.group-title');
+    this.groupDescEl = this.shadowRoot?.querySelector('.group-describe');
+    this.iconEl = this.shadowRoot?.querySelector('.icon');
+    this.group = this.shadowRoot?.querySelector('#group');
+    this.group!.addEventListener('click', (e) => {
+      if (this.nocollapsed) {
+        return;
+      }
+      this.collapsed = !this.collapsed;
+    });
+  }
+
+  initHtml(): string {
+    return `
+        ${initHtmlStyle}
         <div id="group">
         <div class="group-name">
           <lit-icon class="icon" name="user" size="20"></lit-icon>
diff --git a/ide/src/base-ui/menu/LitMainMenuItem.ts b/ide/src/base-ui/menu/LitMainMenuItem.ts
index fb8939516248865bf2e55dc197201e789e0ed595..15ed602c6b2b7a892b29822d5adb81dcb8cd4596 100644
--- a/ide/src/base-ui/menu/LitMainMenuItem.ts
+++ b/ide/src/base-ui/menu/LitMainMenuItem.ts
@@ -15,6 +15,74 @@
 
 import { BaseElement, element } from '../BaseElement';
 
+const initHtmlStyle:string = `
+    <style>
+            :host{
+                user-select: none;
+                display: flex;
+                font-family: Helvetica;
+                font-size: 14px;
+                color: #000;
+                text-align: left;
+                line-height: 20px;
+                font-weight: 400
+                background-color: #FFFFFF;
+                transition: background-color .3s;
+            }
+            :host(:not([disabled]):hover){
+                display: flex;
+                background-color: var(--dark-background8,#6C9BFA);
+                color: #FFFFFF;
+                cursor: pointer;
+            }
+            :host([disabled]:hover){
+                display: flex;
+                /*background-color:#3391FF;*/
+                /*color: #FFFFFF;*/
+                cursor:not-allowed;
+            }
+            :host([disabled]) .root{
+                cursor:not-allowed;
+                display: flex;
+                align-items: center;
+                padding: 10px 24px;
+                width: 100%;
+            }
+            :host(:not([disabled])) .root{
+                cursor:pointer;
+                display: flex;
+                align-items: center;
+                padding: 10px 24px;
+                width: 100%;
+            }
+            .name{
+                padding-left: 10px;
+                cursor: pointer;
+                overflow-wrap: anywhere;
+            }
+            .icon{
+                pointer-events: none;
+            }
+            :host(:not([file])) .name{
+                pointer-events: none;
+            }
+            :host(:not([file])) .root{
+                pointer-events: none;
+            }
+            :host([file]) .name{
+                pointer-events: none;
+            }
+            :host([file]) .icon{
+                pointer-events: none;
+            }
+            
+            :host([back]) {
+                background-color: var(--dark-background8,#6C9BFA);
+            } 
+            
+        </style>
+    `;
+
 @element('lit-main-menu-item')
 export class LitMainMenuItem extends BaseElement {
   private titleEl: HTMLElement | null | undefined;
@@ -115,71 +183,7 @@ export class LitMainMenuItem extends BaseElement {
 
   initHtml(): string {
     return `
-        <style>
-            :host{
-                user-select: none;
-                display: flex;
-                font-family: Helvetica;
-                font-size: 14px;
-                color: #000;
-                text-align: left;
-                line-height: 20px;
-                font-weight: 400
-                background-color: #FFFFFF;
-                transition: background-color .3s;
-            }
-            :host(:not([disabled]):hover){
-                display: flex;
-                background-color: var(--dark-background8,#6C9BFA);
-                color: #FFFFFF;
-                cursor: pointer;
-            }
-            :host([disabled]:hover){
-                display: flex;
-                /*background-color:#3391FF;*/
-                /*color: #FFFFFF;*/
-                cursor:not-allowed;
-            }
-            :host([disabled]) .root{
-                cursor:not-allowed;
-                display: flex;
-                align-items: center;
-                padding: 10px 24px;
-                width: 100%;
-            }
-            :host(:not([disabled])) .root{
-                cursor:pointer;
-                display: flex;
-                align-items: center;
-                padding: 10px 24px;
-                width: 100%;
-            }
-            .name{
-                padding-left: 10px;
-                cursor: pointer;
-                overflow-wrap: anywhere;
-            }
-            .icon{
-                pointer-events: none;
-            }
-            :host(:not([file])) .name{
-                pointer-events: none;
-            }
-            :host(:not([file])) .root{
-                pointer-events: none;
-            }
-            :host([file]) .name{
-                pointer-events: none;
-            }
-            :host([file]) .icon{
-                pointer-events: none;
-            }
-            
-            :host([back]) {
-                background-color: var(--dark-background8,#6C9BFA);
-            } 
-            
-        </style>
+        ${initHtmlStyle}
         <input id="file" class="file" type="file" style="display:none;pointer-events: none" />
         <label class="root" for="file">
             <lit-icon class="icon" name="user" size="20"></lit-icon>
diff --git a/ide/src/base-ui/modal/LitModal.ts b/ide/src/base-ui/modal/LitModal.ts
index 7bdca3eaf3b32a3825b47f51e22d153e41acfad7..27eb5f183f971524c09f33f12dbd2792a97413e2 100644
--- a/ide/src/base-ui/modal/LitModal.ts
+++ b/ide/src/base-ui/modal/LitModal.ts
@@ -15,6 +15,111 @@
 
 import { BaseElement, element } from '../BaseElement';
 
+const initHtmlStyle = (width:string) => {
+  return `
+  <style>
+        :host{ 
+            display: flex;
+            position: absolute;
+            left: 0;
+            right: 0;
+            top: 0;
+            bottom: 0px;
+            z-index: 1000;
+            overflow: auto;
+            transition: all 0.3s;
+        }
+        :host([visible]){
+            background-color: #00000066;
+            transition: all .3s;
+            opacity: 1;
+            visibility: visible;
+        }
+        :host(:not([visible])){
+            pointer-events: none;
+            transition: all .3s;
+            opacity: 0;
+            visibility: hidden;
+        }
+       
+        .modal{
+            width: ${width};
+            position: absolute;
+            display: flex;
+            flex-direction: column;
+            overflow: auto;
+            background-color: #fff;
+            top: 100px;
+            left: 50%;
+            right: auto;
+            transform-origin: left top;
+            pointer-events: all;
+            border-radius: 2px;
+        }
+        :host(:not([visible])) .modal{
+            transition: transform .3s , opacity .3s,visibility .3s;
+            opacity: 0;
+            transform:scale(0.1) translate(-50%,50%) translateZ(0) skew(0deg);
+            visibility: hidden;
+         }
+         :host([visible]) .modal{
+            transition: transform .3s , opacity .3s ,visibility .3s;
+            opacity: 1;
+            transform: scale(1) translate(-50%,0%) translateZ(0) skew(0deg);
+            visibility: visible;
+            box-shadow: 0 0 20px #00000055;
+         }
+        .header{
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            padding: 15px 20px;
+            font-size: 17px;
+            font-weight: bold;
+        }
+        :host([moveable]) .header label{
+            pointer-events: none;
+        }
+        :host([moveable]) .header:hover{
+            background-color: #8c8c8c11;
+        }
+        :host([moveable]) .header{
+            /*cursor: move;*/
+        }
+        .close-icon{
+            color:#8c8c8c;
+            cursor: pointer;
+        }
+        .close-icon:hover{
+            color: #414141;
+        }
+        .footer{
+            display: flex;
+            align-items: center;
+            justify-content: flex-end;
+            padding: 8px 8px;
+        }
+        .footer lit-button{
+            min-width: 70px;
+            margin-right: 10px;
+            cursor: pointer;
+        }
+        :host([line=false]){
+            padding: 10px 20px;
+            flex:1;
+        }
+        :host([line=true]) .body,
+        :host(:not([line])) .body{
+            border-top: 1px solid #f0f0f0;
+            border-bottom: 1px solid #f0f0f0;
+            padding: 10px 20px;
+            flex:1;
+        }
+       
+        </style>
+  `;
+}
+
 @element('lit-modal')
 export class LitModal extends BaseElement {
   private headerTitleElement: HTMLElement | null | undefined;
@@ -123,7 +228,7 @@ export class LitModal extends BaseElement {
 
   initHtml(): string {
     return `
-        ${this.initHtmlStyle()}
+        ${initHtmlStyle(this.width)}
         <div class="modal" title="">
             <div class="header">
                 <label id="modal-title"></label>
@@ -142,111 +247,6 @@ export class LitModal extends BaseElement {
         `;
   }
 
-  private initHtmlStyle(): string {
-    return `
-    <style>
-        :host{ 
-            display: flex;
-            position: absolute;
-            left: 0;
-            right: 0;
-            top: 0;
-            bottom: 0px;
-            z-index: 1000;
-            overflow: auto;
-            transition: all 0.3s;
-        }
-        :host([visible]){
-            background-color: #00000066;
-            transition: all .3s;
-            opacity: 1;
-            visibility: visible;
-        }
-        :host(:not([visible])){
-            pointer-events: none;
-            transition: all .3s;
-            opacity: 0;
-            visibility: hidden;
-        }
-       
-        .modal{
-            width: ${this.width};
-            position: absolute;
-            display: flex;
-            flex-direction: column;
-            overflow: auto;
-            background-color: #fff;
-            top: 100px;
-            left: 50%;
-            right: auto;
-            transform-origin: left top;
-            pointer-events: all;
-            border-radius: 2px;
-        }
-        :host(:not([visible])) .modal{
-            transition: transform .3s , opacity .3s,visibility .3s;
-            opacity: 0;
-            transform:scale(0.1) translate(-50%,50%) translateZ(0) skew(0deg);
-            visibility: hidden;
-         }
-         :host([visible]) .modal{
-            transition: transform .3s , opacity .3s ,visibility .3s;
-            opacity: 1;
-            transform: scale(1) translate(-50%,0%) translateZ(0) skew(0deg);
-            visibility: visible;
-            box-shadow: 0 0 20px #00000055;
-         }
-        .header{
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            padding: 15px 20px;
-            font-size: 17px;
-            font-weight: bold;
-        }
-        :host([moveable]) .header label{
-            pointer-events: none;
-        }
-        :host([moveable]) .header:hover{
-            background-color: #8c8c8c11;
-        }
-        :host([moveable]) .header{
-            /*cursor: move;*/
-        }
-        .close-icon{
-            color:#8c8c8c;
-            cursor: pointer;
-        }
-        .close-icon:hover{
-            color: #414141;
-        }
-        .footer{
-            display: flex;
-            align-items: center;
-            justify-content: flex-end;
-            padding: 8px 8px;
-        }
-        .footer lit-button{
-            min-width: 70px;
-            margin-right: 10px;
-            cursor: pointer;
-        }
-        :host([line=false]){
-            padding: 10px 20px;
-            flex:1;
-        }
-        :host([line=true]) .body,
-        :host(:not([line])) .body{
-            border-top: 1px solid #f0f0f0;
-            border-bottom: 1px solid #f0f0f0;
-            padding: 10px 20px;
-            flex:1;
-        }
-       
-        </style>
-    `
-  }
-
   //当 custom element首次被插入文档DOM时，被调用。
   initElements(): void {
     this.headerTitleElement = this.shadowRoot!.querySelector<HTMLDivElement>('#modal-title');
@@ -277,7 +277,7 @@ export class LitModal extends BaseElement {
         this.onmousemoveFunc = (e: any) => {
           e.stopPropagation();
           srcResizeRect = this.modalElement!.getBoundingClientRect();
-          this.onmousemoveFuncRule(direction,e,srcResizeRect,resizeWidth);
+          direction = this.onmousemoveFuncRule(direction,e,srcResizeRect,resizeWidth);
           this.resizingFunc(direction,e,srcResizeClientX,srcResizeClientY,srcResizeHeight,srcResizeWidth,srcResizeLeft,srcResizeTop);
         };
         this.setOnmousedownFunc(resizeWidth,srcResizeClientX,srcResizeClientY,srcResizeRect,srcResizeHeight,srcResizeWidth,srcResizeRight,srcResizeLeft,srcResizeTop);
@@ -398,7 +398,7 @@ export class LitModal extends BaseElement {
     };
   }
 
-  onmousemoveFuncRule(direction:string,e:any,srcResizeRect:any,resizeWidth:number):void{
+  onmousemoveFuncRule(direction:string,e:any,srcResizeRect:any,resizeWidth:number):string{
     if (
       e.clientX > srcResizeRect.left - resizeWidth &&
       e.clientX < srcResizeRect.left + resizeWidth &&
@@ -406,7 +406,7 @@ export class LitModal extends BaseElement {
       e.clientY < srcResizeRect.top + resizeWidth
     ) {
       this.style.cursor = 'nwse-resize';
-      if (!this.resizing) direction = 'left-top';
+      if (!this.resizing) return 'left-top';
     } else if (
       e.clientX > srcResizeRect.right - resizeWidth &&
       e.clientX < srcResizeRect.right + resizeWidth &&
@@ -414,7 +414,7 @@ export class LitModal extends BaseElement {
       e.clientY < srcResizeRect.top + resizeWidth
     ) {
       this.style.cursor = 'nesw-resize';
-      if (!this.resizing) direction = 'right-top';
+      if (!this.resizing) return 'right-top';
     } else if (
       e.clientX > srcResizeRect.left - resizeWidth &&
       e.clientX < srcResizeRect.left + resizeWidth &&
@@ -422,31 +422,39 @@ export class LitModal extends BaseElement {
       e.clientY < srcResizeRect.bottom + resizeWidth
     ) {
       this.style.cursor = 'nesw-resize';
-      if (!this.resizing) direction = 'left-bottom';
-    } else if (
+      if (!this.resizing) return 'left-bottom';
+    } else {
+      return this.funcRuleIf(direction,e,srcResizeRect,resizeWidth);
+    }
+    return ''
+  }
+
+  funcRuleIf(direction:string,e:any,srcResizeRect:any,resizeWidth:number):string{
+    if (
       e.clientX > srcResizeRect.right - resizeWidth &&
       e.clientX < srcResizeRect.right + resizeWidth &&
       e.clientY > srcResizeRect.bottom - resizeWidth &&
       e.clientY < srcResizeRect.bottom + resizeWidth
     ) {
       this.style.cursor = 'nwse-resize';
-      if (!this.resizing) direction = 'right-bottom';
+      if (!this.resizing) return 'right-bottom';
     } else if (e.clientX > srcResizeRect.left - resizeWidth && e.clientX < srcResizeRect.left + resizeWidth) {
       this.style.cursor = 'ew-resize';
-      if (!this.resizing) direction = 'left';
+      if (!this.resizing) return 'left';
     } else if (e.clientX < srcResizeRect.right + resizeWidth && e.clientX > srcResizeRect.right - resizeWidth) {
       this.style.cursor = 'ew-resize';
-      if (!this.resizing) direction = 'right';
+      if (!this.resizing) return 'right';
     } else if (e.clientY > srcResizeRect.top - resizeWidth && e.clientY < srcResizeRect.top + resizeWidth) {
       this.style.cursor = 'ns-resize';
-      if (!this.resizing) direction = 'top';
+      if (!this.resizing) return 'top';
     } else if (e.clientY < srcResizeRect.bottom + resizeWidth && e.clientY > srcResizeRect.bottom - resizeWidth) {
       this.style.cursor = 'ns-resize';
-      if (!this.resizing) direction = 'bottom';
+      if (!this.resizing) return 'bottom';
     } else {
       this.style.cursor = '';
-      if (!this.resizing) direction = '';
+      if (!this.resizing) return '';
     }
+    return '';
   }
 
   resizingFunc(direction:string,e:any,srcResizeClientX:number,srcResizeClientY:number,srcResizeHeight:number,srcResizeWidth:number,srcResizeLeft:number,srcResizeTop:number):void{
@@ -524,21 +532,27 @@ export class LitModal extends BaseElement {
         e.clientY < srcResizeRect.bottom + resizeWidth
       ) {
         this.resizing = true;
-      } else if (e.clientX > srcResizeRect.left - resizeWidth && e.clientX < srcResizeRect.left + resizeWidth) {
-        this.resizing = true;
-      } else if (e.clientX < srcResizeRect.right + resizeWidth && e.clientX > srcResizeRect.right - resizeWidth) {
-        this.resizing = true;
-      } else if (e.clientY > srcResizeRect.top - resizeWidth && e.clientY < srcResizeRect.top + resizeWidth) {
-        this.resizing = true;
-      } else if (e.clientY < srcResizeRect.bottom + resizeWidth && e.clientY > srcResizeRect.bottom - resizeWidth) {
-        this.resizing = true;
       } else {
-        this.resizing = false;
+        this.resizeIf(e,srcResizeRect,resizeWidth);
       }
       if (this.resizing) document.body.style.userSelect = 'none';
     };
   }
 
+  resizeIf(e:any,srcResizeRect:any,resizeWidth:number){
+    if (e.clientX > srcResizeRect.left - resizeWidth && e.clientX < srcResizeRect.left + resizeWidth) {
+      this.resizing = true;
+    } else if (e.clientX < srcResizeRect.right + resizeWidth && e.clientX > srcResizeRect.right - resizeWidth) {
+      this.resizing = true;
+    } else if (e.clientY > srcResizeRect.top - resizeWidth && e.clientY < srcResizeRect.top + resizeWidth) {
+      this.resizing = true;
+    } else if (e.clientY < srcResizeRect.bottom + resizeWidth && e.clientY > srcResizeRect.bottom - resizeWidth) {
+      this.resizing = true;
+    } else {
+      this.resizing = false;
+    }
+  }
+
   //当 custom element从文档DOM中删除时，被调用。
   disconnectedCallback() {}
 
diff --git a/ide/src/base-ui/popover/LitPopover.ts b/ide/src/base-ui/popover/LitPopover.ts
index 1413e2f56f27cf9f86d3a72d1f75f50ff068ff1a..e94be29043e2302185a05dc047215921cda28425 100644
--- a/ide/src/base-ui/popover/LitPopover.ts
+++ b/ide/src/base-ui/popover/LitPopover.ts
@@ -22,136 +22,8 @@ import { LitCheckBox } from '../checkbox/LitCheckBox';
 import { LitCheckGroup } from '../checkbox/LitCheckGroup';
 import { LitCheckBoxWithText } from '../checkbox/LitCheckBoxWithText';
 
-@element('lit-popover')
-export class LitPopover extends BaseElement {
-  private popContent: LitPopContent | null | undefined;
-  private litGroup: LitRadioGroup | LitCheckGroup | undefined;
-  private _texBox: LitCheckBoxWithText | undefined;
-
-  static get observedAttributes() {
-    return [];
-  }
-
-  get type() {
-    return this.getAttribute('type') || '';
-  }
-
-  set type(type: string) {
-    this.setAttribute('type', type);
-  }
-
-  get title() {
-    return this.getAttribute('title') || '';
-  }
-
-  set title(title: string) {
-    this.setAttribute('title', title);
-  }
-
-  get limit(): LimitText {
-    if (this._texBox?.checked) {
-      return {
-        textLowerLimit: this._texBox.lowerLimit,
-        textUpperLimit: this._texBox.upLimit,
-      };
-    }
-    return { textLowerLimit: '', textUpperLimit: '' };
-  }
-
-  set dataSource(dataSource: Array<SelectBean>) {
-    this.popContent = this.querySelector<LitPopContent>('lit-pop-content');
-    if (!this.popContent) {
-      this.popContent = new LitPopContent();
-      this.appendChild(this.popContent);
-    }
-    switch (this.type) {
-      case 'multiple':
-        this.litGroup = new LitCheckGroup();
-        this.litGroup.setAttribute('layout', 'dispersion');
-        this.popContent!.appendChild(this.litGroup);
-        dataSource.forEach((data) => {
-          let litCheckBox = new LitCheckBox();
-          this.litGroup?.appendChild(litCheckBox);
-          if (data.isSelected) {
-            litCheckBox.setAttribute('checked', 'true');
-          }
-          litCheckBox.setAttribute('value', data.text);
-        });
-        break;
-      case 'radio':
-        this.litGroup = new LitRadioGroup();
-        if (this.title !== '') {
-          let title = new LitPopoverTitle();
-          title.setAttribute('title', this.title || '');
-          this.popContent!.appendChild(title);
-          this.litGroup.setAttribute('layout', 'compact');
-        } else {
-          this.litGroup.setAttribute('layout', 'dispersion');
-        }
-        this.popContent!.appendChild(this.litGroup);
-        dataSource.forEach((data) => {
-          let litRadioBox = new LitRadioBox();
-          if (this.title == '') {
-            litRadioBox.setAttribute('dis', 'round');
-          } else {
-            litRadioBox.setAttribute('dis', 'check');
-          }
-          if (data.isSelected) {
-            litRadioBox.setAttribute('checked', 'true');
-          }
-          this.litGroup?.appendChild(litRadioBox);
-          litRadioBox.setAttribute('value', data.text);
-        });
-        break;
-      case 'multiple-text':
-        dataSource.forEach((data) => {
-          this._texBox = new LitCheckBoxWithText();
-          this._texBox.setAttribute('text', data.text);
-          this._texBox.setAttribute('checked', '');
-          this.popContent!.appendChild(this._texBox);
-        });
-        break;
-      case 'data-ming':
-        break;
-    }
-  }
-
-  get select(): Array<string> | undefined {
-    if (this._texBox?.checked) {
-      return [this._texBox!.text];
-    }
-    return this.litGroup?.value;
-  }
-
-  get trigger() {
-    return this.getAttribute('trigger');
-  }
-
-  get direction() {
-    return this.getAttribute('direction') || 'topright';
-  }
-
-  set direction(value: string) {
-    this.setAttribute('direction', value);
-  }
-
-  get open() {
-    return this.getAttribute('open') !== null;
-  }
-
-  set open(value: boolean) {
-    if (value === null || value === false) {
-      this.removeAttribute('open');
-    } else {
-      this.setAttribute('open', '');
-    }
-  }
-
-  initElements(): void {}
-
-  initHtml(): string {
-    return `
-        <style>
+const initHtmlStyle = `
+    <style>
         :host {
             display:inline-block;
             position:relative;
@@ -419,6 +291,142 @@ export class LitPopover extends BaseElement {
         slot{
         }
         </style>
+    `;
+
+@element('lit-popover')
+export class LitPopover extends BaseElement {
+  private popContent: LitPopContent | null | undefined;
+  private litGroup: LitRadioGroup | LitCheckGroup | undefined;
+  private _texBox: LitCheckBoxWithText | undefined;
+
+  static get observedAttributes() {
+    return [];
+  }
+
+  get type() {
+    return this.getAttribute('type') || '';
+  }
+
+  set type(type: string) {
+    this.setAttribute('type', type);
+  }
+
+  get title() {
+    return this.getAttribute('title') || '';
+  }
+
+  set title(title: string) {
+    this.setAttribute('title', title);
+  }
+
+  get limit(): LimitText {
+    if (this._texBox?.checked) {
+      return {
+        textLowerLimit: this._texBox.lowerLimit,
+        textUpperLimit: this._texBox.upLimit,
+      };
+    }
+    return { textLowerLimit: '', textUpperLimit: '' };
+  }
+
+  set dataSource(dataSource: Array<SelectBean>) {
+    this.popContent = this.querySelector<LitPopContent>('lit-pop-content');
+    if (!this.popContent) {
+      this.popContent = new LitPopContent();
+      this.appendChild(this.popContent);
+    }
+    switch (this.type) {
+      case 'multiple':
+        this.setMultiple(dataSource);
+        break;
+      case 'radio':
+        this.litGroup = new LitRadioGroup();
+        if (this.title !== '') {
+          let title = new LitPopoverTitle();
+          title.setAttribute('title', this.title || '');
+          this.popContent!.appendChild(title);
+          this.litGroup.setAttribute('layout', 'compact');
+        } else {
+          this.litGroup.setAttribute('layout', 'dispersion');
+        }
+        this.popContent!.appendChild(this.litGroup);
+        dataSource.forEach((data) => {
+          let litRadioBox = new LitRadioBox();
+          if (this.title == '') {
+            litRadioBox.setAttribute('dis', 'round');
+          } else {
+            litRadioBox.setAttribute('dis', 'check');
+          }
+          if (data.isSelected) {
+            litRadioBox.setAttribute('checked', 'true');
+          }
+          this.litGroup?.appendChild(litRadioBox);
+          litRadioBox.setAttribute('value', data.text);
+        });
+        break;
+      case 'multiple-text':
+        dataSource.forEach((data) => {
+          this._texBox = new LitCheckBoxWithText();
+          this._texBox.setAttribute('text', data.text);
+          this._texBox.setAttribute('checked', '');
+          this.popContent!.appendChild(this._texBox);
+        });
+        break;
+      case 'data-ming':
+        break;
+    }
+  }
+
+  setMultiple(dataSource: Array<SelectBean>){
+    this.litGroup = new LitCheckGroup();
+    this.litGroup.setAttribute('layout', 'dispersion');
+    this.popContent!.appendChild(this.litGroup);
+    dataSource.forEach((data) => {
+      let litCheckBox = new LitCheckBox();
+      this.litGroup?.appendChild(litCheckBox);
+      if (data.isSelected) {
+        litCheckBox.setAttribute('checked', 'true');
+      }
+      litCheckBox.setAttribute('value', data.text);
+    });
+  }
+
+  get select(): Array<string> | undefined {
+    if (this._texBox?.checked) {
+      return [this._texBox!.text];
+    }
+    return this.litGroup?.value;
+  }
+
+  get trigger() {
+    return this.getAttribute('trigger');
+  }
+
+  get direction() {
+    return this.getAttribute('direction') || 'topright';
+  }
+
+  set direction(value: string) {
+    this.setAttribute('direction', value);
+  }
+
+  get open() {
+    return this.getAttribute('open') !== null;
+  }
+
+  set open(value: boolean) {
+    if (value === null || value === false) {
+      this.removeAttribute('open');
+    } else {
+      this.setAttribute('open', '');
+    }
+  }
+
+  initElements(): void {}
+
+  initHtml(): string {
+    return `
+        ${initHtmlStyle}
         <slot></slot>
       `;
   }
diff --git a/ide/src/base-ui/popover/LitPopoverV.ts b/ide/src/base-ui/popover/LitPopoverV.ts
index f8bf2f9d1c9cc8c8986fffa50e88ad8f8165393b..acd2ef9501de4bb07f6e82234a491dfd646e1e9d 100644
--- a/ide/src/base-ui/popover/LitPopoverV.ts
+++ b/ide/src/base-ui/popover/LitPopoverV.ts
@@ -15,65 +15,9 @@
 
 import { BaseElement, element } from '../BaseElement';
 
-@element('lit-popover')
-export class LitPopover extends BaseElement {
-  static get observedAttributes() {
-    return ['title', 'trigger', 'width', 'placement', 'visible'];
-  }
-
-  get visible() {
-    return this.getAttribute('visible') || 'false';
-  }
-
-  set visible(value) {
-    if (value) {
-      this.setAttribute('visible', 'true');
-    } else {
-      this.setAttribute('visible', 'false');
-    }
-  }
-
-  set placement(value) {
-    this.setAttribute('placement', value || 'bottomLeft');
-  }
-
-  get placement() {
-    return this.getAttribute('placement');
-  }
-
-  get trigger() {
-    return this.getAttribute('trigger') || 'hover';
-  }
-
-  set trigger(value) {
-    this.setAttribute('trigger', value);
-  }
-
-  get title() {
-    return this.getAttribute('title');
-  }
-
-  set title(value: any) {
-    this.setAttribute('title', value);
-  }
-
-  get width() {
-    return this.getAttribute('width') || 'max-content';
-  }
-
-  set width(value) {
-    this.setAttribute('width', value);
-  }
-
-  get haveRadio() {
-    return this.getAttribute('haveRadio');
-  }
-
-  initElements(): void {}
-
-  initHtml() {
-    return `
-        <style>
+const initHtmlStyle = (width: string) => {
+  return `
+    <style>
         :host{ 
             outline: none;
             display:inline-block;
@@ -99,7 +43,7 @@ export class LitPopover extends BaseElement {
         }
         /*通用*/
         .popover{
-            width: ${this.width};
+            width: ${width};
             min-width: 160px;
             display: flex;
             flex-direction: column;
@@ -417,6 +361,68 @@ export class LitPopover extends BaseElement {
             display: none;
         }
         </style>
+    `;
+};
+
+@element('lit-popover')
+export class LitPopover extends BaseElement {
+  static get observedAttributes() {
+    return ['title', 'trigger', 'width', 'placement', 'visible'];
+  }
+
+  get visible() {
+    return this.getAttribute('visible') || 'false';
+  }
+
+  set visible(value) {
+    if (value) {
+      this.setAttribute('visible', 'true');
+    } else {
+      this.setAttribute('visible', 'false');
+    }
+  }
+
+  set placement(value) {
+    this.setAttribute('placement', value || 'bottomLeft');
+  }
+
+  get placement() {
+    return this.getAttribute('placement');
+  }
+
+  get trigger() {
+    return this.getAttribute('trigger') || 'hover';
+  }
+
+  set trigger(value) {
+    this.setAttribute('trigger', value);
+  }
+
+  get title() {
+    return this.getAttribute('title');
+  }
+
+  set title(value: any) {
+    this.setAttribute('title', value);
+  }
+
+  get width() {
+    return this.getAttribute('width') || 'max-content';
+  }
+
+  set width(value) {
+    this.setAttribute('width', value);
+  }
+
+  get haveRadio() {
+    return this.getAttribute('haveRadio');
+  }
+
+  initElements(): void {}
+
+  initHtml() {
+    return `
+        ${initHtmlStyle(this.width)}
         <input class="trigger-click" type="checkbox">
         <div class="popover" title="">
             <div class="title">${this.title}</div>
diff --git a/ide/src/base-ui/radiobox/LitRadioBox.ts b/ide/src/base-ui/radiobox/LitRadioBox.ts
index 797f2013520e3702ba8351c23105dd2d20c2bb9f..21fab3d4c1a33460e1b7675a1101cc00affa99a9 100644
--- a/ide/src/base-ui/radiobox/LitRadioBox.ts
+++ b/ide/src/base-ui/radiobox/LitRadioBox.ts
@@ -16,61 +16,8 @@
 import { BaseElement, element } from '../BaseElement';
 import { LitRadioGroup } from './LitRadioGroup';
 
-@element('lit-radio')
-export class LitRadioBox extends BaseElement {
-  private group: LitRadioGroup | undefined | null;
-  private parent: LitRadioGroup | undefined | null;
-  private radio: HTMLInputElement | undefined | null;
-
-  static get observedAttributes() {
-    return ['checked', 'value', 'disabled'];
-  }
-
-  get disabled() {
-    return this.getAttribute('disabled') !== null;
-  }
-
-
-  get checked() {
-    return this.getAttribute('checked') !== null;
-  }
-
-  get name() {
-    return this.getAttribute('name');
-  }
-
-  set checked(radioValue: boolean) {
-    if (radioValue === null || !radioValue) {
-      this.removeAttribute('checked');
-    } else {
-      this.setAttribute('checked', '');
-    }
-  }
-
-  get value() {
-    let slot = this.shadowRoot?.getElementById('slot');
-    return slot!.textContent || this.textContent || '';
-  }
-
-  set disabled(value: boolean) {
-    if (value === null || value === false) {
-      this.removeAttribute('disabled');
-    } else {
-      this.setAttribute('disabled', '');
-    }
-  }
-
-  set dis(dis: string) {
-    this.setAttribute('dis', dis);
-  }
-
-  set value(value: string) {
-    this.setAttribute('value', value);
-  }
-
-  initHtml(): string {
-    return `
-        <style>
+const initHtmlStyle: string = `
+    <style>
         :host([dis=round]):host{ 
             font-family: Helvetica,serif;
             font-size: 14px;
@@ -204,6 +151,63 @@ export class LitRadioBox extends BaseElement {
             pointer-events: none;
         }
         </style>
+    `;
+
+@element('lit-radio')
+export class LitRadioBox extends BaseElement {
+  private group: LitRadioGroup | undefined | null;
+  private parent: LitRadioGroup | undefined | null;
+  private radio: HTMLInputElement | undefined | null;
+
+  static get observedAttributes() {
+    return ['checked', 'value', 'disabled'];
+  }
+
+  get disabled() {
+    return this.getAttribute('disabled') !== null;
+  }
+
+
+  get checked() {
+    return this.getAttribute('checked') !== null;
+  }
+
+  get name() {
+    return this.getAttribute('name');
+  }
+
+  set checked(radioValue: boolean) {
+    if (radioValue === null || !radioValue) {
+      this.removeAttribute('checked');
+    } else {
+      this.setAttribute('checked', '');
+    }
+  }
+
+  get value() {
+    let slot = this.shadowRoot?.getElementById('slot');
+    return slot!.textContent || this.textContent || '';
+  }
+
+  set disabled(value: boolean) {
+    if (value === null || value === false) {
+      this.removeAttribute('disabled');
+    } else {
+      this.setAttribute('disabled', '');
+    }
+  }
+
+  set dis(dis: string) {
+    this.setAttribute('dis', dis);
+  }
+
+  set value(value: string) {
+    this.setAttribute('value', value);
+  }
+
+  initHtml(): string {
+    return `
+        ${initHtmlStyle}
         <input type="checkbox" id="radio" >
         <label id="label" for="radio">
             <span class="selected">
diff --git a/ide/src/base-ui/select/LitAllocationSelect.ts b/ide/src/base-ui/select/LitAllocationSelect.ts
index 51ed28370be1803dd17b25b332447f5c3e6219ef..13d5ad4327d5e658f8c259539c08f8aec0e92a5a 100644
--- a/ide/src/base-ui/select/LitAllocationSelect.ts
+++ b/ide/src/base-ui/select/LitAllocationSelect.ts
@@ -15,6 +15,95 @@
 
 import { BaseElement, element } from '../BaseElement';
 
+const initHtmlStyle = (listHeight: string) => {
+  return `
+  <style>
+        :host{
+            display: inline-flex;
+            overflow: visible;
+            cursor: pointer;
+            position: relative;
+            border-radius: 16px;
+            outline: none;
+            user-select:none;
+            width: 75%;
+            -webkit-user-select:none ;
+            -moz-user-select:none;
+        }
+        :host(:not([border])),
+        :host([border='true']){
+            border: 1px solid var(--bark-prompt,#dcdcdc);
+        }
+        .multipleSelect{
+            display: flex;
+            width: 100%;
+            z-index: 98;
+            position: relative;
+            padding: 3px 6px;
+            font-size: 1rem;
+            transition: all .3s;
+            outline: none;
+            user-select:none;
+            align-items: center;
+            justify-content: space-between;
+            -webkit-user-select:none ;
+            -moz-user-select:none;
+        }
+        input{
+            display: inline-flex;
+            width:100%;
+            z-index: 8999;
+            color: var(--dark-color2,rgba(0,0,0,0.9));
+            background-color: transparent;
+            border: 0;
+            user-select:none;
+            outline: none;
+            cursor: pointer;
+            -webkit-user-select:none ;
+            -moz-user-select:none;
+        }
+         .body{
+            max-height: ${listHeight};
+            width: 100%;
+            display: block;
+            overflow: auto;
+            position: absolute;
+            bottom: 100%;
+            padding-top: 5px;
+            margin-top: 2px;
+            transition: all 0.2s;
+            flex-direction: column;
+            transform-origin: bottom center;
+            box-shadow: 0 5px 15px 0px #00000033;
+            background-color: var(--dark-background4,#fff);
+            border-radius: 2px;
+            opacity: 0;
+            z-index: 99;
+            visibility: hidden;
+        }
+        :host([placement="bottom"]) .body{
+            bottom:unset;
+            top: 100%;
+            transition: none;
+            transform: none;
+        }
+        .body-bottom{
+            top: 100%;
+            transform-origin: top center;
+            bottom: auto;
+        }
+        .multipleRoot input::-webkit-input-placeholder {
+            color: var(--dark-color,#aab2bd);
+        }
+        :host([disabled]) {
+           pointer-events: none;
+           cursor: not-allowed;
+           background-color: var(--dark-background1,#f5f5f5);
+        }
+        </style>
+  `;
+};
+
 @element('lit-allocation-select')
 export class LitAllocationSelect extends BaseElement {
   private selectAllocationInputEl: HTMLInputElement | null | undefined;
@@ -119,90 +208,7 @@ export class LitAllocationSelect extends BaseElement {
 
   initHtml() {
     return `
-        <style>
-        :host{
-            display: inline-flex;
-            overflow: visible;
-            cursor: pointer;
-            position: relative;
-            border-radius: 16px;
-            outline: none;
-            user-select:none;
-            width: 75%;
-            -webkit-user-select:none ;
-            -moz-user-select:none;
-        }
-        :host(:not([border])),
-        :host([border='true']){
-            border: 1px solid var(--bark-prompt,#dcdcdc);
-        }
-        .multipleSelect{
-            display: flex;
-            width: 100%;
-            z-index: 98;
-            position: relative;
-            padding: 3px 6px;
-            font-size: 1rem;
-            transition: all .3s;
-            outline: none;
-            user-select:none;
-            align-items: center;
-            justify-content: space-between;
-            -webkit-user-select:none ;
-            -moz-user-select:none;
-        }
-        input{
-            display: inline-flex;
-            width:100%;
-            z-index: 8999;
-            color: var(--dark-color2,rgba(0,0,0,0.9));
-            background-color: transparent;
-            border: 0;
-            user-select:none;
-            outline: none;
-            cursor: pointer;
-            -webkit-user-select:none ;
-            -moz-user-select:none;
-        }
-         .body{
-            max-height: ${this.listHeight};
-            width: 100%;
-            display: block;
-            overflow: auto;
-            position: absolute;
-            bottom: 100%;
-            padding-top: 5px;
-            margin-top: 2px;
-            transition: all 0.2s;
-            flex-direction: column;
-            transform-origin: bottom center;
-            box-shadow: 0 5px 15px 0px #00000033;
-            background-color: var(--dark-background4,#fff);
-            border-radius: 2px;
-            opacity: 0;
-            z-index: 99;
-            visibility: hidden;
-        }
-        :host([placement="bottom"]) .body{
-            bottom:unset;
-            top: 100%;
-            transition: none;
-            transform: none;
-        }
-        .body-bottom{
-            top: 100%;
-            transform-origin: top center;
-            bottom: auto;
-        }
-        .multipleRoot input::-webkit-input-placeholder {
-            color: var(--dark-color,#aab2bd);
-        }
-        :host([disabled]) {
-           pointer-events: none;
-           cursor: not-allowed;
-           background-color: var(--dark-background1,#f5f5f5);
-        }
-        </style>
+        ${initHtmlStyle(this.listHeight)}
         <div class="multipleSelect" tabindex="0">
             <div class="multipleRoot" id="select" style="width:100%">
             <input id="singleInput" placeholder="${this.placeholder}"/>
diff --git a/ide/src/base-ui/select/LitSelect.ts b/ide/src/base-ui/select/LitSelect.ts
index d2ab4352fc4c3a969a1ffa114a8a17933a69fc01..e72abac21b246ba665337ec73fad7a3661171ab0 100644
--- a/ide/src/base-ui/select/LitSelect.ts
+++ b/ide/src/base-ui/select/LitSelect.ts
@@ -156,78 +156,7 @@ export class LitSelect extends BaseElement {
 
   initHtml() {
     return `
-        <style>
-        ${selectHtmlStr()}
-        :host(:not([mode]))  input{
-            width: 100%;
-        }
-        .body{
-            max-height: ${this.listHeight};
-            overflow: auto;
-            border-radius: 2px;
-            box-shadow: 0 5px 15px 0px #00000033;
-        }
-        .multipleRoot input::-webkit-input-placeholder {
-            color: var(--dark-color,#aab2bd);
-        }
-        :host(:not([loading])) .loading{
-            display: none;
-        }
-        :host([loading]) .loading{
-            display: flex;
-        }
-        :host(:not([allow-clear])) .clear{
-            display: none;
-        }
-        :host([loading]) .icon{
-            display: none;
-        }
-        :host(:not([loading])) .icon{
-            display: flex;
-        }
-        .clear:hover{
-            color: #8c8c8c;
-        }
-        .clear{
-            color: #bfbfbf;
-            display: none;
-        }
-        .multipleRoot{
-            display: flex;
-            align-items: center;
-            flex-flow: wrap;
-            flex-wrap: wrap;
-            flex-direction: column;
-        }
-        .search{
-            color: #bfbfbf;
-            display: none;
-        }
-        .tag{
-            overflow: auto;
-            height: auto;
-            display: inline-flex;
-            position: relative;
-            align-items: center;
-            font-size: .75rem;
-            font-weight: bold;
-            padding: 1px 4px;
-            margin-right: 4px;
-            margin-top: 1px;
-            margin-bottom: 1px;
-            color: #242424;
-            background-color: #f5f5f5;
-        }
-        .tag-close:hover{
-            color: #333;
-        }
-        .tag-close{
-            padding: 2px;
-            font-size: .8rem;
-            color: #999999;
-            margin-left: 0px;
-        }
-        </style>
+        ${selectHtmlStr(this.listHeight)}
         <div class="root noSelect" tabindex="0" hidefocus="true">
             <div class="multipleRoot">
             <input placeholder="${this.placeholder}" autocomplete="off" ${
diff --git a/ide/src/base-ui/select/LitSelectHtml.ts b/ide/src/base-ui/select/LitSelectHtml.ts
index ac9b98e45f629f47331b1a8f0c4b0cc85bed8b99..5ac9ff91f67584f918731c2973c37a438cdbfae8 100644
--- a/ide/src/base-ui/select/LitSelectHtml.ts
+++ b/ide/src/base-ui/select/LitSelectHtml.ts
@@ -13,8 +13,9 @@
  * limitations under the License.
  */
 
-export const selectHtmlStr = () :string=>{
+export const selectHtmlStr = (listHeight:string) :string=>{
   return `
+  <style>
         :host{
             display: inline-flex;
             position: relative;
@@ -136,5 +137,258 @@ export const selectHtmlStr = () :string=>{
         :host([border='false'][disabled]) *{
             color: #b7b7b7;
             cursor: not-allowed;
-        }`;
+        }
+        :host(:not([mode]))  input{
+            width: 100%;
+        }
+        .body{
+            max-height: ${listHeight};
+            overflow: auto;
+            border-radius: 2px;
+            box-shadow: 0 5px 15px 0px #00000033;
+        }
+        .multipleRoot input::-webkit-input-placeholder {
+            color: var(--dark-color,#aab2bd);
+        }
+        :host(:not([loading])) .loading{
+            display: none;
+        }
+        :host([loading]) .loading{
+            display: flex;
+        }
+        :host(:not([allow-clear])) .clear{
+            display: none;
+        }
+        :host([loading]) .icon{
+            display: none;
+        }
+        :host(:not([loading])) .icon{
+            display: flex;
+        }
+        .clear:hover{
+            color: #8c8c8c;
+        }
+        .clear{
+            color: #bfbfbf;
+            display: none;
+        }
+        .multipleRoot{
+            display: flex;
+            align-items: center;
+            flex-flow: wrap;
+            flex-wrap: wrap;
+            flex-direction: column;
+        }
+        .search{
+            color: #bfbfbf;
+            display: none;
+        }
+        .tag{
+            overflow: auto;
+            height: auto;
+            display: inline-flex;
+            position: relative;
+            align-items: center;
+            font-size: .75rem;
+            font-weight: bold;
+            padding: 1px 4px;
+            margin-right: 4px;
+            margin-top: 1px;
+            margin-bottom: 1px;
+            color: #242424;
+            background-color: #f5f5f5;
+        }
+        .tag-close:hover{
+            color: #333;
+        }
+        .tag-close{
+            padding: 2px;
+            font-size: .8rem;
+            color: #999999;
+            margin-left: 0px;
+        }
+        </style>
+  `;
 }
+
+
+export const selectVHtmlStr = `
+  <style>
+        :host{
+            display: inline-flex;
+            position: relative;
+            overflow: visible;
+            cursor: pointer;
+            border-radius: 2px;
+            outline: none;
+            -webkit-user-select:none ;
+            -moz-user-select:none;
+            user-select:none;
+        }
+        :host(:not([border])),
+        :host([border='true']){
+            border: 1px solid var(--bark-prompt,#dcdcdc);
+        }
+        input{
+            border: 0;
+            outline: none;
+            background-color: transparent;
+            cursor: pointer;
+            -webkit-user-select:none ;
+            -moz-user-select:none;
+            user-select:none;
+            display: inline-flex;
+            color: var(--dark-color2,rgba(0,0,0,0.9));
+        }
+        :host([highlight]) input {
+            color: rgba(255,255,255,0.9);
+        }
+        :host([mode])  input{
+            padding: 6px 0px;
+        }
+        :host([mode])  .root{
+            padding: 1px 8px;
+        }
+        .root{
+            position: relative;
+            padding: 3px 6px;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            border-radius: 2px;
+            outline: none;
+            font-size: 1rem;
+            z-index: 2;
+            -webkit-user-select:none ;
+            -moz-user-select:none;
+            user-select:none;
+            width: 100%;
+        }
+        .body{
+            position: absolute;
+            bottom: 100%;
+            z-index: 99;
+            padding-top: 5px;
+            margin-top: 2px;
+            background-color: var(--dark-background4,#fff);
+            width: 100%;
+            transform: scaleY(.6);
+            visibility: hidden;
+            opacity: 0;
+            transform-origin: bottom center;
+            display: block;
+            flex-direction: column;
+        }
+        .body-bottom{
+            bottom: auto;
+            top: 100%;
+            transform-origin: top center;
+        }
+        :host([placement="bottom"]) .body{
+            bottom:unset;
+            top: 100%;
+            transition: none;
+            transform: none;
+        }
+
+        :host([rounded]) .body {
+            border-radius: 16px;
+        }
+        :host([rounded]) .root {
+            border-radius: 16px;
+            height: 25px;
+        }
+        .icon{
+            pointer-events: none;
+        }
+        .noSelect{
+          -moz-user-select:none;
+          -ms-user-select:none;
+          user-select:none;
+          -khtml-user-select:none;
+          -webkit-touch-callout:none;
+          -webkit-user-select:none;
+        }
+
+        :host(:not([border]):not([disabled]):focus),
+        :host([border='true']:not([disabled]):focus),
+        :host(:not([border]):not([disabled]):hover),
+        :host([border='true']:not([disabled]):hover){
+            border:1px solid var(--bark-prompt,#ccc)
+        }
+        :host(:not([disabled]):focus) .body,
+        :host(:not([disabled]):focus-within) .body{
+            transform: scaleY(1);
+            opacity: 1;
+            z-index: 99;
+            visibility: visible;
+        }
+        :host(:not([disabled]):focus)  input{
+            color: var(--dark-color,#bebebe);
+        }
+        :host(:not([border])[disabled]) *,
+        :host([border='true'][disabled]) *{
+            background-color: var(--dark-background1,#f5f5f5);
+            color: #b7b7b7;
+            cursor: not-allowed;
+        }
+        :host([border='false'][disabled]) *{
+            color: #b7b7b7;
+            cursor: not-allowed;
+        }
+        .body{
+            max-height: 286px;
+            box-shadow: 0 5px 15px 0px #00000033;
+            border-radius: 10px;
+        }
+        input{
+            width: 100%;
+        }
+        #search-input {
+          outline: none;
+          border: none;
+        }
+        .body-select {
+           margin-top: 3px;
+           background-color: var(--dark-background4,#fff);
+           width: 100%;
+           border-bottom: none;
+        }
+        .body-opt{
+            width: 100%;
+            max-height: 256px;
+            border-top: none;
+            overflow: auto;
+            border-bottom-left-radius: 10px;
+            border-bottom-right-radius: 10px;
+            background-color: var(--dark-background4,#fff);
+        }
+        .loading{
+            display: none;
+        }
+        input::-webkit-input-placeholder {
+                color: var(--dark-color,#aab2bd);
+        }
+        #search-input{
+           margin-left: 15px;
+        }
+        .icon{
+            display: flex;
+        }
+        /*Define the height, width and background of the scroll bar*/
+        ::-webkit-scrollbar
+        {
+          width: 8px;
+          border-radius: 10px;
+          background-color: var(--dark-background3,#FFFFFF);
+        }
+
+        /*define slider*/
+        ::-webkit-scrollbar-thumb
+        {
+          border-radius: 6px;
+          background-color: var(--dark-background7,rgba(0,0,0,0.1));
+        }
+        
+        </style>
+        `;
\ No newline at end of file
diff --git a/ide/src/base-ui/select/LitSelectOption.ts b/ide/src/base-ui/select/LitSelectOption.ts
index 46310bbc685ad58356da5fad90bed7fde0dd5545..de6345c0978a329c62e314007d8ccde251e57ca6 100644
--- a/ide/src/base-ui/select/LitSelectOption.ts
+++ b/ide/src/base-ui/select/LitSelectOption.ts
@@ -16,14 +16,8 @@
 import { BaseElement } from '../BaseElement';
 import '../icon/LitIcon';
 
-export class LitSelectOption extends BaseElement {
-  static get observedAttributes() {
-    return ['selected', 'disabled', 'check'];
-  }
-
-  initHtml() {
-    return `
-        <style>
+const initHtmlStyle:string = `
+    <style>
         :host{ 
             display: flex;
             padding: 8px 10px;
@@ -70,6 +64,16 @@ export class LitSelectOption extends BaseElement {
             display: none;
         }
         </style>
+    `;
+
+export class LitSelectOption extends BaseElement {
+  static get observedAttributes() {
+    return ['selected', 'disabled', 'check'];
+  }
+
+  initHtml() {
+    return `
+        ${initHtmlStyle}
         <div class="selected-box">
             <lit-icon class="selected" name="check" size="20"></lit-icon>
         </div>
diff --git a/ide/src/base-ui/select/LitSelectV.ts b/ide/src/base-ui/select/LitSelectV.ts
index 8d61b0323d9c593cbdd39bfe838e248237858c81..dc87e875011f1e927873288ad70e482ad9919107 100644
--- a/ide/src/base-ui/select/LitSelectV.ts
+++ b/ide/src/base-ui/select/LitSelectV.ts
@@ -15,7 +15,7 @@
 
 import { BaseElement, element } from '../BaseElement';
 import { LitSelectOption } from './LitSelectOption';
-import { selectHtmlStr } from './LitSelectHtml';
+import {selectHtmlStr, selectVHtmlStr} from './LitSelectHtml';
 
 @element('lit-select-v')
 export class LitSelectV extends BaseElement {
@@ -211,63 +211,7 @@ export class LitSelectV extends BaseElement {
 
   initHtml() {
     return `
-        <style> 
-        ${selectHtmlStr()}
-        .body{
-            max-height: 286px;
-            box-shadow: 0 5px 15px 0px #00000033;
-            border-radius: 10px;
-        }
-        input{
-            width: 100%;
-        }
-        #search-input {
-          outline: none;
-          border: none;
-        }
-        .body-select {
-           margin-top: 3px;
-           background-color: var(--dark-background4,#fff);
-           width: 100%;
-           border-bottom: none;
-        }
-        .body-opt{
-            width: 100%;
-            max-height: 256px;
-            border-top: none;
-            overflow: auto;
-            border-bottom-left-radius: 10px;
-            border-bottom-right-radius: 10px;
-            background-color: var(--dark-background4,#fff);
-        }
-        .loading{
-            display: none;
-        }
-        input::-webkit-input-placeholder {
-                color: var(--dark-color,#aab2bd);
-        }
-        #search-input{
-           margin-left: 15px;
-        }
-        .icon{
-            display: flex;
-        }
-        /*Define the height, width and background of the scroll bar*/
-        ::-webkit-scrollbar
-        {
-          width: 8px;
-          border-radius: 10px;
-          background-color: var(--dark-background3,#FFFFFF);
-        }
-
-        /*define slider*/
-        ::-webkit-scrollbar-thumb
-        {
-          border-radius: 6px;
-          background-color: var(--dark-background7,rgba(0,0,0,0.1));
-        }
-        
-        </style>
+        ${selectVHtmlStr}
         <div class="root noSelect" tabindex="0" hidefocus="true">
             <input id="select-input" placeholder="${this.placeholder}" tabindex="0" readonly="readonly">
             <lit-icon class="icon" name='down' color="#c3c3c3"></lit-icon>
diff --git a/ide/src/base-ui/slider/LitSlider.ts b/ide/src/base-ui/slider/LitSlider.ts
index b61c142008c935ace928a7b204efb39b0252f0b7..9858d681ab2948d70a5af2a7e74a1a1d783aa65e 100644
--- a/ide/src/base-ui/slider/LitSlider.ts
+++ b/ide/src/base-ui/slider/LitSlider.ts
@@ -15,6 +15,108 @@
 
 import { BaseElement, element } from '../BaseElement';
 
+const initHtmlStyle = (colorStr: string | null,colorText: string | null) => {
+  return `
+  <style>
+        /*
+         * Outer box style
+         */
+        :host{ 
+            box-sizing:border-box; 
+            display:flex;
+            
+        }
+        /*
+         * The mouse is missing
+         */
+        :host([disabled]){ 
+            opacity:0.8; 
+            cursor:not-allowed; 
+        }
+        /*
+         * Disable sliding
+         */
+        :host([disabled]) input[type="range"]{
+            pointer-events:none;
+        }
+        /*
+         * Currently the entire sliding vessel is controlled
+         */
+        #slider-con{ 
+            cursor:pointer;
+            display:flex;
+            align-items:center;
+            width:95%;
+            grid-auto-flow: row dense;
+            position: relative;
+        }
+        /*
+         * Display prompt information
+         */
+        :host([showtips]){
+            pointer-events:all;
+        }
+        
+        #slider{
+            background-color: var(--dark-background7,#D8D8D8);
+            z-index: 5;
+        }
+    
+        /*
+         * Slider basic style
+         */
+        input[type="range"]{
+            pointer-events:all;
+            margin:0 -5px;
+            width: 100%;
+            -webkit-appearance: none;
+            outline : 0;
+            background: rgba(0,0,0,0.1);
+            height: 10px;
+            border-radius:2px;
+            background: -webkit-linear-gradient(right, ${colorStr}, ${colorText}) no-repeat;
+        }
+        
+        /*
+         * Slider-line slidedAble area component
+         */
+        input[type="range"]::-webkit-slider-runnable-track{
+            display: flex;
+            align-items: center;
+            position: relative;
+            height: 10px;
+            border-radius:5px;
+        }
+        
+         /*
+         * Slider slider component
+         */
+        input[type="range"]::-webkit-slider-thumb{
+            -webkit-appearance: none;
+            position: relative;
+            width:20px;
+            height:20px;
+            margin-top: -4px;
+            border-radius: 5px;
+            background:#999999;
+            transition:0.2s cubic-bezier(.12, .4, .29, 1.46);
+        }
+        
+        input[type="range"]:focus{
+            z-index:2;
+        }
+
+        :host(:focus-within) #slider-con,:host(:hover) #slider-con{
+            z-index:10
+        }
+        
+        :host([disabled]) #slider{ 
+            opacity:0.6; 
+        }
+        </style>
+  `;
+}
+
 @element('lit-slider')
 export class LitSlider extends BaseElement {
   private litSliderStyle: LitSliderStyle | undefined | null;
@@ -156,105 +258,7 @@ export class LitSlider extends BaseElement {
 
   initHtml(): string {
     return `
-        <style>
-        /*
-         * Outer box style
-         */
-        :host{ 
-            box-sizing:border-box; 
-            display:flex;
-            
-        }
-        /*
-         * The mouse is missing
-         */
-        :host([disabled]){ 
-            opacity:0.8; 
-            cursor:not-allowed; 
-        }
-        /*
-         * Disable sliding
-         */
-        :host([disabled]) input[type="range"]{
-            pointer-events:none;
-        }
-        /*
-         * Currently the entire sliding vessel is controlled
-         */
-        #slider-con{ 
-            cursor:pointer;
-            display:flex;
-            align-items:center;
-            width:95%;
-            grid-auto-flow: row dense;
-            position: relative;
-        }
-        /*
-         * Display prompt information
-         */
-        :host([showtips]){
-            pointer-events:all;
-        }
-        
-        #slider{
-            background-color: var(--dark-background7,#D8D8D8);
-            z-index: 5;
-        }
-    
-        /*
-         * Slider basic style
-         */
-        input[type="range"]{
-            pointer-events:all;
-            margin:0 -5px;
-            width: 100%;
-            -webkit-appearance: none;
-            outline : 0;
-            background: rgba(0,0,0,0.1);
-            height: 10px;
-            border-radius:2px;
-            background: -webkit-linear-gradient(right, ${
-              this.getAttribute('defaultColor') ? this.getAttribute('defaultColor') : '#46B1E3'
-            }, ${this.getAttribute('defaultColor') ? this.getAttribute('defaultColor') : '#46B1E3'}) no-repeat;
-        }
-        
-        /*
-         * Slider-line slidedAble area component
-         */
-        input[type="range"]::-webkit-slider-runnable-track{
-            display: flex;
-            align-items: center;
-            position: relative;
-            height: 10px;
-            border-radius:5px;
-        }
-        
-         /*
-         * Slider slider component
-         */
-        input[type="range"]::-webkit-slider-thumb{
-            -webkit-appearance: none;
-            position: relative;
-            width:20px;
-            height:20px;
-            margin-top: -4px;
-            border-radius: 5px;
-            background:#999999;
-            transition:0.2s cubic-bezier(.12, .4, .29, 1.46);
-        }
-        
-        input[type="range"]:focus{
-            z-index:2;
-        }
-
-        :host(:focus-within) #slider-con,:host(:hover) #slider-con{
-            z-index:10
-        }
-        
-        :host([disabled]) #slider{ 
-            opacity:0.6; 
-        }
-        </style>
+        ${initHtmlStyle(this.getAttribute('defaultColor') ? this.getAttribute('defaultColor') : '#46B1E3',this.getAttribute('defaultColor') ? this.getAttribute('defaultColor') : '#46B1E3')}
         <slot id="slot"></slot>
         <div id='slider-con' dir="right">
             <input id="slider" type="range" max="10000000">
diff --git a/ide/src/base-ui/switch/lit-switch.ts b/ide/src/base-ui/switch/lit-switch.ts
index b5430c000ff5b8b89974d57fb2710f16568f06ed..725f10df58d17494cc4165423dfe4706950ceb90 100644
--- a/ide/src/base-ui/switch/lit-switch.ts
+++ b/ide/src/base-ui/switch/lit-switch.ts
@@ -15,48 +15,8 @@
 
 import { BaseElement, element } from '../BaseElement';
 
-@element('lit-switch')
-export default class LitSwitch extends BaseElement {
-  private switch: HTMLInputElement | null | undefined;
-  private isfocus: boolean | undefined;
-
-  static get observedAttributes() {
-    return ['disabled', 'checked'];
-  }
-
-  get disabled():boolean {
-    return this.getAttribute('disabled') !== null;
-  }
-
-  get checked() {
-    return this.getAttribute('checked') !== null;
-  }
-
-  set checked(value) {
-    if (value === null || value === false) {
-      this.removeAttribute('checked');
-    } else {
-      this.setAttribute('checked', '');
-    }
-  }
-
-  set disabled(value:boolean) {
-    if (value === null || value === false) {
-      this.removeAttribute('disabled');
-    } else {
-      this.setAttribute('disabled', '');
-    }
-  }
-
-  get name() {
-    return this.getAttribute('name');
-  }
-
-  initElements(): void {}
-
-  initHtml(): string {
-    return `
-        <style>
+const initHtmlStyle:string = `
+    <style>
         :host{ 
             display:inline-block; 
             -webkit-tap-highlight-color: transparent;
@@ -122,6 +82,50 @@ export default class LitSwitch extends BaseElement {
             cursor: not-allowed; 
         }
         </style>
+    `;
+
+@element('lit-switch')
+export default class LitSwitch extends BaseElement {
+  private switch: HTMLInputElement | null | undefined;
+  private isfocus: boolean | undefined;
+
+  static get observedAttributes() {
+    return ['disabled', 'checked'];
+  }
+
+  get disabled():boolean {
+    return this.getAttribute('disabled') !== null;
+  }
+
+  get checked() {
+    return this.getAttribute('checked') !== null;
+  }
+
+  set checked(value) {
+    if (value === null || value === false) {
+      this.removeAttribute('checked');
+    } else {
+      this.setAttribute('checked', '');
+    }
+  }
+
+  set disabled(value:boolean) {
+    if (value === null || value === false) {
+      this.removeAttribute('disabled');
+    } else {
+      this.setAttribute('disabled', '');
+    }
+  }
+
+  get name() {
+    return this.getAttribute('name');
+  }
+
+  initElements(): void {}
+
+  initHtml(): string {
+    return `
+        ${initHtmlStyle}
         <input type="checkbox" id="switch"><label id="name" for="switch"></label>
         `;
   }
diff --git a/ide/src/base-ui/tree/LitTree.ts b/ide/src/base-ui/tree/LitTree.ts
index f3d5876498ddd3d823040d8024046112265a27d6..ddda51f2f3f5b557cabb8141c04a412dc7204d31 100644
--- a/ide/src/base-ui/tree/LitTree.ts
+++ b/ide/src/base-ui/tree/LitTree.ts
@@ -503,6 +503,10 @@ export class LitTree extends BaseElement {
     ul.style.transition = '.3s all';
     this.setChildren(a,insertNode,li,ul);
     // node 添加右键菜单功能
+    this.addedRightClickMenuFunction(insertNode);
+  }
+
+  addedRightClickMenuFunction(insertNode: LitTreeNode):void{
     insertNode.oncontextmenu = (ev): void => {
       ev.preventDefault();
       this.selectedNode(insertNode);
diff --git a/ide/src/base-ui/utils/CSVFormater.ts b/ide/src/base-ui/utils/CSVFormater.ts
index fd3a466442521b08ae4cebd17954e73c5c7e795f..d91d718ab31e2db4c3664ff6ffffd62dde8766dd 100644
--- a/ide/src/base-ui/utils/CSVFormater.ts
+++ b/ide/src/base-ui/utils/CSVFormater.ts
@@ -51,32 +51,7 @@ export class JSONToCSV {
       row = '';
       // 如果存在自定义key值
       if (columns.key.length) {
-        columns.key.map(function (m: any, idx: number) {
-          let strItem: any = '';
-          if (obj.exportFormatter && obj.exportFormatter.has(m)) {
-            strItem = obj.exportFormatter.get(m)?.(n) || n[m];
-          } else if (obj.formatter && obj.formatter.has(m)) {
-            strItem = obj.formatter.get(m)?.(n[m]) || n[m];
-          } else {
-            strItem = n[m];
-          }
-          if (typeof strItem == 'undefined') {
-            strItem = '';
-          } else if (typeof strItem == 'object') {
-            strItem = JSON.stringify(strItem);
-            strItem = strItem.replaceAll('"', '');
-          }
-          if (idx === 0 && typeof n['depthCSV'] !== 'undefined') {
-            row +=
-              '"' +
-              that.treeDepth(n['depthCSV']) +
-              (typeof columns.formatter === 'function' ? columns.formatter(m, n[m]) || n[m] : strItem) +
-              '",';
-          } else {
-            row +=
-              '"' + (typeof columns.formatter === 'function' ? columns.formatter(m, n[m]) || n[m] : strItem) + '",';
-          }
-        });
+        row = that.getCsvStr(columns,obj,n,row);
       } else {
         for (key in n) {
           row +=
@@ -92,6 +67,37 @@ export class JSONToCSV {
     this.saveCsvFile(fileName, csv);
   }
 
+  static getCsvStr(columns: any,obj: any,n: any,row: string){
+    let that = this;
+    columns.key.map(function (m: any, idx: number) {
+      let strItem: any = '';
+      if (obj.exportFormatter && obj.exportFormatter.has(m)) {
+        strItem = obj.exportFormatter.get(m)?.(n) || n[m];
+      } else if (obj.formatter && obj.formatter.has(m)) {
+        strItem = obj.formatter.get(m)?.(n[m]) || n[m];
+      } else {
+        strItem = n[m];
+      }
+      if (typeof strItem == 'undefined') {
+        strItem = '';
+      } else if (typeof strItem == 'object') {
+        strItem = JSON.stringify(strItem);
+        strItem = strItem.replaceAll('"', '');
+      }
+      if (idx === 0 && typeof n['depthCSV'] !== 'undefined') {
+        row +=
+          '"' +
+          that.treeDepth(n['depthCSV']) +
+          (typeof columns.formatter === 'function' ? columns.formatter(m, n[m]) || n[m] : strItem) +
+          '",';
+      } else {
+        row +=
+          '"' + (typeof columns.formatter === 'function' ? columns.formatter(m, n[m]) || n[m] : strItem) + '",';
+      }
+    });
+    return row;
+  }
+
   static saveCsvFile(fileName: any, csvData: any): void {
     let browserType: any = this.browserType();
     if (!browserType.edge || !browserType.ie) {
diff --git a/ide/src/base-ui/utils/ExcelFormater.ts b/ide/src/base-ui/utils/ExcelFormater.ts
index 1f2ee1e55977dcaf281b7691d881d9deb6c48a2c..a251b19dc404ce25d1ede09202cffcda6acaebbd 100644
--- a/ide/src/base-ui/utils/ExcelFormater.ts
+++ b/ide/src/base-ui/utils/ExcelFormater.ts
@@ -13,6 +13,54 @@
  * limitations under the License.
  */
 
+const htmlStr = () => {
+  const html_start = `<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns="http://www.w3.org/TR/REC-html40">`;
+  return {
+    uri : 'data:application/vnd.ms-excel;base64,',
+    template_ExcelWorksheet : `<x:ExcelWorksheet><x:Name>{SheetName}</x:Name><x:WorksheetSource HRef="sheet{SheetIndex}.htm"/><x:WorksheetOptions><x:DisplayGridlines/></x:WorksheetOptions></x:ExcelWorksheet>`,
+    template_ListWorksheet : `<o:File HRef="sheet{SheetIndex}.htm"/>`,
+    template_WorkBook :
+    `MIME-Version: 1.0
+X-Document-Type: Workbook
+Content-Type: multipart/related; boundary="----=_NextPart_dummy"
+
+------=_NextPart_dummy
+Content-Location: WorkBook.htm
+Content-Type: text/html; charset=windows-1252
+
+` +
+    html_start +
+    `
+<head>
+<meta name="Excel Workbook Frameset">
+<meta http-equiv="Content-Type" charset="UTF-8" content="text/html; charset=windows-1252">
+<link rel="File-List" href="filelist.xml">
+<!--[if gte mso 9]><xml>
+ <x:ExcelWorkbook>
+    <x:ExcelWorksheets>{ExcelWorksheets}</x:ExcelWorksheets>
+    <x:ActiveSheet>0</x:ActiveSheet>
+ </x:ExcelWorkbook>
+</xml><![endif]-->
+</head>
+<frameset>
+    <frame src="sheet0.htm" name="frSheet">
+    <noframes><body><p>This page uses frames, but your browser does not support them.</p></body></noframes>
+</frameset>
+</html>
+{HTMLWorksheets}
+Content-Location: filelist.xml
+Content-Type: text/xml; charset="utf-8"
+
+<xml xmlns:o="urn:schemas-microsoft-com:office:office">
+    <o:MainFile HRef="../WorkBook.htm"/>
+    {ListWorksheets}
+    <o:File HRef="filelist.xml"/>
+</xml>
+------=_NextPart_dummy--
+`
+  }
+}
+
 export class ExcelFormater {
   static tmplCellXML = '<Cell{attributeStyleID}{attributeFormula}><Data ss:Type="{nameType}">{data}</Data></Cell>';
   static base64 = function (s: any) {
@@ -135,11 +183,9 @@ export class ExcelFormater {
     filename: string,
     dataSource: { columns: any[]; tables: any[]; sheetName: string }[]
   ) {
-    let uri = 'data:application/vnd.ms-excel;base64,',
-      html_start = `<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns="http://www.w3.org/TR/REC-html40">`,
-      template_ExcelWorksheet = `<x:ExcelWorksheet><x:Name>{SheetName}</x:Name><x:WorksheetSource HRef="sheet{SheetIndex}.htm"/><x:WorksheetOptions><x:DisplayGridlines/></x:WorksheetOptions></x:ExcelWorksheet>`,
-      template_ListWorksheet = `<o:File HRef="sheet{SheetIndex}.htm"/>`,
-      template_HTMLWorksheet =
+    const html_start = `<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns="http://www.w3.org/TR/REC-html40">`;
+    let {uri,template_ExcelWorksheet,template_ListWorksheet,template_WorkBook} = htmlStr();
+      let template_HTMLWorksheet =
         `
 ------=_NextPart_dummy
 Content-Location: sheet{SheetIndex}.htm
@@ -154,46 +200,7 @@ Content-Type: text/html; charset=windows-1252
     <link rel="File-List" href="filelist.xml">
 </head>
 <body><table>{SheetContent}</table></body>
-</html>`,
-      template_WorkBook =
-        `MIME-Version: 1.0
-X-Document-Type: Workbook
-Content-Type: multipart/related; boundary="----=_NextPart_dummy"
-
-------=_NextPart_dummy
-Content-Location: WorkBook.htm
-Content-Type: text/html; charset=windows-1252
-
-` +
-        html_start +
-        `
-<head>
-<meta name="Excel Workbook Frameset">
-<meta http-equiv="Content-Type" charset="UTF-8" content="text/html; charset=windows-1252">
-<link rel="File-List" href="filelist.xml">
-<!--[if gte mso 9]><xml>
- <x:ExcelWorkbook>
-    <x:ExcelWorksheets>{ExcelWorksheets}</x:ExcelWorksheets>
-    <x:ActiveSheet>0</x:ActiveSheet>
- </x:ExcelWorkbook>
-</xml><![endif]-->
-</head>
-<frameset>
-    <frame src="sheet0.htm" name="frSheet">
-    <noframes><body><p>This page uses frames, but your browser does not support them.</p></body></noframes>
-</frameset>
-</html>
-{HTMLWorksheets}
-Content-Location: filelist.xml
-Content-Type: text/xml; charset="utf-8"
-
-<xml xmlns:o="urn:schemas-microsoft-com:office:office">
-    <o:MainFile HRef="../WorkBook.htm"/>
-    {ListWorksheets}
-    <o:File HRef="filelist.xml"/>
-</xml>
-------=_NextPart_dummy--
-`;
+</html>`;
     let context_WorkBook = {
       ExcelWorksheets: '',
       HTMLWorksheets: '',
diff --git a/ide/src/trace/SpApplication.ts b/ide/src/trace/SpApplication.ts
index b93a14e3890bde6ce7709cf47a62382ef550ffb4..3f7cbad4afb5713f1dee29a06b28a7096346e0e3 100644
--- a/ide/src/trace/SpApplication.ts
+++ b/ide/src/trace/SpApplication.ts
@@ -61,7 +61,7 @@ import { Utils } from './component/trace/base/Utils';
 import {
   applicationHtml,
   clearTraceFileCache,
-  findFreeSizeAlgorithm,
+  findFreeSizeAlgorithm, getCurrentDataTime,
   indexedDataToBufferData,
   postLog,
   readTraceFileBuffer,
@@ -143,6 +143,7 @@ export class SpApplication extends BaseElement {
   fileTypeList: string[] = ['ebpf', 'arkts', 'hiperf'];
   private pageTimStamp: number = 0;
   private currentPageNum: number = 1;
+  private currentDataTime: string[] = [];
 
   static get observedAttributes(): Array<string> {
     return ['server', 'sqlite', 'wasm', 'dark', 'vs', 'query-sql', 'subsection'];
@@ -979,10 +980,7 @@ export class SpApplication extends BaseElement {
       this.progressEL!.loading = false;
       return false;
     }
-    if (this.pageTimStamp === 0) {
-      return false;
-    }
-    return true;
+    return this.pageTimStamp !== 0;
   }
 
   private queryFileByPage(
@@ -1010,7 +1008,9 @@ export class SpApplication extends BaseElement {
         let hiPerfArray = new Uint8Array(hiperfData);
         let allOtherData = [ebpfData, arkTsData, hiperfData];
         let otherDataLength = traceData.byteLength + ebpfData.byteLength + arkTsData.byteLength + hiperfData.byteLength;
-        this.traceFileName = `hiprofiler_long_trace_${indexedDbPageNum}.htrace`;
+        let timeStamp = this.currentDataTime[0] + this.currentDataTime[1] + this.currentDataTime[2] + '_' +
+          this.currentDataTime[3] + this.currentDataTime[4] + this.currentDataTime[5];
+        this.traceFileName = `hiprofiler_long_${timeStamp}_${indexedDbPageNum}.htrace`;
         if (otherDataLength > maxTraceFileLength) {
           if (traceData.byteLength > maxTraceFileLength) {
             this.traceFileLoadFailedHandler('hitrace file too big!');
@@ -1105,6 +1105,7 @@ export class SpApplication extends BaseElement {
         },
         (res: Array<any>) => {
           this.litSearch!.setPercent('Cut in file ', 100);
+          this.currentDataTime = getCurrentDataTime();
           if (this.longTraceHeadMessageList.length > 0) {
             this.getTraceFileByPage(this.currentPageNum);
             this.litSearch!.style.marginLeft = '80px';
@@ -1112,7 +1113,7 @@ export class SpApplication extends BaseElement {
             this.initCutFileEvent();
           } else {
             this.progressEL!.loading = false;
-            this.litSearch!.setPercent('The basic trace file in the large-file scenario is missing!', -1);
+            this.litSearch!.setPercent('Missing basic trace in the large-file scenario!', -1);
             this.freshMenuDisable(false);
             return;
           }
diff --git a/ide/src/trace/SpApplicationPublicFunc.ts b/ide/src/trace/SpApplicationPublicFunc.ts
index 87946f84076dd7e0fd1b075c81adc39cbf4e7c4e..fd6dd3571a1819069b83066aeaf6bf6a4696e89d 100644
--- a/ide/src/trace/SpApplicationPublicFunc.ts
+++ b/ide/src/trace/SpApplicationPublicFunc.ts
@@ -481,4 +481,15 @@ export function findFreeSizeAlgorithm(numbers: Array<number>, freeSize: number):
 
   reBackFind(0);
   return finalIndex;
-}
\ No newline at end of file
+}
+
+export function getCurrentDataTime(): string[]{
+  let current = new Date();
+  let year = '' + current.getFullYear();
+  let month = ('0' + (current.getMonth() + 1)).slice(-2);
+  let day = ('0' + current.getDate()).slice(-2);
+  let hours = ('0' + current.getHours()).slice(-2);
+  let minutes = ('0' + current.getMinutes()).slice(-2);
+  let seconds = ('0' + current.getSeconds()).slice(-2);
+  return [year, month, day, hours, minutes, seconds];
+}
diff --git a/ide/src/trace/component/trace/sheet/file-system/TabPaneCallTree.ts b/ide/src/trace/component/trace/sheet/file-system/TabPaneCallTree.ts
index 207b888e6608f4d8ae369e5d743acf1419d7850e..cfa07b6903c2163c777b70d2cadf59369702a36e 100644
--- a/ide/src/trace/component/trace/sheet/file-system/TabPaneCallTree.ts
+++ b/ide/src/trace/component/trace/sheet/file-system/TabPaneCallTree.ts
@@ -106,8 +106,7 @@ export class TabPaneCallTree extends BaseElement {
     } else {
       this.callTreeFilter!.style.display = 'none';
     }
-    procedurePool.submitWithName('logic0', 'fileSystem-reset', [], undefined, () => {
-    });
+    procedurePool.submitWithName('logic0', 'fileSystem-reset', [], undefined, () => {});
     this.callTreeFilter!.initializeFilterTree(true, true, true);
     this.callTreeFilter!.filterValue = '';
     this.callTreeProgressEL!.loading = true;
@@ -138,7 +137,7 @@ export class TabPaneCallTree extends BaseElement {
         },
         {
           funcName: 'getCurrentDataFromDb',
-          funcArgs: [{queryFuncName: this.queryFuncName, ...callTreeSelection}],
+          funcArgs: [{ queryFuncName: this.queryFuncName, ...callTreeSelection }],
         },
       ],
       (results: any[]) => {
@@ -178,7 +177,11 @@ export class TabPaneCallTree extends BaseElement {
         funcName: 'showLibLevelData',
         funcArgs: [this.callTreeLevel.libId, this.callTreeLevel.libName],
       });
-    } else if (this._rowClickData && this._rowClickData.symbolId !== undefined && this._currentCallTreeLevel === NUM_4) {
+    } else if (
+      this._rowClickData &&
+      this._rowClickData.symbolId !== undefined &&
+      this._currentCallTreeLevel === NUM_4
+    ) {
       this.callTreeLevel.symbolName = this._rowClickData.tableName;
       args.push({
         funcName: 'showFunLevelData',
@@ -388,10 +391,10 @@ export class TabPaneCallTree extends BaseElement {
       }
     }
     this.performDataProcessing(callTreeFuncArgs);
-  };
+  }
 
   private handleLibraryCase(data: any, callTreeFuncArgs: any[]): void {
-    this.callTreeFilter!.addDataMining({name: this.callTreeSelectedData.libName}, data.item);
+    this.callTreeFilter!.addDataMining({ name: this.callTreeSelectedData.libName }, data.item);
     callTreeFuncArgs.push({
       funcName: 'splitTree',
       funcArgs: [this.callTreeSelectedData.libName, false, false],
@@ -399,7 +402,7 @@ export class TabPaneCallTree extends BaseElement {
   }
 
   private handleSymbolCase(data: any, callTreeFuncArgs: any[]): void {
-    this.callTreeFilter!.addDataMining({name: this.callTreeSelectedData.symbolName}, data.item);
+    this.callTreeFilter!.addDataMining({ name: this.callTreeSelectedData.symbolName }, data.item);
     callTreeFuncArgs.push({
       funcName: 'splitTree',
       funcArgs: [this.callTreeSelectedData.symbolName, false, true],
@@ -600,7 +603,7 @@ export class TabPaneCallTree extends BaseElement {
       let data = evt.detail.data as MerageBean;
       document.dispatchEvent(
         new CustomEvent('number_calibration', {
-          detail: {time: data.tsArray, durations: data.durArray},
+          detail: { time: data.tsArray, durations: data.durArray },
         })
       );
       this.setRightTableData(data);
@@ -657,22 +660,23 @@ export class TabPaneCallTree extends BaseElement {
     let isHideEvent: boolean = filterData.callTree[2];
     let isHideThread: boolean = filterData.callTree[3];
     let list = filterData.dataMining.concat(filterData.dataLibrary);
-    callTreeArgs.push({funcName: 'hideThread', funcArgs: [isHideThread],});
-    callTreeArgs.push({funcName: 'hideEvent', funcArgs: [isHideEvent],});
-    callTreeArgs.push({funcName: 'getCallChainsBySampleIds', funcArgs: [isTopDown, this.queryFuncName],});
+    callTreeArgs.push({ funcName: 'hideThread', funcArgs: [isHideThread] });
+    callTreeArgs.push({ funcName: 'hideEvent', funcArgs: [isHideEvent] });
+    callTreeArgs.push({ funcName: 'getCallChainsBySampleIds', funcArgs: [isTopDown, this.queryFuncName] });
     this.callTreeTbr!.recycleDataSource = [];
     if (isHideSystemLibrary) {
-      callTreeArgs.push({funcName: 'hideSystemLibrary', funcArgs: [true],});
+      callTreeArgs.push({ funcName: 'hideSystemLibrary', funcArgs: [true] });
     }
     if (filterData.callTreeConstraints.checked) {
       callTreeArgs.push({
-        funcName: 'hideNumMaxAndMin', funcArgs: [parseInt(filterData.callTreeConstraints.inputs[0]),
-          filterData.callTreeConstraints.inputs[1]],
+        funcName: 'hideNumMaxAndMin',
+        funcArgs: [parseInt(filterData.callTreeConstraints.inputs[0]), filterData.callTreeConstraints.inputs[1]],
       });
     }
-    callTreeArgs.push({funcName: 'splitAllProcess', funcArgs: [list],});
+    callTreeArgs.push({ funcName: 'splitAllProcess', funcArgs: [list] });
     callTreeArgs.push({
-      funcName: 'resetAllNode', funcArgs: [],
+      funcName: 'resetAllNode',
+      funcArgs: [],
     });
     if (this._rowClickData && this._rowClickData.libId !== undefined && this._currentCallTreeLevel === 3) {
       callTreeArgs.push({
@@ -730,7 +734,7 @@ export class TabPaneCallTree extends BaseElement {
     procedurePool.submitWithName(
       'logic0',
       this.procedureAction,
-      {args, callType: this.queryFuncName},
+      { args, callType: this.queryFuncName },
       undefined,
       (callTreeResults: any): void => {
         handler(callTreeResults);
diff --git a/ide/src/trace/component/trace/sheet/hiperf/TabPerfProfile.ts b/ide/src/trace/component/trace/sheet/hiperf/TabPerfProfile.ts
index 20722f90366f16f50220a8b5c6bdd94290b77964..cdbbaf91c9c2f61f1918f275a1a8ab4a3eba15fc 100644
--- a/ide/src/trace/component/trace/sheet/hiperf/TabPerfProfile.ts
+++ b/ide/src/trace/component/trace/sheet/hiperf/TabPerfProfile.ts
@@ -304,7 +304,6 @@ export class TabpanePerfProfile extends BaseElement {
     this.perfProfilerTbl!.rememberScrollTop = true;
     this.perfProfilerFilter = this.shadowRoot?.querySelector<TabPaneFilter>('#filter');
     this.perfProfilerList = this.shadowRoot?.querySelector<LitTable>('#tb-perf-list');
-    this.perfProfilerList = this.shadowRoot?.querySelector<LitTable>('#tb-perf-list');
     this.initPerfProfilerDataAndListener();
   }
 
@@ -340,11 +339,11 @@ export class TabpanePerfProfile extends BaseElement {
         (evt.detail as any).callBack(true);
       }
     });
-    this.perfProfilerFilter!.getDataLibrary(this.filterFunc);
-    this.perfProfilerFilter!.getDataMining(this.filterFunc);
-    this.perfProfilerFilter!.getCallTreeData(this.perfProfilerFilterGetCallTree);
-    this.perfProfilerFilter!.getCallTreeConstraintsData(this.perfProfilerFilterGetCallTreeConstraints);
-    this.perfProfilerFilter!.getFilterData(this.perfProfilerFilterGetFilter);
+    this.perfProfilerFilter!.getDataLibrary(this.filterFunc.bind(this));
+    this.perfProfilerFilter!.getDataMining(this.filterFunc.bind(this));
+    this.perfProfilerFilter!.getCallTreeData(this.perfProfilerFilterGetCallTree.bind(this));
+    this.perfProfilerFilter!.getCallTreeConstraintsData(this.perfProfilerFilterGetCallTreeConstraints.bind(this));
+    this.perfProfilerFilter!.getFilterData(this.perfProfilerFilterGetFilter.bind(this));
     this.perfProfilerTbl!.addEventListener('column-click', (evt): void => {
       // @ts-ignore
       this.perfProfileSortKey = evt.detail.key;
@@ -443,7 +442,7 @@ export class TabpanePerfProfile extends BaseElement {
     }
   }
 
-  filterFunc = (data: any): void => {
+  private filterFunc(data: any): void {
     let perfProfileFuncArgs: any[] = [];
     if (data.type === 'check') {
       this.filterFuncByCheckType(data, perfProfileFuncArgs);
@@ -455,7 +454,9 @@ export class TabpanePerfProfile extends BaseElement {
     this.getDataByWorker(perfProfileFuncArgs, (result: any[]): void => {
       this.setPerfProfilerLeftTableData(result);
       this.perfProfileFrameChart!.data = this.perfProfilerDataSource;
-      if (this.isChartShow) {this.perfProfileFrameChart?.calculateChartData()}
+      if (this.isChartShow) {
+        this.perfProfileFrameChart?.calculateChartData();
+      }
       this.perfProfilerTbl!.move1px();
       if (this.perfSelectedData) {
         this.perfSelectedData.isSelected = false;
@@ -464,9 +465,9 @@ export class TabpanePerfProfile extends BaseElement {
         this.perfSelectedData = undefined;
       }
     });
-  };
+  }
 
-  perfProfilerFilterGetFilter = (data: FilterData): void => {
+  private perfProfilerFilterGetFilter(data: FilterData): void {
     if (this.searchValue !== this.perfProfilerFilter!.filterValue) {
       this.searchValue = this.perfProfilerFilter!.filterValue;
       let perfArgs = [
@@ -491,9 +492,9 @@ export class TabpanePerfProfile extends BaseElement {
       this.setPerfProfilerLeftTableData(this.perfProfilerDataSource);
       this.switchFlameChart(data);
     }
-  };
+  }
 
-  perfProfilerFilterGetCallTreeConstraints = (data: any): void => {
+  private perfProfilerFilterGetCallTreeConstraints(data: any): void {
     let perfProfilerConstraintsArgs: any[] = [
       {
         funcName: 'resotreAllNode',
@@ -517,11 +518,13 @@ export class TabpanePerfProfile extends BaseElement {
     this.getDataByWorker(perfProfilerConstraintsArgs, (result: any[]): void => {
       this.setPerfProfilerLeftTableData(result);
       this.perfProfileFrameChart!.data = this.perfProfilerDataSource;
-      if (this.isChartShow) {this.perfProfileFrameChart?.calculateChartData()}
+      if (this.isChartShow) {
+        this.perfProfileFrameChart?.calculateChartData();
+      }
     });
-  };
+  }
 
-  perfProfilerFilterGetCallTree = (data: any): void => {
+  private perfProfilerFilterGetCallTree(data: any): void {
     if (callTreeValueNoSample.includes(data.value)) {
       this.refreshAllNode({
         ...this.perfProfilerFilter!.getFilterTreeData(),
@@ -551,10 +554,12 @@ export class TabpanePerfProfile extends BaseElement {
       this.getDataByWorker(perfProfileArgs, (result: any[]): void => {
         this.setPerfProfilerLeftTableData(result);
         this.perfProfileFrameChart!.data = this.perfProfilerDataSource;
-        if (this.isChartShow) {this.perfProfileFrameChart?.calculateChartData()}
+        if (this.isChartShow) {
+          this.perfProfileFrameChart?.calculateChartData();
+        }
       });
     }
-  };
+  }
 
   connectedCallback(): void {
     super.connectedCallback();
@@ -564,7 +569,9 @@ export class TabpanePerfProfile extends BaseElement {
     let filterHeight = 0;
     new ResizeObserver((entries): void => {
       let perfProfileTabFilter = this.shadowRoot!.querySelector('#filter') as HTMLElement;
-      if (perfProfileTabFilter.clientHeight > 0) {filterHeight = perfProfileTabFilter.clientHeight}
+      if (perfProfileTabFilter.clientHeight > 0) {
+        filterHeight = perfProfileTabFilter.clientHeight;
+      }
       if (this.parentElement!.clientHeight > filterHeight) {
         perfProfileTabFilter.style.display = 'flex';
       } else {
@@ -581,14 +588,14 @@ export class TabpanePerfProfile extends BaseElement {
         // @ts-ignore
         this.perfProfilerTbl?.shadowRoot.querySelector('.table').style.height =
           // @ts-ignore
-          `${this.parentElement.clientHeight - 10 - 35  }px`;
+          `${this.parentElement.clientHeight - 10 - 35}px`;
         this.perfProfilerTbl?.reMeauseHeight();
         // @ts-ignore
         this.perfProfilerList?.shadowRoot.querySelector('.table').style.height =
           // @ts-ignore
-          `${this.parentElement.clientHeight - 45 - 21  }px`;
+          `${this.parentElement.clientHeight - 45 - 21}px`;
         this.perfProfilerList?.reMeauseHeight();
-        this.perfProfileLoadingPage.style.height = `${this.parentElement!.clientHeight - 24  }px`;
+        this.perfProfileLoadingPage.style.height = `${this.parentElement!.clientHeight - 24}px`;
       }
     }).observe(this.parentElement!);
   }
@@ -658,7 +665,7 @@ export class TabpanePerfProfile extends BaseElement {
     this.refreshAllNodeExtend(perfProfileArgs);
   }
 
-  refreshAllNodeExtend(perfProfileArgs: any[]): void{
+  refreshAllNodeExtend(perfProfileArgs: any[]): void {
     if (this._rowClickData && this._rowClickData.libId !== undefined && this._currentLevel === 2) {
       perfProfileArgs.push({
         funcName: 'showLibLevelData',
diff --git a/ide/src/trace/component/trace/sheet/hisysevent/TabPaneHisysEvents.ts b/ide/src/trace/component/trace/sheet/hisysevent/TabPaneHisysEvents.ts
index 6cb428a66b799856b90398e50a655f778b42b2db..4f32e5e903094eafa5ca8edcd005da69ae858f4e 100644
--- a/ide/src/trace/component/trace/sheet/hisysevent/TabPaneHisysEvents.ts
+++ b/ide/src/trace/component/trace/sheet/hisysevent/TabPaneHisysEvents.ts
@@ -54,7 +54,7 @@ export class TabPaneHisysEvents extends BaseElement {
   private eventTableTitle: HTMLLabelElement | undefined | null;
   tableTitleTimeHandle: (() => void) | undefined;
   private currentDetailList: Array<{ key: string; value: string }> = [];
-  private realTime: number = 0;
+  private realTime: number = -1;
   private baseTime: string = '';
 
   set data(systemEventParam: SelectionParam) {
@@ -69,17 +69,17 @@ export class TabPaneHisysEvents extends BaseElement {
       this.detailsTbl!.recycleDataSource = [];
     }
     this.initTabSheetEl();
-    queryHiSysEventTabData(systemEventParam.leftNs, systemEventParam.rightNs).then((res) => {
-      this.currentSelection = systemEventParam;
-      systemEventParam.sysAllEventsData = res;
-      this.hiSysEventTable!.recycleDataSource = res;
-      this.hisysEventSource = res;
-      this.updateData();
-    });
     queryRealTime().then((result) => {
       if (result && result.length > 0) {
         this.realTime = Math.floor(result[0].ts / millisecond);
       }
+      queryHiSysEventTabData(systemEventParam.leftNs, systemEventParam.rightNs).then((res) => {
+        this.currentSelection = systemEventParam;
+        systemEventParam.sysAllEventsData = res;
+        this.hiSysEventTable!.recycleDataSource = res;
+        this.hisysEventSource = res;
+        this.updateData();
+      });
     });
   }
 
@@ -151,7 +151,7 @@ export class TabPaneHisysEvents extends BaseElement {
     this.detailsTbl!.addEventListener('row-hover', (e) => {
       // @ts-ignore
       let data = e.detail.data;
-      if (data && data.key) {
+      if (data && data.key && this.realTime >= 0) {
         if (data.key.endsWith('_TIME') || data.key.endsWith('_LATENCY')) {
           this.drawFlag(data.value, '#999999');
           return;
@@ -404,6 +404,9 @@ export class TabPaneHisysEvents extends BaseElement {
         if (key.endsWith('_TIME')) {
           if (!isNaN(Number(value))) {
             contentValue = ((Number(value) - this.realTime) * millisecond).toString();
+            if (this.realTime < 0) {
+              contentValue = value;
+            }
             if (isFirstTime) {
               this.baseTime = contentValue;
               isFirstTime = false;
diff --git a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMCallTree.ts b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMCallTree.ts
index 1f27646f88902a440b98aa91d4f7ab89196444f7..882ea103ec12dca38e206b491b51036438f72e93 100644
--- a/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMCallTree.ts
+++ b/ide/src/trace/component/trace/sheet/native-memory/TabPaneNMCallTree.ts
@@ -28,10 +28,7 @@ import { SpSystemTrace } from '../../../SpSystemTrace';
 import '../../../../../base-ui/headline/lit-headline';
 import { LitHeadLine } from '../../../../../base-ui/headline/lit-headline';
 import { TabPaneNMCallTreeHtml } from './TabPaneNMCallTree.html';
-import {
-  queryNativeHookStatisticSubType,
-  queryNativeHookSubType
-} from '../../../../database/sql/NativeHook.sql';
+import { queryNativeHookStatisticSubType, queryNativeHookSubType } from '../../../../database/sql/NativeHook.sql';
 
 const InvertOpyionIndex: number = 0;
 const HideSystemSoOptionIndex: number = 1;
@@ -142,8 +139,7 @@ export class TabpaneNMCalltree extends BaseElement {
     } else {
       this.nmCallTreeFilter!.style.display = 'none';
     }
-    procedurePool.submitWithName('logic0', 'native-memory-reset', [], undefined, () => {
-    });
+    procedurePool.submitWithName('logic0', 'native-memory-reset', [], undefined, () => {});
     this.nmCallTreeFilter!.disabledTransfer(true);
     this.nmCallTreeFilter!.initializeFilterTree(true, true, this.currentSelection!.nativeMemory.length > 0);
     this.nmCallTreeFilter!.filterValue = '';
@@ -156,14 +152,14 @@ export class TabpaneNMCalltree extends BaseElement {
     if (nmCallTreeParam.nativeMemory.length > 0) {
       this.nmCallTreeFilter!.isStatisticsMemory = false;
       if (nmCallTreeParam.nativeMemory.indexOf(this.nativeType[0]) !== -1) {
-        types.push('\'AllocEvent\'');
-        types.push('\'MmapEvent\'');
+        types.push("'AllocEvent'");
+        types.push("'MmapEvent'");
       } else {
         if (nmCallTreeParam.nativeMemory.indexOf(this.nativeType[1]) !== -1) {
-          types.push('\'AllocEvent\'');
+          types.push("'AllocEvent'");
         }
         if (nmCallTreeParam.nativeMemory.indexOf(this.nativeType[2]) !== -1) {
-          types.push('\'MmapEvent\'');
+          types.push("'MmapEvent'");
         }
       }
     } else {
@@ -243,10 +239,10 @@ export class TabpaneNMCalltree extends BaseElement {
   banTypeAndLidSelect(): void {
     this.currentNMCallTreeFilter!.firstSelect = '0';
     let secondSelect = this.shadowRoot
-    ?.querySelector('#nm-call-tree-filter')!
+      ?.querySelector('#nm-call-tree-filter')!
       .shadowRoot!.querySelector('#second-select');
     let thirdSelect = this.shadowRoot
-    ?.querySelector('#nm-call-tree-filter')!
+      ?.querySelector('#nm-call-tree-filter')!
       .shadowRoot!.querySelector('#third-select');
     thirdSelect?.setAttribute('disabled', '');
     secondSelect?.setAttribute('disabled', '');
@@ -439,15 +435,15 @@ export class TabpaneNMCalltree extends BaseElement {
         }
       });
     };
-    this.nmCallTreeFilter!.getDataLibrary(filterFunc);
-    this.nmCallTreeFilter!.getDataMining(filterFunc);
-    this.nmCallTreeFilter!.getCallTreeData(this.getCallTreeByNMCallTreeFilter);
-    this.nmCallTreeFilter!.getCallTreeConstraintsData(this.getCallTreeConByNMCallTreeFilter);
-    this.nmCallTreeFilter!.getFilterData(this.getFilterDataByNMCallTreeFilter);
+    this.nmCallTreeFilter!.getDataLibrary(filterFunc.bind(this));
+    this.nmCallTreeFilter!.getDataMining(filterFunc.bind(this));
+    this.nmCallTreeFilter!.getCallTreeData(this.getCallTreeByNMCallTreeFilter.bind(this));
+    this.nmCallTreeFilter!.getCallTreeConstraintsData(this.getCallTreeConByNMCallTreeFilter.bind(this));
+    this.nmCallTreeFilter!.getFilterData(this.getFilterDataByNMCallTreeFilter.bind(this));
     this.initCloseCallBackByHeadLine();
   }
 
-  getFilterDataByNMCallTreeFilter = (nmCallTreeData: FilterData): void => {
+  private getFilterDataByNMCallTreeFilter(nmCallTreeData: FilterData): void {
     if (
       (this.isChartShow && nmCallTreeData.icon === 'tree') ||
       (!this.isChartShow && nmCallTreeData.icon === 'block')
@@ -458,7 +454,7 @@ export class TabpaneNMCalltree extends BaseElement {
     }
   }
 
-  getCallTreeConByNMCallTreeFilter = (nmCallTreeConstraintsData: any): void => {
+  private getCallTreeConByNMCallTreeFilter(nmCallTreeConstraintsData: any): void {
     let nmCallTreeConstraintsArgs: any[] = [
       {
         funcName: 'resotreAllNode',
@@ -486,7 +482,7 @@ export class TabpaneNMCalltree extends BaseElement {
     });
   }
 
-  getCallTreeByNMCallTreeFilter = (callTreeData: any): void => {
+  private getCallTreeByNMCallTreeFilter(callTreeData: any): void {
     if ([InvertOpyionIndex, HideSystemSoOptionIndex, HideThreadOptionIndex].includes(callTreeData.value)) {
       this.refreshAllNode({
         ...this.nmCallTreeFilter!.getFilterTreeData(),
@@ -531,8 +527,7 @@ export class TabpaneNMCalltree extends BaseElement {
         return nmCallTreeFuncArgs;
       }
       if (this.currentSelectedData !== undefined) {
-        this.nmCallTreeFilter!.addDataMining(
-          {name: this.currentSelectedData.symbolName},nmCallTreeFuncData.item);
+        this.nmCallTreeFilter!.addDataMining({ name: this.currentSelectedData.symbolName }, nmCallTreeFuncData.item);
         nmCallTreeFuncArgs.push({
           funcName: 'splitTree',
           funcArgs: [this.currentSelectedData.symbolName, false, true],
@@ -545,7 +540,7 @@ export class TabpaneNMCalltree extends BaseElement {
         return nmCallTreeFuncArgs;
       }
       if (this.currentSelectedData != undefined && this.currentSelectedData.libName !== '') {
-        this.nmCallTreeFilter!.addDataMining({name: this.currentSelectedData.libName}, nmCallTreeFuncData.item);
+        this.nmCallTreeFilter!.addDataMining({ name: this.currentSelectedData.libName }, nmCallTreeFuncData.item);
         nmCallTreeFuncArgs.push({
           funcName: 'splitTree',
           funcArgs: [this.currentSelectedData.libName, false, false],
@@ -558,10 +553,10 @@ export class TabpaneNMCalltree extends BaseElement {
         let list = nmCallTreeFuncData.remove.map((item: any): any => {
           return item.name;
         });
-        nmCallTreeFuncArgs.push({funcName: 'resotreAllNode', funcArgs: [list]});
-        nmCallTreeFuncArgs.push({ funcName: 'resetAllNode', funcArgs: []});
+        nmCallTreeFuncArgs.push({ funcName: 'resotreAllNode', funcArgs: [list] });
+        nmCallTreeFuncArgs.push({ funcName: 'resetAllNode', funcArgs: [] });
         list.forEach((symbolName: string): void => {
-          nmCallTreeFuncArgs.push({funcName: 'clearSplitMapData', funcArgs: [symbolName]});
+          nmCallTreeFuncArgs.push({ funcName: 'clearSplitMapData', funcArgs: [symbolName] });
         });
       }
     }
@@ -645,8 +640,8 @@ export class TabpaneNMCalltree extends BaseElement {
           this.lastIsExpression = false;
           return;
         }
-        nmArgs.push({funcName: 'setSearchValue', funcArgs: [this.searchValue]});
-        nmArgs.push({funcName: 'resetAllNode', funcArgs: []});
+        nmArgs.push({ funcName: 'setSearchValue', funcArgs: [this.searchValue] });
+        nmArgs.push({ funcName: 'resetAllNode', funcArgs: [] });
         this.lastIsExpression = false;
       }
       this.getDataByWorker(nmArgs, (result: any[]): void => {
@@ -704,14 +699,14 @@ export class TabpaneNMCalltree extends BaseElement {
           this.nmCallTreeFrameChart?.updateCanvas(false, entries[0].contentRect.width);
           this.nmCallTreeFrameChart?.calculateChartData();
         }
-        if (this.nmCallTreeTbl){
+        if (this.nmCallTreeTbl) {
           // @ts-ignore
           this.nmCallTreeTbl.shadowRoot.querySelector('.table').style.height = `${
             this.parentElement!.clientHeight - 10 - 35
           }px`;
         }
         this.nmCallTreeTbl?.reMeauseHeight();
-        if (this.filesystemTbr){
+        if (this.filesystemTbr) {
           // @ts-ignore
           this.filesystemTbr.shadowRoot.querySelector('.table').style.height = `${
             this.parentElement!.clientHeight - 45 - 21
@@ -744,7 +739,7 @@ export class TabpaneNMCalltree extends BaseElement {
       // @ts-ignore
       (evt.detail as any).callBack(true);
     }
-  }
+  };
 
   nmCallTreeTblColumnClickHandler = (event: any): void => {
     // @ts-ignore
@@ -754,7 +749,7 @@ export class TabpaneNMCalltree extends BaseElement {
     // @ts-ignore
     this.setLTableData(this.nmCallTreeSource, true);
     this.nmCallTreeFrameChart!.data = this.nmCallTreeSource;
-  }
+  };
 
   nmCallTreeTblRowClickHandler = (event: any): void => {
     // @ts-ignore
@@ -771,12 +766,12 @@ export class TabpaneNMCalltree extends BaseElement {
     }
     document.dispatchEvent(
       new CustomEvent('number_calibration', {
-        detail: {time: event.detail.tsArray, counts: event.detail.countArray},
+        detail: { time: event.detail.tsArray, counts: event.detail.countArray },
       })
     );
-  }
+  };
 
-  switchFlameChart(flameChartData?: any): void {
+  private switchFlameChart(flameChartData?: any): void {
     let nmCallTreePageTab = this.shadowRoot?.querySelector('#show_table');
     let nmCallTreePageChart = this.shadowRoot?.querySelector('#show_chart');
     if (!flameChartData || flameChartData.icon === 'block') {
@@ -797,7 +792,7 @@ export class TabpaneNMCalltree extends BaseElement {
     }
   }
 
-  refreshAllNode(filterData: any, isAnalysisReset?: boolean): void {
+  private refreshAllNode(filterData: any, isAnalysisReset?: boolean): void {
     let nmCallTreeArgs: any[] = [];
     let isTopDown: boolean = !filterData.callTree[0];
     let isHideSystemLibrary = filterData.callTree[1];
@@ -805,9 +800,9 @@ export class TabpaneNMCalltree extends BaseElement {
     let list = filterData.dataMining.concat(filterData.dataLibrary);
     let groupArgs = this.setGroupArgsByRefreshAllNode();
     if ((this.lastIsExpression && !this.expressionStruct) || isAnalysisReset) {
-      nmCallTreeArgs.push({funcName: 'setSearchValue', funcArgs: [this.searchValue]});
+      nmCallTreeArgs.push({ funcName: 'setSearchValue', funcArgs: [this.searchValue] });
     }
-    nmCallTreeArgs.push({funcName: 'hideThread', funcArgs: [this.isHideThread]});
+    nmCallTreeArgs.push({ funcName: 'hideThread', funcArgs: [this.isHideThread] });
     nmCallTreeArgs.push(
       {
         funcName: 'groupCallchainSample',
@@ -831,8 +826,8 @@ export class TabpaneNMCalltree extends BaseElement {
         funcArgs: [parseInt(filterData.callTreeConstraints.inputs[0]), filterData.callTreeConstraints.inputs[1]],
       });
     }
-    nmCallTreeArgs.push({funcName: 'splitAllProcess', funcArgs: [list]});
-    nmCallTreeArgs.push({funcName: 'resetAllNode', funcArgs: []});
+    nmCallTreeArgs.push({ funcName: 'splitAllProcess', funcArgs: [list] });
+    nmCallTreeArgs.push({ funcName: 'resetAllNode', funcArgs: [] });
     this.getDataByWorker(nmCallTreeArgs, (result: any[]) => {
       this.setLTableData(result);
       this.nmCallTreeFrameChart!.data = this.nmCallTreeSource;
@@ -840,7 +835,7 @@ export class TabpaneNMCalltree extends BaseElement {
     });
   }
 
-  private setGroupArgsByRefreshAllNode(): Map<string, any>{
+  private setGroupArgsByRefreshAllNode(): Map<string, any> {
     let groupArgs = new Map<string, any>();
     groupArgs.set('filterAllocType', this.filterAllocationType);
     groupArgs.set('filterEventType', this.filterNativeType);
diff --git a/ide/src/trace/database/TraceWorker.ts b/ide/src/trace/database/TraceWorker.ts
index 65a840d9bd8f282a2d9ca73bdb2d64714d1c26c4..4d715a4b18db6a8903e0a9bef0ef550a7ee2c70b 100644
--- a/ide/src/trace/database/TraceWorker.ts
+++ b/ide/src/trace/database/TraceWorker.ts
@@ -369,7 +369,7 @@ self.onmessage = async (e: MessageEvent) => {
     }
     let wrSize = 0;
     let r2 = -1;
-    let rowTraceStr = Array.from(new Uint32Array(e.data.buffer.slice(0, 4)));
+    let rowTraceStr = Array.from(new Uint16Array(e.data.buffer.slice(0, 2)));
     if (rowTraceStr[0] === 57161) {
       let commonDataOffsetList: Array<{
         startOffset: number;
diff --git a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerPerf.ts b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerPerf.ts
index 30e3f374c27be519516c623a3b4999697b3159e0..9511e51511a8c65d9d459c3593b81f8fec03aa32 100644
--- a/ide/src/trace/database/logic-worker/ProcedureLogicWorkerPerf.ts
+++ b/ide/src/trace/database/logic-worker/ProcedureLogicWorkerPerf.ts
@@ -432,7 +432,12 @@ export class ProcedureLogicWorkerPerf extends LogicHandler {
         this.addOtherCallchainsData(perfSample, perfCallChains);
         let topIndex = isTopDown ? 0 : perfCallChains.length - 1;
         if (perfCallChains.length > 0) {
-          const symbolName = this.dataCache.dataDict.get(perfCallChains[topIndex].name) || '';
+          let symbolName = this.dataCache.dataDict.get(perfCallChains[topIndex].name) || '';
+          if (typeof perfCallChains[topIndex].name === 'number') {
+            symbolName = this.dataCache.dataDict.get(perfCallChains[topIndex].name) || '';
+          } else {
+            symbolName = perfCallChains[topIndex].name;
+          }
           let perfRootNode = this.currentTreeMapData[symbolName + perfSample.pid];
           if (perfRootNode === undefined) {
             perfRootNode = new PerfCallChainMerageData();
diff --git a/trace_streamer/src/base/index_map.h b/trace_streamer/src/base/index_map.h
index 564de376dae9500083e8964b01b7802cf83c7bce..35817e8cd99f545e0ebc467e5f760f3d340b2073 100644
--- a/trace_streamer/src/base/index_map.h
+++ b/trace_streamer/src/base/index_map.h
@@ -78,44 +78,36 @@ public:
         rowIndexBak_.clear();
         switch (op) {
             case SQLITE_INDEX_CONSTRAINT_EQ:
-                ProcessData(
-                    dataQueue, remove, [&](TableRowId id) -> bool { return dataQueue[id] != value; },
-                    [&](TableRowId id) -> bool { return dataQueue[id] == value; });
+                ProcessData(dataQueue, remove, [&](TableRowId id) -> bool { return dataQueue[id] != value; },
+                            [&](TableRowId id) -> bool { return dataQueue[id] == value; });
                 break;
             case SQLITE_INDEX_CONSTRAINT_NE:
-                ProcessData(
-                    dataQueue, remove, [&](TableRowId id) -> bool { return dataQueue[id] == value; },
-                    [&](TableRowId id) -> bool { return dataQueue[id] != value; });
+                ProcessData(dataQueue, remove, [&](TableRowId id) -> bool { return dataQueue[id] == value; },
+                            [&](TableRowId id) -> bool { return dataQueue[id] != value; });
                 break;
             case SQLITE_INDEX_CONSTRAINT_ISNULL:
-                ProcessData(
-                    dataQueue, remove, [&](TableRowId id) -> bool { return dataQueue[id] != invalidValue; },
-                    [&](TableRowId id) -> bool { return dataQueue[id] == invalidValue; });
+                ProcessData(dataQueue, remove, [&](TableRowId id) -> bool { return dataQueue[id] != invalidValue; },
+                            [&](TableRowId id) -> bool { return dataQueue[id] == invalidValue; });
                 break;
             case SQLITE_INDEX_CONSTRAINT_ISNOTNULL:
-                ProcessData(
-                    dataQueue, remove, [&](TableRowId id) -> bool { return dataQueue[id] == invalidValue; },
-                    [&](TableRowId id) -> bool { return dataQueue[id] != invalidValue; });
+                ProcessData(dataQueue, remove, [&](TableRowId id) -> bool { return dataQueue[id] == invalidValue; },
+                            [&](TableRowId id) -> bool { return dataQueue[id] != invalidValue; });
                 break;
             case SQLITE_INDEX_CONSTRAINT_GT:
-                ProcessData(
-                    dataQueue, remove, [&](TableRowId id) -> bool { return dataQueue[id] <= value; },
-                    [&](TableRowId id) -> bool { return dataQueue[id] > value; });
+                ProcessData(dataQueue, remove, [&](TableRowId id) -> bool { return dataQueue[id] <= value; },
+                            [&](TableRowId id) -> bool { return dataQueue[id] > value; });
                 break;
             case SQLITE_INDEX_CONSTRAINT_GE:
-                ProcessData(
-                    dataQueue, remove, [&](TableRowId id) -> bool { return dataQueue[id] < value; },
-                    [&](TableRowId id) -> bool { return dataQueue[id] >= value; });
+                ProcessData(dataQueue, remove, [&](TableRowId id) -> bool { return dataQueue[id] < value; },
+                            [&](TableRowId id) -> bool { return dataQueue[id] >= value; });
                 break;
             case SQLITE_INDEX_CONSTRAINT_LE:
-                ProcessData(
-                    dataQueue, remove, [&](TableRowId id) -> bool { return dataQueue[id] > value; },
-                    [&](TableRowId id) -> bool { return dataQueue[id] <= value; });
+                ProcessData(dataQueue, remove, [&](TableRowId id) -> bool { return dataQueue[id] > value; },
+                            [&](TableRowId id) -> bool { return dataQueue[id] <= value; });
                 break;
             case SQLITE_INDEX_CONSTRAINT_LT:
-                ProcessData(
-                    dataQueue, remove, [&](TableRowId id) -> bool { return dataQueue[id] >= value; },
-                    [&](TableRowId id) -> bool { return dataQueue[id] < value; });
+                ProcessData(dataQueue, remove, [&](TableRowId id) -> bool { return dataQueue[id] >= value; },
+                            [&](TableRowId id) -> bool { return dataQueue[id] < value; });
                 break;
             default:
                 break;
diff --git a/trace_streamer/src/base/log.cpp b/trace_streamer/src/base/log.cpp
index 25caca60a5853aa53acaf8f198b5570c39ccd5a3..f1d9948ecd727439d126eb1faf9fff16e300f4b7 100644
--- a/trace_streamer/src/base/log.cpp
+++ b/trace_streamer/src/base/log.cpp
@@ -15,7 +15,7 @@
 
 #include "log.h"
 bool g_cleanMode = false;
-enum LogLevel g_curLogLevel = LOG_ERROR;
+enum LogLevel g_curLogLevel = LOG_OFF;
 
 bool SetLogLevel(const std::string& level)
 {
diff --git a/trace_streamer/src/cfg/trace_streamer_config.cpp b/trace_streamer/src/cfg/trace_streamer_config.cpp
index 599c1046a1c824b890b1065ff723d785db92579b..667be5eda13b0510879181a4a7ee3826bcc09630 100644
--- a/trace_streamer/src/cfg/trace_streamer_config.cpp
+++ b/trace_streamer/src/cfg/trace_streamer_config.cpp
@@ -612,7 +612,7 @@ void TraceStreamerConfig::InitSecurityMap()
 {
     statSeverityDescMap_ = {
         {STAT_EVENT_RECEIVED, STAT_SEVERITY_LEVEL_INFO},      {STAT_EVENT_DATA_LOST, STAT_SEVERITY_LEVEL_ERROR},
-        {STAT_EVENT_NOTMATCH, STAT_SEVERITY_LEVEL_INFO},      {STAT_EVENT_NOTSUPPORTED, STAT_SEVERITY_LEVEL_INFO},
+        {STAT_EVENT_NOTMATCH, STAT_SEVERITY_LEVEL_INFO},      {STAT_EVENT_NOTSUPPORTED, STAT_SEVERITY_LEVEL_WARN},
         {STAT_EVENT_DATA_INVALID, STAT_SEVERITY_LEVEL_ERROR},
     };
     InitBinderEventSecurityMap();
diff --git a/trace_streamer/src/filter/cpu_filter.cpp b/trace_streamer/src/filter/cpu_filter.cpp
index 14a02811d9297f79817117775e2ffe778de79c4a..e83266367952764859e0d86f2c878748bb49a1f4 100644
--- a/trace_streamer/src/filter/cpu_filter.cpp
+++ b/trace_streamer/src/filter/cpu_filter.cpp
@@ -119,7 +119,7 @@ void CpuFilter::InsertSwitchEvent(uint64_t ts,
         ProcNextPidSwitchEvent(ts, cpu, prevPid, nextPid, nextInfo);
     }
     if (prevPid) {
-        ProcPrevPidSwitchEvent(ts, cpu, prevPid, prevPior, btInfo);
+        ProcPrevPidSwitchEvent(ts, cpu, prevPid, prevState, btInfo);
     }
     if (traceDataCache_->BinderRunnableTraceEnabled() && iTidToTransaction_.find(prevPid) != iTidToTransaction_.end()) {
         uint64_t transactionId = iTidToTransaction_.at(prevPid);
diff --git a/trace_streamer/src/filter/offline_symbolization_filter.cpp b/trace_streamer/src/filter/offline_symbolization_filter.cpp
index aeb813fa25299fe68e61612c9fed2692985d7d43..7361485b244adfe8c4be1fd3232e677b5fbfdce8 100644
--- a/trace_streamer/src/filter/offline_symbolization_filter.cpp
+++ b/trace_streamer/src/filter/offline_symbolization_filter.cpp
@@ -58,11 +58,7 @@ void OfflineSymbolizationFilter::GetSymbolStartMaybeUpdateFrameInfo(T* elfSym,
     }
 }
 
-bool OfflineSymbolizationFilter::FillFrameInfo(const std::shared_ptr<FrameInfo>& frameInfo,
-                                               uint64_t ip,
-                                               uint64_t& vmStart,
-                                               uint64_t& vmOffset,
-                                               uint64_t ipid)
+bool OfflineSymbolizationFilter::FillFrameInfo(const std::shared_ptr<FrameInfo>& frameInfo, uint64_t ip, uint64_t ipid)
 {
     frameInfo->ip_ = ip;
     auto startAddrToMapsInfoItor = ipidToStartAddrToMapsInfoMap_.Find(ipid);
@@ -74,8 +70,8 @@ bool OfflineSymbolizationFilter::FillFrameInfo(const std::shared_ptr<FrameInfo>&
         endItor--;
         // Follow the rules of front closing and rear opening, [start, end)
         if (ip < endItor->second->end()) {
-            vmStart = endItor->second->start();
-            vmOffset = endItor->second->offset();
+            vmStart_ = endItor->second->start();
+            vmOffset_ = endItor->second->offset();
             frameInfo->filePathId_ = endItor->second->file_path_id();
         }
     }
@@ -86,40 +82,16 @@ bool OfflineSymbolizationFilter::FillFrameInfo(const std::shared_ptr<FrameInfo>&
     }
     return true;
 }
-
-std::shared_ptr<FrameInfo> OfflineSymbolizationFilter::OfflineSymbolizationByIp(uint64_t ipid, uint64_t ip)
+bool OfflineSymbolizationFilter::CalcSymInfo(uint64_t ipid,
+                                             uint64_t ip,
+                                             uint32_t& symbolStart,
+                                             std::shared_ptr<FrameInfo>& frameInfo,
+                                             std::shared_ptr<ProtoReader::SymbolTable_Reader>& symbolTable)
 {
-    if (isSingleProcData_) {
-        ipid = SINGLE_PROC_IPID;
-    }
-    auto frameInfoPtr = ipidToIpToFrameInfo_.Find(ipid, ip);
-    if (frameInfoPtr != nullptr) {
-        return frameInfoPtr;
-    }
-    uint64_t vmStart = INVALID_UINT64;
-    uint64_t vmOffset = INVALID_UINT64;
-    // start symbolization
-    std::shared_ptr<FrameInfo> frameInfo = std::make_shared<FrameInfo>();
-    if (!FillFrameInfo(frameInfo, ip, vmStart, vmOffset, ipid)) {
-        if (ip & usefulIpMask_) {
-            return frameInfo;
-        }
-        return nullptr;
-    }
-    // find SymbolTable by filePathId
-    auto symbolTable = ipidTofilePathIdToSymbolTableMap_.Find(ipid, frameInfo->filePathId_);
-    if (symbolTable == nullptr) {
-        // find matching SymbolTable failed, but filePathId is availiable
-        ipidToIpToFrameInfo_.Insert(ipid, ip, frameInfo);
-        TS_LOGD("find matching filePathId failed, ipid = %" PRIu64 ", ip = %" PRIu64 ", filePathId = %u", ipid, ip,
-                frameInfo->filePathId_);
-        return frameInfo;
-    }
     // calculate symVaddr = ip - vmStart + vmOffset + phdrVaddr - phdrOffset
     uint64_t symVaddr =
-        ip - vmStart + vmOffset + symbolTable->text_exec_vaddr() - symbolTable->text_exec_vaddr_file_offset();
+        ip - vmStart_ + vmOffset_ + symbolTable->text_exec_vaddr() - symbolTable->text_exec_vaddr_file_offset();
     frameInfo->symVaddr_ = symVaddr;
-
     // pase sym_table to Elf32_Sym or Elf64_Sym array decided by sym_entry_size.
     auto symEntLen = symbolTable->sym_entry_size();
     auto startValueToSymAddrMap = symbolTablePtrAndStValueToSymAddr_.Find(symbolTable);
@@ -128,12 +100,11 @@ std::shared_ptr<FrameInfo> OfflineSymbolizationFilter::OfflineSymbolizationByIp(
         ipidToIpToFrameInfo_.Insert(ipid, ip, frameInfo);
         // find symbolTable failed!!!
         TS_LOGD("find symbolTalbe failed!!!");
-        return frameInfo;
+        return false;
     }
     // Traverse array, st_value <= symVaddr and symVaddr <= st_value + st_size.  then you can get st_name
     auto end = startValueToSymAddrMap->upper_bound(symVaddr);
     auto length = std::distance(startValueToSymAddrMap->begin(), end);
-    uint32_t symbolStart = INVALID_UINT32;
     if (length > 0) {
         end--;
         if (symEntLen == ELF32_SYM) {
@@ -144,16 +115,48 @@ std::shared_ptr<FrameInfo> OfflineSymbolizationFilter::OfflineSymbolizationByIp(
                                                ip, frameInfo.get());
         }
     }
-
     if (symbolStart == INVALID_UINT32 || symbolStart >= symbolTable->str_table().Size()) {
         // find symbolStart failed, but some data is availiable.
         frameInfo->offset_ = ip;
         frameInfo->symbolOffset_ = 0;
         ipidToIpToFrameInfo_.Insert(ipid, ip, frameInfo);
         TS_LOGD("symbolStart is %u invaliable!!!", symbolStart);
+        return false;
+    }
+    return true;
+}
+std::shared_ptr<FrameInfo> OfflineSymbolizationFilter::OfflineSymbolizationByIp(uint64_t ipid, uint64_t ip)
+{
+    if (isSingleProcData_) {
+        ipid = SINGLE_PROC_IPID;
+    }
+    auto frameInfoPtr = ipidToIpToFrameInfo_.Find(ipid, ip);
+    if (frameInfoPtr != nullptr) {
+        return frameInfoPtr;
+    }
+    vmStart_ = INVALID_UINT64;
+    vmOffset_ = INVALID_UINT64;
+    // start symbolization
+    std::shared_ptr<FrameInfo> frameInfo = std::make_shared<FrameInfo>();
+    if (!FillFrameInfo(frameInfo, ip, ipid)) {
+        if (ip & usefulIpMask_) {
+            return frameInfo;
+        }
+        return nullptr;
+    }
+    // find SymbolTable by filePathId
+    auto symbolTable = ipidTofilePathIdToSymbolTableMap_.Find(ipid, frameInfo->filePathId_);
+    if (symbolTable == nullptr) {
+        // find matching SymbolTable failed, but filePathId is availiable
+        ipidToIpToFrameInfo_.Insert(ipid, ip, frameInfo);
+        TS_LOGD("find matching filePathId failed, ipid = %" PRIu64 ", ip = %" PRIu64 ", filePathId = %u", ipid, ip,
+                frameInfo->filePathId_);
+        return frameInfo;
+    }
+    uint32_t symbolStart = INVALID_UINT32;
+    if (!CalcSymInfo(ipid, ip, symbolStart, frameInfo, symbolTable)) {
         return frameInfo;
     }
-
     auto mangle = reinterpret_cast<const char*>(symbolTable->str_table().Data() + symbolStart);
     auto demangle = base::GetDemangleSymbolIndex(mangle);
     frameInfo->symbolIndex_ = traceDataCache_->GetDataIndex(demangle);
diff --git a/trace_streamer/src/filter/offline_symbolization_filter.h b/trace_streamer/src/filter/offline_symbolization_filter.h
index ec309ca2b2b14dd41405d3374bd141932c7e1edb..26aa1e644113f2e9a7330a785f6e25339c9cac23 100644
--- a/trace_streamer/src/filter/offline_symbolization_filter.h
+++ b/trace_streamer/src/filter/offline_symbolization_filter.h
@@ -93,12 +93,15 @@ private:
                                                    uint64_t symVaddr,
                                                    uint64_t ip,
                                                    FrameInfo* frameInfo);
-    bool FillFrameInfo(const std::shared_ptr<FrameInfo>& frameInfo,
-                       uint64_t ip,
-                       uint64_t& vmStart,
-                       uint64_t& vmOffset,
-                       uint64_t ipid);
+    bool FillFrameInfo(const std::shared_ptr<FrameInfo>& frameInfo, uint64_t ip, uint64_t ipid);
+    bool CalcSymInfo(uint64_t ipid,
+                     uint64_t ip,
+                     uint32_t& symbolStart,
+                     std::shared_ptr<FrameInfo>& frameInfo,
+                     std::shared_ptr<ProtoReader::SymbolTable_Reader>& symbolTable);
     const uint64_t usefulIpMask_ = 0xffffff0000000000;
+    uint64_t vmStart_ = INVALID_UINT64;
+    uint64_t vmOffset_ = INVALID_UINT64;
 };
 
 } // namespace TraceStreamer
diff --git a/trace_streamer/src/filter/slice_filter.cpp b/trace_streamer/src/filter/slice_filter.cpp
index dc34b64a8eb52a4b7e4cc0a163684021dd52023c..de567b56edf57fc43a15b56f6d3ca5b2f3a20bfc 100644
--- a/trace_streamer/src/filter/slice_filter.cpp
+++ b/trace_streamer/src/filter/slice_filter.cpp
@@ -371,6 +371,16 @@ size_t SliceFilter::CompleteSlice(uint64_t timeStamp,
     auto lastRow = stack[stackIdx].index;
     auto slices = traceDataCache_->GetInternalSlicesData();
     slices->SetDuration(lastRow, timeStamp);
+
+    HandleAsyncEventAndOther(args, slices, lastRow, stackInfo);
+    if (stackIdx == stack.size() - 1) {
+        stack.pop_back();
+    }
+    streamFilters_->processFilter_->AddThreadSliceNum(internalTid);
+    return lastRow;
+}
+void SliceFilter::HandleAsyncEventAndOther(ArgsSet args, CallStack* slices, uint64_t lastRow, StackOfSlices& stackInfo)
+{
     auto argSize = sliceRowToArgsSetId_.count(lastRow);
     size_t argSetId = 0;
     if (args.valuesMap_.size()) {
@@ -395,11 +405,6 @@ size_t SliceFilter::CompleteSlice(uint64_t timeStamp,
             streamFilters_->argsFilter_->AppendArgs(args, argSetId);
         }
     }
-    if (stackIdx == stack.size() - 1) {
-        stack.pop_back();
-    }
-    streamFilters_->processFilter_->AddThreadSliceNum(internalTid);
-    return lastRow;
 }
 size_t SliceFilter::EndBinder(uint64_t timeStamp, uint32_t pid, DataIndex category, DataIndex name, ArgsSet args)
 {
diff --git a/trace_streamer/src/filter/slice_filter.h b/trace_streamer/src/filter/slice_filter.h
index 2fe6c89f1bc3712da32d14b7158952df75ace4c5..ffbdf0c94c537c6ed1b20991b04dad63896b561e 100644
--- a/trace_streamer/src/filter/slice_filter.h
+++ b/trace_streamer/src/filter/slice_filter.h
@@ -111,6 +111,7 @@ private:
     void CloseUnMatchedSlice(int64_t ts, SlicesStack& stack, InternalTid itid);
     int32_t MatchingIncompleteSliceIndex(const SlicesStack& stack, DataIndex category, DataIndex name);
     uint8_t CurrentDepth(InternalTid internalTid);
+    void HandleAsyncEventAndOther(ArgsSet args, CallStack* slices, uint64_t lastRow, StackOfSlices& stackInfo);
 
 private:
     // The parameter list is tid, cookid, functionName, asyncCallId.
diff --git a/trace_streamer/src/main.cpp b/trace_streamer/src/main.cpp
index 69f907c189b41c2ecd12fbd675689ec3b540327f..512d39663b3c9dcc4d96025f140a2a048aae5f14 100644
--- a/trace_streamer/src/main.cpp
+++ b/trace_streamer/src/main.cpp
@@ -436,16 +436,16 @@ bool ReadAndParserLongTrace(SysTuning::TraceStreamer::TraceStreamerSelector& ta,
     g_loadSize = 0;
     while (true) {
         std::unique_ptr<uint8_t[]> buf = std::make_unique<uint8_t[]>(G_CHUNK_SIZE);
-        auto rsize = Read(fd, buf.get(), G_CHUNK_SIZE);
-        if (rsize == 0) {
+        auto rSize = Read(fd, buf.get(), G_CHUNK_SIZE);
+        if (rSize == 0) {
             break;
         }
-        if (rsize < 0) {
+        if (rSize < 0) {
             TS_LOGE("Reading trace file failed (errno: %d, %s)", errno, strerror(errno));
             return false;
         }
-        g_loadSize += rsize;
-        if (!ta.BatchParseTraceDataSegment(std::move(buf), static_cast<size_t>(rsize))) {
+        g_loadSize += rSize;
+        if (!ta.BatchParseTraceDataSegment(std::move(buf), static_cast<size_t>(rSize))) {
             return false;
         }
         printf("\rLoadingFile:\t%.2f MB\r", static_cast<double>(g_loadSize) / 1E6);
diff --git a/trace_streamer/src/metrics/metrics.cpp b/trace_streamer/src/metrics/metrics.cpp
index 782fa417e08f1a07e2a3c72da8960647626e2c38..80441fa52e36572c804d6812fcfbe02884ea029f 100644
--- a/trace_streamer/src/metrics/metrics.cpp
+++ b/trace_streamer/src/metrics/metrics.cpp
@@ -188,69 +188,25 @@ void Metrics::PrintMetricsResult(uint32_t metricsIndex, ResultCallBack callback)
     std::string repeateValue = "";
     switch (metricsIndex) {
         case METRICS_TRACE_MEM:
-            metricsName = TRACE_MEM;
-            for (auto item : memStrategy_) {
-                repeateValue += PROCESS_METRICES + PROCESS_NAME + "\"" + item.processName + "\"," + OVERALL_COUNTERS +
-                                ANON_RSS + MIN + std::to_string(item.overallCounters.min) + "," + MAX +
-                                std::to_string(item.overallCounters.max) + "," + AVG +
-                                std::to_string(item.overallCounters.avg) + "}}},";
-            }
+            UpdataRepeateValueByTraceMem(repeateValue, metricsName);
             break;
         case METRICS_TRACE_MEM_TOP_TEN:
-            metricsName = TRACE_MEM_TOP_TEN;
-            for (auto item : memStrategy_) {
-                repeateValue += PROCESS_METRICES + PROCESS_NAME + "\"" + item.processName + "\"," + OVERALL_COUNTERS +
-                                ANON_RSS + MIN + std::to_string(item.overallCounters.min) + "," + MAX +
-                                std::to_string(item.overallCounters.max) + "," + AVG +
-                                std::to_string(item.overallCounters.avg) + "}}},";
-            }
+            UpdataRepeateValueByTopTen(repeateValue, metricsName);
             break;
         case METRICS_TRACE_MEM_UNAGG:
-            metricsName = TRACE_MEM_UNAGG;
-            for (auto item : memAggStrategy_) {
-                repeateValue +=
-                    PROCESS_VALUES + PROCESS_NAME + "\"" + item.processName + "\"," + ANON_RSS + TS +
-                    std::to_string(item.anonRss.ts) + "," + OOM_SCORE + std::to_string(item.anonRss.oomScore) + "," +
-                    VALUE + std::to_string(item.anonRss.value) + "}," + FILE_RSS + TS +
-                    std::to_string(item.fileRss.ts) + "," + OOM_SCORE + std::to_string(item.fileRss.oomScore) + "," +
-                    VALUE + std::to_string(item.fileRss.value) + "}," + SWAP + TS + std::to_string(item.swap.ts) + "," +
-                    OOM_SCORE + std::to_string(item.swap.oomScore) + "," + VALUE + std::to_string(item.swap.value) +
-                    "}},";
-            }
+            UpdataRepeateValueByMemUnagg(repeateValue, metricsName);
             break;
         case METRICS_TRACE_TASK_NAMES:
-            metricsName = TRACE_TASK_NAMES;
-            for (auto item : taskNameStrategy_) {
-                repeateValue +=
-                    PROCESS + PID + std::to_string(item.pid) + "," + PROCESS_NAME + "\"" + item.processName + "\",";
-                for (auto threadItem : item.threadName) {
-                    repeateValue += THREAD_NAME + "\"" + threadItem + "\",";
-                }
-                repeateValue.pop_back();
-                repeateValue += "},";
-            }
+            UpdataRepeateValueByTaskNames(repeateValue, metricsName);
             break;
         case METRICS_TRACE_STATS:
-            metricsName = TRACE_STATS;
-            for (auto item : statStrategy_) {
-                repeateValue += STAT + NAME + "\"" + item.name + "\"," + COUNT + std::to_string(item.count) + "," +
-                                SOURCE + "\"" + item.source + "\"," + SEVERITY + "\"" + item.severity + "\"" + "},";
-            }
+            UpdataRepeateValueByStats(repeateValue, metricsName);
             break;
         case METRICS_TRACE_METADATA:
-            metricsName = TRACE_METADATA;
-            for (auto item : metaDataStrategy_) {
-                repeateValue +=
-                    TRACE_METADATA + ":{" + NAME + "\"" + item.name + "\"," + VALUE + "\"" + item.value + "\"" + "},";
-            }
+            UpdataRepeateValueByMetadata(repeateValue, metricsName);
             break;
         case METRICS_SYS_CALLS:
-            metricsName = SYS_CALLS;
-            for (auto item : sysCallStrategy_) {
-                repeateValue += FUNCTION + FUNCTION_NAME + "\"" + item.functionName + "\"," + DUR_MAX +
-                                std::to_string(item.durMax) + "," + DUR_MIN + std::to_string(item.durMin) + "," +
-                                DUR_AVG + std::to_string(item.durAvg) + "},";
-            }
+            UpdataRepeateValueBySysCalls(repeateValue, metricsName);
             break;
         default:
             break;
@@ -269,6 +225,76 @@ void Metrics::PrintMetricsResult(uint32_t metricsIndex, ResultCallBack callback)
 #endif
     return;
 }
+void Metrics::UpdataRepeateValueByTraceMem(std::string& repeateValue, std::string& metricsName)
+{
+    metricsName = TRACE_MEM;
+    for (auto item : memStrategy_) {
+        repeateValue += PROCESS_METRICES + PROCESS_NAME + "\"" + item.processName + "\"," + OVERALL_COUNTERS +
+                        ANON_RSS + MIN + std::to_string(item.overallCounters.min) + "," + MAX +
+                        std::to_string(item.overallCounters.max) + "," + AVG +
+                        std::to_string(item.overallCounters.avg) + "}}},";
+    }
+}
+void Metrics::UpdataRepeateValueByTopTen(std::string& repeateValue, std::string& metricsName)
+{
+    metricsName = TRACE_MEM_TOP_TEN;
+    for (auto item : memStrategy_) {
+        repeateValue += PROCESS_METRICES + PROCESS_NAME + "\"" + item.processName + "\"," + OVERALL_COUNTERS +
+                        ANON_RSS + MIN + std::to_string(item.overallCounters.min) + "," + MAX +
+                        std::to_string(item.overallCounters.max) + "," + AVG +
+                        std::to_string(item.overallCounters.avg) + "}}},";
+    }
+}
+void Metrics::UpdataRepeateValueByMemUnagg(std::string& repeateValue, std::string& metricsName)
+{
+    metricsName = TRACE_MEM_UNAGG;
+    for (auto item : memAggStrategy_) {
+        repeateValue += PROCESS_VALUES + PROCESS_NAME + "\"" + item.processName + "\"," + ANON_RSS + TS +
+                        std::to_string(item.anonRss.ts) + "," + OOM_SCORE + std::to_string(item.anonRss.oomScore) +
+                        "," + VALUE + std::to_string(item.anonRss.value) + "}," + FILE_RSS + TS +
+                        std::to_string(item.fileRss.ts) + "," + OOM_SCORE + std::to_string(item.fileRss.oomScore) +
+                        "," + VALUE + std::to_string(item.fileRss.value) + "}," + SWAP + TS +
+                        std::to_string(item.swap.ts) + "," + OOM_SCORE + std::to_string(item.swap.oomScore) + "," +
+                        VALUE + std::to_string(item.swap.value) + "}},";
+    }
+}
+void Metrics::UpdataRepeateValueByTaskNames(std::string& repeateValue, std::string& metricsName)
+{
+    metricsName = TRACE_TASK_NAMES;
+    for (auto item : taskNameStrategy_) {
+        repeateValue += PROCESS + PID + std::to_string(item.pid) + "," + PROCESS_NAME + "\"" + item.processName + "\",";
+        for (auto threadItem : item.threadName) {
+            repeateValue += THREAD_NAME + "\"" + threadItem + "\",";
+        }
+        repeateValue.pop_back();
+        repeateValue += "},";
+    }
+}
+void Metrics::UpdataRepeateValueByStats(std::string& repeateValue, std::string& metricsName)
+{
+    metricsName = TRACE_STATS;
+    for (auto item : statStrategy_) {
+        repeateValue += STAT + NAME + "\"" + item.name + "\"," + COUNT + std::to_string(item.count) + "," + SOURCE +
+                        "\"" + item.source + "\"," + SEVERITY + "\"" + item.severity + "\"" + "},";
+    }
+}
+void Metrics::UpdataRepeateValueByMetadata(std::string& repeateValue, std::string& metricsName)
+{
+    metricsName = TRACE_METADATA;
+    for (auto item : metaDataStrategy_) {
+        repeateValue +=
+            TRACE_METADATA + ":{" + NAME + "\"" + item.name + "\"," + VALUE + "\"" + item.value + "\"" + "},";
+    }
+}
+void Metrics::UpdataRepeateValueBySysCalls(std::string& repeateValue, std::string& metricsName)
+{
+    metricsName = SYS_CALLS;
+    for (auto item : sysCallStrategy_) {
+        repeateValue += FUNCTION + FUNCTION_NAME + "\"" + item.functionName + "\"," + DUR_MAX +
+                        std::to_string(item.durMax) + "," + DUR_MIN + std::to_string(item.durMin) + "," + DUR_AVG +
+                        std::to_string(item.durAvg) + "},";
+    }
+}
 std::string Metrics::GetLevelSpace(int level)
 {
     std::string levelStr = "";
diff --git a/trace_streamer/src/metrics/metrics.h b/trace_streamer/src/metrics/metrics.h
index 8c351e3447d851d65bd4276687d1938e10fd3697..3b25ba9a330931a6eb31419dbd8f24c3290d6e87 100644
--- a/trace_streamer/src/metrics/metrics.h
+++ b/trace_streamer/src/metrics/metrics.h
@@ -100,6 +100,13 @@ private:
     void InitSysCallStrategy(const std::string& result);
     std::string JsonFormat(std::string json);
     std::string GetLevelSpace(int level);
+    void UpdataRepeateValueByTraceMem(std::string& repeateValue, std::string& metricsName);
+    void UpdataRepeateValueByTopTen(std::string& repeateValue, std::string& metricsName);
+    void UpdataRepeateValueByMemUnagg(std::string& repeateValue, std::string& metricsName);
+    void UpdataRepeateValueByTaskNames(std::string& repeateValue, std::string& metricsName);
+    void UpdataRepeateValueByStats(std::string& repeateValue, std::string& metricsName);
+    void UpdataRepeateValueByMetadata(std::string& repeateValue, std::string& metricsName);
+    void UpdataRepeateValueBySysCalls(std::string& repeateValue, std::string& metricsName);
     std::vector<ProcessMetricsItems> memStrategy_ = {};
     std::vector<ProcessValuesItem> memAggStrategy_ = {};
     std::vector<TaskProcessItem> taskNameStrategy_ = {};
diff --git a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_event_parser/htrace_event_parser.cpp b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_event_parser/htrace_event_parser.cpp
index ea649c4a4330567531c44bd2389749b946ce5cf5..4edd51c234d90fb71369f1b883e909ada4e4ca24 100644
--- a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_event_parser/htrace_event_parser.cpp
+++ b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_event_parser/htrace_event_parser.cpp
@@ -418,30 +418,12 @@ bool HtraceEventParser::SetEventType(const ProtoReader::FtraceEvent_Reader& even
                                      EventInfo& eventInfo,
                                      ProtoReader::BytesView& bytesView)
 {
-    bool judgment = false;
-    judgment = ConstructEventSet(event, eventInfo, bytesView);
-    if (!judgment) {
-        judgment = ConstructEventSet(event, eventInfo, bytesView);
-    }
-    if (!judgment) {
-        judgment = InterruptEventSet(event, eventInfo, bytesView);
-    }
-    if (!judgment) {
-        judgment = ClockEventSet(event, eventInfo, bytesView);
-    }
-    if (!judgment) {
-        judgment = CpuEventSet(event, eventInfo, bytesView);
-    }
-    if (!judgment) {
-        judgment = LockEventSet(event, eventInfo, bytesView);
-    }
-    if (!judgment) {
-        judgment = BinderEventSet(event, eventInfo, bytesView);
-    }
-    if (!judgment) {
-        judgment = StackEventSet(event, eventInfo, bytesView);
-    }
-    if (!judgment) {
+    // If all conditions are false, execute the data in else
+    if (ConstructEventSet(event, eventInfo, bytesView) || InterruptEventSet(event, eventInfo, bytesView) ||
+        ClockEventSet(event, eventInfo, bytesView) || CpuEventSet(event, eventInfo, bytesView) ||
+        LockEventSet(event, eventInfo, bytesView) || BinderEventSet(event, eventInfo, bytesView) ||
+        StackEventSet(event, eventInfo, bytesView)) {
+    } else {
         // Tracking event signal generation and transmission
         if (event.has_signal_generate_format()) {
             bytesView = event.signal_generate_format();
@@ -454,6 +436,7 @@ bool HtraceEventParser::SetEventType(const ProtoReader::FtraceEvent_Reader& even
             return false;
         }
     }
+
     return true;
 }
 bool HtraceEventParser::BinderTractionAllocBufEvent(const EventInfo& event) const
@@ -942,8 +925,8 @@ void HtraceEventParser::FilterAllEvents()
     while (htraceEventList_.size()) {
         int32_t size = std::min(MAX_BUFF_SIZE, htraceEventList_.size());
         auto endOfList = htraceEventList_.begin() + size;
-        for (auto eventItor = htraceEventList_.begin(); eventItor != endOfList; eventItor++) {
-            auto event = eventItor->get();
+        for (auto eventIter = htraceEventList_.begin(); eventIter != endOfList; ++eventIter) {
+            auto event = eventIter->get();
             if (event->tgid_ != INVALID_INT32) {
                 if (!pids_.count(event->tgid_)) {
                     pids_.insert(event->tgid_);
@@ -951,7 +934,7 @@ void HtraceEventParser::FilterAllEvents()
                 streamFilters_->processFilter_->GetOrCreateThreadWithPid(event->tgid_, event->tgid_);
             }
             ProtoReaderDealEvent(event);
-            eventItor->reset();
+            eventIter->reset();
         }
         htraceEventList_.erase(htraceEventList_.begin(), endOfList);
     }
diff --git a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_mem_parser.cpp b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_mem_parser.cpp
index 2e38a6742567fc4c01a26427d7806c6ed50afa91..d68072e41e3adca1e6354ecfab0ac44ddf7891b4 100644
--- a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_mem_parser.cpp
+++ b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_mem_parser.cpp
@@ -134,6 +134,37 @@ void HtraceMemParser::Parse(HtraceDataSegment& seg, uint64_t timeStamp, BuiltinC
         ParseRSImageDumpInfo(&memData, newTimeStamp);
     }
 }
+
+void HtraceMemParser::SpecialDataAddition(ProtoReader::ProcessMemoryInfo_Reader& processMemoryInfo,
+                                          uint64_t timeStamp,
+                                          uint32_t ipid,
+                                          uint32_t hasValue) const
+{
+    // processMemoryInfo Special data addition
+    if (processMemoryInfo.has_purg_sum_kb()) {
+        hasValue += streamFilters_->processMeasureFilter_->AppendNewMeasureData(
+            ipid, memNameDictMap_.at(MEM_PURG_SUM), timeStamp, processMemoryInfo.purg_sum_kb());
+    }
+    if (processMemoryInfo.has_purg_pin_kb()) {
+        hasValue += streamFilters_->processMeasureFilter_->AppendNewMeasureData(
+            ipid, memNameDictMap_.at(MEM_PURG_PIN), timeStamp, processMemoryInfo.purg_pin_kb());
+    }
+    if (processMemoryInfo.has_gl_pss_kb()) {
+        hasValue += streamFilters_->processMeasureFilter_->AppendNewMeasureData(
+            ipid, memNameDictMap_.at(MEM_GL_PSS), timeStamp, processMemoryInfo.gl_pss_kb());
+    }
+    if (processMemoryInfo.has_graph_pss_kb()) {
+        hasValue += streamFilters_->processMeasureFilter_->AppendNewMeasureData(
+            ipid, memNameDictMap_.at(MEM_GRAPH_PSS), timeStamp, processMemoryInfo.graph_pss_kb());
+    }
+    if (hasValue) {
+        streamFilters_->processFilter_->AddProcessMemory(ipid);
+    }
+    if (processMemoryInfo.has_smapinfo()) {
+        ParseSmapsInfoEasy(&processMemoryInfo, timeStamp, ipid);
+    }
+}
+
 void HtraceMemParser::ParseProcessInfo(const ProtoReader::MemoryData_Reader* tracePacket, uint64_t timeStamp) const
 {
     if (tracePacket->has_processesinfo()) {
@@ -162,28 +193,8 @@ void HtraceMemParser::ParseProcessInfo(const ProtoReader::MemoryData_Reader* tra
             ipid, memNameDictMap_.at(MEM_VM_HWM), timeStamp, processMemoryInfo.vm_hwm_kb());
         hasValue += streamFilters_->processMeasureFilter_->AppendNewMeasureData(
             ipid, memNameDictMap_.at(MEM_OOM_SCORE_ADJ), timeStamp, processMemoryInfo.oom_score_adj());
-        if (processMemoryInfo.has_purg_sum_kb()) {
-            hasValue += streamFilters_->processMeasureFilter_->AppendNewMeasureData(
-                ipid, memNameDictMap_.at(MEM_PURG_SUM), timeStamp, processMemoryInfo.purg_sum_kb());
-        }
-        if (processMemoryInfo.has_purg_pin_kb()) {
-            hasValue += streamFilters_->processMeasureFilter_->AppendNewMeasureData(
-                ipid, memNameDictMap_.at(MEM_PURG_PIN), timeStamp, processMemoryInfo.purg_pin_kb());
-        }
-        if (processMemoryInfo.has_gl_pss_kb()) {
-            hasValue += streamFilters_->processMeasureFilter_->AppendNewMeasureData(
-                ipid, memNameDictMap_.at(MEM_GL_PSS), timeStamp, processMemoryInfo.gl_pss_kb());
-        }
-        if (processMemoryInfo.has_graph_pss_kb()) {
-            hasValue += streamFilters_->processMeasureFilter_->AppendNewMeasureData(
-                ipid, memNameDictMap_.at(MEM_GRAPH_PSS), timeStamp, processMemoryInfo.graph_pss_kb());
-        }
-        if (hasValue) {
-            streamFilters_->processFilter_->AddProcessMemory(ipid);
-        }
-        if (processMemoryInfo.has_smapinfo()) {
-            ParseSmapsInfoEasy(&processMemoryInfo, timeStamp, ipid);
-        }
+
+        SpecialDataAddition(processMemoryInfo, timeStamp, ipid, hasValue);
     }
 }
 
@@ -328,736 +339,874 @@ void HtraceMemParser::ParseVMemInfoEasy(const ProtoReader::MemoryData_Reader* tr
     }
 }
 
+void HtraceMemParser::ParseMemInfoOne(ProtoReader::SysMeminfo_Reader& sysMeminfo, uint64_t timeStamp) const
+{
+    switch (sysMeminfo.key()) {
+        case ProtoReader::PMEM_UNSPECIFIED:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_UNSPECIFIED), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_MEM_TOTAL:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_MEM_TOTAL), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_MEM_FREE:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_MEM_FREE), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_MEM_AVAILABLE:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_MEM_AVAILABLE), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_BUFFERS:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_BUFFERS), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_CACHED:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_CACHED), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_SWAP_CACHED:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_SWAP_CACHED), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_ACTIVE:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_ACTIVE), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_INACTIVE:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_INACTIVE), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_ACTIVE_ANON:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_ACTIVE_ANON), timeStamp, sysMeminfo.value());
+            break;
+    }
+}
+
+void HtraceMemParser::ParseMemInfoTwo(ProtoReader::SysMeminfo_Reader& sysMeminfo, uint64_t timeStamp) const
+{
+    switch (sysMeminfo.key()) {
+        case ProtoReader::PMEM_INACTIVE_ANON:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_INACTIVE_ANON), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_ACTIVE_FILE:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_ACTIVE_FILE), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_INACTIVE_FILE:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_INACTIVE_FILE), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_UNEVICTABLE:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_UNEVICTABLE), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_MLOCKED:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_MLOCKED), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_SWAP_TOTAL:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_SWAP_TOTAL), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_SWAP_FREE:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_SWAP_FREE), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_DIRTY:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_DIRTY), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_WRITEBACK:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_WRITEBACK), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_ANON_PAGES:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_ANON_PAGES), timeStamp, sysMeminfo.value());
+            break;
+    }
+}
+
+void HtraceMemParser::ParseMemInfoThree(ProtoReader::SysMeminfo_Reader& sysMeminfo, uint64_t timeStamp) const
+{
+    switch (sysMeminfo.key()) {
+        case ProtoReader::PMEM_MAPPED:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_MAPPED), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_SHMEM:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_SHMEM), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_SLAB:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_SLAB), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_SLAB_RECLAIMABLE:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_SLAB_RECLAIMABLE), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_SLAB_UNRECLAIMABLE:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_SLAB_UNRECLAIMABLE), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_KERNEL_STACK:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_KERNEL_STACK), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_PAGE_TABLES:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_PAGE_TABLES), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_COMMIT_LIMIT:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_COMMIT_LIMIT), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_COMMITED_AS:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_COMMITED_AS), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_VMALLOC_TOTAL:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_VMALLOC_TOTAL), timeStamp, sysMeminfo.value());
+            break;
+    }
+}
+
+void HtraceMemParser::ParseMemInfoFour(ProtoReader::SysMeminfo_Reader& sysMeminfo, uint64_t timeStamp) const
+{
+    switch (sysMeminfo.key()) {
+        case ProtoReader::PMEM_VMALLOC_USED:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_VMALLOC_USED), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_VMALLOC_CHUNK:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_VMALLOC_CHUNK), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_CMA_TOTAL:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_CMA_TOTAL), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_CMA_FREE:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_CMA_FREE), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_KERNEL_RECLAIMABLE:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_KERNEL_RECLAIMABLE), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_ACTIVE_PURG:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_ACTIVE_PURG), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_INACTIVE_PURG:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_INACTIVE_PURG), timeStamp, sysMeminfo.value());
+            break;
+        case ProtoReader::PMEM_PINED_PURG:
+            streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
+                sysMemNameDictMap_.at(ProtoReader::PMEM_PINED_PURG), timeStamp, sysMeminfo.value());
+            break;
+        // case SysMeminfoType_INT_MIN_SENTINEL_DO_NOT_USE_:
+        // case SysMeminfoType_INT_MAX_SENTINEL_DO_NOT_USE_:
+        default:
+            streamFilters_->statFilter_->IncreaseStat(TRACE_SYS_MEMORY, STAT_EVENT_DATA_INVALID);
+            break;
+    }
+}
+
 void HtraceMemParser::ParseMemInfo(const ProtoReader::MemoryData_Reader* tracePacket, uint64_t timeStamp) const
 {
     streamFilters_->statFilter_->IncreaseStat(TRACE_SYS_MEMORY, STAT_EVENT_RECEIVED);
     for (auto i = tracePacket->meminfo(); i; ++i) {
         ProtoReader::SysMeminfo_Reader sysMeminfo(i->ToBytes());
-        switch (sysMeminfo.key()) {
-            case ProtoReader::PMEM_UNSPECIFIED:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_UNSPECIFIED), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_MEM_TOTAL:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_MEM_TOTAL), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_MEM_FREE:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_MEM_FREE), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_MEM_AVAILABLE:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_MEM_AVAILABLE), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_BUFFERS:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_BUFFERS), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_CACHED:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_CACHED), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_SWAP_CACHED:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_SWAP_CACHED), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_ACTIVE:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_ACTIVE), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_INACTIVE:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_INACTIVE), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_ACTIVE_ANON:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_ACTIVE_ANON), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_INACTIVE_ANON:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_INACTIVE_ANON), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_ACTIVE_FILE:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_ACTIVE_FILE), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_INACTIVE_FILE:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_INACTIVE_FILE), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_UNEVICTABLE:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_UNEVICTABLE), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_MLOCKED:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_MLOCKED), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_SWAP_TOTAL:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_SWAP_TOTAL), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_SWAP_FREE:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_SWAP_FREE), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_DIRTY:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_DIRTY), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_WRITEBACK:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_WRITEBACK), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_ANON_PAGES:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_ANON_PAGES), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_MAPPED:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_MAPPED), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_SHMEM:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_SHMEM), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_SLAB:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_SLAB), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_SLAB_RECLAIMABLE:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_SLAB_RECLAIMABLE), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_SLAB_UNRECLAIMABLE:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_SLAB_UNRECLAIMABLE), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_KERNEL_STACK:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_KERNEL_STACK), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_PAGE_TABLES:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_PAGE_TABLES), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_COMMIT_LIMIT:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_COMMIT_LIMIT), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_COMMITED_AS:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_COMMITED_AS), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_VMALLOC_TOTAL:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_VMALLOC_TOTAL), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_VMALLOC_USED:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_VMALLOC_USED), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_VMALLOC_CHUNK:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_VMALLOC_CHUNK), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_CMA_TOTAL:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_CMA_TOTAL), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_CMA_FREE:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_CMA_FREE), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_KERNEL_RECLAIMABLE:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_KERNEL_RECLAIMABLE), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_ACTIVE_PURG:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_ACTIVE_PURG), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_INACTIVE_PURG:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_INACTIVE_PURG), timeStamp, sysMeminfo.value());
-                break;
-            case ProtoReader::PMEM_PINED_PURG:
-                streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(
-                    sysMemNameDictMap_.at(ProtoReader::PMEM_PINED_PURG), timeStamp, sysMeminfo.value());
-                break;
-            // case SysMeminfoType_INT_MIN_SENTINEL_DO_NOT_USE_:
-            // case SysMeminfoType_INT_MAX_SENTINEL_DO_NOT_USE_:
-            default:
-                streamFilters_->statFilter_->IncreaseStat(TRACE_SYS_MEMORY, STAT_EVENT_DATA_INVALID);
-                break;
+        if (sysMeminfo.key() >= ProtoReader::PMEM_UNSPECIFIED && sysMeminfo.key() <= ProtoReader::PMEM_ACTIVE_ANON) {
+            // key  0 <----> 9
+            ParseMemInfoOne(sysMeminfo, timeStamp);
+        } else if (sysMeminfo.key() >= ProtoReader::PMEM_INACTIVE_ANON &&
+                   sysMeminfo.key() <= ProtoReader::PMEM_ANON_PAGES) {
+            // key 10 <----> 19
+            ParseMemInfoTwo(sysMeminfo, timeStamp);
+        } else if (sysMeminfo.key() >= ProtoReader::PMEM_MAPPED &&
+                   sysMeminfo.key() <= ProtoReader::PMEM_VMALLOC_TOTAL) {
+            // key 20 <----> 29
+            ParseMemInfoThree(sysMeminfo, timeStamp);
+        } else {
+            // key 30 <---->
+            ParseMemInfoFour(sysMeminfo, timeStamp);
         }
     }
     streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(zramIndex_, timeStamp, zram_);
     streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(gpuLimitSizeIndex_, timeStamp, gpuLimit_);
     streamFilters_->sysEventMemMeasureFilter_->AppendNewMeasureData(gpuUsedSizeIndex_, timeStamp, gpuUsed_);
 }
+
+void HtraceMemParser::ParseVMemInfoOne(ProtoReader::SysVMeminfo_Reader& sysVMeminfo, uint64_t timeStamp) const
+{
+    switch (sysVMeminfo.key()) {
+        case ProtoReader::VMEMINFO_UNSPECIFIED:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_UNSPECIFIED), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_FREE_PAGES:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_FREE_PAGES), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_ALLOC_BATCH:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ALLOC_BATCH), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_INACTIVE_ANON:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_INACTIVE_ANON), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_ACTIVE_ANON:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ACTIVE_ANON), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_INACTIVE_FILE:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_INACTIVE_FILE), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_ACTIVE_FILE:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ACTIVE_FILE), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_UNEVICTABLE:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_UNEVICTABLE), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_MLOCK:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_MLOCK), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_ANON_PAGES:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ANON_PAGES), timeStamp, sysVMeminfo.value());
+            break;
+    }
+}
+
+void HtraceMemParser::ParseVMemInfoTwo(ProtoReader::SysVMeminfo_Reader& sysVMeminfo, uint64_t timeStamp) const
+{
+    switch (sysVMeminfo.key()) {
+        case ProtoReader::VMEMINFO_NR_MAPPED:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_MAPPED), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_FILE_PAGES:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_FILE_PAGES), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_DIRTY:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_DIRTY), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_WRITEBACK:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_WRITEBACK), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_SLAB_RECLAIMABLE:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_SLAB_RECLAIMABLE), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_SLAB_UNRECLAIMABLE:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_SLAB_UNRECLAIMABLE), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_PAGE_TABLE_PAGES:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_PAGE_TABLE_PAGES), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_KERNEL_STACK:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_KERNEL_STACK), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_OVERHEAD:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_OVERHEAD), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_UNSTABLE:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_UNSTABLE), timeStamp, sysVMeminfo.value());
+            break;
+    }
+}
+void HtraceMemParser::ParseVMemInfoThree(ProtoReader::SysVMeminfo_Reader& sysVMeminfo, uint64_t timeStamp) const
+{
+    switch (sysVMeminfo.key()) {
+        case ProtoReader::VMEMINFO_NR_BOUNCE:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_BOUNCE), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_VMSCAN_WRITE:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_VMSCAN_WRITE), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_VMSCAN_IMMEDIATE_RECLAIM:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_VMSCAN_IMMEDIATE_RECLAIM), timeStamp,
+                sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_WRITEBACK_TEMP:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_WRITEBACK_TEMP), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_ISOLATED_ANON:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ISOLATED_ANON), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_ISOLATED_FILE:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ISOLATED_FILE), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_SHMEM:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_SHMEM), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_DIRTIED:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_DIRTIED), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_WRITTEN:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_WRITTEN), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_PAGES_SCANNED:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_PAGES_SCANNED), timeStamp, sysVMeminfo.value());
+            break;
+    }
+}
+
+void HtraceMemParser::ParseVMemInfoFour(ProtoReader::SysVMeminfo_Reader& sysVMeminfo, uint64_t timeStamp) const
+{
+    switch (sysVMeminfo.key()) {
+        case ProtoReader::VMEMINFO_WORKINGSET_REFAULT:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_WORKINGSET_REFAULT), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_WORKINGSET_ACTIVATE:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_WORKINGSET_ACTIVATE), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_WORKINGSET_NODERECLAIM:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_WORKINGSET_NODERECLAIM), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_ANON_TRANSPARENT_HUGEPAGES:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ANON_TRANSPARENT_HUGEPAGES), timeStamp,
+                sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_FREE_CMA:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_FREE_CMA), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_SWAPCACHE:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_SWAPCACHE), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_DIRTY_THRESHOLD:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_DIRTY_THRESHOLD), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_DIRTY_BACKGROUND_THRESHOLD:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_DIRTY_BACKGROUND_THRESHOLD), timeStamp,
+                sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGPGIN:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGPGIN), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGPGOUT:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGPGOUT), timeStamp, sysVMeminfo.value());
+            break;
+    }
+}
+
+void HtraceMemParser::ParseVMemInfoFive(ProtoReader::SysVMeminfo_Reader& sysVMeminfo, uint64_t timeStamp) const
+{
+    switch (sysVMeminfo.key()) {
+        case ProtoReader::VMEMINFO_PGPGOUTCLEAN:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGPGOUTCLEAN), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PSWPIN:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PSWPIN), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PSWPOUT:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PSWPOUT), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGALLOC_DMA:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGALLOC_DMA), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGALLOC_NORMAL:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGALLOC_NORMAL), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGALLOC_MOVABLE:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGALLOC_MOVABLE), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGFREE:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGFREE), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGACTIVATE:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGACTIVATE), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGDEACTIVATE:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGDEACTIVATE), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGFAULT:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGFAULT), timeStamp, sysVMeminfo.value());
+            break;
+    }
+}
+
+void HtraceMemParser::ParseVMemInfoSix(ProtoReader::SysVMeminfo_Reader& sysVMeminfo, uint64_t timeStamp) const
+{
+    switch (sysVMeminfo.key()) {
+        case ProtoReader::VMEMINFO_PGMAJFAULT:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGMAJFAULT), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGREFILL_DMA:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGREFILL_DMA), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGREFILL_NORMAL:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGREFILL_NORMAL), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGREFILL_MOVABLE:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGREFILL_MOVABLE), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGSTEAL_KSWAPD_DMA:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSTEAL_KSWAPD_DMA), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGSTEAL_KSWAPD_NORMAL:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSTEAL_KSWAPD_NORMAL), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGSTEAL_KSWAPD_MOVABLE:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSTEAL_KSWAPD_MOVABLE), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGSTEAL_DIRECT_DMA:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSTEAL_DIRECT_DMA), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGSTEAL_DIRECT_NORMAL:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSTEAL_DIRECT_NORMAL), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGSTEAL_DIRECT_MOVABLE:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSTEAL_DIRECT_MOVABLE), timeStamp, sysVMeminfo.value());
+            break;
+    }
+}
+void HtraceMemParser::ParseVMemInfoSeven(ProtoReader::SysVMeminfo_Reader& sysVMeminfo, uint64_t timeStamp) const
+{
+    switch (sysVMeminfo.key()) {
+        case ProtoReader::VMEMINFO_PGSCAN_KSWAPD_DMA:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSCAN_KSWAPD_DMA), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGSCAN_KSWAPD_NORMAL:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSCAN_KSWAPD_NORMAL), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGSCAN_KSWAPD_MOVABLE:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSCAN_KSWAPD_MOVABLE), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGSCAN_DIRECT_DMA:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSCAN_DIRECT_DMA), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGSCAN_DIRECT_NORMAL:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSCAN_DIRECT_NORMAL), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGSCAN_DIRECT_MOVABLE:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSCAN_DIRECT_MOVABLE), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGSCAN_DIRECT_THROTTLE:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSCAN_DIRECT_THROTTLE), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGINODESTEAL:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGINODESTEAL), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_SLABS_SCANNED:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_SLABS_SCANNED), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_KSWAPD_INODESTEAL:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_KSWAPD_INODESTEAL), timeStamp, sysVMeminfo.value());
+            break;
+    }
+}
+void HtraceMemParser::ParseVMemInfoEight(ProtoReader::SysVMeminfo_Reader& sysVMeminfo, uint64_t timeStamp) const
+{
+    switch (sysVMeminfo.key()) {
+        case ProtoReader::VMEMINFO_KSWAPD_LOW_WMARK_HIT_QUICKLY:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_KSWAPD_LOW_WMARK_HIT_QUICKLY), timeStamp,
+                sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_KSWAPD_HIGH_WMARK_HIT_QUICKLY:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_KSWAPD_HIGH_WMARK_HIT_QUICKLY), timeStamp,
+                sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PAGEOUTRUN:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PAGEOUTRUN), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_ALLOCSTALL:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_ALLOCSTALL), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGROTATED:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGROTATED), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_DROP_PAGECACHE:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_DROP_PAGECACHE), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_DROP_SLAB:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_DROP_SLAB), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGMIGRATE_SUCCESS:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGMIGRATE_SUCCESS), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGMIGRATE_FAIL:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGMIGRATE_FAIL), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_COMPACT_MIGRATE_SCANNED:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_COMPACT_MIGRATE_SCANNED), timeStamp, sysVMeminfo.value());
+            break;
+    }
+}
+void HtraceMemParser::ParseVMemInfoNine(ProtoReader::SysVMeminfo_Reader& sysVMeminfo, uint64_t timeStamp) const
+{
+    switch (sysVMeminfo.key()) {
+        case ProtoReader::VMEMINFO_COMPACT_FREE_SCANNED:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_COMPACT_FREE_SCANNED), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_COMPACT_ISOLATED:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_COMPACT_ISOLATED), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_COMPACT_STALL:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_COMPACT_STALL), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_COMPACT_FAIL:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_COMPACT_FAIL), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_COMPACT_SUCCESS:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_COMPACT_SUCCESS), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_COMPACT_DAEMON_WAKE:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_COMPACT_DAEMON_WAKE), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_UNEVICTABLE_PGS_CULLED:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_UNEVICTABLE_PGS_CULLED), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_UNEVICTABLE_PGS_SCANNED:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_UNEVICTABLE_PGS_SCANNED), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_UNEVICTABLE_PGS_RESCUED:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_UNEVICTABLE_PGS_RESCUED), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_UNEVICTABLE_PGS_MLOCKED:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_UNEVICTABLE_PGS_MLOCKED), timeStamp, sysVMeminfo.value());
+            break;
+    }
+}
+void HtraceMemParser::ParseVMemInfoTen(ProtoReader::SysVMeminfo_Reader& sysVMeminfo, uint64_t timeStamp) const
+{
+    switch (sysVMeminfo.key()) {
+        case ProtoReader::VMEMINFO_UNEVICTABLE_PGS_MUNLOCKED:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_UNEVICTABLE_PGS_MUNLOCKED), timeStamp,
+                sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_UNEVICTABLE_PGS_CLEARED:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_UNEVICTABLE_PGS_CLEARED), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_UNEVICTABLE_PGS_STRANDED:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_UNEVICTABLE_PGS_STRANDED), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_ZSPAGES:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ZSPAGES), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_ION_HEAP:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ION_HEAP), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_GPU_HEAP:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_GPU_HEAP), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_ALLOCSTALL_DMA:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_ALLOCSTALL_DMA), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_ALLOCSTALL_MOVABLE:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_ALLOCSTALL_MOVABLE), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_ALLOCSTALL_NORMAL:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_ALLOCSTALL_NORMAL), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_COMPACT_DAEMON_FREE_SCANNED:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_COMPACT_DAEMON_FREE_SCANNED), timeStamp,
+                sysVMeminfo.value());
+            break;
+    }
+}
+void HtraceMemParser::ParseVMemInfoEleven(ProtoReader::SysVMeminfo_Reader& sysVMeminfo, uint64_t timeStamp) const
+{
+    switch (sysVMeminfo.key()) {
+        case ProtoReader::VMEMINFO_COMPACT_DAEMON_MIGRATE_SCANNED:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_COMPACT_DAEMON_MIGRATE_SCANNED), timeStamp,
+                sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_FASTRPC:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_FASTRPC), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_INDIRECTLY_RECLAIMABLE:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_INDIRECTLY_RECLAIMABLE), timeStamp,
+                sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_ION_HEAP_POOL:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ION_HEAP_POOL), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_KERNEL_MISC_RECLAIMABLE:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_KERNEL_MISC_RECLAIMABLE), timeStamp,
+                sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_SHADOW_CALL_STACK_BYTES:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_SHADOW_CALL_STACK_BYTES), timeStamp,
+                sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_SHMEM_HUGEPAGES:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_SHMEM_HUGEPAGES), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_SHMEM_PMDMAPPED:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_SHMEM_PMDMAPPED), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_UNRECLAIMABLE_PAGES:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_UNRECLAIMABLE_PAGES), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_ZONE_ACTIVE_ANON:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ZONE_ACTIVE_ANON), timeStamp, sysVMeminfo.value());
+            break;
+    }
+}
+
+void HtraceMemParser::ParseVMemInfoTwelve(ProtoReader::SysVMeminfo_Reader& sysVMeminfo, uint64_t timeStamp) const
+{
+    switch (sysVMeminfo.key()) {
+        case ProtoReader::VMEMINFO_NR_ZONE_ACTIVE_FILE:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ZONE_ACTIVE_FILE), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_ZONE_INACTIVE_ANON:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ZONE_INACTIVE_ANON), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_ZONE_INACTIVE_FILE:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ZONE_INACTIVE_FILE), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_ZONE_UNEVICTABLE:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ZONE_UNEVICTABLE), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_NR_ZONE_WRITE_PENDING:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ZONE_WRITE_PENDING), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_OOM_KILL:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_OOM_KILL), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGLAZYFREE:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGLAZYFREE), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGLAZYFREED:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGLAZYFREED), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGREFILL:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGREFILL), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGSCAN_DIRECT:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSCAN_DIRECT), timeStamp, sysVMeminfo.value());
+            break;
+    }
+}
+void HtraceMemParser::ParseVMemInfoThirteen(ProtoReader::SysVMeminfo_Reader& sysVMeminfo, uint64_t timeStamp) const
+{
+    switch (sysVMeminfo.key()) {
+        case ProtoReader::VMEMINFO_PGSCAN_KSWAPD:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSCAN_KSWAPD), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGSKIP_DMA:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSKIP_DMA), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGSKIP_MOVABLE:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSKIP_MOVABLE), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGSKIP_NORMAL:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSKIP_NORMAL), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGSTEAL_DIRECT:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSTEAL_DIRECT), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_PGSTEAL_KSWAPD:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSTEAL_KSWAPD), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_SWAP_RA:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_SWAP_RA), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_SWAP_RA_HIT:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_SWAP_RA_HIT), timeStamp, sysVMeminfo.value());
+            break;
+        case ProtoReader::VMEMINFO_WORKINGSET_RESTORE:
+            streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
+                sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_WORKINGSET_RESTORE), timeStamp, sysVMeminfo.value());
+            break;
+        // case SysVMeminfoType_INT_MIN_SENTINEL_DO_NOT_USE_:
+        // case SysVMeminfoType_INT_MAX_SENTINEL_DO_NOT_USE_:
+        default:
+            streamFilters_->statFilter_->IncreaseStat(TRACE_SYS_VIRTUAL_MEMORY, STAT_EVENT_DATA_INVALID);
+    }
+}
+
 void HtraceMemParser::ParseVMemInfo(const ProtoReader::MemoryData_Reader* tracePacket, uint64_t timeStamp) const
 {
     streamFilters_->statFilter_->IncreaseStat(TRACE_SYS_VIRTUAL_MEMORY, STAT_EVENT_RECEIVED);
     for (auto i = tracePacket->vmeminfo(); i; ++i) {
         ProtoReader::SysVMeminfo_Reader sysVMeminfo(i->ToBytes());
-        switch (sysVMeminfo.key()) {
-            case ProtoReader::VMEMINFO_UNSPECIFIED:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_UNSPECIFIED), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_FREE_PAGES:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_FREE_PAGES), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_ALLOC_BATCH:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ALLOC_BATCH), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_INACTIVE_ANON:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_INACTIVE_ANON), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_ACTIVE_ANON:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ACTIVE_ANON), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_INACTIVE_FILE:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_INACTIVE_FILE), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_ACTIVE_FILE:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ACTIVE_FILE), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_UNEVICTABLE:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_UNEVICTABLE), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_MLOCK:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_MLOCK), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_ANON_PAGES:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ANON_PAGES), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_MAPPED:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_MAPPED), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_FILE_PAGES:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_FILE_PAGES), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_DIRTY:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_DIRTY), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_WRITEBACK:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_WRITEBACK), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_SLAB_RECLAIMABLE:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_SLAB_RECLAIMABLE), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_SLAB_UNRECLAIMABLE:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_SLAB_UNRECLAIMABLE), timeStamp,
-                    sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_PAGE_TABLE_PAGES:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_PAGE_TABLE_PAGES), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_KERNEL_STACK:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_KERNEL_STACK), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_OVERHEAD:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_OVERHEAD), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_UNSTABLE:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_UNSTABLE), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_BOUNCE:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_BOUNCE), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_VMSCAN_WRITE:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_VMSCAN_WRITE), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_VMSCAN_IMMEDIATE_RECLAIM:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_VMSCAN_IMMEDIATE_RECLAIM), timeStamp,
-                    sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_WRITEBACK_TEMP:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_WRITEBACK_TEMP), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_ISOLATED_ANON:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ISOLATED_ANON), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_ISOLATED_FILE:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ISOLATED_FILE), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_SHMEM:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_SHMEM), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_DIRTIED:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_DIRTIED), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_WRITTEN:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_WRITTEN), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_PAGES_SCANNED:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_PAGES_SCANNED), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_WORKINGSET_REFAULT:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_WORKINGSET_REFAULT), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_WORKINGSET_ACTIVATE:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_WORKINGSET_ACTIVATE), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_WORKINGSET_NODERECLAIM:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_WORKINGSET_NODERECLAIM), timeStamp,
-                    sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_ANON_TRANSPARENT_HUGEPAGES:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ANON_TRANSPARENT_HUGEPAGES), timeStamp,
-                    sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_FREE_CMA:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_FREE_CMA), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_SWAPCACHE:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_SWAPCACHE), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_DIRTY_THRESHOLD:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_DIRTY_THRESHOLD), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_DIRTY_BACKGROUND_THRESHOLD:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_DIRTY_BACKGROUND_THRESHOLD), timeStamp,
-                    sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGPGIN:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGPGIN), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGPGOUT:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGPGOUT), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGPGOUTCLEAN:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGPGOUTCLEAN), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PSWPIN:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PSWPIN), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PSWPOUT:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PSWPOUT), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGALLOC_DMA:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGALLOC_DMA), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGALLOC_NORMAL:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGALLOC_NORMAL), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGALLOC_MOVABLE:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGALLOC_MOVABLE), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGFREE:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGFREE), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGACTIVATE:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGACTIVATE), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGDEACTIVATE:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGDEACTIVATE), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGFAULT:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGFAULT), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGMAJFAULT:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGMAJFAULT), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGREFILL_DMA:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGREFILL_DMA), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGREFILL_NORMAL:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGREFILL_NORMAL), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGREFILL_MOVABLE:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGREFILL_MOVABLE), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGSTEAL_KSWAPD_DMA:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSTEAL_KSWAPD_DMA), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGSTEAL_KSWAPD_NORMAL:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSTEAL_KSWAPD_NORMAL), timeStamp,
-                    sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGSTEAL_KSWAPD_MOVABLE:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSTEAL_KSWAPD_MOVABLE), timeStamp,
-                    sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGSTEAL_DIRECT_DMA:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSTEAL_DIRECT_DMA), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGSTEAL_DIRECT_NORMAL:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSTEAL_DIRECT_NORMAL), timeStamp,
-                    sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGSTEAL_DIRECT_MOVABLE:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSTEAL_DIRECT_MOVABLE), timeStamp,
-                    sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGSCAN_KSWAPD_DMA:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSCAN_KSWAPD_DMA), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGSCAN_KSWAPD_NORMAL:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSCAN_KSWAPD_NORMAL), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGSCAN_KSWAPD_MOVABLE:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSCAN_KSWAPD_MOVABLE), timeStamp,
-                    sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGSCAN_DIRECT_DMA:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSCAN_DIRECT_DMA), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGSCAN_DIRECT_NORMAL:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSCAN_DIRECT_NORMAL), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGSCAN_DIRECT_MOVABLE:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSCAN_DIRECT_MOVABLE), timeStamp,
-                    sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGSCAN_DIRECT_THROTTLE:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSCAN_DIRECT_THROTTLE), timeStamp,
-                    sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGINODESTEAL:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGINODESTEAL), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_SLABS_SCANNED:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_SLABS_SCANNED), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_KSWAPD_INODESTEAL:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_KSWAPD_INODESTEAL), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_KSWAPD_LOW_WMARK_HIT_QUICKLY:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_KSWAPD_LOW_WMARK_HIT_QUICKLY), timeStamp,
-                    sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_KSWAPD_HIGH_WMARK_HIT_QUICKLY:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_KSWAPD_HIGH_WMARK_HIT_QUICKLY), timeStamp,
-                    sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PAGEOUTRUN:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PAGEOUTRUN), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_ALLOCSTALL:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_ALLOCSTALL), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGROTATED:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGROTATED), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_DROP_PAGECACHE:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_DROP_PAGECACHE), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_DROP_SLAB:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_DROP_SLAB), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGMIGRATE_SUCCESS:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGMIGRATE_SUCCESS), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGMIGRATE_FAIL:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGMIGRATE_FAIL), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_COMPACT_MIGRATE_SCANNED:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_COMPACT_MIGRATE_SCANNED), timeStamp,
-                    sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_COMPACT_FREE_SCANNED:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_COMPACT_FREE_SCANNED), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_COMPACT_ISOLATED:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_COMPACT_ISOLATED), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_COMPACT_STALL:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_COMPACT_STALL), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_COMPACT_FAIL:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_COMPACT_FAIL), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_COMPACT_SUCCESS:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_COMPACT_SUCCESS), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_COMPACT_DAEMON_WAKE:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_COMPACT_DAEMON_WAKE), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_UNEVICTABLE_PGS_CULLED:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_UNEVICTABLE_PGS_CULLED), timeStamp,
-                    sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_UNEVICTABLE_PGS_SCANNED:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_UNEVICTABLE_PGS_SCANNED), timeStamp,
-                    sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_UNEVICTABLE_PGS_RESCUED:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_UNEVICTABLE_PGS_RESCUED), timeStamp,
-                    sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_UNEVICTABLE_PGS_MLOCKED:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_UNEVICTABLE_PGS_MLOCKED), timeStamp,
-                    sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_UNEVICTABLE_PGS_MUNLOCKED:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_UNEVICTABLE_PGS_MUNLOCKED), timeStamp,
-                    sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_UNEVICTABLE_PGS_CLEARED:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_UNEVICTABLE_PGS_CLEARED), timeStamp,
-                    sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_UNEVICTABLE_PGS_STRANDED:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_UNEVICTABLE_PGS_STRANDED), timeStamp,
-                    sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_ZSPAGES:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ZSPAGES), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_ION_HEAP:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ION_HEAP), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_GPU_HEAP:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_GPU_HEAP), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_ALLOCSTALL_DMA:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_ALLOCSTALL_DMA), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_ALLOCSTALL_MOVABLE:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_ALLOCSTALL_MOVABLE), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_ALLOCSTALL_NORMAL:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_ALLOCSTALL_NORMAL), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_COMPACT_DAEMON_FREE_SCANNED:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_COMPACT_DAEMON_FREE_SCANNED), timeStamp,
-                    sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_COMPACT_DAEMON_MIGRATE_SCANNED:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_COMPACT_DAEMON_MIGRATE_SCANNED), timeStamp,
-                    sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_FASTRPC:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_FASTRPC), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_INDIRECTLY_RECLAIMABLE:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_INDIRECTLY_RECLAIMABLE), timeStamp,
-                    sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_ION_HEAP_POOL:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ION_HEAP_POOL), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_KERNEL_MISC_RECLAIMABLE:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_KERNEL_MISC_RECLAIMABLE), timeStamp,
-                    sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_SHADOW_CALL_STACK_BYTES:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_SHADOW_CALL_STACK_BYTES), timeStamp,
-                    sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_SHMEM_HUGEPAGES:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_SHMEM_HUGEPAGES), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_SHMEM_PMDMAPPED:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_SHMEM_PMDMAPPED), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_UNRECLAIMABLE_PAGES:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_UNRECLAIMABLE_PAGES), timeStamp,
-                    sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_ZONE_ACTIVE_ANON:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ZONE_ACTIVE_ANON), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_ZONE_ACTIVE_FILE:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ZONE_ACTIVE_FILE), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_ZONE_INACTIVE_ANON:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ZONE_INACTIVE_ANON), timeStamp,
-                    sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_ZONE_INACTIVE_FILE:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ZONE_INACTIVE_FILE), timeStamp,
-                    sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_ZONE_UNEVICTABLE:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ZONE_UNEVICTABLE), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_NR_ZONE_WRITE_PENDING:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_NR_ZONE_WRITE_PENDING), timeStamp,
-                    sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_OOM_KILL:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_OOM_KILL), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGLAZYFREE:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGLAZYFREE), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGLAZYFREED:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGLAZYFREED), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGREFILL:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGREFILL), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGSCAN_DIRECT:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSCAN_DIRECT), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGSCAN_KSWAPD:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSCAN_KSWAPD), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGSKIP_DMA:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSKIP_DMA), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGSKIP_MOVABLE:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSKIP_MOVABLE), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGSKIP_NORMAL:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSKIP_NORMAL), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGSTEAL_DIRECT:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSTEAL_DIRECT), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_PGSTEAL_KSWAPD:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_PGSTEAL_KSWAPD), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_SWAP_RA:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_SWAP_RA), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_SWAP_RA_HIT:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_SWAP_RA_HIT), timeStamp, sysVMeminfo.value());
-                break;
-            case ProtoReader::VMEMINFO_WORKINGSET_RESTORE:
-                streamFilters_->sysEventVMemMeasureFilter_->AppendNewMeasureData(
-                    sysVMemNameDictMap_.at(ProtoReader::VMEMINFO_WORKINGSET_RESTORE), timeStamp, sysVMeminfo.value());
-                break;
-            // case SysVMeminfoType_INT_MIN_SENTINEL_DO_NOT_USE_:
-            // case SysVMeminfoType_INT_MAX_SENTINEL_DO_NOT_USE_:
-            default:
-                streamFilters_->statFilter_->IncreaseStat(TRACE_SYS_VIRTUAL_MEMORY, STAT_EVENT_DATA_INVALID);
+        if (sysVMeminfo.key() >= ProtoReader::VMEMINFO_UNSPECIFIED &&
+            sysVMeminfo.key() <= ProtoReader::VMEMINFO_NR_ANON_PAGES) {
+            // key  0 <----> 9
+            ParseVMemInfoOne(sysVMeminfo, timeStamp);
+        } else if (sysVMeminfo.key() >= ProtoReader::VMEMINFO_NR_MAPPED &&
+                   sysVMeminfo.key() <= ProtoReader::VMEMINFO_NR_UNSTABLE) {
+            // key  10 <----> 19
+            ParseVMemInfoTwo(sysVMeminfo, timeStamp);
+        } else if (sysVMeminfo.key() >= ProtoReader::VMEMINFO_NR_BOUNCE &&
+                   sysVMeminfo.key() <= ProtoReader::VMEMINFO_NR_PAGES_SCANNED) {
+            // key  20 <----> 29
+            ParseVMemInfoThree(sysVMeminfo, timeStamp);
+        } else if (sysVMeminfo.key() >= ProtoReader::VMEMINFO_WORKINGSET_REFAULT &&
+                   sysVMeminfo.key() <= ProtoReader::VMEMINFO_PGPGOUT) {
+            // key  30 <----> 39
+            ParseVMemInfoFour(sysVMeminfo, timeStamp);
+        } else if (sysVMeminfo.key() >= ProtoReader::VMEMINFO_PGPGOUTCLEAN &&
+                   sysVMeminfo.key() <= ProtoReader::VMEMINFO_PGFAULT) {
+            // key  40 <----> 49
+            ParseVMemInfoFive(sysVMeminfo, timeStamp);
+        } else if (sysVMeminfo.key() >= ProtoReader::VMEMINFO_PGMAJFAULT &&
+                   sysVMeminfo.key() <= ProtoReader::VMEMINFO_PGSTEAL_DIRECT_MOVABLE) {
+            // key  50 <----> 59
+            ParseVMemInfoSix(sysVMeminfo, timeStamp);
+        } else if (sysVMeminfo.key() >= ProtoReader::VMEMINFO_PGSCAN_KSWAPD_DMA &&
+                   sysVMeminfo.key() <= ProtoReader::VMEMINFO_KSWAPD_INODESTEAL) {
+            // key  60 <----> 69
+            ParseVMemInfoSeven(sysVMeminfo, timeStamp);
+        } else if (sysVMeminfo.key() >= ProtoReader::VMEMINFO_KSWAPD_LOW_WMARK_HIT_QUICKLY &&
+                   sysVMeminfo.key() <= ProtoReader::VMEMINFO_COMPACT_MIGRATE_SCANNED) {
+            // key  70 <----> 79
+            ParseVMemInfoEight(sysVMeminfo, timeStamp);
+        } else if (sysVMeminfo.key() >= ProtoReader::VMEMINFO_COMPACT_FREE_SCANNED &&
+                   sysVMeminfo.key() <= ProtoReader::VMEMINFO_UNEVICTABLE_PGS_MLOCKED) {
+            // key  80 <----> 89
+            ParseVMemInfoNine(sysVMeminfo, timeStamp);
+        } else if (sysVMeminfo.key() >= ProtoReader::VMEMINFO_UNEVICTABLE_PGS_MUNLOCKED &&
+                   sysVMeminfo.key() <= ProtoReader::VMEMINFO_COMPACT_DAEMON_FREE_SCANNED) {
+            // key  90 <----> 99
+            ParseVMemInfoTen(sysVMeminfo, timeStamp);
+        } else if (sysVMeminfo.key() >= ProtoReader::VMEMINFO_COMPACT_DAEMON_MIGRATE_SCANNED &&
+                   sysVMeminfo.key() <= ProtoReader::VMEMINFO_NR_ZONE_ACTIVE_ANON) {
+            // key  100 <----> 109
+            ParseVMemInfoEleven(sysVMeminfo, timeStamp);
+        } else if (sysVMeminfo.key() >= ProtoReader::VMEMINFO_NR_ZONE_ACTIVE_FILE &&
+                   sysVMeminfo.key() <= ProtoReader::VMEMINFO_PGSCAN_DIRECT) {
+            // key  110 <----> 119
+            ParseVMemInfoTwelve(sysVMeminfo, timeStamp);
+        } else {
+            // key  120 <---->
+            ParseVMemInfoThirteen(sysVMeminfo, timeStamp);
         }
     }
 }
-
 void HtraceMemParser::ParseAshmemInfo(const ProtoReader::MemoryData_Reader* tracePacket, uint64_t timeStamp) const
 {
     if (tracePacket->has_ashmeminfo()) {
diff --git a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_mem_parser.h b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_mem_parser.h
index 374af450b730c41604d20b7cca21f33fb6b12c90..cf27b92a50f3a99028eeef148bcf3c26a561bf5a 100644
--- a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_mem_parser.h
+++ b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_mem_parser.h
@@ -90,6 +90,31 @@ private:
     void ParseCpuDumpInfo(const ProtoReader::MemoryData_Reader* tracePacket, uint64_t timeStamp) const;
     void ParseProfileMemInfo(const ProtoReader::MemoryData_Reader* tracePacket, uint64_t timeStamp) const;
     void ParseRSImageDumpInfo(const ProtoReader::MemoryData_Reader* tracePacket, uint64_t timeStamp) const;
+
+    void SpecialDataAddition(ProtoReader::ProcessMemoryInfo_Reader& processMemoryInfo,
+                             uint64_t timeStamp,
+                             uint32_t ipid,
+                             uint32_t hasValue) const;
+
+    void ParseMemInfoOne(ProtoReader::SysMeminfo_Reader& sysMeminfo, uint64_t timeStamp) const;
+    void ParseMemInfoTwo(ProtoReader::SysMeminfo_Reader& sysMeminfo, uint64_t timeStamp) const;
+    void ParseMemInfoThree(ProtoReader::SysMeminfo_Reader& sysMeminfo, uint64_t timeStamp) const;
+    void ParseMemInfoFour(ProtoReader::SysMeminfo_Reader& sysMeminfo, uint64_t timeStamp) const;
+
+    void ParseVMemInfoOne(ProtoReader::SysVMeminfo_Reader& sysVMeminfo, uint64_t timeStamp) const;
+    void ParseVMemInfoTwo(ProtoReader::SysVMeminfo_Reader& sysVMeminfo, uint64_t timeStamp) const;
+    void ParseVMemInfoThree(ProtoReader::SysVMeminfo_Reader& sysVMeminfo, uint64_t timeStamp) const;
+    void ParseVMemInfoFour(ProtoReader::SysVMeminfo_Reader& sysVMeminfo, uint64_t timeStamp) const;
+    void ParseVMemInfoFive(ProtoReader::SysVMeminfo_Reader& sysVMeminfo, uint64_t timeStamp) const;
+    void ParseVMemInfoSix(ProtoReader::SysVMeminfo_Reader& sysVMeminfo, uint64_t timeStamp) const;
+    void ParseVMemInfoSeven(ProtoReader::SysVMeminfo_Reader& sysVMeminfo, uint64_t timeStamp) const;
+    void ParseVMemInfoEight(ProtoReader::SysVMeminfo_Reader& sysVMeminfo, uint64_t timeStamp) const;
+    void ParseVMemInfoNine(ProtoReader::SysVMeminfo_Reader& sysVMeminfo, uint64_t timeStamp) const;
+    void ParseVMemInfoTen(ProtoReader::SysVMeminfo_Reader& sysVMeminfo, uint64_t timeStamp) const;
+    void ParseVMemInfoEleven(ProtoReader::SysVMeminfo_Reader& sysVMeminfo, uint64_t timeStamp) const;
+    void ParseVMemInfoTwelve(ProtoReader::SysVMeminfo_Reader& sysVMeminfo, uint64_t timeStamp) const;
+    void ParseVMemInfoThirteen(ProtoReader::SysVMeminfo_Reader& sysVMeminfo, uint64_t timeStamp) const;
+
     std::map<MemInfoType, DataIndex> memNameDictMap_ = {};
     std::map<uint32_t, DataIndex> sysMemNameDictMap_ = {};
     std::map<uint32_t, DataIndex> sysVMemNameDictMap_ = {};
diff --git a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_parser.cpp b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_parser.cpp
index 320335edf781a14e5b01f498e38e23795b5449b6..694af5e4bffc7e2523ff12c7db23ad952d01ff46 100644
--- a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_parser.cpp
+++ b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_parser.cpp
@@ -49,12 +49,51 @@ HtraceParser::HtraceParser(TraceDataCache* dataCache, const TraceStreamerFilters
       perfDataParser_(std::make_unique<PerfDataParser>(dataCache, filters)),
       ebpfDataParser_(std::make_unique<EbpfDataParser>(dataCache, filters))
 {
+    InitPluginNameIndex();
     if (traceDataCache_->supportThread_) {
         dataSegArray_ = std::make_unique<HtraceDataSegment[]>(maxSegArraySize);
     } else {
         dataSegArray_ = std::make_unique<HtraceDataSegment[]>(1);
     }
 }
+void HtraceParser::InitPluginNameIndex()
+{
+    nativeHookPluginIndex_.insert(traceDataCache_->GetDataIndex("nativehook"));
+    nativeHookPluginIndex_.insert(traceDataCache_->GetDataIndex("hookdaemon"));
+    nativeHookConfigIndex_ = traceDataCache_->GetDataIndex("nativehook_config");
+    hisyseventPluginIndex_ = traceDataCache_->GetDataIndex("hisysevent-plugin");
+    hisyseventPluginConfigIndex_ = traceDataCache_->GetDataIndex("hisysevent-plugin_config");
+    memPluginIndex_ = traceDataCache_->GetDataIndex("memory-plugin");
+    memoryPluginConfigIndex_ = traceDataCache_->GetDataIndex("memory-plugin_config");
+    ftracePluginIndex_.insert(traceDataCache_->GetDataIndex("ftrace-plugin"));
+    ftracePluginIndex_.insert(traceDataCache_->GetDataIndex("/data/local/tmp/libftrace_plugin.z.so"));
+    hilogPluginIndex_.insert(traceDataCache_->GetDataIndex("hilog-plugin"));
+    hilogPluginIndex_.insert(traceDataCache_->GetDataIndex("/data/local/tmp/libhilogplugin.z.so"));
+    hidumpPluginIndex_.insert(traceDataCache_->GetDataIndex("hidump-plugin"));
+    hidumpPluginIndex_.insert(traceDataCache_->GetDataIndex("/data/local/tmp/libhidumpplugin.z.so"));
+    cpuPluginIndex_ = traceDataCache_->GetDataIndex("cpu-plugin");
+    networkPluginIndex_ = traceDataCache_->GetDataIndex("network-plugin");
+    diskioPluginIndex_ = traceDataCache_->GetDataIndex("diskio-plugin");
+    processPluginIndex_ = traceDataCache_->GetDataIndex("process-plugin");
+    arktsPluginIndex_ = traceDataCache_->GetDataIndex("arkts-plugin");
+    arktsPluginConfigIndex_ = traceDataCache_->GetDataIndex("arkts-plugin_config");
+    supportPluginNameIndex_.insert(nativeHookPluginIndex_.begin(), nativeHookPluginIndex_.end());
+    supportPluginNameIndex_.insert(nativeHookConfigIndex_);
+    supportPluginNameIndex_.insert(hisyseventPluginIndex_);
+    supportPluginNameIndex_.insert(hisyseventPluginConfigIndex_);
+    supportPluginNameIndex_.insert(memPluginIndex_);
+    supportPluginNameIndex_.insert(memoryPluginConfigIndex_);
+    supportPluginNameIndex_.insert(ftracePluginIndex_.begin(), ftracePluginIndex_.end());
+    supportPluginNameIndex_.insert(hilogPluginIndex_.begin(), hilogPluginIndex_.end());
+    supportPluginNameIndex_.insert(hidumpPluginIndex_.begin(), hidumpPluginIndex_.end());
+    supportPluginNameIndex_.insert(cpuPluginIndex_);
+    supportPluginNameIndex_.insert(networkPluginIndex_);
+    supportPluginNameIndex_.insert(diskioPluginIndex_);
+    supportPluginNameIndex_.insert(processPluginIndex_);
+    supportPluginNameIndex_.insert(arktsPluginIndex_);
+    supportPluginNameIndex_.insert(arktsPluginConfigIndex_);
+}
+
 void HtraceParser::ParserFileSO(std::string& directory, const std::vector<std::string>& relativeFilePaths)
 {
     for (const auto& filePath : relativeFilePaths) {
@@ -256,107 +295,100 @@ void HtraceParser::FilterThread()
         FilterData(seg, false);
     }
 }
-void HtraceParser::ParserData(HtraceDataSegment& dataSeg, bool isSplitFile)
+
+bool HtraceParser::SpliteConfigData(const std::string& pluginName, const HtraceDataSegment& dataSeg)
 {
-    ProtoReader::ProfilerPluginData_Reader pluginDataZero(reinterpret_cast<const uint8_t*>(dataSeg.seg->c_str()),
-                                                          dataSeg.seg->length());
-    std::string pluginName;
-    if (pluginDataZero.has_name()) {
-        pluginName = pluginDataZero.name().ToStdString();
-        if (isSplitFile && EndWith(pluginName, "arkts-plugin_config")) {
-            std::string dataString(dataSeg.seg->c_str(), dataSeg.seg->length());
-            arkTsConfigData_ = lenBuffer_ + dataString;
-            return;
-        } else if (isSplitFile && EndWith(pluginName, "config")) {
-            mTraceDataHtrace_.emplace(splitFileOffset_, nextLength_ + packetSegLength);
-            return;
-        }
+    if (EndWith(pluginName, "arkts-plugin_config")) {
+        std::string dataString(dataSeg.seg->c_str(), dataSeg.seg->length());
+        arkTsConfigData_ = lenBuffer_ + dataString;
+        return true;
+    } else if (EndWith(pluginName, "config")) {
+        mTraceDataHtrace_.emplace(splitFileOffset_, nextLength_ + packetSegLength);
+        return true;
     }
-    if (pluginDataZero.has_tv_sec() && pluginDataZero.has_tv_nsec()) {
-        dataSeg.timeStamp = pluginDataZero.tv_sec() * SEC_TO_NS + pluginDataZero.tv_nsec();
+    return false;
+}
+
+bool HtraceParser::SpliteDataBySegment(DataIndex pluginNameIndex, HtraceDataSegment& dataSeg)
+{
+    if (nativeHookPluginIndex_.count(pluginNameIndex) || ftracePluginIndex_.count(pluginNameIndex) ||
+        hilogPluginIndex_.count(pluginNameIndex) || hisyseventPluginIndex_ == pluginNameIndex) {
+        return false;
     }
-    bool isHookData = (pluginName == "nativehook" || pluginName == "hookdaemon");
-    bool isFtrace = (pluginDataZero.name().ToStdString() == "ftrace-plugin" ||
-                     pluginDataZero.name().ToStdString() == "/data/local/tmp/libftrace_plugin.z.so");
-    bool isHilog = (pluginName == "hilog-plugin" || pluginName == "/data/local/tmp/libhilogplugin.z.so");
-    bool isHisysevent = (pluginName == "hisysevent-plugin");
-    if (isSplitFile && !isHookData && !isHilog && !isFtrace && !isHisysevent) {
-        bool needToPrimaryTimePlugin = (pluginName == "memory-plugin");
-        if (needToPrimaryTimePlugin) {
-            dataSeg.timeStamp = streamFilters_->clockFilter_->ToPrimaryTraceTime(TS_CLOCK_REALTIME, dataSeg.timeStamp);
-            UpdatePluginTimeRange(TS_CLOCK_BOOTTIME, dataSeg.timeStamp, dataSeg.timeStamp);
-        }
-        if (dataSeg.timeStamp >= traceDataCache_->SplitFileMinTime() &&
-            dataSeg.timeStamp <= traceDataCache_->SplitFileMaxTime()) {
-            mTraceDataHtrace_.emplace(splitFileOffset_, nextLength_ + packetSegLength);
-        }
-        if (!StartWith(pluginName, "arkts")) {
-            return;
-        }
+    // need convert to Primary Time Plugin
+    if (pluginNameIndex == memPluginIndex_) {
+        dataSeg.timeStamp = streamFilters_->clockFilter_->ToPrimaryTraceTime(TS_CLOCK_REALTIME, dataSeg.timeStamp);
+        UpdatePluginTimeRange(TS_CLOCK_BOOTTIME, dataSeg.timeStamp, dataSeg.timeStamp);
     }
-    if (isHookData) {
-        dataSourceTypeNativeHookClockid_ = TS_CLOCK_REALTIME;
-        dataSeg.dataType = DATA_SOURCE_TYPE_NATIVEHOOK;
-        if (isSplitFile) {
-            dataSourceType_ = DATA_SOURCE_TYPE_NATIVEHOOK;
-        }
-        dataSeg.protoData = pluginDataZero.data();
-        dataSeg.status = TS_PARSE_STATUS_PARSED;
-    } else if (pluginName == "nativehook_config") {
-        dataSeg.dataType = DATA_SOURCE_TYPE_NATIVEHOOK_CONFIG;
-        dataSeg.protoData = pluginDataZero.data();
-        dataSeg.status = TS_PARSE_STATUS_PARSED;
-    } else if (isFtrace) { // ok
-        dataSeg.dataType = DATA_SOURCE_TYPE_TRACE;
-        dataSeg.protoData = pluginDataZero.data();
+    if (dataSeg.timeStamp >= traceDataCache_->SplitFileMinTime() &&
+        dataSeg.timeStamp <= traceDataCache_->SplitFileMaxTime()) {
+        mTraceDataHtrace_.emplace(splitFileOffset_, nextLength_ + packetSegLength);
+    }
+    if (pluginNameIndex == arktsPluginConfigIndex_ || pluginNameIndex == arktsPluginIndex_) {
+        return false;
+    }
+    return true;
+}
+void HtraceParser::ParseDataByPluginName(HtraceDataSegment& dataSeg,
+                                         DataIndex pulginNameIndex,
+                                         const ProtoReader::ProfilerPluginData_Reader& pluginDataZero,
+                                         bool isSplitFile)
+{
+    if (nativeHookPluginIndex_.count(pulginNameIndex)) {
+        ParseNativeHook(dataSeg, isSplitFile);
+    } else if (pulginNameIndex == nativeHookConfigIndex_) {
+        ParseNativeHookConfig(dataSeg);
+    } else if (ftracePluginIndex_.count(pulginNameIndex)) { // ok
         ParseFtrace(dataSeg);
-    } else if (pluginName == "memory-plugin") {
-        dataSeg.protoData = pluginDataZero.data();
-        dataSeg.dataType = DATA_SOURCE_TYPE_MEM;
-        ParseMemory(&pluginDataZero, dataSeg);
-    } else if (isHilog) {
-        dataSeg.protoData = pluginDataZero.data();
+    } else if (pulginNameIndex == memPluginIndex_) {
+        ParseMemory(pluginDataZero, dataSeg);
+    } else if (hilogPluginIndex_.count(pulginNameIndex)) {
         ParseHilog(dataSeg);
-    } else if (pluginName == "hidump-plugin" || pluginName == "/data/local/tmp/libhidumpplugin.z.so") {
-        dataSeg.protoData = pluginDataZero.data();
+    } else if (hidumpPluginIndex_.count(pulginNameIndex)) {
         ParseFPS(dataSeg);
-    } else if (pluginName == "cpu-plugin") {
-        dataSeg.protoData = pluginDataZero.data();
+    } else if (pulginNameIndex == cpuPluginIndex_) {
         ParseCpuUsage(dataSeg);
-    } else if (pluginName == "network-plugin") {
-        dataSeg.protoData = pluginDataZero.data();
+    } else if (pulginNameIndex == networkPluginIndex_) {
         ParseNetwork(dataSeg);
-    } else if (pluginName == "diskio-plugin") {
-        dataSeg.protoData = pluginDataZero.data();
+    } else if (pulginNameIndex == diskioPluginIndex_) {
         ParseDiskIO(dataSeg);
-    } else if (pluginName == "process-plugin") {
-        dataSeg.protoData = pluginDataZero.data();
+    } else if (pulginNameIndex == processPluginIndex_) {
         ParseProcess(dataSeg);
-    } else if (isHisysevent) {
-        dataSeg.protoData = pluginDataZero.data();
+    } else if (pulginNameIndex == hisyseventPluginIndex_) {
         ParseHisysevent(dataSeg);
-    } else if (pluginName == "hisysevent-plugin_config") {
-        dataSeg.protoData = pluginDataZero.data();
+    } else if (pulginNameIndex == hisyseventPluginConfigIndex_) {
         ParseHisyseventConfig(dataSeg);
-    } else if (pluginName == "arkts-plugin") {
-        if (isSplitFile) {
-            dataSourceType_ = DATA_SOURCE_TYPE_JSMEMORY;
-            memcpy_s(&profilerPluginData_, sizeof(profilerPluginData_), dataSeg.seg->c_str(), dataSeg.seg->length());
-        }
-        dataSeg.protoData = pluginDataZero.data();
-        ParseJSMemory(dataSeg);
-    } else if (pluginName == "arkts-plugin_config") {
-        dataSeg.protoData = pluginDataZero.data();
+    } else if (pulginNameIndex == arktsPluginIndex_) {
+        ParseJSMemory(dataSeg, isSplitFile);
+    } else if (pulginNameIndex == arktsPluginConfigIndex_) {
         ParseJSMemoryConfig(dataSeg);
-    } else if (pluginName == "memory-plugin_config") {
-        if (pluginDataZero.has_sample_interval()) {
-            uint32_t sampleInterval = pluginDataZero.sample_interval();
-            traceDataCache_->GetTraceConfigData()->AppendNewData("memory_config", "sample_interval",
-                                                                 std::to_string(sampleInterval));
-        }
-        dataSeg.dataType = DATA_SOURCE_TYPE_MEM_CONFIG;
+    } else if (pulginNameIndex == memoryPluginConfigIndex_) {
+        ParseMemoryConfig(dataSeg, pluginDataZero);
+    }
+}
+
+void HtraceParser::ParserData(HtraceDataSegment& dataSeg, bool isSplitFile)
+{
+    ProtoReader::ProfilerPluginData_Reader pluginDataZero(reinterpret_cast<const uint8_t*>(dataSeg.seg->c_str()),
+                                                          dataSeg.seg->length());
+    if (!pluginDataZero.has_name()) {
+        return;
+    }
+    auto pluginName = pluginDataZero.name().ToStdString();
+    auto pluginNameIndex = traceDataCache_->GetDataIndex(pluginName);
+    if (isSplitFile && SpliteConfigData(pluginName, dataSeg)) {
+        return;
+    }
+    if (pluginDataZero.has_tv_sec() && pluginDataZero.has_tv_nsec()) {
+        dataSeg.timeStamp = pluginDataZero.tv_sec() * SEC_TO_NS + pluginDataZero.tv_nsec();
+    }
+
+    if (isSplitFile && SpliteDataBySegment(pluginNameIndex, dataSeg)) {
+        return;
+    }
+    if (supportPluginNameIndex_.count(pluginNameIndex)) {
         dataSeg.protoData = pluginDataZero.data();
-        dataSeg.status = TS_PARSE_STATUS_PARSED;
+        ParseDataByPluginName(dataSeg, pluginNameIndex, pluginDataZero, isSplitFile);
     } else {
 #if IS_WASM
         TraceStreamer_Plugin_Out_Filter(reinterpret_cast<const char*>(pluginDataZero.data().data_),
@@ -388,10 +420,10 @@ void HtraceParser::ParseThread()
     }
 }
 
-void HtraceParser::ParseMemory(ProtoReader::ProfilerPluginData_Reader* pluginDataZero, HtraceDataSegment& dataSeg)
+void HtraceParser::ParseMemory(const ProtoReader::ProfilerPluginData_Reader& pluginDataZero, HtraceDataSegment& dataSeg)
 {
     BuiltinClocks clockId = TS_CLOCK_REALTIME;
-    auto clockIdTemp = pluginDataZero->clock_id();
+    auto clockIdTemp = pluginDataZero.clock_id();
     if (clockIdTemp == ProtoReader::ProfilerPluginData_ClockId_CLOCKID_REALTIME) {
         clockId = TS_CLOCK_REALTIME;
     }
@@ -406,9 +438,35 @@ void HtraceParser::ParseHilog(HtraceDataSegment& dataSeg)
     dataSourceTypeHilogClockid_ = TS_CLOCK_REALTIME;
     dataSeg.status = TS_PARSE_STATUS_PARSED;
 }
+void HtraceParser::ParseNativeHookConfig(HtraceDataSegment& dataSeg)
+{
+    dataSeg.dataType = DATA_SOURCE_TYPE_NATIVEHOOK_CONFIG;
+    dataSeg.status = TS_PARSE_STATUS_PARSED;
+}
+void HtraceParser::ParseNativeHook(HtraceDataSegment& dataSeg, bool isSplitFile)
+{
+    dataSourceTypeNativeHookClockid_ = TS_CLOCK_REALTIME;
+    dataSeg.dataType = DATA_SOURCE_TYPE_NATIVEHOOK;
+    dataSeg.status = TS_PARSE_STATUS_PARSED;
+    if (isSplitFile) {
+        dataSourceType_ = DATA_SOURCE_TYPE_NATIVEHOOK;
+    }
+}
+void HtraceParser::ParseMemoryConfig(HtraceDataSegment& dataSeg,
+                                     const ProtoReader::ProfilerPluginData_Reader& pluginDataZero)
+{
+    if (pluginDataZero.has_sample_interval()) {
+        uint32_t sampleInterval = pluginDataZero.sample_interval();
+        traceDataCache_->GetTraceConfigData()->AppendNewData("memory_config", "sample_interval",
+                                                             std::to_string(sampleInterval));
+    }
+    dataSeg.dataType = DATA_SOURCE_TYPE_MEM_CONFIG;
+    dataSeg.status = TS_PARSE_STATUS_PARSED;
+}
 
 void HtraceParser::ParseFtrace(HtraceDataSegment& dataSeg)
 {
+    dataSeg.dataType = DATA_SOURCE_TYPE_TRACE;
     ProtoReader::TracePluginResult_Reader tracePluginResult(dataSeg.protoData);
     if (tracePluginResult.has_ftrace_cpu_stats()) {
         auto cpuStats = *tracePluginResult.ftrace_cpu_stats();
@@ -499,8 +557,12 @@ void HtraceParser::ParseHisyseventConfig(HtraceDataSegment& dataSeg)
     dataSeg.status = TS_PARSE_STATUS_PARSED;
 }
 
-void HtraceParser::ParseJSMemory(HtraceDataSegment& dataSeg)
+void HtraceParser::ParseJSMemory(HtraceDataSegment& dataSeg, bool isSplitFile)
 {
+    if (isSplitFile) {
+        dataSourceType_ = DATA_SOURCE_TYPE_JSMEMORY;
+        memcpy_s(&profilerPluginData_, sizeof(profilerPluginData_), dataSeg.seg->c_str(), dataSeg.seg->length());
+    }
     dataSourceTypeJSMemoryClockid_ = TS_CLOCK_REALTIME;
     dataSeg.dataType = DATA_SOURCE_TYPE_JSMEMORY;
     dataSeg.status = TS_PARSE_STATUS_PARSED;
diff --git a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_parser.h b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_parser.h
index 9ffb4f9c08dc075aeaaa4d01dd7d3bab770e8b7c..d0aa81b9e2a4e427a12abef3914368728bd4b090 100644
--- a/trace_streamer/src/parser/htrace_pbreader_parser/htrace_parser.h
+++ b/trace_streamer/src/parser/htrace_pbreader_parser/htrace_parser.h
@@ -118,7 +118,9 @@ private:
     void ParserData(HtraceDataSegment& dataSeg, bool isSplitFile);
 
 private:
-    void ParseMemory(ProtoReader::ProfilerPluginData_Reader* pluginDataZero, HtraceDataSegment& dataSeg);
+    void InitPluginNameIndex();
+    void ParseMemory(const ProtoReader::ProfilerPluginData_Reader& pluginDataZero, HtraceDataSegment& dataSeg);
+    void ParseMemoryConfig(HtraceDataSegment& dataSeg, const ProtoReader::ProfilerPluginData_Reader& pluginDataZero);
     void ParseHilog(HtraceDataSegment& dataSeg);
     void ParseFtrace(HtraceDataSegment& dataSeg);
     void ParseFPS(HtraceDataSegment& dataSeg);
@@ -128,14 +130,21 @@ private:
     void ParseProcess(HtraceDataSegment& dataSeg);
     void ParseHisysevent(HtraceDataSegment& dataSeg);
     void ParseHisyseventConfig(HtraceDataSegment& dataSeg);
-    void ParseJSMemory(HtraceDataSegment& dataSeg);
+    void ParseJSMemory(HtraceDataSegment& dataSeg, bool isSplitFile);
+    void ParseNativeHookConfig(HtraceDataSegment& dataSeg);
+    void ParseNativeHook(HtraceDataSegment& dataSeg, bool isSplitFile);
     void ParseJSMemoryConfig(HtraceDataSegment& dataSeg);
     void ParseThread();
     int32_t GetNextSegment();
     void FilterThread();
     bool CalcEbpfCutOffset(std::deque<uint8_t>::iterator& packagesBegin, size_t& currentLength);
-
+    bool SpliteConfigData(const std::string& pluginName, const HtraceDataSegment& dataSeg);
     bool InitProfilerTraceFileHeader();
+    void ParseDataByPluginName(HtraceDataSegment& dataSeg,
+                               DataIndex pulginNameIndex,
+                               const ProtoReader::ProfilerPluginData_Reader& pluginDataZero,
+                               bool isSplitFile);
+    bool SpliteDataBySegment(DataIndex pluginNameIndex, HtraceDataSegment& dataSeg);
     ProfilerTraceFileHeader profilerTraceFileHeader_;
     uint32_t profilerDataType_ = ProfilerTraceFileHeader::UNKNOW_TYPE;
     uint64_t profilerDataLength_ = 0;
@@ -199,6 +208,22 @@ private:
     uint32_t dataSourceType_ = INVALID_UINT32;
     std::string arkTsConfigData_ = "";
     std::string lenBuffer_ = "";
+    std::set<DataIndex> nativeHookPluginIndex_ = {};
+    std::set<DataIndex> ftracePluginIndex_ = {};
+    std::set<DataIndex> hilogPluginIndex_ = {};
+    DataIndex hisyseventPluginIndex_;
+    DataIndex nativeHookConfigIndex_;
+    DataIndex memPluginIndex_;
+    std::set<DataIndex> hidumpPluginIndex_ = {};
+    DataIndex cpuPluginIndex_;
+    DataIndex networkPluginIndex_;
+    DataIndex diskioPluginIndex_;
+    DataIndex processPluginIndex_;
+    DataIndex hisyseventPluginConfigIndex_;
+    DataIndex arktsPluginIndex_;
+    DataIndex arktsPluginConfigIndex_;
+    DataIndex memoryPluginConfigIndex_;
+    std::set<DataIndex> supportPluginNameIndex_ = {};
 };
 } // namespace TraceStreamer
 } // namespace SysTuning
diff --git a/trace_streamer/src/proto_reader/protoc_plugin/proto_reader_plugin.cpp b/trace_streamer/src/proto_reader/protoc_plugin/proto_reader_plugin.cpp
index 0a354a26321f0beda82a84136202a056ed693ad3..1912b255a27b13e322fd33c522e2f3599fa91537 100644
--- a/trace_streamer/src/proto_reader/protoc_plugin/proto_reader_plugin.cpp
+++ b/trace_streamer/src/proto_reader/protoc_plugin/proto_reader_plugin.cpp
@@ -212,7 +212,6 @@ void ProtoReaderGenerator::WriteDecoder(const Descriptor* descriptor)
         const FieldDescriptor* field = descriptor->field(i);
         maxFieldID = std::max(maxFieldID, field->number());
     }
-
     std::string className = GetDescriptorClass(descriptor) + "_Reader";
     codePrinter_->Print(
         "class $name$ : public "
@@ -220,7 +219,6 @@ void ProtoReaderGenerator::WriteDecoder(const Descriptor* descriptor)
         "name", className, "maxDataAreaID", std::to_string(maxFieldID));
     codePrinter_->Print(" public:\n");
     maxFieldID = 1 + maxFieldID;
-
     WriteEnum(descriptor);
     codePrinter_->Indent();
     codePrinter_->Print(
@@ -236,7 +234,29 @@ void ProtoReaderGenerator::WriteDecoder(const Descriptor* descriptor)
         "explicit $name$(const BytesView& raw) : "
         "TypedProtoReader(raw.data_, raw.size_) {}\n",
         "name", className);
+    WriteFunc(descriptor, maxFieldID);
+    codePrinter_->Outdent();
+    codePrinter_->Print("};\n\n");
+}
+
+void ProtoReaderGenerator::WriteEnum(const Descriptor* descriptor)
+{
+    if (descriptor->field_count()) {
+        codePrinter_->Print("enum : int32_t {\n");
+        codePrinter_->Indent();
+
+        for (int32_t i = 0; i < descriptor->field_count(); ++i) {
+            const FieldDescriptor* field = descriptor->field(i);
+            codePrinter_->Print("$name$ = $id$,\n", "name", GetFieldNumberConstant(field), "id",
+                                std::to_string(field->number()));
+        }
+        codePrinter_->Outdent();
+        codePrinter_->Print("};\n");
+    }
+}
 
+void ProtoReaderGenerator::WriteFunc(const Descriptor* descriptor, const int32_t maxFieldID)
+{
     for (int32_t i = 0; i < descriptor->field_count(); ++i) {
         const FieldDescriptor* field = descriptor->field(i);
         if (field->number() > maxFieldID) {
@@ -278,24 +298,6 @@ void ProtoReaderGenerator::WriteDecoder(const Descriptor* descriptor)
                                 toFunc);
         }
     }
-    codePrinter_->Outdent();
-    codePrinter_->Print("};\n\n");
-}
-
-void ProtoReaderGenerator::WriteEnum(const Descriptor* descriptor)
-{
-    if (descriptor->field_count()) {
-        codePrinter_->Print("enum : int32_t {\n");
-        codePrinter_->Indent();
-
-        for (int32_t i = 0; i < descriptor->field_count(); ++i) {
-            const FieldDescriptor* field = descriptor->field(i);
-            codePrinter_->Print("$name$ = $id$,\n", "name", GetFieldNumberConstant(field), "id",
-                                std::to_string(field->number()));
-        }
-        codePrinter_->Outdent();
-        codePrinter_->Print("};\n");
-    }
 }
 
 void ProtoReaderGenerator::WriteEnd()
diff --git a/trace_streamer/src/proto_reader/protoc_plugin/proto_reader_plugin.h b/trace_streamer/src/proto_reader/protoc_plugin/proto_reader_plugin.h
index c7ae60558a9eb3df9717b36ff33ab892dfdee704..0347ce9eb9209c60417b5d89bd4d106d4413b68b 100644
--- a/trace_streamer/src/proto_reader/protoc_plugin/proto_reader_plugin.h
+++ b/trace_streamer/src/proto_reader/protoc_plugin/proto_reader_plugin.h
@@ -59,6 +59,7 @@ public:
     void WriteEnumDescriptor(const EnumDescriptor* enumeration);
     void WriteDecoder(const Descriptor* descriptor);
     void WriteEnum(const Descriptor* descriptor);
+    void WriteFunc(const Descriptor* descriptor, const int32_t maxFieldID);
     void WriteEnd();
     const std::string& GetError() const
     {
diff --git a/trace_streamer/src/rpc/ffrt_converter.cpp b/trace_streamer/src/rpc/ffrt_converter.cpp
index 78d7cd8bb5609d541832e0953473d64667a1e6ec..48e3438dca7b285f621c386188c9c7ccc45d3fa2 100644
--- a/trace_streamer/src/rpc/ffrt_converter.cpp
+++ b/trace_streamer/src/rpc/ffrt_converter.cpp
@@ -100,7 +100,7 @@ std::string FfrtConverter::MakeBeginFakeLog(const std::string& mark,
                                             const std::string& threadName,
                                             const int prio)
 {
-    auto timestamp = ExtractTimeStr(mark);
+    auto beginTimeStamp = ExtractTimeStr(mark);
     auto cpuId = ExtractCpuId(mark);
     std::unique_ptr<char[]> result = std::make_unique<char[]>(MAX_LEN);
     auto taskId = GetTaskId(pid, gid);
@@ -108,8 +108,8 @@ std::string FfrtConverter::MakeBeginFakeLog(const std::string& mark,
         result.get(), MAX_LEN,
         "\n  %s-%d    (%7d) [%s] ....   %s: sched_switch: prev_comm=%s prev_pid=%d prev_prio=%d prev_state=S ==> "
         "next_comm=%s next_pid=%s next_prio=%d\n",
-        threadName.c_str(), tid, pid, cpuId.c_str(), timestamp.c_str(), threadName.c_str(), tid, prio, label.c_str(),
-        taskId.c_str(), prio);
+        threadName.c_str(), tid, pid, cpuId.c_str(), beginTimeStamp.c_str(), threadName.c_str(), tid, prio,
+        label.c_str(), taskId.c_str(), prio);
     return mark + result.get();
 }
 
@@ -121,7 +121,7 @@ std::string FfrtConverter::MakeEndFakeLog(const std::string& mark,
                                           const std::string& threadName,
                                           const int prio)
 {
-    auto timestamp = ExtractTimeStr(mark);
+    auto endTimeStamp = ExtractTimeStr(mark);
     auto cpuId = ExtractCpuId(mark);
     std::unique_ptr<char[]> result = std::make_unique<char[]>(MAX_LEN);
     auto taskId = GetTaskId(pid, gid);
@@ -129,13 +129,13 @@ std::string FfrtConverter::MakeEndFakeLog(const std::string& mark,
         result.get(), MAX_LEN,
         "  %s-%s    (%7d) [%s] ....   %s: sched_switch: prev_comm=%s prev_pid=%s prev_prio=%d prev_state=S ==> "
         "next_comm=%s next_pid=%s next_prio=%d\n",
-        label.c_str(), taskId.c_str(), pid, cpuId.c_str(), timestamp.c_str(), label.c_str(), taskId.c_str(), prio,
+        label.c_str(), taskId.c_str(), pid, cpuId.c_str(), endTimeStamp.c_str(), label.c_str(), taskId.c_str(), prio,
         threadName.c_str(), tid, prio);
     std::string fakeLog = result.get();
     memset_s(result.get(), MAX_LEN, 0, MAX_LEN);
     if (mark.find("|B|") != std::string::npos || mark.find("|H:B ") != std::string::npos) {
         (void)sprintf_s(result.get(), MAX_LEN, "  %s-%s    (%7d) [%s] ....   %s: %sE|%d\n", label.c_str(),
-                        taskId.c_str(), pid, cpuId.c_str(), timestamp.c_str(), tracingMarkerKey_.c_str(), pid);
+                        taskId.c_str(), pid, cpuId.c_str(), endTimeStamp.c_str(), tracingMarkerKey_.c_str(), pid);
         fakeLog = result.get() + fakeLog;
     }
     return fakeLog;
diff --git a/trace_streamer/src/rpc/rpc_server.cpp b/trace_streamer/src/rpc/rpc_server.cpp
index 926e81ba076121b691e9c5ea8479618f7a8aa113..f3f7717be0f96dfa6d9e0cceb2859015086cce31 100644
--- a/trace_streamer/src/rpc/rpc_server.cpp
+++ b/trace_streamer/src/rpc/rpc_server.cpp
@@ -371,12 +371,12 @@ void RpcServer::ProcHookCommSplitResult(SplitFileCallBack splitFileCallBack)
 }
 void RpcServer::ProcEbpfSplitResult(SplitFileCallBack splitFileCallBack, bool isLast)
 {
-    auto splitResult = ts_->GetHtraceData()->GetEbpfDataParser()->GetEbpfSplitResult();
+    auto ebpfSplitResult = ts_->GetHtraceData()->GetEbpfDataParser()->GetEbpfSplitResult();
     std::string result = VALUE;
-    for (auto it = splitResult.begin(); it != splitResult.end(); ++it) {
-        if (it->type == (int32_t)SplitDataDataType::SPLIT_FILE_JSON) {
-            result += OFFSET + std::to_string(it->originSeg.offset);
-            result += SIZE + std::to_string(it->originSeg.size);
+    for (auto ebpfIter = ebpfSplitResult.begin(); ebpfIter != ebpfSplitResult.end(); ++ebpfIter) {
+        if (ebpfIter->type == (int32_t)SplitDataDataType::SPLIT_FILE_JSON) {
+            result += OFFSET + std::to_string(ebpfIter->originSeg.offset);
+            result += SIZE + std::to_string(ebpfIter->originSeg.size);
             result += "},";
         } else {
             if (result != VALUE) {
@@ -385,7 +385,7 @@ void RpcServer::ProcEbpfSplitResult(SplitFileCallBack splitFileCallBack, bool is
                 splitFileCallBack(result, (int32_t)SplitDataDataType::SPLIT_FILE_JSON, 0);
                 result = VALUE;
             }
-            std::string buffer(reinterpret_cast<char*>(it->buffer.address), it->buffer.size);
+            std::string buffer(reinterpret_cast<char*>(ebpfIter->buffer.address), ebpfIter->buffer.size);
             splitFileCallBack(buffer, (int32_t)SplitDataDataType::SPLIT_FILE_DATA, 0);
         }
     }
@@ -397,12 +397,12 @@ void RpcServer::ProcEbpfSplitResult(SplitFileCallBack splitFileCallBack, bool is
 }
 void RpcServer::ProcPerfSplitResult(SplitFileCallBack splitFileCallBack, bool isLast)
 {
-    auto splitResult = ts_->GetHtraceData()->GetPerfSplitResult();
+    auto perfSplitResult = ts_->GetHtraceData()->GetPerfSplitResult();
     std::string result = VALUE;
-    for (auto it = splitResult.begin(); it != splitResult.end(); ++it) {
-        if (it->type == (int32_t)SplitDataDataType::SPLIT_FILE_JSON) {
-            result += OFFSET + std::to_string(it->originSeg.offset);
-            result += SIZE + std::to_string(it->originSeg.size);
+    for (auto perfIter = perfSplitResult.begin(); perfIter != perfSplitResult.end(); ++perfIter) {
+        if (perfIter->type == (int32_t)SplitDataDataType::SPLIT_FILE_JSON) {
+            result += OFFSET + std::to_string(perfIter->originSeg.offset);
+            result += SIZE + std::to_string(perfIter->originSeg.size);
             result += "},";
         } else {
             if (result != VALUE) {
@@ -411,7 +411,7 @@ void RpcServer::ProcPerfSplitResult(SplitFileCallBack splitFileCallBack, bool is
                 splitFileCallBack(result, (int32_t)SplitDataDataType::SPLIT_FILE_JSON, 0);
                 result = VALUE;
             }
-            std::string buffer(reinterpret_cast<char*>(it->buffer.address), it->buffer.size);
+            std::string buffer(reinterpret_cast<char*>(perfIter->buffer.address), perfIter->buffer.size);
             splitFileCallBack(buffer, (int32_t)SplitDataDataType::SPLIT_FILE_DATA, 0);
         }
     }
diff --git a/trace_streamer/src/table/base/trace_config_table.cpp b/trace_streamer/src/table/base/trace_config_table.cpp
index 8ffeab70640c8fda453c2a5602fe05e323a25ea7..e4dd6039d5f893d9c346789791f3ca1a87364e78 100644
--- a/trace_streamer/src/table/base/trace_config_table.cpp
+++ b/trace_streamer/src/table/base/trace_config_table.cpp
@@ -42,9 +42,9 @@ TraceConfigTable::Cursor::Cursor(const TraceDataCache* dataCache, TableBase* tab
 
 TraceConfigTable::Cursor::~Cursor() {}
 
-int32_t TraceConfigTable::Cursor::Column(int32_t column) const
+int32_t TraceConfigTable::Cursor::Column(int32_t traceCfgColumn) const
 {
-    switch (static_cast<Index>(column)) {
+    switch (static_cast<Index>(traceCfgColumn)) {
         case Index::ID:
             sqlite3_result_int64(context_, static_cast<sqlite3_int64>(CurrentRow()));
             break;
@@ -61,7 +61,7 @@ int32_t TraceConfigTable::Cursor::Column(int32_t column) const
                                 STR_DEFAULT_LEN, nullptr);
             break;
         default:
-            TS_LOGF("Unregistered column : %d", column);
+            TS_LOGF("Unregistered traceCfgColumn : %d", traceCfgColumn);
             break;
     }
     return SQLITE_OK;
diff --git a/trace_streamer/src/table/ebpf/bio_latency_sample_table.cpp b/trace_streamer/src/table/ebpf/bio_latency_sample_table.cpp
index ea903a568a51e5f39f755e52d61054a47b3f311a..c9f6d650c5e2c20f48883dfa2c122c0db7c86c2b 100644
--- a/trace_streamer/src/table/ebpf/bio_latency_sample_table.cpp
+++ b/trace_streamer/src/table/ebpf/bio_latency_sample_table.cpp
@@ -21,8 +21,8 @@ enum class Index : int32_t {
     ID = 0,
     CALLCHAIN_ID,
     TYPE,
-    IPID,
-    ITID,
+    IPIDS,
+    ITIDS,
     START_TS,
     END_TS,
     LATENCY_DUR,
@@ -98,7 +98,7 @@ int32_t BioLatencySampleTable::Cursor::Filter(const FilterConstraints& fc, sqlit
         return SQLITE_OK;
     }
 
-    auto&  bioLateSamTabCs = fc.GetConstraints();
+    auto& bioLateSamTabCs = fc.GetConstraints();
     for (size_t i = 0; i < bioLateSamTabCs.size(); i++) {
         const auto& c = bioLateSamTabCs[i];
         switch (static_cast<Index>(c.col)) {
@@ -137,10 +137,10 @@ int32_t BioLatencySampleTable::Cursor::Column(int32_t column) const
         case Index::TYPE:
             sqlite3_result_int64(context_, static_cast<int64_t>(bioLatencySampleObj_.Types()[CurrentRow()]));
             break;
-        case Index::IPID:
+        case Index::IPIDS:
             SetTypeColumnInt64(bioLatencySampleObj_.Ipids()[CurrentRow()], INVALID_UINT64);
             break;
-        case Index::ITID:
+        case Index::ITIDS:
             SetTypeColumnInt64(bioLatencySampleObj_.Itids()[CurrentRow()], INVALID_UINT64);
             break;
         case Index::START_TS:
diff --git a/trace_streamer/src/table/ebpf/ebpf_callstack_table.cpp b/trace_streamer/src/table/ebpf/ebpf_callstack_table.cpp
index 9ba4c99b229ee01803085c60d33780c3593fd613..8ef39c46d1d80d296696e0012090b4beb411177a 100644
--- a/trace_streamer/src/table/ebpf/ebpf_callstack_table.cpp
+++ b/trace_streamer/src/table/ebpf/ebpf_callstack_table.cpp
@@ -40,7 +40,7 @@ EbpfCallStackTable::~EbpfCallStackTable() {}
 
 void EbpfCallStackTable::FilterByConstraint(FilterConstraints& callfc,
                                             double& callfilterCost,
-                                            size_t callrowCount,
+                                            size_t callRowCnt,
                                             uint32_t callcurrenti)
 {
     // To use the EstimateFilterCost function in the TableBase parent class function to calculate the i-value of each
@@ -48,16 +48,16 @@ void EbpfCallStackTable::FilterByConstraint(FilterConstraints& callfc,
     const auto& callc = callfc.GetConstraints()[callcurrenti];
     switch (static_cast<Index>(callc.col)) {
         case Index::ID: {
-            if (CanFilterId(callc.op, callrowCount)) {
+            if (CanFilterId(callc.op, callRowCnt)) {
                 callfc.UpdateConstraint(callcurrenti, true);
                 callfilterCost += 1; // id can position by 1 step
             } else {
-                callfilterCost += callrowCount; // scan all rows
+                callfilterCost += callRowCnt; // scan all rows
             }
             break;
         }
-        default:                            // other column
-            callfilterCost += callrowCount; // scan all rows
+        default:                          // other column
+            callfilterCost += callRowCnt; // scan all rows
             break;
     }
 }
@@ -149,15 +149,15 @@ int32_t EbpfCallStackTable::Cursor::Column(int32_t column) const
     }
     return SQLITE_OK;
 }
-void EbpfCallStackTable::GetOrbyes(FilterConstraints& callfc, EstimatedIndexInfo& callei)
+void EbpfCallStackTable::GetOrbyes(FilterConstraints& ebpfCallfc, EstimatedIndexInfo& ebpfCalleInfo)
 {
-    auto callorderbys = callfc.GetOrderBys();
-    for (auto i = 0; i < callorderbys.size(); i++) {
-        switch (static_cast<Index>(callorderbys[i].iColumn)) {
+    auto ebpfCallOrderbys = ebpfCallfc.GetOrderBys();
+    for (auto i = 0; i < ebpfCallOrderbys.size(); i++) {
+        switch (static_cast<Index>(ebpfCallOrderbys[i].iColumn)) {
             case Index::ID:
                 break;
-            default: // other columns can be sorted by SQLite
-                callei.isOrdered = false;
+            default: // other columns can be sorted by SQLitep
+                ebpfCalleInfo.isOrdered = false;
                 break;
         }
     }
diff --git a/trace_streamer/src/table/ebpf/file_system_sample_table.cpp b/trace_streamer/src/table/ebpf/file_system_sample_table.cpp
index 7949c50337b195c6bd4973e592dfe8e4dff03e8d..460473186fb170a2e1eeafc010bbfeb1fdf1e4bd 100644
--- a/trace_streamer/src/table/ebpf/file_system_sample_table.cpp
+++ b/trace_streamer/src/table/ebpf/file_system_sample_table.cpp
@@ -178,9 +178,9 @@ int32_t FileSystemSampleTable::Cursor::Column(int32_t column) const
     }
     return SQLITE_OK;
 }
-void FileSystemSampleTable::Cursor::HandleTypeColumns(int32_t column) const
+void FileSystemSampleTable::Cursor::HandleTypeColumns(int32_t fileSysSampleCol) const
 {
-    switch (static_cast<Index>(column)) {
+    switch (static_cast<Index>(fileSysSampleCol)) {
         case Index::FD:
             SetTypeColumnInt64(fileSystemSampleTableObj_.Fds()[CurrentRow()], INVALID_UINT64);
             break;
@@ -204,15 +204,15 @@ void FileSystemSampleTable::Cursor::HandleTypeColumns(int32_t column) const
             SetTypeColumnText(fileSystemSampleTableObj_.FourthArguments()[CurrentRow()], INVALID_UINT64);
             break;
         default:
-            TS_LOGF("Unregistered column : %d", column);
+            TS_LOGF("Unregistered fileSysSampleCol : %d", fileSysSampleCol);
             break;
     }
 }
 void FileSystemSampleTable::GetOrbyes(FilterConstraints& sysfc, EstimatedIndexInfo& sysei)
 {
-    auto sysorderbys = sysfc.GetOrderBys();
-    for (auto i = 0; i < sysorderbys.size(); i++) {
-        switch (static_cast<Index>(sysorderbys[i].iColumn)) {
+    auto sysOrderbys = sysfc.GetOrderBys();
+    for (auto i = 0; i < sysOrderbys.size(); i++) {
+        switch (static_cast<Index>(sysOrderbys[i].iColumn)) {
             case Index::ID:
                 break;
             default: // other columns can be sorted by SQLite
diff --git a/trace_streamer/src/table/ebpf/include/bio_latency_sample_table.h b/trace_streamer/src/table/ebpf/include/bio_latency_sample_table.h
index b0e4e10ebc486fee828677bfc6c5d077b885d564..606cf1e93eeb88af816d2ae03dd8e0be08dece6f 100644
--- a/trace_streamer/src/table/ebpf/include/bio_latency_sample_table.h
+++ b/trace_streamer/src/table/ebpf/include/bio_latency_sample_table.h
@@ -32,17 +32,17 @@ private:
     {
         return dataCache_->GetConstBioLatencySampleData().Size();
     }
-    void GetOrbyes(FilterConstraints& argsfc, EstimatedIndexInfo& argsei) override;
-    void FilterByConstraint(FilterConstraints& argsfc,
-                            double& argsfilterCost,
-                            size_t argsrowCount,
-                            uint32_t argscurrenti) override;
+    void GetOrbyes(FilterConstraints& biofc, EstimatedIndexInfo& bioei) override;
+    void FilterByConstraint(FilterConstraints& biofc,
+                            double& biofilterCost,
+                            size_t biorowCount,
+                            uint32_t biocurrenti) override;
 
     class Cursor : public TableBase::Cursor {
     public:
         explicit Cursor(const TraceDataCache* dataCache, TableBase* table);
         ~Cursor() override;
-        int32_t Filter(const FilterConstraints& fc, sqlite3_value** argv) override;
+        int32_t Filter(const FilterConstraints& fcs, sqlite3_value** argv) override;
         int32_t Column(int32_t column) const override;
 
     private:
diff --git a/trace_streamer/src/table/ebpf/include/ebpf_callstack_table.h b/trace_streamer/src/table/ebpf/include/ebpf_callstack_table.h
index dfabd3769c78c0e76b706aec5130349d4cc8c6c4..f0d38b78650e96a522f1dc5c0cc2378b8aa06d5d 100644
--- a/trace_streamer/src/table/ebpf/include/ebpf_callstack_table.h
+++ b/trace_streamer/src/table/ebpf/include/ebpf_callstack_table.h
@@ -32,17 +32,17 @@ private:
     {
         return dataCache_->GetConstEbpfCallStackData().Size();
     }
-    void GetOrbyes(FilterConstraints& callfc, EstimatedIndexInfo& callei) override;
-    void FilterByConstraint(FilterConstraints& callfc,
-                            double& callfilterCost,
-                            size_t callrowCount,
-                            uint32_t callcurrenti) override;
+    void GetOrbyes(FilterConstraints& ebpfCallfc, EstimatedIndexInfo& ebpfCallei) override;
+    void FilterByConstraint(FilterConstraints& ebpfCallfc,
+                            double& ebpfCallfilterCost,
+                            size_t ebpfCallrowCount,
+                            uint32_t ebpfCallcurrenti) override;
 
     class Cursor : public TableBase::Cursor {
     public:
         explicit Cursor(const TraceDataCache* dataCache, TableBase* table);
         ~Cursor() override;
-        int32_t Filter(const FilterConstraints& fc, sqlite3_value** argv) override;
+        int32_t Filter(const FilterConstraints& fcs, sqlite3_value** argv) override;
         int32_t Column(int32_t column) const override;
 
     private:
diff --git a/trace_streamer/src/table/ftrace/app_startup_table.cpp b/trace_streamer/src/table/ftrace/app_startup_table.cpp
index a626403613e59c427a04073bda81d4cf35ec62c1..449c65a1f1257e78564b5bfc96be99fdef8fcb0c 100644
--- a/trace_streamer/src/table/ftrace/app_startup_table.cpp
+++ b/trace_streamer/src/table/ftrace/app_startup_table.cpp
@@ -46,9 +46,9 @@ AppStartupTable::Cursor::Cursor(const TraceDataCache* dataCache, TableBase* tabl
 
 AppStartupTable::Cursor::~Cursor() {}
 
-int32_t AppStartupTable::Cursor::Column(int32_t column) const
+int32_t AppStartupTable::Cursor::Column(int32_t appStartupCol) const
 {
-    switch (static_cast<Index>(column)) {
+    switch (static_cast<Index>(appStartupCol)) {
         case Index::ID:
             sqlite3_result_int64(context_, static_cast<int32_t>(CurrentRow()));
             break;
@@ -76,7 +76,7 @@ int32_t AppStartupTable::Cursor::Column(int32_t column) const
                                 STR_DEFAULT_LEN, nullptr);
             break;
         default:
-            TS_LOGF("Unregistered column : %d", column);
+            TS_LOGF("Unregistered appStartupCol : %d", appStartupCol);
             break;
     }
     return SQLITE_OK;
diff --git a/trace_streamer/src/table/ftrace/callstack_table.cpp b/trace_streamer/src/table/ftrace/callstack_table.cpp
index 1dbc308a9387850d7b331bd937cd1375506f23a8..4bb35b31cd3ab65d3ebefac5686743e8dd20a62e 100644
--- a/trace_streamer/src/table/ftrace/callstack_table.cpp
+++ b/trace_streamer/src/table/ftrace/callstack_table.cpp
@@ -20,19 +20,19 @@ namespace TraceStreamer {
 enum class Index : int32_t {
     ID = 0,
     TS,
-    DUR,
-    CALL_ID,
-    CAT,
+    DURS,
+    CALL_IDS,
+    CATS,
     IDENTIFY,
     NAME,
-    DEPTH,
-    COOKIE_ID,
+    DEPTHS,
+    COOKIES_ID,
     PARENT_ID,
     ARGSET,
-    CHAIN_ID,
-    SPAN_ID,
-    PARENT_SPAN_ID,
-    FLAG,
+    CHAIN_IDS,
+    SPAN_IDS,
+    PARENT_SPAN_IDS,
+    FLAGS,
     ARGS
 };
 CallStackTable::CallStackTable(const TraceDataCache* dataCache) : TableBase(dataCache)
@@ -63,15 +63,15 @@ CallStackTable::~CallStackTable() {}
 void CallStackTable::FilterByConstraint(FilterConstraints& callfc,
                                         double& callfilterCost,
                                         size_t callrowCount,
-                                        uint32_t callcurrenti)
+                                        uint32_t callCurrenti)
 {
     // To use the EstimateFilterCost function in the TableBase parent class function to calculate the i-value of each
     // for loop
-    const auto& callc = callfc.GetConstraints()[callcurrenti];
+    const auto& callc = callfc.GetConstraints()[callCurrenti];
     switch (static_cast<Index>(callc.col)) {
         case Index::ID: {
             if (CanFilterId(callc.op, callrowCount)) {
-                callfc.UpdateConstraint(callcurrenti, true);
+                callfc.UpdateConstraint(callCurrenti, true);
                 callfilterCost += 1; // id can position by 1 step
             } else {
                 callfilterCost += callrowCount; // scan all rows
@@ -118,10 +118,10 @@ int32_t CallStackTable::Cursor::Filter(const FilterConstraints& fc, sqlite3_valu
             case Index::TS:
                 FilterTS(c.op, argv[i], slicesObj_.TimeStampData());
                 break;
-            case Index::CALL_ID:
+            case Index::CALL_IDS:
                 indexMap_->MixRange(c.op, static_cast<uint32_t>(sqlite3_value_int(argv[i])), slicesObj_.CallIds());
                 break;
-            case Index::COOKIE_ID:
+            case Index::COOKIES_ID:
                 indexMap_->MixRange(c.op, static_cast<uint64_t>(sqlite3_value_int64(argv[i])), slicesObj_.Cookies());
                 break;
             default:
@@ -153,13 +153,13 @@ int32_t CallStackTable::Cursor::Column(int32_t col) const
         case Index::TS:
             SetTypeColumnInt64(slicesObj_.TimeStampData()[CurrentRow()], INVALID_UINT64);
             break;
-        case Index::DUR:
+        case Index::DURS:
             SetTypeColumnInt64(slicesObj_.DursData()[CurrentRow()], INVALID_UINT64);
             break;
-        case Index::CALL_ID:
+        case Index::CALL_IDS:
             SetTypeColumnInt64(slicesObj_.CallIds()[CurrentRow()], INVALID_UINT64);
             break;
-        case Index::CAT: {
+        case Index::CATS: {
             SetTypeColumnText(slicesObj_.CatsData()[CurrentRow()], INVALID_UINT64);
             break;
         }
@@ -178,10 +178,10 @@ int32_t CallStackTable::Cursor::Column(int32_t col) const
 void CallStackTable::Cursor::HandleTypeColumns(int32_t col) const
 {
     switch (static_cast<Index>(col)) {
-        case Index::DEPTH:
+        case Index::DEPTHS:
             SetTypeColumnInt64(slicesObj_.Depths()[CurrentRow()], INVALID_UINT64);
             break;
-        case Index::COOKIE_ID:
+        case Index::COOKIES_ID:
             SetTypeColumnInt64(slicesObj_.Cookies()[CurrentRow()], INVALID_UINT64);
             break;
         case Index::PARENT_ID: {
@@ -193,19 +193,19 @@ void CallStackTable::Cursor::HandleTypeColumns(int32_t col) const
         case Index::ARGSET:
             SetTypeColumnInt64(slicesObj_.ArgSetIdsData()[CurrentRow()], INVALID_UINT32);
             break;
-        case Index::CHAIN_ID:
+        case Index::CHAIN_IDS:
             SetTypeColumnTextNotEmpty(slicesObj_.ChainIds()[CurrentRow()].empty(),
                                       slicesObj_.ChainIds()[CurrentRow()].c_str());
             break;
-        case Index::SPAN_ID:
+        case Index::SPAN_IDS:
             SetTypeColumnTextNotEmpty(slicesObj_.SpanIds()[CurrentRow()].empty(),
                                       slicesObj_.SpanIds()[CurrentRow()].c_str());
             break;
-        case Index::PARENT_SPAN_ID:
+        case Index::PARENT_SPAN_IDS:
             SetTypeColumnTextNotEmpty(slicesObj_.ParentSpanIds()[CurrentRow()].empty(),
                                       slicesObj_.ParentSpanIds()[CurrentRow()].c_str());
             break;
-        case Index::FLAG:
+        case Index::FLAGS:
             SetTypeColumnTextNotEmpty(slicesObj_.Flags()[CurrentRow()].empty(),
                                       slicesObj_.Flags()[CurrentRow()].c_str());
             break;
diff --git a/trace_streamer/src/table/ftrace/include/thread_table.h b/trace_streamer/src/table/ftrace/include/thread_table.h
index 0d0a6542af28f44137867277f751279849b3a2c2..93f7bc4bd2576a458344a4edb0c3c886600e1110 100644
--- a/trace_streamer/src/table/ftrace/include/thread_table.h
+++ b/trace_streamer/src/table/ftrace/include/thread_table.h
@@ -61,22 +61,22 @@ private:
                                   const std::deque<SysTuning::TraceStdtype::Thread>& threadQueue)
         {
             if (remove) {
-                for (auto i = indexMapBack_->rowIndex_.begin(); i != indexMapBack_->rowIndex_.end();) {
-                    if (threadQueue[*i].switchCount_ != value) {
-                        i++;
+                for (auto idx = indexMapBack_->rowIndex_.begin(); idx != indexMapBack_->rowIndex_.end();) {
+                    if (threadQueue[*idx].switchCount_ != value) {
+                        idx++;
                     } else {
                         changed = true;
-                        rowIndexBak_.push_back(*i);
-                        i++;
+                        rowIndexBak_.push_back(*idx);
+                        idx++;
                     }
                 }
                 if (changed) {
                     indexMapBack_->rowIndex_ = rowIndexBak_;
                 }
             } else {
-                for (auto i = 0; i < size; i++) {
-                    if (threadQueue[i].switchCount_ == value) {
-                        indexMapBack_->rowIndex_.push_back(i);
+                for (auto idx = 0; idx < size; idx++) {
+                    if (threadQueue[idx].switchCount_ == value) {
+                        indexMapBack_->rowIndex_.push_back(idx);
                     }
                 }
             }
@@ -84,7 +84,7 @@ private:
         }
         template <typename Value, typename Size>
         void HandleSwitchCount(bool remove,
-                               bool& changed,
+                               bool& isChanged,
                                Value value,
                                Size size,
                                const std::deque<SysTuning::TraceStdtype::Thread>& threadQueue)
@@ -94,12 +94,12 @@ private:
                     if (threadQueue[*i].internalPid_ != value) {
                         i++;
                     } else {
-                        changed = true;
+                        isChanged = true;
                         rowIndexBak_.push_back(*i);
                         i++;
                     }
                 }
-                if (changed) {
+                if (isChanged) {
                     indexMapBack_->rowIndex_ = rowIndexBak_;
                 }
             } else {
diff --git a/trace_streamer/src/table/ftrace/instants_table.cpp b/trace_streamer/src/table/ftrace/instants_table.cpp
index c2526dd8c8a98b2964c68a8d2d254ef218ffba87..d6bc461959c4e96b17a756fa3bf448840a82ce39 100644
--- a/trace_streamer/src/table/ftrace/instants_table.cpp
+++ b/trace_streamer/src/table/ftrace/instants_table.cpp
@@ -118,11 +118,11 @@ int32_t InstantsTable::Cursor::Filter(const FilterConstraints& fc, sqlite3_value
     if (rowCount_ <= 0) {
         return SQLITE_OK;
     }
-    auto cs = fc.GetConstraints();
+    auto instantsTabCs = fc.GetConstraints();
     std::set<uint32_t> sId = {static_cast<uint32_t>(Index::TS)};
-    SwapIndexFront(cs, sId);
-    for (size_t i = 0; i < cs.size(); i++) {
-        const auto& c = cs[i];
+    SwapIndexFront(instantsTabCs, sId);
+    for (size_t i = 0; i < instantsTabCs.size(); i++) {
+        const auto& c = instantsTabCs[i];
         switch (static_cast<Index>(c.col)) {
             case Index::TS:
                 FilterTS(c.op, argv[i], InstantsObj_.TimeStampData());
diff --git a/trace_streamer/src/table/ftrace/irq_table.cpp b/trace_streamer/src/table/ftrace/irq_table.cpp
index 4e941dcddedb252ab036ed89b14e4d07e15004f6..51ed85aaf2b23d8fe5cec16ac622f2a50317835b 100644
--- a/trace_streamer/src/table/ftrace/irq_table.cpp
+++ b/trace_streamer/src/table/ftrace/irq_table.cpp
@@ -20,40 +20,39 @@ namespace TraceStreamer {
 enum class Index : int32_t {
     ID = 0,
     TS,
-    DUR,
-    CALL_ID,
+    DURS,
+    CALL_IDS,
     CAT,
     NAME,
     DEPTH,
     COOKIE_ID,
     PARENT_ID,
     ARGSET,
-    CHAIN_ID,
-    SPAN_ID,
-    PARENT_SPAN_ID,
+    CHAIN_IDS,
+    SPAN_IDS,
+    PARENT_SPAN_IDS,
     FLAG,
     ARGS
 };
 IrqTable::IrqTable(const TraceDataCache* dataCache) : TableBase(dataCache)
 {
-    tableColumn_.push_back(TableBase::ColumnInfo("id", "INTEGER"));
-    tableColumn_.push_back(TableBase::ColumnInfo("ts", "INTEGER"));
-    tableColumn_.push_back(TableBase::ColumnInfo("dur", "INTEGER"));
-    tableColumn_.push_back(TableBase::ColumnInfo("callid", "INTEGER"));
-    tableColumn_.push_back(TableBase::ColumnInfo("cat", "TEXT"));
-    tableColumn_.push_back(TableBase::ColumnInfo("name", "TEXT"));
-    tableColumn_.push_back(TableBase::ColumnInfo("depth", "INTEGER"));
-    tableColumn_.push_back(TableBase::ColumnInfo("cookie", "INTEGER"));
-    tableColumn_.push_back(TableBase::ColumnInfo("parent_id", "INTEGER"));
-    tableColumn_.push_back(TableBase::ColumnInfo("argsetid", "INTEGER"));
-    tableColumn_.push_back(TableBase::ColumnInfo("chainId", "TEXT"));
-    tableColumn_.push_back(TableBase::ColumnInfo("spanId", "TEXT"));
-    tableColumn_.push_back(TableBase::ColumnInfo("parentSpanId", "TEXT"));
-    tableColumn_.push_back(TableBase::ColumnInfo("flag", "TEXT"));
-    tableColumn_.push_back(TableBase::ColumnInfo("args", "TEXT"));
-    tablePriKey_.push_back("callid");
-    tablePriKey_.push_back("ts");
-    tablePriKey_.push_back("depth");
+    tableColumn_.emplace_back(TableBase::ColumnInfo("id", "INTEGER"));
+    tableColumn_.emplace_back(TableBase::ColumnInfo("ts", "INTEGER"));
+    tableColumn_.emplace_back(TableBase::ColumnInfo("dur", "INTEGER"));
+    tableColumn_.emplace_back(TableBase::ColumnInfo("callid", "INTEGER"));
+    tableColumn_.emplace_back(TableBase::ColumnInfo("cat", "TEXT"));
+    tableColumn_.emplace_back(TableBase::ColumnInfo("name", "TEXT"));
+    tableColumn_.emplace_back(TableBase::ColumnInfo("depth", "INTEGER"));
+    tableColumn_.emplace_back(TableBase::ColumnInfo("cookie", "INTEGER"));
+    tableColumn_.emplace_back(TableBase::ColumnInfo("parent_id", "INTEGER"));
+    tableColumn_.emplace_back(TableBase::ColumnInfo("argsetid", "INTEGER"));
+    tableColumn_.emplace_back(TableBase::ColumnInfo("spanId", "TEXT"));
+    tableColumn_.emplace_back(TableBase::ColumnInfo("parentSpanId", "TEXT"));
+    tableColumn_.emplace_back(TableBase::ColumnInfo("flag", "TEXT"));
+    tableColumn_.emplace_back(TableBase::ColumnInfo("args", "TEXT"));
+    tablePriKey_.emplace_back("callid");
+    tablePriKey_.emplace_back("ts");
+    tablePriKey_.emplace_back("depth");
 }
 
 IrqTable::~IrqTable() {}
@@ -140,10 +139,10 @@ int32_t IrqTable::Cursor::Column(int32_t column) const
         case Index::TS:
             SetTypeColumnInt64(slicesObj_.TimeStampData()[CurrentRow()], INVALID_UINT64);
             break;
-        case Index::DUR:
+        case Index::DURS:
             SetTypeColumnInt64(slicesObj_.DursData()[CurrentRow()], INVALID_UINT64);
             break;
-        case Index::CALL_ID:
+        case Index::CALL_IDS:
             SetTypeColumnInt64(slicesObj_.CallIds()[CurrentRow()], INVALID_UINT64);
             break;
         case Index::CAT: {
@@ -177,13 +176,13 @@ void IrqTable::Cursor::HandleTypeColumns(int32_t column) const
         case Index::ARGSET:
             SetTypeColumnInt64(slicesObj_.ArgSetIdsData()[CurrentRow()], INVALID_UINT32);
             break;
-        case Index::CHAIN_ID:
+        case Index::CHAIN_IDS:
             sqlite3_result_text(context_, slicesObj_.ChainIds()[CurrentRow()].c_str(), STR_DEFAULT_LEN, nullptr);
             break;
-        case Index::SPAN_ID:
+        case Index::SPAN_IDS:
             sqlite3_result_text(context_, slicesObj_.SpanIds()[CurrentRow()].c_str(), STR_DEFAULT_LEN, nullptr);
             break;
-        case Index::PARENT_SPAN_ID:
+        case Index::PARENT_SPAN_IDS:
             sqlite3_result_text(context_, slicesObj_.ParentSpanIds()[CurrentRow()].c_str(), STR_DEFAULT_LEN, nullptr);
             break;
         case Index::FLAG:
diff --git a/trace_streamer/src/table/ftrace/measure_table.cpp b/trace_streamer/src/table/ftrace/measure_table.cpp
index 624c6384007cf2f5eef304e586dd593039b011e6..6e2db44eac147a5b0742615a5727d7a44662e06e 100644
--- a/trace_streamer/src/table/ftrace/measure_table.cpp
+++ b/trace_streamer/src/table/ftrace/measure_table.cpp
@@ -107,11 +107,11 @@ int32_t MeasureTable::Cursor::Filter(const FilterConstraints& fc, sqlite3_value*
     if (rowCount_ <= 0) {
         return SQLITE_OK;
     }
-    auto cs = fc.GetConstraints();
+    auto measureTabCs = fc.GetConstraints();
     std::set<uint32_t> sId = {static_cast<uint32_t>(Index::TS)};
-    SwapIndexFront(cs, sId);
-    for (size_t i = 0; i < cs.size(); i++) {
-        const auto& c = cs[i];
+    SwapIndexFront(measureTabCs, sId);
+    for (size_t i = 0; i < measureTabCs.size(); i++) {
+        const auto& c = measureTabCs[i];
         switch (static_cast<Index>(c.col)) {
             case Index::TS:
                 FilterTS(c.op, argv[i], measureObj.TimeStampData());
diff --git a/trace_streamer/src/table/ftrace/thread_state_table.cpp b/trace_streamer/src/table/ftrace/thread_state_table.cpp
index 3c2ab701ce5bb349dfc1818ac40bbd3aca62903e..133e7435d115341eb0ed1d0105930f8997ecb7bc 100644
--- a/trace_streamer/src/table/ftrace/thread_state_table.cpp
+++ b/trace_streamer/src/table/ftrace/thread_state_table.cpp
@@ -118,13 +118,13 @@ int32_t ThreadStateTable::Cursor::Filter(const FilterConstraints& fc, sqlite3_va
         indexMap_->Merge(indexMapBack);
     }
 
-    auto orderbys = fc.GetOrderBys();
-    for (auto i = orderbys.size(); i > 0;) {
+    auto ThreadStateOrderbys = fc.GetOrderBys();
+    for (auto i = ThreadStateOrderbys.size(); i > 0;) {
         i--;
-        switch (static_cast<Index>(orderbys[i].iColumn)) {
+        switch (static_cast<Index>(ThreadStateOrderbys[i].iColumn)) {
             case Index::ID:
             case Index::TS:
-                indexMap_->SortBy(orderbys[i].desc);
+                indexMap_->SortBy(ThreadStateOrderbys[i].desc);
                 break;
             default:
                 break;
diff --git a/trace_streamer/src/table/ftrace/thread_table.cpp b/trace_streamer/src/table/ftrace/thread_table.cpp
index 6be0185d0023b331480cd32b4883e73b44d8ddfe..da00248f54be895cb79946991bc7443f3538b03f 100644
--- a/trace_streamer/src/table/ftrace/thread_table.cpp
+++ b/trace_streamer/src/table/ftrace/thread_table.cpp
@@ -135,24 +135,24 @@ void ThreadTable::Cursor::FilterTid(unsigned char op, uint64_t value)
 }
 void ThreadTable::Cursor::FilterIpid(unsigned char op, uint64_t value)
 {
-    bool remove = false;
+    bool isRemove = false;
     if (indexMapBack_->HasData()) {
         indexMapBack_->CovertToIndexMap();
-        remove = true;
+        isRemove = true;
     }
     const auto& threadQueue = dataCache_->GetConstThreadData();
-    auto size = threadQueue.size();
+    auto thdQueueSize = threadQueue.size();
     rowIndexBak_.clear();
     bool changed = false;
     switch (op) {
         case SQLITE_INDEX_CONSTRAINT_EQ:
-            HandleIpidConstraint(remove, changed, value, size, threadQueue);
+            HandleIpidConstraint(isRemove, changed, value, thdQueueSize, threadQueue);
             break;
         case SQLITE_INDEX_CONSTRAINT_ISNULL:
-            HandleIpidConstraint(remove, changed, INVALID_UINT32, size, threadQueue);
+            HandleIpidConstraint(isRemove, changed, INVALID_UINT32, thdQueueSize, threadQueue);
             break;
         case SQLITE_INDEX_CONSTRAINT_ISNOTNULL:
-            HandleIpidConstraint(threadQueue, size, remove, changed);
+            HandleIpidConstraint(threadQueue, thdQueueSize, isRemove, changed);
             break;
         default:
             break;
diff --git a/trace_streamer/src/table/hi_sysevent/sysevent_measure_table.cpp b/trace_streamer/src/table/hi_sysevent/sysevent_measure_table.cpp
index 64646121f5d678a29e642160a086a726a9cdfde7..837d1874898d1c3d80722ffe6cd690db71566e75 100644
--- a/trace_streamer/src/table/hi_sysevent/sysevent_measure_table.cpp
+++ b/trace_streamer/src/table/hi_sysevent/sysevent_measure_table.cpp
@@ -46,9 +46,9 @@ SysEventMeasureTable::Cursor::Cursor(const TraceDataCache* dataCache, TableBase*
 
 SysEventMeasureTable::Cursor::~Cursor() {}
 
-int32_t SysEventMeasureTable::Cursor::Column(int32_t column) const
+int32_t SysEventMeasureTable::Cursor::Column(int32_t sysEntMeasureCol) const
 {
-    switch (static_cast<Index>(column)) {
+    switch (static_cast<Index>(sysEntMeasureCol)) {
         case Index::ID:
             sqlite3_result_int64(context_, dataCache_->GetConstHiSyseventMeasureData().IdsData()[CurrentRow()]);
             break;
@@ -76,7 +76,7 @@ int32_t SysEventMeasureTable::Cursor::Column(int32_t column) const
                                 STR_DEFAULT_LEN, nullptr);
             break;
         default:
-            TS_LOGF("Unregistered column : %d", column);
+            TS_LOGF("Unregistered sysEntMeasureCol : %d", sysEntMeasureCol);
             break;
     }
     return SQLITE_OK;
diff --git a/trace_streamer/src/table/hiperf/perf_thread_table.cpp b/trace_streamer/src/table/hiperf/perf_thread_table.cpp
index ef99f6d1cb2b264dfa48ce6798a4596d25b0683a..bbcc207c856cf9cba2686fcb5c52ecd6b5054bb2 100644
--- a/trace_streamer/src/table/hiperf/perf_thread_table.cpp
+++ b/trace_streamer/src/table/hiperf/perf_thread_table.cpp
@@ -31,22 +31,22 @@ PerfThreadTable::~PerfThreadTable() {}
 
 void PerfThreadTable::FilterByConstraint(FilterConstraints& threadfc,
                                          double& threadfilterCost,
-                                         size_t threadrowCount,
+                                         size_t threadRowCnt,
                                          uint32_t threadcurrenti)
 {
-    const auto& threadc = threadfc.GetConstraints()[threadcurrenti];
-    switch (static_cast<Index>(threadc.col)) {
+    const auto& perfThreadc = threadfc.GetConstraints()[threadcurrenti];
+    switch (static_cast<Index>(perfThreadc.col)) {
         case Index::ID: {
-            if (CanFilterId(threadc.op, threadrowCount)) {
+            if (CanFilterId(perfThreadc.op, threadRowCnt)) {
                 threadfc.UpdateConstraint(threadcurrenti, true);
                 threadfilterCost += 1; // id can position by 1 step
             } else {
-                threadfilterCost += threadrowCount; // scan all rows
+                threadfilterCost += threadRowCnt; // scan all rows
             }
             break;
         }
-        default:                                // other column
-            threadfilterCost += threadrowCount; // scan all rows
+        default:                              // other column
+            threadfilterCost += threadRowCnt; // scan all rows
             break;
     }
 }
diff --git a/trace_streamer/src/table/native_hook/native_hook_frame_table.cpp b/trace_streamer/src/table/native_hook/native_hook_frame_table.cpp
index 401933f20b8f7140ef2067009c3424c30248628a..8310ce1d33e92db5bd7d775614d4ccfd345b4c00 100644
--- a/trace_streamer/src/table/native_hook/native_hook_frame_table.cpp
+++ b/trace_streamer/src/table/native_hook/native_hook_frame_table.cpp
@@ -119,9 +119,9 @@ int32_t NativeHookFrameTable::Cursor::Filter(const FilterConstraints& fc, sqlite
     return SQLITE_OK;
 }
 
-int32_t NativeHookFrameTable::Cursor::Column(int32_t column) const
+int32_t NativeHookFrameTable::Cursor::Column(int32_t nativeHookFrameCol) const
 {
-    switch (static_cast<Index>(column)) {
+    switch (static_cast<Index>(nativeHookFrameCol)) {
         case Index::ID:
             sqlite3_result_int64(context_, static_cast<int32_t>(CurrentRow()));
             break;
@@ -155,7 +155,7 @@ int32_t NativeHookFrameTable::Cursor::Column(int32_t column) const
             break;
         }
         default:
-            TS_LOGF("Unregistered column : %d", column);
+            TS_LOGF("Unregistered nativeHookFrameCol : %d", nativeHookFrameCol);
             break;
     }
     return SQLITE_OK;
diff --git a/trace_streamer/src/trace_data/trace_data_db.cpp b/trace_streamer/src/trace_data/trace_data_db.cpp
index a6fcf318238ee6ab2621f9d6707fa58246f4f72c..caa2f3b13b34fbd8e533bdc17844f72cba754967 100644
--- a/trace_streamer/src/trace_data/trace_data_db.cpp
+++ b/trace_streamer/src/trace_data/trace_data_db.cpp
@@ -292,17 +292,7 @@ std::vector<std::string> TraceDataDB::SearchData()
         }
         values.clear();
         std::string option = "";
-        size_t pos = std::string::npos;
-        if ((pos = line.find(" ")) != std::string::npos) {
-            option = line.substr(0, pos);
-            auto left = line.substr(pos + 1);
-            while ((pos = left.find(",")) != std::string::npos) {
-                values.push_back(left.substr(0, pos + 1));
-                left = left.substr(pos + 1);
-            }
-            values.push_back(left);
-        }
-        printf("option:%s\n", option.c_str());
+        ParseCommandLine(option, line, values);
         if (!line.compare("-q") || !line.compare("-quit")) {
             break;
         } else if (!line.compare("-e")) {
@@ -332,15 +322,32 @@ std::vector<std::string> TraceDataDB::SearchData()
             }
             continue;
         }
-
-        using namespace std::chrono;
-        const auto start = steady_clock::now();
-        int32_t rowCount = SearchDatabase(line, printResult);
-        std::chrono::nanoseconds searchDur = duration_cast<nanoseconds>(steady_clock::now() - start);
-        printf("\"%s\"\n\tused %.3fms row: %d\n", line.c_str(), searchDur.count() / 1E6, rowCount);
+        PrintSearchResult(line, printResult);
     }
     return values;
 }
+void TraceDataDB::ParseCommandLine(std::string& option, std::string line, std::vector<std::string>& values)
+{
+    size_t pos = std::string::npos;
+    if ((pos = line.find(" ")) != std::string::npos) {
+        option = line.substr(0, pos);
+        auto left = line.substr(pos + 1);
+        while ((pos = left.find(",")) != std::string::npos) {
+            values.push_back(left.substr(0, pos + 1));
+            left = left.substr(pos + 1);
+        }
+        values.push_back(left);
+    }
+    printf("option:%s\n", option.c_str());
+}
+void TraceDataDB::PrintSearchResult(std::string line, bool printResult)
+{
+    using namespace std::chrono;
+    const auto start = steady_clock::now();
+    int32_t rowCount = SearchDatabase(line, printResult);
+    std::chrono::nanoseconds searchDur = duration_cast<nanoseconds>(steady_clock::now() - start);
+    printf("\"%s\"\n\tused %.3fms row: %d\n", line.c_str(), searchDur.count() / 1E6, rowCount);
+}
 int32_t TraceDataDB::SearchDatabase(std::string& sql, bool print)
 {
     Prepare();
@@ -521,13 +528,13 @@ int32_t TraceDataDB::SearchDatabase(const std::string& sql, uint8_t* out, int32_
     sqlite3_stmt* stmt = nullptr;
     std::unique_ptr<sqlite3_stmt, void (*)(sqlite3_stmt*)> stmtLocal(stmt, SqliteFinalize);
     int32_t ret = sqlite3_prepare_v2(db_, sql.c_str(), static_cast<int32_t>(sql.size()), &stmt, nullptr);
-    stmtLocal.reset(stmt);
     if (ret != SQLITE_OK) {
         TS_LOGE("sqlite3_prepare_v2(%s) failed: %d:%s", sql.c_str(), ret, sqlite3_errmsg(db_));
         return -1;
     }
-    char* res = reinterpret_cast<char*>(out);
+    stmtLocal.reset(stmt);
     std::string snprintfInfo("ok");
+    char* res = reinterpret_cast<char*>(out);
     int32_t retSnprintf = snprintf_s(res, outLen, snprintfInfo.size(), snprintfInfo.data());
     if (retSnprintf < 0) {
         return -1;
@@ -537,8 +544,17 @@ int32_t TraceDataDB::SearchDatabase(const std::string& sql, uint8_t* out, int32_
     if (colCount == 0) {
         return pos;
     }
-    snprintfInfo = "{\"columns\":[";
-    retSnprintf = snprintf_s(res + pos, outLen - pos, snprintfInfo.size(), "%s", snprintfInfo.c_str());
+    auto returnvalue = HandleColumnNames(stmt, res, outLen, pos, colCount);
+    if (returnvalue == -1) {
+        return -1;
+    }
+    pos = returnvalue;
+    return HandleRowData(stmt, res, outLen, pos, colCount);
+}
+int32_t TraceDataDB::HandleColumnNames(sqlite3_stmt* stmt, char* res, int32_t outLen, int32_t pos, int32_t colCount)
+{
+    std::string snprintfInfo = "{\"columns\":[";
+    int32_t retSnprintf = snprintf_s(res + pos, outLen - pos, snprintfInfo.size(), "%s", snprintfInfo.c_str());
     if (retSnprintf < 0) {
         return -1;
     }
@@ -551,13 +567,19 @@ int32_t TraceDataDB::SearchDatabase(const std::string& sql, uint8_t* out, int32_
         }
         pos += retSnprintf;
     }
-    pos--; // rmove the last ','
+    pos--; // Remove the last ','
     snprintfInfo = "],\"values\":[";
     retSnprintf = snprintf_s(res + pos, outLen - pos, snprintfInfo.size(), snprintfInfo.data());
     if (retSnprintf < 0) {
         return -1;
     }
     pos += retSnprintf;
+    return pos;
+}
+int32_t TraceDataDB::HandleRowData(sqlite3_stmt* stmt, char* res, int32_t outLen, int32_t pos, int32_t colCount)
+{
+    std::string snprintfInfo;
+    int32_t retSnprintf;
     bool hasRow = false;
     std::string row;
     row.reserve(DEFAULT_LEN_ROW_STRING);
diff --git a/trace_streamer/src/trace_data/trace_data_db.h b/trace_streamer/src/trace_data/trace_data_db.h
index 7ca7efc8ba26969d95d2719f12fe5992ac698e08..20745fcf56ab9a6905452d87c1c0c2d77e345b04 100644
--- a/trace_streamer/src/trace_data/trace_data_db.h
+++ b/trace_streamer/src/trace_data/trace_data_db.h
@@ -74,6 +74,10 @@ public:
 private:
     void ExecuteSql(const std::string_view& sql);
     void SendDatabase(ResultCallBack resultCallBack);
+    void ParseCommandLine(std::string& option, std::string line, std::vector<std::string>& values);
+    void PrintSearchResult(std::string line, bool printResult);
+    int32_t HandleColumnNames(sqlite3_stmt* stmt, char* res, int32_t outLen, int32_t pos, int32_t colCount);
+    int32_t HandleRowData(sqlite3_stmt* stmt, char* res, int32_t outLen, int32_t pos, int32_t colCount);
     static void GetRowString(sqlite3_stmt* stmt, int32_t colCount, std::string& rowStr);
     static void SqliteFinalize(sqlite3_stmt* ptr);
 
diff --git a/trace_streamer/test/unittest/htrace/ebpf/bio_parser_test.cpp b/trace_streamer/test/unittest/htrace/ebpf/bio_parser_test.cpp
index 23443a923ec51645d7f45c16b6f3acddc1d037e2..b1f9e691d31b8cdf08c4471cc831add1f2b100d4 100644
--- a/trace_streamer/test/unittest/htrace/ebpf/bio_parser_test.cpp
+++ b/trace_streamer/test/unittest/htrace/ebpf/bio_parser_test.cpp
@@ -50,7 +50,7 @@ public:
         dequeBuffer_.clear();
     }
 
-    void InitData(uint32_t length, uint32_t nips, const uint64_t startTime, const uint64_t endTime)
+    void InitData(uint32_t length, uint32_t nips, const uint64_t startTime, const uint64_t endTime, uint32_t prio = 0)
     {
         ebpfHeader_.header.clock = EBPF_CLOCK_BOOTTIME;
         ebpfHeader_.header.cmdLineLen = COMMAND_LINE.length();
@@ -102,25 +102,18 @@ HWTEST_F(EbpfBioParserTest, EbpfBioParserCorrectWithoutCallback, TestSize.Level1
     ebpfDataParser->ParseBioLatencyEvent();
     ebpfDataParser->Finish();
     EXPECT_TRUE(ebpfDataParser->reader_->ebpfDataHeader_->header.clock == EBPF_CLOCK_BOOTTIME);
-    auto callChainId = stream_.traceDataCache_->GetConstBioLatencySampleData().CallChainIds()[0];
-    EXPECT_EQ(callChainId, INVALID_UINT32);
-    auto type = stream_.traceDataCache_->GetConstBioLatencySampleData().Types()[0];
-    EXPECT_EQ(type, 2);
-    auto startTs = stream_.traceDataCache_->GetConstBioLatencySampleData().StartTs()[0];
-    EXPECT_EQ(startTs, START_TIME);
-    auto endTs = stream_.traceDataCache_->GetConstBioLatencySampleData().EndTs()[0];
-    EXPECT_EQ(endTs, END_TIME);
-    auto dur = stream_.traceDataCache_->GetConstBioLatencySampleData().LatencyDurs()[0];
+    auto sampleData = stream_.traceDataCache_->GetConstBioLatencySampleData();
+    EXPECT_EQ(sampleData.CallChainIds()[0], INVALID_UINT32);
+    EXPECT_EQ(sampleData.Types()[0], 2);
+    EXPECT_EQ(sampleData.StartTs()[0], START_TIME);
+    EXPECT_EQ(sampleData.EndTs()[0], END_TIME);
+    auto dur = sampleData.LatencyDurs()[0];
     EXPECT_EQ(dur, END_TIME - START_TIME);
-    auto tier = stream_.traceDataCache_->GetConstBioLatencySampleData().Tiers()[0];
-    EXPECT_EQ(tier, 0);
-    auto size = stream_.traceDataCache_->GetConstBioLatencySampleData().Sizes()[0];
+    EXPECT_EQ(sampleData.Tiers()[0], 0);
+    auto size = sampleData.Sizes()[0];
     EXPECT_EQ(size, DURPER4K);
-    auto Expectblk = ebpfDataParser->ConvertToHexTextIndex(BLKCNT);
-    auto blk = stream_.traceDataCache_->GetConstBioLatencySampleData().BlockNumbers()[0];
-    EXPECT_EQ(blk, Expectblk);
-    auto durPer4K = stream_.traceDataCache_->GetConstBioLatencySampleData().DurPer4k()[0];
-    EXPECT_EQ(durPer4K, dur / (size / DURPER4K));
+    EXPECT_EQ(sampleData.BlockNumbers()[0], ebpfDataParser->ConvertToHexTextIndex(BLKCNT));
+    EXPECT_EQ(sampleData.DurPer4k()[0], dur / (size / DURPER4K));
 }
 
 /**
@@ -131,7 +124,7 @@ HWTEST_F(EbpfBioParserTest, EbpfBioParserCorrectWithoutCallback, TestSize.Level1
 HWTEST_F(EbpfBioParserTest, EbpfBioParserwrongWithoutCallback, TestSize.Level1)
 {
     TS_LOGI("test32-2");
-    InitData(sizeof(BIOFixedHeader), 0, END_TIME, START_TIME);
+    InitData(sizeof(BIOFixedHeader), 0, END_TIME, START_TIME, 1);
 
     std::unique_ptr<EbpfDataParser> ebpfDataParser =
         std::make_unique<EbpfDataParser>(stream_.traceDataCache_.get(), stream_.streamFilters_.get());
@@ -140,25 +133,20 @@ HWTEST_F(EbpfBioParserTest, EbpfBioParserwrongWithoutCallback, TestSize.Level1)
     ebpfDataParser->ParseBioLatencyEvent();
     ebpfDataParser->Finish();
     EXPECT_TRUE(ebpfDataParser->reader_->ebpfDataHeader_->header.clock == EBPF_CLOCK_BOOTTIME);
-    auto callChainId = stream_.traceDataCache_->GetConstBioLatencySampleData().CallChainIds()[0];
-    EXPECT_FALSE(callChainId == INVALID_UINT64);
-    auto type = stream_.traceDataCache_->GetConstBioLatencySampleData().Types()[0];
-    EXPECT_FALSE(type == 2);
-    auto startTs = stream_.traceDataCache_->GetConstBioLatencySampleData().StartTs()[0];
-    EXPECT_FALSE(startTs == END_TIME);
-    auto endTs = stream_.traceDataCache_->GetConstBioLatencySampleData().EndTs()[0];
-    EXPECT_FALSE(endTs == START_TIME);
-    auto dur = stream_.traceDataCache_->GetConstBioLatencySampleData().LatencyDurs()[0];
-    EXPECT_FALSE(dur == endTs - startTs);
-    auto tier = stream_.traceDataCache_->GetConstBioLatencySampleData().Tiers()[0];
-    EXPECT_FALSE(tier == 0);
-    auto size = stream_.traceDataCache_->GetConstBioLatencySampleData().Sizes()[0];
-    EXPECT_FALSE(size == DURPER4K);
-    auto Expectblk = ebpfDataParser->ConvertToHexTextIndex(BLKCNT);
-    auto blk = stream_.traceDataCache_->GetConstBioLatencySampleData().BlockNumbers()[0];
-    EXPECT_FALSE(blk == Expectblk);
-    auto durPer4K = stream_.traceDataCache_->GetConstBioLatencySampleData().DurPer4k()[0];
-    EXPECT_FALSE(durPer4K == dur / (size / DURPER4K));
+    auto sampleData = stream_.traceDataCache_->GetConstBioLatencySampleData();
+    EXPECT_NE(sampleData.CallChainIds()[0], INVALID_UINT64);
+    EXPECT_NE(sampleData.Types()[0], 2);
+    EXPECT_NE(sampleData.StartTs()[0], END_TIME);
+    EXPECT_NE(sampleData.EndTs()[0], START_TIME);
+    auto dur = sampleData.LatencyDurs()[0];
+    EXPECT_NE(dur, START_TIME - END_TIME);
+    EXPECT_NE(sampleData.Tiers()[0], 1);
+    auto size = sampleData.Sizes()[0];
+    EXPECT_NE(size, DURPER4K);
+    EXPECT_NE(sampleData.BlockNumbers()[0], ebpfDataParser->ConvertToHexTextIndex(BLKCNT));
+    if (size > 0) {
+        EXPECT_NE(sampleData.DurPer4k()[0], dur / (size / DURPER4K));
+    }
 }
 
 /**
@@ -181,29 +169,20 @@ HWTEST_F(EbpfBioParserTest, EbpfBioParserCorrectWithOneCallback, TestSize.Level1
     ebpfDataParser->ParseBioLatencyEvent();
     ebpfDataParser->Finish();
     EXPECT_TRUE(ebpfDataParser->reader_->ebpfDataHeader_->header.clock == EBPF_CLOCK_BOOTTIME);
-    auto callChainId = stream_.traceDataCache_->GetConstBioLatencySampleData().CallChainIds()[0];
-    EXPECT_EQ(callChainId, 0);
-    auto type = stream_.traceDataCache_->GetConstBioLatencySampleData().Types()[0];
-    EXPECT_EQ(type, 2);
-    auto ipid = stream_.traceDataCache_->GetConstBioLatencySampleData().Ipids()[0];
-    EXPECT_EQ(ipid, 1);
-    auto itid = stream_.traceDataCache_->GetConstBioLatencySampleData().Itids()[0];
-    EXPECT_EQ(itid, 1);
-    auto startTs = stream_.traceDataCache_->GetConstBioLatencySampleData().StartTs()[0];
-    EXPECT_EQ(startTs, START_TIME);
-    auto endTs = stream_.traceDataCache_->GetConstBioLatencySampleData().EndTs()[0];
-    EXPECT_EQ(endTs, END_TIME);
-    auto dur = stream_.traceDataCache_->GetConstBioLatencySampleData().LatencyDurs()[0];
+    auto sampleData = stream_.traceDataCache_->GetConstBioLatencySampleData();
+    EXPECT_EQ(sampleData.CallChainIds()[0], 0);
+    EXPECT_EQ(sampleData.Types()[0], 2);
+    EXPECT_EQ(sampleData.Ipids()[0], 1);
+    EXPECT_EQ(sampleData.Itids()[0], 1);
+    EXPECT_EQ(sampleData.StartTs()[0], START_TIME);
+    EXPECT_EQ(sampleData.EndTs()[0], END_TIME);
+    auto dur = sampleData.LatencyDurs()[0];
     EXPECT_EQ(dur, END_TIME - START_TIME);
-    auto tier = stream_.traceDataCache_->GetConstBioLatencySampleData().Tiers()[0];
-    EXPECT_EQ(tier, 0);
-    auto size = stream_.traceDataCache_->GetConstBioLatencySampleData().Sizes()[0];
+    EXPECT_EQ(sampleData.Tiers()[0], 0);
+    auto size = sampleData.Sizes()[0];
     EXPECT_EQ(size, DURPER4K);
-    auto Expectblk = ebpfDataParser->ConvertToHexTextIndex(BLKCNT);
-    auto blk = stream_.traceDataCache_->GetConstBioLatencySampleData().BlockNumbers()[0];
-    EXPECT_EQ(blk, Expectblk);
-    auto durPer4K = stream_.traceDataCache_->GetConstBioLatencySampleData().DurPer4k()[0];
-    EXPECT_EQ(durPer4K, dur / (size / DURPER4K));
+    EXPECT_EQ(sampleData.BlockNumbers()[0], ebpfDataParser->ConvertToHexTextIndex(BLKCNT));
+    EXPECT_EQ(sampleData.DurPer4k()[0], dur / (size / DURPER4K));
     auto ExpectIps0 = ebpfDataParser->ConvertToHexTextIndex(ips[0]);
     auto ips0 = stream_.traceDataCache_->GetConstEbpfCallStackData().Ips()[0];
     EXPECT_EQ(ips0, ExpectIps0);
@@ -229,29 +208,20 @@ HWTEST_F(EbpfBioParserTest, EbpfBioParserCorrectWithMultipleCallback, TestSize.L
     ebpfDataParser->ParseBioLatencyEvent();
     ebpfDataParser->Finish();
     EXPECT_TRUE(ebpfDataParser->reader_->ebpfDataHeader_->header.clock == EBPF_CLOCK_BOOTTIME);
-    auto callChainId = stream_.traceDataCache_->GetConstBioLatencySampleData().CallChainIds()[0];
-    EXPECT_EQ(callChainId, 0);
-    auto type = stream_.traceDataCache_->GetConstBioLatencySampleData().Types()[0];
-    EXPECT_EQ(type, 2);
-    auto ipid = stream_.traceDataCache_->GetConstBioLatencySampleData().Ipids()[0];
-    EXPECT_EQ(ipid, 1);
-    auto itid = stream_.traceDataCache_->GetConstBioLatencySampleData().Itids()[0];
-    EXPECT_EQ(itid, 1);
-    auto startTs = stream_.traceDataCache_->GetConstBioLatencySampleData().StartTs()[0];
-    EXPECT_EQ(startTs, START_TIME);
-    auto endTs = stream_.traceDataCache_->GetConstBioLatencySampleData().EndTs()[0];
-    EXPECT_EQ(endTs, END_TIME);
-    auto dur = stream_.traceDataCache_->GetConstBioLatencySampleData().LatencyDurs()[0];
+    auto sampleData = stream_.traceDataCache_->GetConstBioLatencySampleData();
+    EXPECT_EQ(sampleData.CallChainIds()[0], 0);
+    EXPECT_EQ(sampleData.Types()[0], 2);
+    EXPECT_EQ(sampleData.Ipids()[0], 1);
+    EXPECT_EQ(sampleData.Itids()[0], 1);
+    EXPECT_EQ(sampleData.StartTs()[0], START_TIME);
+    EXPECT_EQ(sampleData.EndTs()[0], END_TIME);
+    auto dur = sampleData.LatencyDurs()[0];
     EXPECT_EQ(dur, END_TIME - START_TIME);
-    auto tier = stream_.traceDataCache_->GetConstBioLatencySampleData().Tiers()[0];
-    EXPECT_EQ(tier, 0);
-    auto size = stream_.traceDataCache_->GetConstBioLatencySampleData().Sizes()[0];
+    EXPECT_EQ(sampleData.Tiers()[0], 0);
+    auto size = sampleData.Sizes()[0];
     EXPECT_EQ(size, DURPER4K);
-    auto Expectblk = ebpfDataParser->ConvertToHexTextIndex(BLKCNT);
-    auto blk = stream_.traceDataCache_->GetConstBioLatencySampleData().BlockNumbers()[0];
-    EXPECT_EQ(blk, Expectblk);
-    auto durPer4K = stream_.traceDataCache_->GetConstBioLatencySampleData().DurPer4k()[0];
-    EXPECT_EQ(durPer4K, dur / (size / DURPER4K));
+    EXPECT_EQ(sampleData.BlockNumbers()[0], ebpfDataParser->ConvertToHexTextIndex(BLKCNT));
+    EXPECT_EQ(sampleData.DurPer4k()[0], dur / (size / DURPER4K));
     auto ExpectIps0 = ebpfDataParser->ConvertToHexTextIndex(ips[0]);
     auto ips0 = stream_.traceDataCache_->GetConstEbpfCallStackData().Ips()[1];
     EXPECT_EQ(ips0, ExpectIps0);
diff --git a/trace_streamer/test/unittest/interface/rpc_server_test.cpp b/trace_streamer/test/unittest/interface/rpc_server_test.cpp
index e02ebbb92fabefe2882c55d18a3ec0cf33216fc1..6ad5066a77664f0e8e4030d28697fe55bd991bef 100644
--- a/trace_streamer/test/unittest/interface/rpc_server_test.cpp
+++ b/trace_streamer/test/unittest/interface/rpc_server_test.cpp
@@ -101,7 +101,9 @@ HWTEST_F(RpcServerTest, ParserConfig, TestSize.Level1)
     BytraceLine line;
     // if the configuration changes, the current variable also needs to change
     std::string json(
-        "{\"config\": {\"TaskPool\": 1,\"AnimationAnalysis\": 0,\"AppStartup\": 0, \"BinderRunnable\": 0}}");
+        "{\"config\": {"
+        "\"TaskPool\": 1,\"AnimationAnalysis\": 0,\"AppStartup\": 0, \"BinderRunnable\": 0, \"FfrtConvert\": 0"
+        "}}");
 
     RpcServer rpcServer;
     auto ret = rpcServer.ParserConfig(json);
diff --git a/trace_streamer/test/unittest/interface/split_file_data_test.cpp b/trace_streamer/test/unittest/interface/split_file_data_test.cpp
index 107ed6e1b7ceb8f8816191d0f627ed863da9152f..795b2f16c2ad725b27695202d963eaa0cbec8926 100644
--- a/trace_streamer/test/unittest/interface/split_file_data_test.cpp
+++ b/trace_streamer/test/unittest/interface/split_file_data_test.cpp
@@ -43,6 +43,7 @@ protected:
     {
         ta->EnableMetaTable(false);
 
+        size_t readSize = 0;
         int32_t fd(base::OpenFile(path, O_RDONLY, G_FILE_PERMISSION));
         while (true) {
             std::unique_ptr<uint8_t[]> buf = std::make_unique<uint8_t[]>(READ_SIZE);
@@ -57,6 +58,10 @@ protected:
             if (!ta->ParseTraceDataSegment(std::move(buf), rsize, 1, 1)) {
                 break;
             };
+
+            dataBuf_ = std::make_unique<uint8_t[]>(readSize + rsize);
+            memcpy_s(dataBuf_.get() + readSize, rsize, buf.get(), rsize);
+            readSize += rsize;
         }
 
         ta->WaitForParserEnd();
@@ -108,6 +113,9 @@ protected:
         bool ret = ts->ParseTraceDataSegment(std::move(combinedBuf), dataSize + PROFILE_HEADER + headDataSize, 1, 1);
         return ret;
     }
+
+public:
+    std::unique_ptr<uint8_t[]> dataBuf_;
 };
 
 /**
@@ -172,12 +180,9 @@ HWTEST_F(SplitFileDataTest, SplitFileDataBySystraceTest, TestSize.Level1)
         ta->maxTs_ = 88032820831000;
         ParseData(ta, tracePath);
 
-        std::unique_ptr<uint8_t[]> bufParser(new uint8_t[ta->GetBytraceData()->GetTraceDataBytrace().size()]);
-        std::copy(ta->GetBytraceData()->GetTraceDataBytrace().begin(),
-                  ta->GetBytraceData()->GetTraceDataBytrace().end(), bufParser.get());
         std::unique_ptr<TraceStreamerSelector> ts = std::make_unique<TraceStreamerSelector>();
         EXPECT_TRUE(
-            ts->ParseTraceDataSegment(std::move(bufParser), ta->GetBytraceData()->GetTraceDataBytrace().size(), 1, 1));
+            ts->ParseTraceDataSegment(std::move(dataBuf_), ta->GetBytraceData()->GetTraceDataBytrace().size(), 1, 1));
     } else {
         EXPECT_TRUE(false);
     }
diff --git a/trace_streamer/test/unittest/table/table_test.cpp b/trace_streamer/test/unittest/table/table_test.cpp
index 9ece04fbade75c267b6032ba10f0f6403a47d0c1..f3f483d2938207e8be781fa52d888dd7a715d769 100644
--- a/trace_streamer/test/unittest/table/table_test.cpp
+++ b/trace_streamer/test/unittest/table/table_test.cpp
@@ -73,8 +73,7 @@ HWTEST_F(TableTest, AppnameTableTest, TestSize.Level1)
     DataIndex eventSource = stream_.traceDataCache_->GetDataIndex("eventSource");
     DataIndex appName = stream_.traceDataCache_->GetDataIndex("app1");
     stream_.traceDataCache_->GetHiSysEventSubkeysData()->AppendSysEventSubkey(eventSource, appName);
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 1);
 }
 /**
  * @tc.name: ArgsTableTest
@@ -101,18 +100,12 @@ HWTEST_F(TableTest, ArgsTableTest, TestSize.Level1)
     stream_.traceDataCache_->InitDB();
     stream_.traceDataCache_->GetArgSetData()->AppendNewArg(nameId0, dataType0, value0, argSet0);
     stream_.traceDataCache_->GetArgSetData()->AppendNewArg(nameId1, dataType1, value1, argSet1);
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 2);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect1, false);
-    EXPECT_EQ(row, 1);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect2, false);
-    EXPECT_EQ(row, 2);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect3, false);
-    EXPECT_EQ(row, 1);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect4, false);
-    EXPECT_EQ(row, 1);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect5, false);
-    EXPECT_EQ(row, 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect1, false), 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect2, false), 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect3, false), 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect4, false), 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect5, false), 2);
 }
 /**
  * @tc.name: CallstackTableTest
@@ -185,18 +178,12 @@ HWTEST_F(TableTest, ClkEventFilterTableTest, TestSize.Level1)
     uint64_t cpu1 = 1;
     stream_.traceDataCache_->GetClkEventFilterData()->AppendNewFilter(id, rate, name, cpu);
     stream_.traceDataCache_->GetClkEventFilterData()->AppendNewFilter(id1, rate1, name1, cpu1);
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 2);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect1, false);
-    EXPECT_EQ(row, 2);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect2, false);
-    EXPECT_EQ(row, 0);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect3, false);
-    EXPECT_EQ(row, 2);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect4, false);
-    EXPECT_EQ(row, 2);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect5, false);
-    EXPECT_EQ(row, 0);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect1, false), 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect2, false), 0);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect3, false), 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect4, false), 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect5, false), 0);
 }
 /**
  * @tc.name: ClockEventFilterTableTest
@@ -223,18 +210,12 @@ HWTEST_F(TableTest, ClockEventFilterTableTest, TestSize.Level1)
     uint64_t cpu1 = 1;
     stream_.traceDataCache_->GetClockEventFilterData()->AppendNewFilter(id, type, name, cpu);
     stream_.traceDataCache_->GetClockEventFilterData()->AppendNewFilter(id1, type1, name1, cpu1);
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 2);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect1, false);
-    EXPECT_EQ(row, 2);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect2, false);
-    EXPECT_EQ(row, 1);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect3, false);
-    EXPECT_EQ(row, 0);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect4, false);
-    EXPECT_EQ(row, 2);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect5, false);
-    EXPECT_EQ(row, 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect1, false), 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect2, false), 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect3, false), 0);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect4, false), 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect5, false), 2);
 }
 /**
  * @tc.name: CpuMeasureFilterTableTest
@@ -260,18 +241,12 @@ HWTEST_F(TableTest, CpuMeasureFilterTableTest, TestSize.Level1)
 
     stream_.traceDataCache_->GetCpuMeasuresData()->AppendNewFilter(filterId, name, cpu);
     stream_.traceDataCache_->GetCpuMeasuresData()->AppendNewFilter(filterId1, name1, cpu1);
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 2);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect1, false);
-    EXPECT_EQ(row, 2);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect2, false);
-    EXPECT_EQ(row, 0);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect3, false);
-    EXPECT_EQ(row, 0);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect4, false);
-    EXPECT_EQ(row, 2);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect5, false);
-    EXPECT_EQ(row, 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect1, false), 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect2, false), 0);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect3, false), 0);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect4, false), 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect5, false), 1);
 }
 /**
  * @tc.name: CpuUsageFilterTableTest
@@ -298,11 +273,10 @@ HWTEST_F(TableTest, CpuUsageFilterTableTest, TestSize.Level1)
 
     stream_.traceDataCache_->GetCpuUsageInfoData()->AppendNewData(newTimeStamp, dur, totalLoad, userLoad, userLoad,
                                                                   thread);
-    stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 1);
     stream_.traceDataCache_->GetCpuUsageInfoData()->AppendNewData(newTimeStamp1, dur1, totalLoad1, userLoad1, userLoad1,
                                                                   thread1);
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 2);
 }
 /**
  * @tc.name: DataDictTableTest
@@ -319,18 +293,12 @@ HWTEST_F(TableTest, DataDictTableTest, TestSize.Level1)
     std::string sqlSelect4 = "select * from data_dict where id >= 1";
     std::string sqlSelect5 = "select * from data_dict where data <= 1";
     stream_.traceDataCache_->GetDataFromDict(1);
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 69);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect1, false);
-    EXPECT_EQ(row, 1);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect2, false);
-    EXPECT_EQ(row, 67);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect3, false);
-    EXPECT_EQ(row, 1);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect4, false);
-    EXPECT_EQ(row, 68);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect5, false);
-    EXPECT_EQ(row, 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 69);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect1, false), 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect2, false), 67);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect3, false), 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect4, false), 68);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect5, false), 1);
 }
 /**
  * @tc.name: DataTypeTableTest
@@ -351,20 +319,20 @@ HWTEST_F(TableTest, DataTypeTableTest, TestSize.Level1)
     BaseDataType dataType1 = BASE_DATA_TYPE_STRING;
     DataIndex dataDescIndex1 = stream_.traceDataCache_->GetDataIndex("dataDescIndex1");
 
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 4);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect1, false), 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect2, false), 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect3, false), 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect4, false), 3);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect5, false), 2);
     stream_.traceDataCache_->GetDataTypeData()->UpdateNewDataType(dataType, dataDescIndex);
     stream_.traceDataCache_->GetDataTypeData()->UpdateNewDataType(dataType1, dataDescIndex1);
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 6);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect1, false);
-    EXPECT_EQ(row, 1);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect2, false);
-    EXPECT_EQ(row, 4);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect3, false);
-    EXPECT_EQ(row, 1);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect4, false);
-    EXPECT_EQ(row, 4);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect5, false);
-    EXPECT_EQ(row, 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 4);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect1, false), 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect2, false), 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect3, false), 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect4, false), 3);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect5, false), 2);
 }
 /**
  * @tc.name: DiskIoTableTest
@@ -418,23 +386,16 @@ HWTEST_F(TableTest, EbpfCallstackTableTest, TestSize.Level1)
 
     stream_.traceDataCache_->GetHidumpData()->AppendNewHidumpInfo(timeStamp, FPS);
     stream_.traceDataCache_->GetHidumpData()->AppendNewHidumpInfo(timestamp1, FPS1);
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect6, false);
-    EXPECT_EQ(row, 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect6, false), 2);
 
     stream_.traceDataCache_->GetEbpfCallStack()->AppendNewData(CALLCHAIN_ID, depth, ip, symbolId, filePathId, 0);
     stream_.traceDataCache_->GetEbpfCallStack()->AppendNewData(CALLCHAIN_ID1, depth1, ip1, symbolId1, filePathId1, 0);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 2);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect1, false);
-    EXPECT_EQ(row, 1);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect2, false);
-    EXPECT_EQ(row, 0);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect3, false);
-    EXPECT_EQ(row, 1);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect4, false);
-    EXPECT_EQ(row, 1);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect5, false);
-    EXPECT_EQ(row, 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect1, false), 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect2, false), 0);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect3, false), 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect4, false), 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect5, false), 2);
 }
 /**
  * @tc.name: FileSystemSampleTableTest
@@ -495,8 +456,7 @@ HWTEST_F(TableTest, HidumpTableTest, TestSize.Level1)
     uint32_t fps = 1;
 
     stream_.traceDataCache_->GetHidumpData()->AppendNewHidumpInfo(timeStamp, fps);
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 1);
 }
 /**
  * @tc.name: HisysEventMeasureTableTest
@@ -517,8 +477,7 @@ HWTEST_F(TableTest, HisysEventMeasureTableTest, TestSize.Level1)
 
     stream_.traceDataCache_->GetHiSysEventMeasureData()->AppendData(ts, nameId, keyId, type, numericValue, stringValue,
                                                                     serial);
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 1);
 }
 /**
  * @tc.name: InstantTableTest
@@ -554,8 +513,7 @@ HWTEST_F(TableTest, InstantTableTest, TestSize.Level1)
 
     stream_.traceDataCache_->GetMeasureData()->AppendMeasureData(type, timeStamp, value, filterId);
     stream_.traceDataCache_->GetMeasureData()->AppendMeasureData(type1, timestamp1, value1, filterId1);
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect1, false);
-    EXPECT_EQ(row, 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect1, false), 2);
 
     stream_.traceDataCache_->GetInstantsData()->AppendInstantEventData(timeStamp, nameIndex, internalTid,
                                                                        wakeupFromInternalPid);
@@ -608,18 +566,15 @@ HWTEST_F(TableTest, IoLatencySampleTableTest, TestSize.Level1)
 
     stream_.traceDataCache_->GetHidumpData()->AppendNewHidumpInfo(timeStamp, fps);
     stream_.traceDataCache_->GetHidumpData()->AppendNewHidumpInfo(timestamp1, fps1);
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect1, false);
-    EXPECT_EQ(row, 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect1, false), 2);
 
     stream_.traceDataCache_->GetBioLatencySampleData()->AppendNewData(
         CALLCHAIN_ID, TYPE, IPID, ITID, startTs, endTs, latencyDur, tier, size, blockNumber, filePathId, durPer4k);
     stream_.traceDataCache_->GetBioLatencySampleData()->AppendNewData(callChainId1, type1, ipid1, itid1, startTs1,
                                                                       endTs1, latencyDur1, tier1, size1, blockNumber1,
                                                                       filePathId1, durPer4k1);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 2);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect2, false);
-    EXPECT_EQ(row, 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect2, false), 1);
 }
 /**
  * @tc.name: IrqTableTest
@@ -653,10 +608,8 @@ HWTEST_F(TableTest, IrqTableTest, TestSize.Level1)
                                                                depth, parentId);
     stream_.traceDataCache_->GetIrqData()->AppendInternalSlice(startT1, durationNs1, internalTid1, cat1, nameIdentify1,
                                                                name1, depth1, parentId1);
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 2);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect1, false);
-    EXPECT_EQ(row, 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect1, false), 2);
 }
 /**
  * @tc.name: LiveProcessTableTest
@@ -684,8 +637,7 @@ HWTEST_F(TableTest, LiveProcessTableTest, TestSize.Level1)
     stream_.traceDataCache_->GetLiveProcessData()->AppendNewData(newTimeStamp, dur, processID, processName,
                                                                  parentProcessID, uid, userName, cpuUsage, pssInfo,
                                                                  cpuTime, threads, diskWrites, diskReads);
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 1);
 }
 /**
  * @tc.name: LogTableTest
@@ -706,8 +658,7 @@ HWTEST_F(TableTest, LogTableTest, TestSize.Level1)
     uint64_t originTs = 1;
 
     stream_.traceDataCache_->GetHilogData()->AppendNewLogInfo(seq, timeStamp, pid, tid, level, tag, context, originTs);
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 1);
 }
 /**
  * @tc.name: MeasureTableTest
@@ -731,10 +682,8 @@ HWTEST_F(TableTest, MeasureTableTest, TestSize.Level1)
 
     stream_.traceDataCache_->GetMeasureData()->AppendMeasureData(type, timeStamp, value, filterId);
     stream_.traceDataCache_->GetMeasureData()->AppendMeasureData(type1, timestamp1, value1, filterId1);
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 2);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect1, false);
-    EXPECT_EQ(row, 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect1, false), 1);
 }
 /**
  * @tc.name: MeasureFilterTableTest
@@ -746,13 +695,11 @@ HWTEST_F(TableTest, MeasureFilterTableTest, TestSize.Level1)
     TS_LOGI("test31-21");
     std::string sqlSelect = "select * from measure_filter";
     uint64_t filterId = stream_.traceDataCache_->GetDataIndex("filter");
-    ;
     uint32_t nameIndex = stream_.traceDataCache_->GetDataIndex("name");
     uint64_t internalTid = 1;
 
     stream_.traceDataCache_->GetProcessMeasureFilterData()->AppendNewFilter(filterId, nameIndex, internalTid);
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 0);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 0);
 }
 /**
  * @tc.name: MetaTableTest
@@ -765,8 +712,7 @@ HWTEST_F(TableTest, MetaTableTest, TestSize.Level1)
     std::string sqlSelect = "select * from meta";
 
     stream_.traceDataCache_->GetMetaData();
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 9);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 9);
 }
 /**
  * @tc.name: NativeHookTableTest
@@ -874,8 +820,7 @@ HWTEST_F(TableTest, NetworkTableTest, TestSize.Level1)
 
     stream_.traceDataCache_->GetNetworkData()->AppendNewNetData(newTimeStamp, tx, rx, dur, rxSpeed, txSpeed, packetIn,
                                                                 packetInSec, packetOut, packetOutSec, netType);
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 1);
 }
 /**
  * @tc.name: PerfCallchainTableTest
@@ -938,12 +883,9 @@ HWTEST_F(TableTest, PerfFilesTableTest, TestSize.Level1)
 
     stream_.traceDataCache_->GetPerfFilesData()->AppendNewPerfFiles(fileIds, serial, symbols, filePath);
     stream_.traceDataCache_->GetPerfFilesData()->AppendNewPerfFiles(fileIds1, serial1, symbols1, filePath1);
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 2);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect1, false);
-    EXPECT_EQ(row, 1);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect2, false);
-    EXPECT_EQ(row, 0);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect1, false), 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect2, false), 0);
 }
 /**
  * @tc.name: PerfReportTableTest
@@ -958,8 +900,7 @@ HWTEST_F(TableTest, PerfReportTableTest, TestSize.Level1)
     DataIndex value = stream_.traceDataCache_->GetDataIndex("value");
 
     stream_.traceDataCache_->GetPerfReportData()->AppendNewPerfReport(type, value);
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 1);
 }
 /**
  * @tc.name: PerfSampleTableTest
@@ -1026,14 +967,10 @@ HWTEST_F(TableTest, PerfThreadTableTest, TestSize.Level1)
 
     stream_.traceDataCache_->GetPerfThreadData()->AppendNewPerfThread(pid, tid, threadName);
     stream_.traceDataCache_->GetPerfThreadData()->AppendNewPerfThread(pid1, tid1, threadName1);
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 2);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect1, false);
-    EXPECT_EQ(row, 1);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect2, false);
-    EXPECT_EQ(row, 1);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect3, false);
-    EXPECT_EQ(row, 0);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect1, false), 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect2, false), 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect3, false), 0);
 }
 /**
  * @tc.name: ProcessTableTest
@@ -1046,27 +983,8 @@ HWTEST_F(TableTest, ProcessTableTest, TestSize.Level1)
     std::string sqlSelect = "select * from process";
     std::string sqlSelect1 = "select * from process where id = 1";
 
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 1);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect1, false);
-    EXPECT_EQ(row, 0);
-}
-/**
- * @tc.name: ProcessFilterTableTest
- * @tc.desc: Process filter table test
- * @tc.type: FUNC
- */
-HWTEST_F(TableTest, ProcessFilterTableTest, TestSize.Level1)
-{
-    TS_LOGI("test31-32");
-    std::string sqlSelect = "select * from process_filter";
-    uint64_t id = 1;
-    DataIndex name = stream_.traceDataCache_->GetDataIndex("name");
-    uint32_t internalPid = 1;
-
-    stream_.traceDataCache_->GetProcessMeasureFilterData()->AppendNewFilter(id, name, internalPid);
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect1, false), 0);
 }
 /**
  * @tc.name: ProcessMeasureTableTest
@@ -1075,7 +993,7 @@ HWTEST_F(TableTest, ProcessFilterTableTest, TestSize.Level1)
  */
 HWTEST_F(TableTest, ProcessMeasureTableTest, TestSize.Level1)
 {
-    TS_LOGI("test31-33");
+    TS_LOGI("test31-32");
     std::string sqlSelect = "select * from process_measure";
     uint32_t type = 1;
     uint64_t timeStamp = 1663869124160;
@@ -1083,8 +1001,7 @@ HWTEST_F(TableTest, ProcessMeasureTableTest, TestSize.Level1)
     uint32_t filterId = 1;
 
     stream_.traceDataCache_->GetProcessMeasureData()->AppendMeasureData(type, timeStamp, value, filterId);
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 1);
 }
 /**
  * @tc.name: ProcessMeasureFilterTableTest
@@ -1093,7 +1010,7 @@ HWTEST_F(TableTest, ProcessMeasureTableTest, TestSize.Level1)
  */
 HWTEST_F(TableTest, ProcessMeasureFilterTableTest, TestSize.Level1)
 {
-    TS_LOGI("test31-34");
+    TS_LOGI("test31-33");
     std::string sqlSelect = "select * from process_measure_filter";
     std::string sqlSelect1 = "select * from process_measure_filter where id = 1";
     std::string sqlSelect2 = "select * from process_measure_filter where ipid < 1";
@@ -1108,14 +1025,10 @@ HWTEST_F(TableTest, ProcessMeasureFilterTableTest, TestSize.Level1)
 
     stream_.traceDataCache_->GetProcessMeasureFilterData()->AppendNewFilter(id, name, internalPid);
     stream_.traceDataCache_->GetProcessMeasureFilterData()->AppendNewFilter(id1, name1, internalPid1);
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 2);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect1, false);
-    EXPECT_EQ(row, 2);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect2, false);
-    EXPECT_EQ(row, 0);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect3, false);
-    EXPECT_EQ(row, 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect1, false), 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect2, false), 0);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect3, false), 2);
 }
 /**
  * @tc.name: RawTableTest
@@ -1124,7 +1037,7 @@ HWTEST_F(TableTest, ProcessMeasureFilterTableTest, TestSize.Level1)
  */
 HWTEST_F(TableTest, RawTableTest, TestSize.Level1)
 {
-    TS_LOGI("test31-35");
+    TS_LOGI("test31-34");
     std::string sqlSelect = "select * from raw";
     std::string sqlSelect1 = "select * from raw where id = 1";
     std::string sqlSelect2 = "select * from raw where name = \"sched_waking\"";
@@ -1155,7 +1068,7 @@ HWTEST_F(TableTest, RawTableTest, TestSize.Level1)
  */
 HWTEST_F(TableTest, SchedSliceTest, TestSize.Level1)
 {
-    TS_LOGI("test31-36");
+    TS_LOGI("test31-35");
     std::string sqlSelect = "select * from sched_slice";
     std::string sqlSelect1 = "select * from sched_slice where id = 1";
     std::string sqlSelect2 = "select * from sched_slice where ts > 1";
@@ -1194,7 +1107,7 @@ HWTEST_F(TableTest, SchedSliceTest, TestSize.Level1)
  */
 HWTEST_F(TableTest, SmapsTest, TestSize.Level1)
 {
-    TS_LOGI("test31-37");
+    TS_LOGI("test31-36");
     std::string sqlSelect = "select * from smaps";
     uint64_t timeStamp = 1663869124160;
     std::string startAddr = "startAddr";
@@ -1219,8 +1132,7 @@ HWTEST_F(TableTest, SmapsTest, TestSize.Level1)
     stream_.traceDataCache_->GetSmapsData()->AppendNewData(
         timeStamp, IPID, startAddr, endAddr, dirty, swapper, rss, pss, size, reside, protectionId, pathId, sharedClean,
         sharedDirty, privateClean, privateDirty, swap, swapPss, type);
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 1);
 }
 /**
  * @tc.name: StatTableTest
@@ -1229,11 +1141,10 @@ HWTEST_F(TableTest, SmapsTest, TestSize.Level1)
  */
 HWTEST_F(TableTest, StatTableTest, TestSize.Level1)
 {
-    TS_LOGI("test31-38");
+    TS_LOGI("test31-37");
     std::string sqlSelect = "select * from stat";
     stream_.traceDataCache_->GetStatAndInfo();
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 455);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 455);
 }
 /**
  * @tc.name: SymbolsTableTest
@@ -1242,7 +1153,7 @@ HWTEST_F(TableTest, StatTableTest, TestSize.Level1)
  */
 HWTEST_F(TableTest, SymbolsTableTest, TestSize.Level1)
 {
-    TS_LOGI("test31-39");
+    TS_LOGI("test31-38");
     std::string sqlSelect = "select * from symbols";
     std::string sqlSelect1 = "select * from symbols where id = 1";
     std::string sqlSelect2 = "select * from symbols where id < 1";
@@ -1254,12 +1165,9 @@ HWTEST_F(TableTest, SymbolsTableTest, TestSize.Level1)
 
     stream_.traceDataCache_->GetSymbolsData()->UpdateSymbol(addr, name);
     stream_.traceDataCache_->GetSymbolsData()->UpdateSymbol(addr1, name1);
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 2);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect1, false);
-    EXPECT_EQ(row, 1);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect2, false);
-    EXPECT_EQ(row, 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect1, false), 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect2, false), 1);
 }
 /**
  * @tc.name: SyscallTableTest
@@ -1268,7 +1176,7 @@ HWTEST_F(TableTest, SymbolsTableTest, TestSize.Level1)
  */
 HWTEST_F(TableTest, SyscallTableTest, TestSize.Level1)
 {
-    TS_LOGI("test31-40");
+    TS_LOGI("test31-39");
     std::string sqlSelect = "select * from syscall";
     int64_t sysCallNum = 1;
     DataIndex type = stream_.traceDataCache_->GetDataIndex("type");
@@ -1277,8 +1185,7 @@ HWTEST_F(TableTest, SyscallTableTest, TestSize.Level1)
     int64_t ret = 1;
 
     stream_.traceDataCache_->GetSysCallData()->AppendSysCallData(sysCallNum, type, ipid, timeStamp, ret);
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 1);
 }
 /**
  * @tc.name: SysEventFilterTableTest
@@ -1287,7 +1194,7 @@ HWTEST_F(TableTest, SyscallTableTest, TestSize.Level1)
  */
 HWTEST_F(TableTest, SysEventFilterTableTest, TestSize.Level1)
 {
-    TS_LOGI("test31-41");
+    TS_LOGI("test31-40");
     std::string sqlSelect = "select * from sys_event_filter";
     std::string sqlSelect1 = "select * from sys_event_filter where id = 1";
     std::string sqlSelect2 = "select * from sys_event_filter where id > 1";
@@ -1304,18 +1211,12 @@ HWTEST_F(TableTest, SysEventFilterTableTest, TestSize.Level1)
 
     stream_.traceDataCache_->GetSysMeasureFilterData()->AppendNewFilter(filterId, type, nameId);
     stream_.traceDataCache_->GetSysMeasureFilterData()->AppendNewFilter(filterId1, type1, nameId1);
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 2);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect1, false);
-    EXPECT_EQ(row, 1);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect2, false);
-    EXPECT_EQ(row, 1);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect3, false);
-    EXPECT_EQ(row, 1);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect4, false);
-    EXPECT_EQ(row, 2);
-    row = stream_.traceDataCache_->SearchDatabase(sqlSelect5, false);
-    EXPECT_EQ(row, 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect1, false), 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect2, false), 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect3, false), 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect4, false), 2);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect5, false), 2);
 }
 /**
  * @tc.name: SysMemMeasureTableTest
@@ -1324,7 +1225,7 @@ HWTEST_F(TableTest, SysEventFilterTableTest, TestSize.Level1)
  */
 HWTEST_F(TableTest, SysMemMeasureTableTest, TestSize.Level1)
 {
-    TS_LOGI("test31-42");
+    TS_LOGI("test31-41");
     std::string sqlSelect = "select * from sys_mem_measure";
     uint32_t type = 1;
     uint64_t timeStamp = 1663869124160;
@@ -1332,8 +1233,7 @@ HWTEST_F(TableTest, SysMemMeasureTableTest, TestSize.Level1)
     uint32_t filterId = stream_.traceDataCache_->GetDataIndex("filter");
 
     stream_.traceDataCache_->GetSysMemMeasureData()->AppendMeasureData(type, timeStamp, value, filterId);
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 1);
 }
 /**
  * @tc.name: ThreadTableTest
@@ -1342,28 +1242,10 @@ HWTEST_F(TableTest, SysMemMeasureTableTest, TestSize.Level1)
  */
 HWTEST_F(TableTest, ThreadTableTest, TestSize.Level1)
 {
-    TS_LOGI("test31-43");
+    TS_LOGI("test31-42");
     std::string sqlSelect = "select * from thread";
 
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 1);
-}
-/**
- * @tc.name: ThreadFilterTableTest
- * @tc.desc: ThreadFilter table test
- * @tc.type: FUNC
- */
-HWTEST_F(TableTest, ThreadFilterTableTest, TestSize.Level1)
-{
-    TS_LOGI("test31-44");
-    std::string sqlSelect = "select * from thread_filter";
-    uint64_t filterId = stream_.traceDataCache_->GetDataIndex("ilter");
-    uint32_t nameIndex = stream_.traceDataCache_->GetDataIndex("name");
-    uint64_t internalTid = 1;
-
-    stream_.traceDataCache_->GetProcessMeasureFilterData()->AppendNewFilter(filterId, nameIndex, internalTid);
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 1);
 }
 /**
  * @tc.name: ThreadStateTableTest
@@ -1372,7 +1254,7 @@ HWTEST_F(TableTest, ThreadFilterTableTest, TestSize.Level1)
  */
 HWTEST_F(TableTest, ThreadStateTableTest, TestSize.Level1)
 {
-    TS_LOGI("test31-45");
+    TS_LOGI("test31-43");
     std::string sqlSelect = "select * from thread_state";
     std::string sqlSelect1 = "select * from thread_state where id = 1";
     std::string sqlSelect2 = "select * from thread_state where tid > 1";
@@ -1413,12 +1295,11 @@ HWTEST_F(TableTest, ThreadStateTableTest, TestSize.Level1)
  */
 HWTEST_F(TableTest, TraceRangeTableTest, TestSize.Level1)
 {
-    TS_LOGI("test31-46");
+    TS_LOGI("test31-44");
     std::string sqlSelect = "select * from trace_range";
 
     stream_.traceDataCache_->UpdateTraceRange();
-    auto row = stream_.traceDataCache_->SearchDatabase(sqlSelect, false);
-    EXPECT_EQ(row, 1);
+    EXPECT_EQ(stream_.traceDataCache_->SearchDatabase(sqlSelect, false), 1);
 }
 } // namespace TraceStreamer
 } // namespace SysTuning