From c3f43dafd961c7d64e08bcfb76baaa4057754c0c Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Mon, 11 Jan 2021 17:28:09 +0000 Subject: Don't write outfile with empty result set --- internal/mapr/groupset.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'internal/mapr') diff --git a/internal/mapr/groupset.go b/internal/mapr/groupset.go index 6ee2811..70ad28b 100644 --- a/internal/mapr/groupset.go +++ b/internal/mapr/groupset.go @@ -68,11 +68,15 @@ func (g *GroupSet) WriteResult(query *Query) error { } // -1: Don't limit the result, include all data sets - result, _, err := g.limitedResult(query, -1, "", ",", true) + result, count, err := g.limitedResult(query, -1, "", ",", true) if err != nil { return err } + if count == 0 { + logger.Warn("Not writing outfile this time as empty result set", query.Outfile) + } + logger.Info("Writing outfile", query.Outfile) tmpOutfile := fmt.Sprintf("%s.tmp", query.Outfile) -- cgit v1.2.3 From e811d1725ee5f931ece6fac01db70227b0fc8a7a Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Mon, 11 Jan 2021 17:29:26 +0000 Subject: also respect 'limit' when writing mapreduce result to outfile. --- internal/mapr/groupset.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'internal/mapr') diff --git a/internal/mapr/groupset.go b/internal/mapr/groupset.go index 70ad28b..50155f8 100644 --- a/internal/mapr/groupset.go +++ b/internal/mapr/groupset.go @@ -68,7 +68,7 @@ func (g *GroupSet) WriteResult(query *Query) error { } // -1: Don't limit the result, include all data sets - result, count, err := g.limitedResult(query, -1, "", ",", true) + result, count, err := g.limitedResult(query, query.Limit, "", ",", true) if err != nil { return err } -- cgit v1.2.3 From 3ebfee952559fccbbaeaa3fa61e6584b3504e1aa Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Tue, 12 Jan 2021 10:56:34 +0000 Subject: undo not writing empty result set --- internal/mapr/groupset.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'internal/mapr') diff --git a/internal/mapr/groupset.go b/internal/mapr/groupset.go index 50155f8..b5c8a48 100644 --- a/internal/mapr/groupset.go +++ b/internal/mapr/groupset.go @@ -68,15 +68,11 @@ func (g *GroupSet) WriteResult(query *Query) error { } // -1: Don't limit the result, include all data sets - result, count, err := g.limitedResult(query, query.Limit, "", ",", true) + result, _, err := g.limitedResult(query, query.Limit, "", ",", true) if err != nil { return err } - if count == 0 { - logger.Warn("Not writing outfile this time as empty result set", query.Outfile) - } - logger.Info("Writing outfile", query.Outfile) tmpOutfile := fmt.Sprintf("%s.tmp", query.Outfile) -- cgit v1.2.3