Add initial implementation of Graveler (#1019)

Co-authored-by: Barak Amar <[email protected]>

export/export_handler.go

@@ -92,7 +92,7 @@ func (h *Handler) generateTasks(startData StartData, config catalog.ExportConfig
 		if diffFromBase {
 			diffs, hasMore, err = getDiffFromBase(context.Background(), startData.Repo, startData.ToCommitRef, after, limit, h.cataloger)
 		} else {
-			// Todo(guys) change this to work with diff iterator once it is available outside of cataloger
+			// TODO(guys) change this to work with diff iterator once it is available outside of cataloger
 			diffs, hasMore, err = h.cataloger.Diff(context.Background(), startData.Repo, startData.ToCommitRef, startData.FromCommitRef, catalog.DiffParams{
 				Limit:            limit,
 				After:            after,

graveler/combined_iterator.go

@@ -0,0 +1,100 @@
+package graveler
+
+import "bytes"
+
+// combinedIterator iterates over two listing iterators,
+// in case of duplication (in values or in errors) returns value in iterA
+type combinedIterator struct {
+	iterA ListingIterator
+	iterB ListingIterator
+	p     ListingIterator
+}
+
+func NewCombinedIterator(iterA, iterB ListingIterator) ListingIterator {
+	return &combinedIterator{
+		iterA: iterA,
+		iterB: iterB,
+		p:     nil,
+	}
+}
+
+func (c *combinedIterator) Next() bool {
+	// call next with the relevant iterators
+	valA := c.iterA.Value()
+	valB := c.iterB.Value()
+
+	switch {
+	case c.p == nil:
+		// first
+		c.iterA.Next()
+		c.iterB.Next()
+	case valA == nil && valB == nil:
+		// last
+		return false
+	case valA == nil:
+		c.p = c.iterB
+		return c.iterB.Next()
+	case valB == nil:
+		c.p = c.iterA
+		return c.iterA.Next()
+	case bytes.Equal(valA.Key, valB.Key):
+		c.iterA.Next()
+		c.iterB.Next()
+	case bytes.Compare(valA.Key, valB.Key) < 0:
+		c.iterA.Next()
+	default:
+		// value of iterA < value of iterB
+		c.iterB.Next()
+	}
+
+	if c.iterA.Err() != nil {
+		c.p = c.iterA
+		return false
+	}
+	if c.iterB.Err() != nil {
+		c.p = c.iterB
+		return false
+	}
+	// get the current pointer
+	valA = c.iterA.Value()
+	valB = c.iterB.Value()
+	switch {
+	case valA == nil && valB == nil:
+		c.p = c.iterA // in order not to be stuck in start state
+		return false
+	case valA == nil:
+		c.p = c.iterB
+	case valB == nil:
+		c.p = c.iterA
+	case bytes.Compare(valA.Key, valB.Key) <= 0:
+		c.p = c.iterA
+	default:
+		c.p = c.iterB
+	}
+	return true
+}
+
+func (c *combinedIterator) SeekGE(id Key) {
+	c.p = nil
+	c.iterA.SeekGE(id)
+	c.iterB.SeekGE(id)
+}
+
+func (c *combinedIterator) Value() *Listing {
+	if c.p == nil {
+		return nil
+	}
+	return c.p.Value()
+}
+
+func (c *combinedIterator) Err() error {
+	if c.p == nil {
+		return nil
+	}
+	return c.p.Err()
+}
+
+func (c *combinedIterator) Close() {
+	c.iterA.Close()
+	c.iterB.Close()
+}