Code changes to make store and pull symmetrical.

lihe2019 · Jul 27, 2016 · f43f6fb · f43f6fb
1 parent ce7bbce
commit f43f6fb
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 29 deletions.
diff --git a/chapter10/listing01/listing01.go b/chapter10/listing01/listing01.go
@@ -71,25 +71,25 @@ func pull(x *Xenia, data []Data) (int, error) {
 	return len(data), nil
 }
 
-// store knows how to store bulks of data from Pillar.
-func store(p *Pillar, data []Data) error {
-	for _, d := range data {
+// store knows how to store bulks of data into Pillar.
+func store(p *Pillar, data []Data) (int, error) {
+	for i, d := range data {
 		if err := p.Store(d); err != nil {
-			return err
+			return i, err
 		}
 	}
 
-	return nil
+	return len(data), nil
 }
 
 // Copy knows how to pull and store data from the System.
 func Copy(sys *System, batch int) error {
-	for {
-		data := make([]Data, batch)
+	data := make([]Data, batch)
 
+	for {
 		i, err := pull(&sys.Xenia, data)
 		if i > 0 {
-			if err := store(&sys.Pillar, data[:i]); err != nil {
+			if _, err := store(&sys.Pillar, data[:i]); err != nil {
 				return err
 			}
 		}

diff --git a/chapter10/listing02/listing02.go b/chapter10/listing02/listing02.go
@@ -84,24 +84,24 @@ func pull(p Puller, data []Data) (int, error) {
 }
 
 // store knows how to store bulks of data from any Storer.
-func store(s Storer, data []Data) error {
-	for _, d := range data {
+func store(s Storer, data []Data) (int, error) {
+	for i, d := range data {
 		if err := s.Store(d); err != nil {
-			return err
+			return i, err
 		}
 	}
 
-	return nil
+	return len(data), nil
 }
 
 // Copy knows how to pull and store data from the System.
 func Copy(sys *System, batch int) error {
-	for {
-		data := make([]Data, batch)
+	data := make([]Data, batch)
 
+	for {
 		i, err := pull(&sys.Xenia, data)
 		if i > 0 {
-			if err := store(&sys.Pillar, data[:i]); err != nil {
+			if _, err := store(&sys.Pillar, data[:i]); err != nil {
 				return err
 			}
 		}

diff --git a/chapter10/listing03/listing03.go b/chapter10/listing03/listing03.go
@@ -90,24 +90,24 @@ func pull(p Puller, data []Data) (int, error) {
 }
 
 // store knows how to store bulks of data from any Storer.
-func store(s Storer, data []Data) error {
-	for _, d := range data {
+func store(s Storer, data []Data) (int, error) {
+	for i, d := range data {
 		if err := s.Store(d); err != nil {
-			return err
+			return i, err
 		}
 	}
 
-	return nil
+	return len(data), nil
 }
 
 // Copy knows how to pull and store data from any System.
 func Copy(ps PullStorer, batch int) error {
-	for {
-		data := make([]Data, batch)
+	data := make([]Data, batch)
 
+	for {
 		i, err := pull(ps, data)
 		if i > 0 {
-			if err := store(ps, data[:i]); err != nil {
+			if _, err := store(ps, data[:i]); err != nil {
 				return err
 			}
 		}

diff --git a/chapter10/listing04/listing04.go b/chapter10/listing04/listing04.go
@@ -90,24 +90,24 @@ func pull(p Puller, data []Data) (int, error) {
 }
 
 // store knows how to store bulks of data from any Storer.
-func store(s Storer, data []Data) error {
-	for _, d := range data {
+func store(s Storer, data []Data) (int, error) {
+	for i, d := range data {
 		if err := s.Store(d); err != nil {
-			return err
+			return i, err
 		}
 	}
 
-	return nil
+	return len(data), nil
 }
 
 // Copy knows how to pull and store data from any System.
 func Copy(ps PullStorer, batch int) error {
-	for {
-		data := make([]Data, batch)
+	data := make([]Data, batch)
 
+	for {
 		i, err := pull(ps, data)
 		if i > 0 {
-			if err := store(ps, data[:i]); err != nil {
+			if _, err := store(ps, data[:i]); err != nil {
 				return err
 			}
 		}