More grpc v1 fixes

Tim Middleton · Tim Middleton · commit a27551c05d69 · 2024-10-01T15:35:13.000+08:00
diff --git a/.github/workflows/build-compatability.yaml b/.github/workflows/build-compatability.yaml
@@ -23,8 +23,7 @@ jobs:
       fail-fast: false
       matrix:
         coherenceVersion:
-          - 24.03.1
-          - 24.03.2-SNAPSHOT
+          - 24.09
         go-version:
           - 1.19.x
           - 1.20.x
diff --git a/.github/workflows/build-queues.yaml b/.github/workflows/build-queues.yaml
@@ -23,8 +23,8 @@ jobs:
       fail-fast: false
       matrix:
         coherenceVersion:
-          - 24.03.1
-          - 24.03.2-SNAPSHOT
+          - 24.09
+          - 24.09.1-SNAPSHOT
         go-version:
           - 1.19.x
           - 1.20.x
diff --git a/.github/workflows/discovery-compatability-tests.yaml b/.github/workflows/discovery-compatability-tests.yaml
@@ -22,7 +22,6 @@ jobs:
         coherenceVersion:
           - 22.06.9
           - 22.06.10-SNAPSHOT
-          - 24.03.1
           - 24.09
           - 24.09.1-SNAPSHOT
         go-version:
diff --git a/.github/workflows/examples-jakarta.yaml b/.github/workflows/examples-jakarta.yaml
@@ -22,7 +22,6 @@ jobs:
         coherenceVersion:
           - 24.09
           - 24.09.1-SNAPSHOT
-          - 24.03.1
         go-version:
           - 1.19.x
           - 1.20.x
diff --git a/.github/workflows/resolver-clusters-compatability-tests.yaml b/.github/workflows/resolver-clusters-compatability-tests.yaml
@@ -21,7 +21,6 @@ jobs:
       matrix:
         coherenceVersion:
           - 22.06.9
-          - 24.03.1
           - 24.09
         go-version:
           - 1.19.x
diff --git a/.github/workflows/resolver-compatability-tests.yaml b/.github/workflows/resolver-compatability-tests.yaml
@@ -21,7 +21,6 @@ jobs:
       matrix:
         coherenceVersion:
           - 22.06.9
-          - 24.03.1
           - 24.09
         go-version:
           - 1.19.x
diff --git a/coherence/cache.go b/coherence/cache.go
@@ -238,6 +238,8 @@ type StreamedValue[V any] struct {
 	Err error
 	// Value contains the value of the entry.
 	Value V
+	// indicates if the value is empty
+	IsValueEmpty bool
 }
 
 // StreamedEntry is wrapper object that wraps an error and a Key and a Value .
diff --git a/coherence/common.go b/coherence/common.go
@@ -873,7 +873,11 @@ func getStreamedValuesWithEntry[K comparable, V any, R any](bc *baseClient[K, V]
 			return
 		}
 
-		chResponse <- &StreamedValue[R]{Value: *value}
+		if value == nil {
+			chResponse <- &StreamedValue[R]{IsValueEmpty: true}
+		} else {
+			chResponse <- &StreamedValue[R]{Value: *value}
+		}
 	}
 }
 
@@ -1059,6 +1063,9 @@ func executeInvoke[K comparable, V any, R any](ctx context.Context, bc *baseClie
 		if v.Err != nil {
 			return zeroValue, v.Err
 		}
+		if v.IsValueEmpty {
+			return nil, nil
+		}
 		return &v.Value, nil
 	}
 
diff --git a/test/e2e/standalone/filter_test.go b/test/e2e/standalone/filter_test.go
@@ -207,6 +207,9 @@ func TestFiltersAgainstMapAndCache(t *testing.T) {
 func TestPresentFilter(t *testing.T) {
 	g := gomega.NewWithT(t)
 
+	t.Setenv("COHERENCE_SESSION_DEBUG", "true")
+	t.Setenv("COHERENCE_GRPCV1_DEBUG", "true")
+
 	session, err := utils.GetSession()
 	g.Expect(err).ShouldNot(gomega.HaveOccurred())
 	defer session.Close()
diff --git a/test/e2e/standalone/suite_test.go b/test/e2e/standalone/suite_test.go
@@ -13,5 +13,5 @@ import (
 
 // The entry point for the test suite
 func TestMain(m *testing.M) {
-	utils.RunTest(m, 1408, 30000, 8080, true)
+	utils.RunTest(m, 1408, 30000, 8080, false)
 }
diff --git a/test/v1/base/base_test.go b/test/v1/base/base_test.go
@@ -887,6 +887,7 @@ func getTestSession(t *testing.T, g *gomega.WithT) *coherence.Session {
 	t.Setenv("COHERENCE_GRPCV1_DEBUG", "true")
 
 	timeout := time.Duration(300) * time.Second
+	// TODO: Change from 300 second timeout
 	session, err := utils.GetSession(coherence.WithRequestTimeout(timeout), coherence.WithReadyTimeout(timeout))
 	g.Expect(err).ShouldNot(gomega.HaveOccurred())
 

Original file line number	Diff line number	Diff line change
`@@ -238,6 +238,8 @@ type StreamedValue[V any] struct {`
`238`	`238`	`Err error`
`239`	`239`	`// Value contains the value of the entry.`
`240`	`240`	`Value V`
	`241`	`+ // indicates if the value is empty`
	`242`	`+ IsValueEmpty bool`
`241`	`243`	`}`
`242`	`244`
`243`	`245`	`// StreamedEntry is wrapper object that wraps an error and a Key and a Value .`
Original file line number	Diff line number	Diff line change
`@@ -873,7 +873,11 @@ func getStreamedValuesWithEntry[K comparable, V any, R any](bc *baseClient[K, V]`
`873`	`873`	`return`
`874`	`874`	`}`
`875`	`875`
`876`		`- chResponse <- &StreamedValue[R]{Value: *value}`
	`876`	`+ if value == nil {`
	`877`	`+ chResponse <- &StreamedValue[R]{IsValueEmpty: true}`
	`878`	`+ } else {`
	`879`	`+ chResponse <- &StreamedValue[R]{Value: *value}`
	`880`	`+ }`
`877`	`881`	`}`
`878`	`882`	`}`
`879`	`883`
`@@ -1059,6 +1063,9 @@ func executeInvoke[K comparable, V any, R any](ctx context.Context, bc *baseClie`
`1059`	`1063`	`if v.Err != nil {`
`1060`	`1064`	`return zeroValue, v.Err`
`1061`	`1065`	`}`
	`1066`	`+ if v.IsValueEmpty {`
	`1067`	`+ return nil, nil`
	`1068`	`+ }`
`1062`	`1069`	`return &v.Value, nil`
`1063`	`1070`	`}`
`1064`	`1071`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ import (`
`13`	`13`
`14`	`14`	`// The entry point for the test suite`
`15`	`15`	`func TestMain(m *testing.M) {`
`16`		`- utils.RunTest(m, 1408, 30000, 8080, true)`
	`16`	`+ utils.RunTest(m, 1408, 30000, 8080, false)`
`17`	`17`	`}`