Better support for elasticity operations (#30)

* Modified internal query processing to better support elasticity operations

Author: connelly38

CHANGELOG.md

@@ -20,6 +20,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ### Changed
 - Changed copyrights to 2024
+- Modified internal query processing to better support elasticity operations
 
 ## 1.4.2 - 2023-09-25
 

nosqldb/bad_protocol_test.go

@@ -115,7 +115,7 @@ func (suite *BadProtocolTestSuite) createTableAndIndex() {
 
 // processTestResponse is a custom handleResponse function for the Client.
 // It checks error code from the response, does not parse the response content.
-func processTestResponse(httpResp *http.Response, req nosqldb.Request, serialVerUsed int16) (nosqldb.Result, error) {
+func processTestResponse(httpResp *http.Response, req nosqldb.Request, serialVerUsed int16, queryVerUsed int16) (nosqldb.Result, error) {
 	data, err := io.ReadAll(httpResp.Body)
 	httpResp.Body.Close()
 	if err != nil {
@@ -167,7 +167,8 @@ func seekPos(lengths []int, fieldOff int) (off int) {
 
 func (suite *BadProtocolTestSuite) doBadProtoTest(req nosqldb.Request, data []byte, desc string, expectErrCode nosqlerr.ErrorCode) {
 	serialVerUsed := suite.bpTestClient.GetSerialVersion()
-	_, err := suite.bpTestClient.DoExecute(context.Background(), req, data, serialVerUsed)
+	queryVerUsed := suite.bpTestClient.GetQueryVersion()
+	_, err := suite.bpTestClient.DoExecute(context.Background(), req, data, serialVerUsed, queryVerUsed)
 	switch expectErrCode {
 	case nosqlerr.NoError:
 		suite.NoErrorf(err, "%q should have succeeded, got error %v", desc, err)
@@ -179,7 +180,8 @@ func (suite *BadProtocolTestSuite) doBadProtoTest(req nosqldb.Request, data []by
 
 func (suite *BadProtocolTestSuite) doBadProtoTest2(req nosqldb.Request, data []byte, desc string, expectErrCode1 nosqlerr.ErrorCode, expectErrCode2 nosqlerr.ErrorCode) {
 	serialVerUsed := suite.bpTestClient.GetSerialVersion()
-	_, err := suite.bpTestClient.DoExecute(context.Background(), req, data, serialVerUsed)
+	queryVerUsed := suite.bpTestClient.GetQueryVersion()
+	_, err := suite.bpTestClient.DoExecute(context.Background(), req, data, serialVerUsed, queryVerUsed)
 	suite.Truef((nosqlerr.Is(err, expectErrCode1) || nosqlerr.Is(err, expectErrCode2)),
 		"%q failed, got error %v, want error %s or %s", desc, err, expectErrCode1, expectErrCode2)
 }
@@ -191,7 +193,7 @@ func (suite *BadProtocolTestSuite) TestBadGetRequest() {
 		Key:         suite.key,
 	}
 
-	data, _, err := suite.bpTestClient.ProcessRequest(req)
+	data, _, _, err := suite.bpTestClient.ProcessRequest(req)
 	suite.Require().NoError(err)
 	origData := make([]byte, len(data))
 	copy(origData, data)
@@ -265,7 +267,7 @@ func (suite *BadProtocolTestSuite) TestBadGetIndexesRequest() {
 		IndexName: suite.index,
 	}
 
-	data, _, err := suite.bpTestClient.ProcessRequest(req)
+	data, _, _, err := suite.bpTestClient.ProcessRequest(req)
 	suite.Require().NoError(err)
 	origData := make([]byte, len(data))
 	copy(origData, data)
@@ -306,7 +308,7 @@ func (suite *BadProtocolTestSuite) TestBadGetTableRequest() {
 		TableName: suite.table,
 	}
 
-	data, _, err := suite.bpTestClient.ProcessRequest(req)
+	data, _, _, err := suite.bpTestClient.ProcessRequest(req)
 	suite.Require().NoError(err)
 	origData := make([]byte, len(data))
 	copy(origData, data)
@@ -342,7 +344,7 @@ func (suite *BadProtocolTestSuite) TestBadListTablesRequest() {
 		Namespace: ns,
 	}
 
-	data, _, err := suite.bpTestClient.ProcessRequest(req)
+	data, _, _, err := suite.bpTestClient.ProcessRequest(req)
 	suite.Require().NoError(err)
 	origData := make([]byte, len(data))
 	copy(origData, data)
@@ -393,7 +395,7 @@ func (suite *BadProtocolTestSuite) TestBadListTablesRequest() {
 func (suite *BadProtocolTestSuite) TestBadPrepareRequest() {
 	stmt := "select * from " + suite.table
 	req := &nosqldb.PrepareRequest{Statement: stmt}
-	data, _, err := suite.bpTestClient.ProcessRequest(req)
+	data, _, _, err := suite.bpTestClient.ProcessRequest(req)
 	suite.Require().NoError(err)
 	origData := make([]byte, len(data))
 	copy(origData, data)
@@ -501,7 +503,7 @@ func (suite *BadProtocolTestSuite) TestBadQueryRequest() {
 		2,           // VariableValue: INT_TYPE + packed int
 	}
 
-	data, _, err := suite.bpTestClient.ProcessRequest(req)
+	data, _, _, err := suite.bpTestClient.ProcessRequest(req)
 	suite.Require().NoError(err)
 	origData := make([]byte, len(data))
 	copy(origData, data)
@@ -597,7 +599,7 @@ func (suite *BadProtocolTestSuite) TestBadPutRequest() {
 		ttlLen,         // TTL: value(packed long) + unit(byte)
 	}
 
-	data, _, err := suite.bpTestClient.ProcessRequest(req)
+	data, _, _, err := suite.bpTestClient.ProcessRequest(req)
 	suite.Require().NoError(err)
 	origData := make([]byte, len(data))
 	copy(origData, data)
@@ -679,7 +681,7 @@ func (suite *BadProtocolTestSuite) TestBadDeleteRequest() {
 		0,              // MatchVersion: bytes
 	}
 
-	data, _, err := suite.bpTestClient.ProcessRequest(req)
+	data, _, _, err := suite.bpTestClient.ProcessRequest(req)
 	suite.Require().NoError(err)
 	origData := make([]byte, len(data))
 	copy(origData, data)
@@ -736,7 +738,7 @@ func (suite *BadProtocolTestSuite) TestBadWriteMultipleRequest() {
 		0,              // Sub requests: the size does not matter for this test.
 	}
 
-	data, _, err := suite.bpTestClient.ProcessRequest(req)
+	data, _, _, err := suite.bpTestClient.ProcessRequest(req)
 	suite.Require().NoError(err)
 	origData := make([]byte, len(data))
 	copy(origData, data)
@@ -796,7 +798,7 @@ func (suite *BadProtocolTestSuite) TestBadMultiDeleteRequest() {
 		21,             // ContinuationKey: byte array
 	}
 
-	data, _, err := suite.bpTestClient.ProcessRequest(req)
+	data, _, _, err := suite.bpTestClient.ProcessRequest(req)
 	suite.Require().NoError(err)
 	origData := make([]byte, len(data))
 	copy(origData, data)
@@ -872,7 +874,7 @@ func (suite *BadProtocolTestSuite) TestBadTableRequest() {
 		1,       // HasTableName: boolean
 	}
 
-	data, _, err := suite.bpTestClient.ProcessRequest(req)
+	data, _, _, err := suite.bpTestClient.ProcessRequest(req)
 	suite.Require().NoError(err)
 	suite.AddToTables(newTable)
 	origData := make([]byte, len(data))
@@ -932,7 +934,7 @@ func (suite *BadProtocolTestSuite) TestBadSystemRequest() {
 		stmtLen, // Statement: string
 	}
 
-	data, _, err := suite.bpTestClient.ProcessRequest(req)
+	data, _, _, err := suite.bpTestClient.ProcessRequest(req)
 	suite.Require().NoError(err)
 	origData := make([]byte, len(data))
 	copy(origData, data)
@@ -982,7 +984,7 @@ func (suite *BadProtocolTestSuite) TestBadSystemStatusRequest() {
 		stmtLen, // Statement: string
 	}
 
-	data, _, err := suite.bpTestClient.ProcessRequest(req)
+	data, _, _, err := suite.bpTestClient.ProcessRequest(req)
 	suite.Require().NoError(err)
 	origData := make([]byte, len(data))
 	copy(origData, data)