Code changes to make store and pull symmetrical.

ardan-bkennedy · ardan-bkennedy · commit f43f6fbd236c · 2016-07-27T12:02:20.000-04:00
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
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -71,25 +71,25 @@ func pull(x *Xenia, data []Data) (int, error) {`
`71`	`71`	`return len(data), nil`
`72`	`72`	`}`
`73`	`73`
`74`		`-// store knows how to store bulks of data from Pillar.`
`75`		`-func store(p *Pillar, data []Data) error {`
`76`		`- for _, d := range data {`
	`74`	`+// store knows how to store bulks of data into Pillar.`
	`75`	`+func store(p *Pillar, data []Data) (int, error) {`
	`76`	`+ for i, d := range data {`
`77`	`77`	`if err := p.Store(d); err != nil {`
`78`		`- return err`
	`78`	`+ return i, err`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
`82`		`- return nil`
	`82`	`+ return len(data), nil`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`// Copy knows how to pull and store data from the System.`
`86`	`86`	`func Copy(sys *System, batch int) error {`
`87`		`- for {`
`88`		`- data := make([]Data, batch)`
	`87`	`+ data := make([]Data, batch)`
`89`	`88`
	`89`	`+ for {`
`90`	`90`	`i, err := pull(&sys.Xenia, data)`
`91`	`91`	`if i > 0 {`
`92`		`- if err := store(&sys.Pillar, data[:i]); err != nil {`
	`92`	`+ if _, err := store(&sys.Pillar, data[:i]); err != nil {`
`93`	`93`	`return err`
`94`	`94`	`}`
`95`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,24 +84,24 @@ func pull(p Puller, data []Data) (int, error) {`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`// store knows how to store bulks of data from any Storer.`
`87`		`-func store(s Storer, data []Data) error {`
`88`		`- for _, d := range data {`
	`87`	`+func store(s Storer, data []Data) (int, error) {`
	`88`	`+ for i, d := range data {`
`89`	`89`	`if err := s.Store(d); err != nil {`
`90`		`- return err`
	`90`	`+ return i, err`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`
`94`		`- return nil`
	`94`	`+ return len(data), nil`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`// Copy knows how to pull and store data from the System.`
`98`	`98`	`func Copy(sys *System, batch int) error {`
`99`		`- for {`
`100`		`- data := make([]Data, batch)`
	`99`	`+ data := make([]Data, batch)`
`101`	`100`
	`101`	`+ for {`
`102`	`102`	`i, err := pull(&sys.Xenia, data)`
`103`	`103`	`if i > 0 {`
`104`		`- if err := store(&sys.Pillar, data[:i]); err != nil {`
	`104`	`+ if _, err := store(&sys.Pillar, data[:i]); err != nil {`
`105`	`105`	`return err`
`106`	`106`	`}`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,24 +90,24 @@ func pull(p Puller, data []Data) (int, error) {`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`// store knows how to store bulks of data from any Storer.`
`93`		`-func store(s Storer, data []Data) error {`
`94`		`- for _, d := range data {`
	`93`	`+func store(s Storer, data []Data) (int, error) {`
	`94`	`+ for i, d := range data {`
`95`	`95`	`if err := s.Store(d); err != nil {`
`96`		`- return err`
	`96`	`+ return i, err`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`
`100`		`- return nil`
	`100`	`+ return len(data), nil`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`// Copy knows how to pull and store data from any System.`
`104`	`104`	`func Copy(ps PullStorer, batch int) error {`
`105`		`- for {`
`106`		`- data := make([]Data, batch)`
	`105`	`+ data := make([]Data, batch)`
`107`	`106`
	`107`	`+ for {`
`108`	`108`	`i, err := pull(ps, data)`
`109`	`109`	`if i > 0 {`
`110`		`- if err := store(ps, data[:i]); err != nil {`
	`110`	`+ if _, err := store(ps, data[:i]); err != nil {`
`111`	`111`	`return err`
`112`	`112`	`}`
`113`	`113`	`}`