From cc83fd44f41d0e606242385553da04f09abb6f8d Mon Sep 17 00:00:00 2001 From: Andrew Bell Date: Mon, 14 May 2018 09:57:25 -0400 Subject: [PATCH] Add stream mode for kernels.merge --- kernels/MergeKernel.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/kernels/MergeKernel.cpp b/kernels/MergeKernel.cpp index ad72e034b2..cc94407345 100644 --- a/kernels/MergeKernel.cpp +++ b/kernels/MergeKernel.cpp @@ -83,8 +83,18 @@ int MergeKernel::execute() } Stage& writer = makeWriter(m_outputFile, filter, ""); - writer.prepare(table); - writer.execute(table); + if (writer.pipelineStreamable()) + { + FixedPointTable table(10000); + writer.prepare(table); + writer.execute(table); + } + else + { + PointTable table; + writer.prepare(table); + writer.execute(table); + } return 0; }