WIP: fix tests & docs

Signed-off-by: Maurice van Veen <[email protected]>

Author: MauriceVanVeen

server/errors.json

@@ -2049,20 +2049,10 @@
     "url": "",
     "deprecates": ""
   },
-  {
-    "constant": "JSBatchPublishInvalidGapModeErr",
-    "code": 400,
-    "error_code": 10207,
-    "description": "batch publish gap mode is invalid",
-    "comment": "",
-    "help": "",
-    "url": "",
-    "deprecates": ""
-  },
   {
     "constant": "JSMirrorWithBatchPublishErr",
     "code": 400,
-    "error_code": 10208,
+    "error_code": 10207,
     "description": "stream mirrors can not also use batch publishing",
     "comment": "",
     "help": "",

server/jetstream_batching.go

@@ -121,7 +121,7 @@ func (b *batchGroup) readyForCommit() bool {
 
 // fastBatchRegisterSequences registers the highest stored batch and stream sequence and returns
 // whether a PubAck should be sent if the batch has been committed.
-// TODO(mvv): docs about flow acks
+// Also returns whether a flow control message should be sent.
 // Lock should be held.
 func (batches *batching) fastBatchRegisterSequences(batchId string, batchSeq, streamSeq uint64) (*batchGroup, bool, string) {
 	if b, ok := batches.group[batchId]; ok {

server/jetstream_batching_test.go

@@ -3122,11 +3122,11 @@ func TestJetStreamFastBatchPublishGapDetection(t *testing.T) {
 		rmsg, err := sub.NextMsg(time.Second)
 		require_NoError(t, err)
 
-		if gapMode == _EMPTY_ || gapMode == "unknown" {
+		if gapMode == "unknown" {
 			pubAck = JSPubAckResponse{}
 			require_NoError(t, json.Unmarshal(rmsg.Data, &pubAck))
 			require_NotNil(t, pubAck.Error)
-			require_Error(t, pubAck.Error, NewJSBatchPublishInvalidGapModeError())
+			require_Error(t, pubAck.Error, NewJSBatchPublishInvalidPatternError())
 			return
 		}
 
@@ -3179,7 +3179,7 @@ func TestJetStreamFastBatchPublishGapDetection(t *testing.T) {
 	for _, storage := range []StorageType{FileStorage, MemoryStorage} {
 		for _, retention := range []RetentionPolicy{LimitsPolicy, InterestPolicy, WorkQueuePolicy} {
 			for _, replicas := range []int{1, 3} {
-				for _, gapMode := range []string{_EMPTY_, "fail", "ok", "unknown"} {
+				for _, gapMode := range []string{"fail", "ok", "unknown"} {
 					t.Run(fmt.Sprintf("%s/%s/R%d/%s", storage, retention, replicas, gapMode), func(t *testing.T) {
 						test(t, storage, retention, replicas, gapMode)
 					})

server/jetstream_errors_generated.go

@@ -41,9 +41,6 @@ const (
 	// JSBatchPublishInvalidBatchIDErr batch publish ID is invalid
 	JSBatchPublishInvalidBatchIDErr ErrorIdentifier = 10205
 
-	// JSBatchPublishInvalidGapModeErr batch publish gap mode is invalid
-	JSBatchPublishInvalidGapModeErr ErrorIdentifier = 10207
-
 	// JSBatchPublishInvalidPatternErr batch publish pattern is invalid
 	JSBatchPublishInvalidPatternErr ErrorIdentifier = 10204
 
@@ -369,7 +366,7 @@ const (
 	JSMirrorWithAtomicPublishErr ErrorIdentifier = 10198
 
 	// JSMirrorWithBatchPublishErr stream mirrors can not also use batch publishing
-	JSMirrorWithBatchPublishErr ErrorIdentifier = 10208
+	JSMirrorWithBatchPublishErr ErrorIdentifier = 10207
 
 	// JSMirrorWithCountersErr stream mirrors can not also calculate counters
 	JSMirrorWithCountersErr ErrorIdentifier = 10173
@@ -641,7 +638,6 @@ var (
 		JSBadRequestErr:                              {Code: 400, ErrCode: 10003, Description: "bad request"},
 		JSBatchPublishDisabledErr:                    {Code: 400, ErrCode: 10203, Description: "batch publish is disabled"},
 		JSBatchPublishInvalidBatchIDErr:              {Code: 400, ErrCode: 10205, Description: "batch publish ID is invalid"},
-		JSBatchPublishInvalidGapModeErr:              {Code: 400, ErrCode: 10207, Description: "batch publish gap mode is invalid"},
 		JSBatchPublishInvalidPatternErr:              {Code: 400, ErrCode: 10204, Description: "batch publish pattern is invalid"},
 		JSBatchPublishUnknownBatchIDErr:              {Code: 400, ErrCode: 10206, Description: "batch publish ID unknown"},
 		JSClusterIncompleteErr:                       {Code: 503, ErrCode: 10004, Description: "incomplete results"},
@@ -750,7 +746,7 @@ var (
 		JSMirrorMultipleFiltersNotAllowed:            {Code: 400, ErrCode: 10150, Description: "mirror with multiple subject transforms cannot also have a single subject filter"},
 		JSMirrorOverlappingSubjectFilters:            {Code: 400, ErrCode: 10152, Description: "mirror subject filters can not overlap"},
 		JSMirrorWithAtomicPublishErr:                 {Code: 400, ErrCode: 10198, Description: "stream mirrors can not also use atomic publishing"},
-		JSMirrorWithBatchPublishErr:                  {Code: 400, ErrCode: 10208, Description: "stream mirrors can not also use batch publishing"},
+		JSMirrorWithBatchPublishErr:                  {Code: 400, ErrCode: 10207, Description: "stream mirrors can not also use batch publishing"},
 		JSMirrorWithCountersErr:                      {Code: 400, ErrCode: 10173, Description: "stream mirrors can not also calculate counters"},
 		JSMirrorWithFirstSeqErr:                      {Code: 400, ErrCode: 10143, Description: "stream mirrors can not have first sequence configured"},
 		JSMirrorWithMsgSchedulesErr:                  {Code: 400, ErrCode: 10186, Description: "stream mirrors can not also schedule messages"},
@@ -993,16 +989,6 @@ func NewJSBatchPublishInvalidBatchIDError(opts ...ErrorOption) *ApiError {
 	return ApiErrors[JSBatchPublishInvalidBatchIDErr]
 }
 
-// NewJSBatchPublishInvalidGapModeError creates a new JSBatchPublishInvalidGapModeErr error: "batch publish gap mode is invalid"
-func NewJSBatchPublishInvalidGapModeError(opts ...ErrorOption) *ApiError {
-	eopts := parseOpts(opts)
-	if ae, ok := eopts.err.(*ApiError); ok {
-		return ae
-	}
-
-	return ApiErrors[JSBatchPublishInvalidGapModeErr]
-}
-
 // NewJSBatchPublishInvalidPatternError creates a new JSBatchPublishInvalidPatternErr error: "batch publish pattern is invalid"
 func NewJSBatchPublishInvalidPatternError(opts ...ErrorOption) *ApiError {
 	eopts := parseOpts(opts)