Clean up and match previous behavior more closely

aij · Shakeel · commit 36d222fd8434 · 2020-02-03T11:06:00.000-08:00
diff --git a/splunklib/searchcommands/generating_command.py b/splunklib/searchcommands/generating_command.py
@@ -193,8 +193,6 @@ def generate(self):
         """
         raise NotImplementedError('GeneratingCommand.generate(self)')
 
-
-
     def _execute(self, ifile, process):
         """ Execution loop
 
diff --git a/splunklib/searchcommands/internals.py b/splunklib/searchcommands/internals.py
@@ -556,7 +556,6 @@ def _clear(self):
         self._buffer.truncate()
         self._inspector.clear()
         self._record_count = 0
-        self._flushed = False
 
     def _ensure_validity(self):
         if self._finished is True:
@@ -654,7 +653,6 @@ def _write_record(self, record):
         self._record_count += 1
 
         if self._record_count >= self._maxresultrows:
-
             self.flush(partial=True)
 
     try:
@@ -755,8 +753,8 @@ def flush(self, finished=None, partial=None):
             # provide a way to send partial chunks yet.
             return
 
-        #if finished is True:
-        self.write_chunk(finished=True)
+        if not self.is_flushed:
+            self.write_chunk(finished=True)
 
     def write_chunk(self, finished=None):
         inspector = self._inspector
@@ -821,4 +819,4 @@ def _write_chunk(self, metadata, body):
         self.write(metadata)
         self.write(body)
         self._ofile.flush()
-        self._flushed = False
+        self._flushed = True
diff --git a/splunklib/searchcommands/search_command.py b/splunklib/searchcommands/search_command.py
@@ -941,6 +941,8 @@ def _execute_v2(self, ifile, process):
             action = getattr(metadata, 'action', None)
             if action != 'execute':
                 raise RuntimeError('Expected execute action, not {}'.format(action))
+
+            self._finished = getattr(metadata, 'finished', False)
             self._record_writer.is_flushed = False
 
             self._execute_chunk_v2(process, result)
