CASSGO-7 Change Batch API to be consistent with Query() #1764

tengu-alt · 2024-06-04T13:15:27Z

According to issue #1187, I have refactored the Query() method for the batch and implemented the Exec() method for the batch structure to save the general pattern of the query execution, and saved the older method (session.ExecuteBatch()) for backward compatibility.
This means the batch for now behaves the same way as query.

joao-r-reis · 2024-10-29T16:02:37Z

@tengu-alt we should also add a new Batch() function and deprecate the existing NewBatch (basically a "soft" rename of NewBatch() -> Batch() without breaking users) and deprecate Session.ExecuteBatch.

NewBatch and ExecuteBatch can then be removed in 3.0 so that users have more than enough time to transition to the new names.

tengu-alt · 2024-10-31T12:39:00Z

@tengu-alt we should also add a new Batch() function and deprecate the existing NewBatch (basically a "soft" rename of NewBatch() -> Batch() without breaking users) and deprecate Session.ExecuteBatch.

NewBatch and ExecuteBatch can then be removed in 3.0 so that users have more than enough time to transition to the new names.

@joao-r-reis I do not clearly understand. The NewBatch() function is already marked as deprecated and session.NewBatch is recommended to use instead. Also I can't name the function same as struct (Batch) because the Batch is already declared.

joao-r-reis · 2024-10-31T13:59:45Z

Session.NewBatch() should be deprecated now, global NewBatch() can be removed since it was deprecated already and Session.Batch() should be added to replace Session.NewBatch() (keep the same functionality).

Session.Batch() does not have a conflict with the type Batch, you can have both (in fact this already exists with Query())

The original issue mentions the rename Session.NewBatch() to Session.Batch() already, my only additional suggestion here is to keep and deprecate Session.NewBatch() for now AND add the new Session.Batch().

joao-r-reis · 2024-10-31T14:00:39Z

global NewBatch() removal is already handled by #1762 so it doesn't have to happen here

tengu-alt · 2024-11-01T08:47:58Z

Session.NewBatch() should be deprecated now, global NewBatch() can be removed since it was deprecated already and Session.Batch() should be added to replace Session.NewBatch() (keep the same functionality).

Session.Batch() does not have a conflict with the type Batch, you can have both (in fact this already exists with Query())

The original issue mentions the rename Session.NewBatch() to Session.Batch() already, my only additional suggestion here is to keep and deprecate Session.NewBatch() for now AND add the new Session.Batch().

I see, thank you. Done, also I've changed the Session.NewBatch() usage in .doc and tests.

worryg0d · 2024-11-05T11:02:08Z

session.go

+func (b *Batch) Exec() error {
+	iter := b.session.executeBatch(b)
+	return iter.Close()
+}


I think you should add a doc here because it is meant to be used by users. Maybe use the same description as for Session.ExecuteBatch().

Also, add a doc for Session.Batch() too.

Agree, done.

joao-r-reis

LGTM, just 1 comment about the duplicate code in the new function

joao-r-reis · 2024-11-05T15:23:08Z

session.go

+		spec:             &NonSpeculativeExecution{},
+		routingInfo:      &queryRoutingInfo{},
+	}
+


duplicate code (NewBatch)

I kept the session.NewBatch and marked it as deprecated according to your suggestion.

Yes thanks but please create a private function that both can call or make one of them call the other so we don't have the duplicate code.

Got it! Fixed.

joao-r-reis · 2024-11-12T15:46:58Z

Please format your commit message following the rules stated in CONTRIBUTING.md and add this JIRA to the CHANGELOG.md in the Changed section of Unreleased, thanks!

We need another committer +1 to merge this.

joao-r-reis · 2024-11-22T15:29:14Z

Sorry I merged another PR which is causing a git conflict on CHANGELOG.md can you fix it and I'll merge this right after? Otherwise I can merge manually and fix it in place

Exec() method for batch was added & Query() method was refactored. Batch for now behaves the same way as query. patch by Oleksandr Luzhniy; reviewed by João Reis, Danylo Savchenko, Bohdan Siryk, Jackson Fleming, for CASSGO-7

tengu-alt · 2024-11-23T11:16:58Z

Sorry I merged another PR which is causing a git conflict on CHANGELOG.md can you fix it and I'll merge this right after? Otherwise I can merge manually and fix it in place

Fixed! Thank you for the hint.

joao-r-reis · 2025-02-20T15:45:20Z

@tengu-alt we forgot to deprecate session.ExecuteBatch(), do you have some free time to work on this? I created https://issues.apache.org/jira/browse/CASSGO-57 for it

joao-r-reis · 2025-02-20T15:50:01Z

Oh and there's a few other session methods to execute batches that should also be moved to the Batch type

tengu-alt · 2025-02-21T13:10:55Z

@tengu-alt we forgot to deprecate session.ExecuteBatch()

Got It I'll take it to work.

Oh and there's a few other session methods to execute batches that should also be moved to the Batch type

I'll mark them as deprecated and create similar methods for batch. (If I understand correctly - these methods: ExecuteBatchCAS, MapExecuteBatchCAS )

testisnullus approved these changes Jun 7, 2024

View reviewed changes

tengu-alt force-pushed the batch-exec branch from 7353ad6 to b12fcac Compare June 27, 2024 12:09

tengu-alt force-pushed the batch-exec branch 3 times, most recently from 5a44475 to a6d1a09 Compare October 14, 2024 09:01

joao-r-reis changed the title ~~Exec() method for batch was added & Query() method was refactored~~ CASSGO-7 Exec() method for batch was added & Query() method was refactored Oct 29, 2024

tengu-alt force-pushed the batch-exec branch from a6d1a09 to 5161ea8 Compare November 1, 2024 08:45

worryg0d reviewed Nov 5, 2024

View reviewed changes

tengu-alt force-pushed the batch-exec branch from 5161ea8 to 7337d08 Compare November 5, 2024 13:10

joao-r-reis reviewed Nov 5, 2024

View reviewed changes

tengu-alt force-pushed the batch-exec branch from 7337d08 to bcfb3cc Compare November 8, 2024 10:08

joao-r-reis approved these changes Nov 8, 2024

View reviewed changes

tengu-alt force-pushed the batch-exec branch from bcfb3cc to 2c5b2be Compare November 13, 2024 12:36

tengu-alt changed the title ~~CASSGO-7 Exec() method for batch was added & Query() method was refactored~~ CASSGO-7 Change Batch API to be consistent with Query() Nov 18, 2024

tengu-alt force-pushed the batch-exec branch from 2c5b2be to e76de4f Compare November 20, 2024 11:37

Jacko161 approved these changes Nov 21, 2024

View reviewed changes

tengu-alt force-pushed the batch-exec branch from e76de4f to bdb9265 Compare November 22, 2024 09:34

Change Batch API to be consistent with Query()

9007bd0

Exec() method for batch was added & Query() method was refactored. Batch for now behaves the same way as query. patch by Oleksandr Luzhniy; reviewed by João Reis, Danylo Savchenko, Bohdan Siryk, Jackson Fleming, for CASSGO-7

tengu-alt force-pushed the batch-exec branch from bdb9265 to 9007bd0 Compare November 23, 2024 11:15

joao-r-reis merged commit 48bb2bc into apache:trunk Nov 25, 2024
16 checks passed

OleksiienkoMykyta mentioned this pull request Feb 20, 2025

CASSGO-7 Change Batch API to be consistent with Query() #1187

Closed

CASSGO-7 Change Batch API to be consistent with Query() #1764

CASSGO-7 Change Batch API to be consistent with Query() #1764

Uh oh!

Conversation

tengu-alt commented Jun 4, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

joao-r-reis commented Oct 29, 2024

Uh oh!

tengu-alt commented Oct 31, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

joao-r-reis commented Oct 31, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

joao-r-reis commented Oct 31, 2024

Uh oh!

tengu-alt commented Nov 1, 2024

Uh oh!

worryg0d Nov 5, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tengu-alt Nov 5, 2024

Choose a reason for hiding this comment

Uh oh!

joao-r-reis left a comment

Choose a reason for hiding this comment

Uh oh!

joao-r-reis Nov 5, 2024

Choose a reason for hiding this comment

Uh oh!

tengu-alt Nov 7, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

joao-r-reis Nov 7, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tengu-alt Nov 8, 2024

Choose a reason for hiding this comment

Uh oh!

joao-r-reis commented Nov 12, 2024

Uh oh!

joao-r-reis commented Nov 22, 2024

Uh oh!

tengu-alt commented Nov 23, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

joao-r-reis commented Feb 20, 2025

Uh oh!

joao-r-reis commented Feb 20, 2025

Uh oh!

tengu-alt commented Feb 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

tengu-alt commented Jun 4, 2024 •

edited

Loading

tengu-alt commented Oct 31, 2024 •

edited

Loading

joao-r-reis commented Oct 31, 2024 •

edited

Loading

worryg0d Nov 5, 2024 •

edited

Loading

tengu-alt Nov 7, 2024 •

edited

Loading

joao-r-reis Nov 7, 2024 •

edited

Loading

tengu-alt commented Nov 23, 2024 •

edited

Loading

tengu-alt commented Feb 21, 2025 •

edited

Loading