From ec008b582015867243f1a62b843c9261bda67a34 Mon Sep 17 00:00:00 2001 From: kortschak Date: Fri, 22 Aug 2014 16:50:39 +0930 Subject: [PATCH] Move remove() and removeAll() to tests This is done to keep deadcode quiet. --- cayley.go | 18 ------------------ cayley_test.go | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/cayley.go b/cayley.go index d7364b9..d03dd2a 100644 --- a/cayley.go +++ b/cayley.go @@ -194,24 +194,6 @@ func load(qw graph.QuadWriter, cfg *config.Config, path, typ string) error { return decompressAndLoad(qw, cfg, path, typ, db.Load) } -func removeAll(qw graph.QuadWriter, cfg *config.Config, path, typ string) error { - return decompressAndLoad(qw, cfg, path, typ, remove) -} - -func remove(qw graph.QuadWriter, cfg *config.Config, dec quad.Unmarshaler) error { - for { - t, err := dec.Unmarshal() - if err != nil { - if err == io.EOF { - break - } - return err - } - qw.RemoveQuad(t) - } - return nil -} - func decompressAndLoad(qw graph.QuadWriter, cfg *config.Config, path, typ string, loadFn func(graph.QuadWriter, *config.Config, quad.Unmarshaler) error) error { var r io.Reader diff --git a/cayley_test.go b/cayley_test.go index 02d4f4a..a5c312f 100644 --- a/cayley_test.go +++ b/cayley_test.go @@ -19,6 +19,7 @@ import ( "compress/bzip2" "compress/gzip" "fmt" + "github.com/google/cayley/quad" "io" "reflect" "sort" @@ -411,6 +412,24 @@ func deletePrepare(t testing.TB) { }) } +func removeAll(qw graph.QuadWriter, cfg *config.Config, path, typ string) error { + return decompressAndLoad(qw, cfg, path, typ, remove) +} + +func remove(qw graph.QuadWriter, cfg *config.Config, dec quad.Unmarshaler) error { + for { + t, err := dec.Unmarshal() + if err != nil { + if err == io.EOF { + break + } + return err + } + qw.RemoveQuad(t) + } + return nil +} + func TestQueries(t *testing.T) { prepare(t) checkQueries(t)