소스 검색

revert the omit empty result fix

RockyJin 5 년 전
부모
커밋
54c0845294
4개의 변경된 파일5개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      fvt_scripts/change_stream_rule.jmx
  2. 2 0
      fvt_scripts/change_stream_rule.txt
  3. 1 0
      xsql/processors/xsql_processor_test.go
  4. 1 1
      xstream/nodes/sink_node.go

+ 1 - 1
fvt_scripts/change_stream_rule.jmx

@@ -599,7 +599,7 @@
         <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
         <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
         <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
         <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
           <boolProp name="LoopController.continue_forever">false</boolProp>
           <boolProp name="LoopController.continue_forever">false</boolProp>
-          <stringProp name="LoopController.loops">1</stringProp>
+          <stringProp name="LoopController.loops">3</stringProp>
         </elementProp>
         </elementProp>
         <stringProp name="ThreadGroup.num_threads">1</stringProp>
         <stringProp name="ThreadGroup.num_threads">1</stringProp>
         <stringProp name="ThreadGroup.ramp_time">1</stringProp>
         <stringProp name="ThreadGroup.ramp_time">1</stringProp>

+ 2 - 0
fvt_scripts/change_stream_rule.txt

@@ -1 +1,3 @@
+[{}]
+[{}]
 light
 light

+ 1 - 0
xsql/processors/xsql_processor_test.go

@@ -1111,6 +1111,7 @@ func TestSingleSQLError(t *testing.T) {
 				{{
 				{{
 					"rengine_field_0": float64(10),
 					"rengine_field_0": float64(10),
 				}},
 				}},
+				{{}},
 			},
 			},
 			s: "op_filter_0_records_in_total",
 			s: "op_filter_0_records_in_total",
 			m: map[string]interface{}{
 			m: map[string]interface{}{

+ 1 - 1
xstream/nodes/sink_node.go

@@ -102,7 +102,7 @@ func (m *SinkNode) Open(ctx api.StreamContext, result chan<- error) {
 				cacheSaveInterval = t
 				cacheSaveInterval = t
 			}
 			}
 		}
 		}
-		omitIfEmpty := true
+		omitIfEmpty := false
 		if c, ok := m.options["omitIfEmpty"]; ok {
 		if c, ok := m.options["omitIfEmpty"]; ok {
 			if t, ok := c.(bool); !ok {
 			if t, ok := c.(bool); !ok {
 				logger.Warnf("invalid type for omitIfEmpty property, should be a bool value 'true/false'.", c)
 				logger.Warnf("invalid type for omitIfEmpty property, should be a bool value 'true/false'.", c)