[cassandra-website] branch asf-staging updated (e7f71254 -> 5d3944f0)

2023-08-18 Thread git-site-role
This is an automated email from the ASF dual-hosted git repository.

git-site-role pushed a change to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/cassandra-website.git


 discard e7f71254 generate docs for cceb2c06
 new 5d3944f0 generate docs for cceb2c06

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (e7f71254)
\
 N -- N -- N   refs/heads/asf-staging (5d3944f0)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../cassandra/tools/nodetool/rangekeysample.html   |   3 ++-
 .../cassandra/tools/nodetool/rangekeysample.html   |   3 ++-
 .../cassandra/tools/nodetool/rangekeysample.html   |   3 ++-
 .../cassandra/tools/nodetool/rangekeysample.html   |   3 ++-
 .../cassandra/tools/nodetool/rangekeysample.html   |   3 ++-
 .../cassandra/tools/nodetool/rangekeysample.html   |   3 ++-
 .../cassandra/tools/nodetool/rangekeysample.html   |   3 ++-
 .../cassandra/tools/nodetool/rangekeysample.html   |   3 ++-
 .../cassandra/tools/nodetool/rangekeysample.html   |   3 ++-
 .../cassandra/tools/nodetool/rangekeysample.html   |   3 ++-
 .../cassandra/tools/nodetool/rangekeysample.html   |   3 ++-
 .../cassandra/tools/nodetool/rangekeysample.html   |   3 ++-
 .../cassandra/tools/nodetool/rangekeysample.html   |   3 ++-
 content/search-index.js|   2 +-
 site-ui/build/ui-bundle.zip| Bin 4852435 -> 4852435 
bytes
 15 files changed, 27 insertions(+), 14 deletions(-)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Commented] (CASSANDRA-18725) IsolatedJMX should not release all TCPEndpoints on instance shutdown

2023-08-18 Thread Jon Meredith (Jira)


[ 
https://issues.apache.org/jira/browse/CASSANDRA-18725?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17756132#comment-17756132
 ] 

Jon Meredith commented on CASSANDRA-18725:
--

+1 - thanks for digging through the test failures

> IsolatedJMX should not release all TCPEndpoints on instance shutdown
> 
>
> Key: CASSANDRA-18725
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18725
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Test/dtest/java
>Reporter: Doug Rohrer
>Assignee: Doug Rohrer
>Priority: Normal
> Fix For: 3.11.x, 4.0.x, 4.1.x, 5.0.x, 5.x
>
>  Time Spent: 1h 20m
>  Remaining Estimate: 0h
>
> In the original implementation of the JMX feature, we fixed some memory leaks 
> by clearing some internal state in Java’s TCPEndpoint. However, that 
> implementation was overly aggressive and cleared the whole map, vs. just 
> removing the endpoints created by the individual instances. This causes 
> issues when you remove a node from the cluster (as all of the endpoints are 
> cleared, not just the ones in use by that instance).
>  
> In stead, we should check if the endpoint was created by the instance in 
> question and only remove it if it was.



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Comment Edited] (CASSANDRA-18717) Fix errors or remove ant javadoc task

2023-08-18 Thread Maxim Muzafarov (Jira)


[ 
https://issues.apache.org/jira/browse/CASSANDRA-18717?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17756130#comment-17756130
 ] 

Maxim Muzafarov edited comment on CASSANDRA-18717 at 8/18/23 9:31 PM:
--

[~smiklosovic] I've updated your PR for 5.0 brach (can't push it to your 
repository), see the link below. I've put javadoc under the check task, rebased 
on the top of trunk (cassandra-5.0 for the second one), and fixed a couple of 
new errors. 

[~e.dimitrova] please, check the links below. I've updated them in accordance 
to the ML discussion.

For the trunk changes are here:
https://github.com/apache/cassandra/pull/2548

For the 5.0:
https://github.com/apache/cassandra/compare/trunk...Mmuzaf:cassandra:CASSANDRA-18717-5.0


was (Author: mmuzaf):
[~smiklosovic] I've updated your PR for 5.0 brach (can't push it to your 
repository), see the link below. I've put javadoc under the check task, rebased 
on the top of trunk (cassandra-5.0 for the second one), and fixed a couple of 
new errors. 

[~e.dimitrova] please, check the links below.

For the trunk changes are here:
https://github.com/apache/cassandra/pull/2548

For the 5.0:
https://github.com/apache/cassandra/compare/trunk...Mmuzaf:cassandra:CASSANDRA-18717-5.0

> Fix errors or remove ant javadoc task
> -
>
> Key: CASSANDRA-18717
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18717
> Project: Cassandra
>  Issue Type: Bug
>  Components: Documentation/Javadoc
>Reporter: Ekaterina Dimitrova
>Assignee: Maxim Muzafarov
>Priority: Normal
> Fix For: 5.0.x, 5.x
>
>  Time Spent: 0.5h
>  Remaining Estimate: 0h
>
> As discussed on CASSANDRA-17687, the javadoc task completes successfully, but 
> there are errors that deserve to be fixed if we keep the task around.
> If we do not plan to use it, we should remove it and reduce the clutter. 



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Comment Edited] (CASSANDRA-18717) Fix errors or remove ant javadoc task

2023-08-18 Thread Maxim Muzafarov (Jira)


[ 
https://issues.apache.org/jira/browse/CASSANDRA-18717?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17756130#comment-17756130
 ] 

Maxim Muzafarov edited comment on CASSANDRA-18717 at 8/18/23 9:31 PM:
--

[~smiklosovic] I've updated your PR for 5.0 brach (can't push it to your 
repository), see the link below. I've put javadoc under the check task, rebased 
on the top of trunk (cassandra-5.0 for the second one), and fixed a couple of 
new errors. 

[~e.dimitrova] please, check the links below. I've updated them according to 
the ML discussion.

For the trunk changes are here:
https://github.com/apache/cassandra/pull/2548

For the 5.0:
https://github.com/apache/cassandra/compare/trunk...Mmuzaf:cassandra:CASSANDRA-18717-5.0


was (Author: mmuzaf):
[~smiklosovic] I've updated your PR for 5.0 brach (can't push it to your 
repository), see the link below. I've put javadoc under the check task, rebased 
on the top of trunk (cassandra-5.0 for the second one), and fixed a couple of 
new errors. 

[~e.dimitrova] please, check the links below. I've updated them in accordance 
to the ML discussion.

For the trunk changes are here:
https://github.com/apache/cassandra/pull/2548

For the 5.0:
https://github.com/apache/cassandra/compare/trunk...Mmuzaf:cassandra:CASSANDRA-18717-5.0

> Fix errors or remove ant javadoc task
> -
>
> Key: CASSANDRA-18717
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18717
> Project: Cassandra
>  Issue Type: Bug
>  Components: Documentation/Javadoc
>Reporter: Ekaterina Dimitrova
>Assignee: Maxim Muzafarov
>Priority: Normal
> Fix For: 5.0.x, 5.x
>
>  Time Spent: 0.5h
>  Remaining Estimate: 0h
>
> As discussed on CASSANDRA-17687, the javadoc task completes successfully, but 
> there are errors that deserve to be fixed if we keep the task around.
> If we do not plan to use it, we should remove it and reduce the clutter. 



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Commented] (CASSANDRA-18717) Fix errors or remove ant javadoc task

2023-08-18 Thread Maxim Muzafarov (Jira)


[ 
https://issues.apache.org/jira/browse/CASSANDRA-18717?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17756130#comment-17756130
 ] 

Maxim Muzafarov commented on CASSANDRA-18717:
-

[~smiklosovic] I've updated your PR for 5.0 brach (can't push it to your 
repository), see the link below. I've put javadoc under the check task, rebased 
on the top of trunk (cassandra-5.0 for the second one), and fixed a couple of 
new errors. 

[~e.dimitrova] please, check the links below.

For the trunk changes are here:
https://github.com/apache/cassandra/pull/2548

For the 5.0:
https://github.com/apache/cassandra/compare/trunk...Mmuzaf:cassandra:CASSANDRA-18717-5.0

> Fix errors or remove ant javadoc task
> -
>
> Key: CASSANDRA-18717
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18717
> Project: Cassandra
>  Issue Type: Bug
>  Components: Documentation/Javadoc
>Reporter: Ekaterina Dimitrova
>Assignee: Maxim Muzafarov
>Priority: Normal
> Fix For: 5.0.x, 5.x
>
>  Time Spent: 0.5h
>  Remaining Estimate: 0h
>
> As discussed on CASSANDRA-17687, the javadoc task completes successfully, but 
> there are errors that deserve to be fixed if we keep the task around.
> If we do not plan to use it, we should remove it and reduce the clutter. 



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Updated] (CASSANDRA-18779) Allow exceptions to be propagated remotely

2023-08-18 Thread Ariel Weisberg (Jira)


 [ 
https://issues.apache.org/jira/browse/CASSANDRA-18779?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Ariel Weisberg updated CASSANDRA-18779:
---
Reviewers: David Capwell

> Allow exceptions to be propagated remotely
> --
>
> Key: CASSANDRA-18779
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18779
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Accord, Messaging/Internode
>Reporter: Ariel Weisberg
>Assignee: Ariel Weisberg
>Priority: Normal
>
> It's useful to be able to propagate an exception to a remote calling process 
> and then be able to treat it like a real exception (cause, `addSuppressed` 
> etc.).



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Assigned] (CASSANDRA-18779) Allow exceptions to be propagated remotely

2023-08-18 Thread Ariel Weisberg (Jira)


 [ 
https://issues.apache.org/jira/browse/CASSANDRA-18779?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Ariel Weisberg reassigned CASSANDRA-18779:
--

Assignee: Ariel Weisberg

> Allow exceptions to be propagated remotely
> --
>
> Key: CASSANDRA-18779
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18779
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Accord, Messaging/Internode
>Reporter: Ariel Weisberg
>Assignee: Ariel Weisberg
>Priority: Normal
>
> It's useful to be able to propagate an exception to a remote calling process 
> and then be able to treat it like a real exception (cause, `addSuppressed` 
> etc.).



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra-accord] branch trunk updated: Allow exceptions to be propagated remotely

2023-08-18 Thread aweisberg
This is an automated email from the ASF dual-hosted git repository.

aweisberg pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-accord.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 91336705 Allow exceptions to be propagated remotely
91336705 is described below

commit 91336705bde8332954e849219d73205d68fa168a
Author: aweisberg 
AuthorDate: Fri Aug 18 16:48:42 2023 -0400

Allow exceptions to be propagated remotely

https://github.com/apache/cassandra-accord/pull/56

Patch by Ariel Weisberg; Reviewed by David Capwell for CASSANDRA-18779
---
 .../src/main/java/accord/api/MessageSink.java  |  1 +
 .../accord/coordinate/CoordinateShardDurable.java  |  5 ---
 .../src/main/java/accord/coordinate/Execute.java   | 17 +
 .../java/accord/impl/AbstractFetchCoordinator.java |  8 ++--
 accord-core/src/main/java/accord/local/Node.java   | 26 ++---
 .../java/accord/messages/AbstractEpochRequest.java |  2 +-
 .../src/main/java/accord/messages/Accept.java  | 29 +-
 .../src/main/java/accord/messages/Apply.java   |  4 +-
 .../main/java/accord/messages/BeginRecovery.java   | 40 ++--
 .../src/main/java/accord/messages/CheckStatus.java |  8 ++--
 .../src/main/java/accord/messages/Commit.java  | 44 +-
 .../src/main/java/accord/messages/GetDeps.java | 18 +
 .../main/java/accord/messages/InformDurable.java   | 20 +-
 .../src/main/java/accord/messages/MessageType.java |  1 +
 .../src/main/java/accord/messages/PreAccept.java   | 27 -
 .../src/main/java/accord/messages/ReadData.java| 22 +--
 .../src/main/java/accord/messages/ReadTxnData.java | 10 +++--
 .../src/main/java/accord/messages/Reply.java   | 21 +++
 .../main/java/accord/messages/WaitOnCommit.java| 38 +++
 .../java/accord/messages/WaitUntilApplied.java |  9 +++--
 accord-core/src/main/java/accord/utils/Utils.java  | 16 ++--
 .../main/java/accord/utils/async/AsyncResults.java | 17 ++---
 .../accord/burn/BurnTestConfigurationService.java  | 26 +++--
 .../src/test/java/accord/impl/basic/NodeSink.java  | 13 +--
 .../basic/SimulatedDelayedExecutorService.java |  4 +-
 .../accord/impl/basic/TaskExecutorService.java | 19 +-
 .../src/test/java/accord/impl/list/ListAgent.java  | 19 --
 .../test/java/accord/impl/list/ListRequest.java| 25 ++--
 .../java/accord/impl/mock/SimpleMessageSink.java   | 10 -
 .../src/test/java/accord/utils/MessageTask.java| 23 +++
 .../src/main/java/accord/maelstrom/Cluster.java|  7 
 .../src/main/java/accord/maelstrom/Error.java  |  2 +-
 .../main/java/accord/maelstrom/MaelstromAgent.java | 22 ---
 .../java/accord/maelstrom/MaelstromRequest.java| 15 
 .../src/main/java/accord/maelstrom/Main.java   |  7 
 35 files changed, 376 insertions(+), 199 deletions(-)

diff --git a/accord-core/src/main/java/accord/api/MessageSink.java 
b/accord-core/src/main/java/accord/api/MessageSink.java
index ee4d681e..47a3fa03 100644
--- a/accord-core/src/main/java/accord/api/MessageSink.java
+++ b/accord-core/src/main/java/accord/api/MessageSink.java
@@ -30,4 +30,5 @@ public interface MessageSink
 void send(Id to, Request request);
 void send(Id to, Request request, AgentExecutor executor, Callback 
callback);
 void reply(Id replyingToNode, ReplyContext replyContext, Reply reply);
+void replyWithUnknownFailure(Id replyingToNode, ReplyContext replyContext, 
Throwable failure);
 }
diff --git 
a/accord-core/src/main/java/accord/coordinate/CoordinateShardDurable.java 
b/accord-core/src/main/java/accord/coordinate/CoordinateShardDurable.java
index daaf81fe..1b5b39b1 100644
--- a/accord-core/src/main/java/accord/coordinate/CoordinateShardDurable.java
+++ b/accord-core/src/main/java/accord/coordinate/CoordinateShardDurable.java
@@ -77,11 +77,6 @@ public class CoordinateShardDurable extends 
SettableResult implements Call
 tryFailure(new RuntimeException("Unexpected reply"));
 return;
 
-case Error:
-// TODO (required): error propagation
-tryFailure(new RuntimeException("Unknown error"));
-return;
-
 case Invalid:
 tryFailure(new Invalidated(exclusiveSyncPoint.syncId, 
exclusiveSyncPoint.homeKey));
 return;
diff --git a/accord-core/src/main/java/accord/coordinate/Execute.java 
b/accord-core/src/main/java/accord/coordinate/Execute.java
index da39a056..7a64395e 100644
--- a/accord-core/src/main/java/accord/coordinate/Execute.java
+++ b/accord-core/src/main/java/accord/coordinate/Execute.java
@@ -24,14 +24,20 @@ import java.util.function.BiConsumer;
 import accord.api.Data;
 import accord.api.Result;
 import accord.local.Node;
-import 

[jira] [Created] (CASSANDRA-18779) Allow exceptions to be propagated remotely

2023-08-18 Thread Ariel Weisberg (Jira)
Ariel Weisberg created CASSANDRA-18779:
--

 Summary: Allow exceptions to be propagated remotely
 Key: CASSANDRA-18779
 URL: https://issues.apache.org/jira/browse/CASSANDRA-18779
 Project: Cassandra
  Issue Type: Improvement
  Components: Accord, Messaging/Internode
Reporter: Ariel Weisberg


It's useful to be able to propagate an exception to a remote calling process 
and then be able to treat it like a real exception (cause, `addSuppressed` 
etc.).



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Commented] (CASSANDRA-18717) Fix errors or remove ant javadoc task

2023-08-18 Thread Maxim Muzafarov (Jira)


[ 
https://issues.apache.org/jira/browse/CASSANDRA-18717?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17756116#comment-17756116
 ] 

Maxim Muzafarov commented on CASSANDRA-18717:
-

To me, the most important obligation we have is to provide users with a good 
view of Cassandra internals by making the javadocs available on the web. Many 
important things are only mentioned in the javadocs, but not in the 
documentation. This is not a bad thing, as it is up to the user how deep they 
want to go.

If we want the javadocs to be a part of the documentation, and to be available 
with every new release, it should at least be compilable. This is even more 
important when new CEPs that come into play.

And now we have two ways to go: either every commit has compilable javadocs, or 
we fix them all before releasing a new version. So, I've assumed here, that 
we've chosen the first one, right?

> Fix errors or remove ant javadoc task
> -
>
> Key: CASSANDRA-18717
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18717
> Project: Cassandra
>  Issue Type: Bug
>  Components: Documentation/Javadoc
>Reporter: Ekaterina Dimitrova
>Assignee: Maxim Muzafarov
>Priority: Normal
> Fix For: 5.0.x, 5.x
>
>  Time Spent: 0.5h
>  Remaining Estimate: 0h
>
> As discussed on CASSANDRA-17687, the javadoc task completes successfully, but 
> there are errors that deserve to be fixed if we keep the task around.
> If we do not plan to use it, we should remove it and reduce the clutter. 



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Updated] (CASSANDRA-18673) Reduce size of per-SSTable index components

2023-08-18 Thread Caleb Rackliffe (Jira)


 [ 
https://issues.apache.org/jira/browse/CASSANDRA-18673?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Caleb Rackliffe updated CASSANDRA-18673:

  Fix Version/s: 5.0-alpha1
 5.1
 (was: 5.x)
 (was: 5.0.x)
Source Control Link: 
https://github.com/apache/cassandra/commit/655a2455ac29395b0a303e6ad7fc4d458b18932d
  (was: https://github.com/apache/cassandra/pull/2540)
 Resolution: Fixed
 Status: Resolved  (was: Ready to Commit)

Committed as 
[https://github.com/apache/cassandra/commit/655a2455ac29395b0a303e6ad7fc4d458b18932d]

> Reduce size of per-SSTable index components
> ---
>
> Key: CASSANDRA-18673
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18673
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Feature/SAI
>Reporter: Mike Adamson
>Assignee: Mike Adamson
>Priority: Urgent
> Fix For: 5.0-alpha1, 5.1
>
>  Time Spent: 6.5h
>  Remaining Estimate: 0h
>
> The current per-SSTable index components are large because the primary keys 
> that are stored in them include the token as part of the byte comparable. The 
> byte comparable puts the token first meaning that we get very little prefix 
> compression from either the trie or the sorted terms store. 
> We can fix this by removing the token from the primary key serialization. 
> This would allow us to get the prefix compression from the trie and the 
> sorted terms store.



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] branch trunk updated (1e19887f72 -> 49e04e8df2)

2023-08-18 Thread maedhroz
This is an automated email from the ASF dual-hosted git repository.

maedhroz pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git


from 1e19887f72 Merge branch 'cassandra-5.0' into trunk
 new 655a2455ac Reduce size of per-SSTable index components for SAI
 new 49e04e8df2 Merge branch 'cassandra-5.0' into trunk

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .build/parent-pom-template.xml |   4 +-
 CHANGES.txt|   1 +
 .../config/CassandraRelevantProperties.java|  10 +
 .../apache/cassandra/index/sai/SSTableContext.java |   2 +-
 .../index/sai/StorageAttachedIndexGroup.java   |   4 +-
 .../index/sai/disk/PerSSTableIndexWriter.java  |   4 +
 .../cassandra/index/sai/disk/RowMapping.java   |  11 +-
 .../index/sai/disk/StorageAttachedIndexWriter.java |  10 +
 .../index/sai/disk/format/IndexComponent.java  |  22 +-
 .../index/sai/disk/format/IndexDescriptor.java |  68 +++-
 .../index/sai/disk/format/OnDiskFormat.java|   8 +-
 .../index/sai/disk/io/IndexFileUtils.java  |  12 +-
 .../cassandra/index/sai/disk/v1/LongArray.java |  15 +
 .../index/sai/disk/v1/PerColumnIndexFiles.java |   8 +-
 .../index/sai/disk/v1/RowAwarePrimaryKeyMap.java   | 201 --
 .../index/sai/disk/v1/SSTableComponentsWriter.java |  66 +++-
 .../index/sai/disk/v1/SkinnyPrimaryKeyMap.java | 208 +++
 .../index/sai/disk/v1/V1OnDiskFormat.java  |  43 ++-
 .../index/sai/disk/v1/WidePrimaryKeyMap.java   | 179 +
 .../sai/disk/v1/bbtree/NumericIndexWriter.java |   2 +-
 .../disk/v1/bitpack/AbstractBlockPackedReader.java | 166 +
 .../sai/disk/v1/bitpack/NumericValuesWriter.java   |  30 +-
 .../index/sai/disk/v1/keystore/KeyLookup.java  | 377 +++
 .../KeyLookupMeta.java}|  27 +-
 .../index/sai/disk/v1/keystore/KeyStoreWriter.java | 218 +++
 .../index/sai/disk/v1/postings/PostingsReader.java |   6 +
 .../sai/disk/v1/sortedterms/SortedTermsMeta.java   |  48 ---
 .../sai/disk/v1/sortedterms/SortedTermsReader.java | 234 
 .../sai/disk/v1/sortedterms/SortedTermsWriter.java | 214 ---
 .../sai/disk/v1/sortedterms/package-info.java  |  58 ---
 .../index/sai/disk/v1/trie/TriePrefixSearcher.java |  98 -
 .../sai/iterators/KeyRangeConcatIterator.java  |   3 +-
 .../cassandra/index/sai/utils/PrimaryKey.java  |  98 +++--
 .../distributed/test/sai/IndexStreamingTest.java   |  30 +-
 .../test/microbench/sai/KeyLookupBench.java| 205 ++
 .../org/apache/cassandra/index/sai/SAITester.java  |   2 +-
 .../index/sai/cql/StorageAttachedIndexDDLTest.java |  12 +-
 .../index/sai/cql/TokenCollisionTest.java  | 120 ++
 .../cassandra/index/sai/disk/NodeStartupTest.java  |   2 +-
 .../index/sai/disk/v1/SegmentFlushTest.java|   6 +-
 .../index/sai/disk/v1/TermsReaderTest.java |   8 +-
 .../index/sai/disk/v1/WideRowPrimaryKeyTest.java   | 115 ++
 .../BlockBalancedTreePostingsWriterTest.java   |   6 +-
 .../v1/bbtree/BlockBalancedTreeReaderTest.java |   4 +-
 .../sai/disk/v1/bbtree/NumericIndexWriterTest.java |   8 +-
 .../sai/disk/v1/bitpack/NumericValuesTest.java |   6 +-
 .../index/sai/disk/v1/keystore/KeyLookupTest.java  | 413 
 .../sai/disk/v1/sortedterms/SortedTermsTest.java   | 415 -
 .../sai/disk/v1/trie/TriePrefixSearcherTest.java   | 160 
 .../sai/disk/v1/trie/TrieTermsDictionaryTest.java  |   6 +-
 .../index/sai/disk/v1/trie/TrieValidationTest.java |  93 -
 .../index/sai/functional/GroupComponentsTest.java  |   6 +-
 .../sai/iterators/KeyRangeConcatIteratorTest.java  |  22 +-
 .../index/sai/metrics/IndexGroupMetricsTest.java   |   4 +-
 .../index/sai/utils/AbstractPrimaryKeyTester.java  |  36 +-
 .../cassandra/index/sai/utils/PrimaryKeyTest.java  |  42 +--
 .../index/sai/utils/SAIRandomizedTester.java   |  21 +-
 57 files changed, 2417 insertions(+), 1780 deletions(-)
 delete mode 100644 
src/java/org/apache/cassandra/index/sai/disk/v1/RowAwarePrimaryKeyMap.java
 create mode 100644 
src/java/org/apache/cassandra/index/sai/disk/v1/SkinnyPrimaryKeyMap.java
 create mode 100644 
src/java/org/apache/cassandra/index/sai/disk/v1/WidePrimaryKeyMap.java
 create mode 100644 
src/java/org/apache/cassandra/index/sai/disk/v1/keystore/KeyLookup.java
 copy 
src/java/org/apache/cassandra/index/sai/disk/v1/{bitpack/NumericValuesMeta.java 
=> keystore/KeyLookupMeta.java} (61%)
 create mode 100644 
src/java/org/apache/cassandra/index/sai/disk/v1/keystore/KeyStoreWriter.java
 delete mode 100644 

[cassandra] 01/01: Merge branch 'cassandra-5.0' into trunk

2023-08-18 Thread maedhroz
This is an automated email from the ASF dual-hosted git repository.

maedhroz pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 49e04e8df25c7e47a1e045f51132b9a0bdf90e1f
Merge: 1e19887f72 655a2455ac
Author: Caleb Rackliffe 
AuthorDate: Fri Aug 18 14:51:11 2023 -0500

Merge branch 'cassandra-5.0' into trunk

* cassandra-5.0:
  Reduce size of per-SSTable index components for SAI

 .build/parent-pom-template.xml |   4 +-
 CHANGES.txt|   1 +
 .../config/CassandraRelevantProperties.java|  10 +
 .../apache/cassandra/index/sai/SSTableContext.java |   2 +-
 .../index/sai/StorageAttachedIndexGroup.java   |   4 +-
 .../index/sai/disk/PerSSTableIndexWriter.java  |   4 +
 .../cassandra/index/sai/disk/RowMapping.java   |  11 +-
 .../index/sai/disk/StorageAttachedIndexWriter.java |  10 +
 .../index/sai/disk/format/IndexComponent.java  |  22 +-
 .../index/sai/disk/format/IndexDescriptor.java |  68 +++-
 .../index/sai/disk/format/OnDiskFormat.java|   8 +-
 .../index/sai/disk/io/IndexFileUtils.java  |  12 +-
 .../cassandra/index/sai/disk/v1/LongArray.java |  15 +
 .../index/sai/disk/v1/PerColumnIndexFiles.java |   8 +-
 .../index/sai/disk/v1/RowAwarePrimaryKeyMap.java   | 201 --
 .../index/sai/disk/v1/SSTableComponentsWriter.java |  66 +++-
 .../index/sai/disk/v1/SkinnyPrimaryKeyMap.java | 208 +++
 .../index/sai/disk/v1/V1OnDiskFormat.java  |  43 ++-
 .../index/sai/disk/v1/WidePrimaryKeyMap.java   | 179 +
 .../sai/disk/v1/bbtree/NumericIndexWriter.java |   2 +-
 .../disk/v1/bitpack/AbstractBlockPackedReader.java | 166 +
 .../sai/disk/v1/bitpack/NumericValuesWriter.java   |  30 +-
 .../index/sai/disk/v1/keystore/KeyLookup.java  | 377 +++
 .../KeyLookupMeta.java}|  25 +-
 .../index/sai/disk/v1/keystore/KeyStoreWriter.java | 218 +++
 .../index/sai/disk/v1/postings/PostingsReader.java |   6 +
 .../sai/disk/v1/sortedterms/SortedTermsReader.java | 234 
 .../sai/disk/v1/sortedterms/SortedTermsWriter.java | 214 ---
 .../sai/disk/v1/sortedterms/package-info.java  |  58 ---
 .../index/sai/disk/v1/trie/TriePrefixSearcher.java |  98 -
 .../sai/iterators/KeyRangeConcatIterator.java  |   3 +-
 .../cassandra/index/sai/utils/PrimaryKey.java  |  98 +++--
 .../distributed/test/sai/IndexStreamingTest.java   |  30 +-
 .../test/microbench/sai/KeyLookupBench.java| 205 ++
 .../org/apache/cassandra/index/sai/SAITester.java  |   2 +-
 .../index/sai/cql/StorageAttachedIndexDDLTest.java |  12 +-
 .../index/sai/cql/TokenCollisionTest.java  | 120 ++
 .../cassandra/index/sai/disk/NodeStartupTest.java  |   2 +-
 .../index/sai/disk/v1/SegmentFlushTest.java|   6 +-
 .../index/sai/disk/v1/TermsReaderTest.java |   8 +-
 .../index/sai/disk/v1/WideRowPrimaryKeyTest.java   | 115 ++
 .../BlockBalancedTreePostingsWriterTest.java   |   6 +-
 .../v1/bbtree/BlockBalancedTreeReaderTest.java |   4 +-
 .../sai/disk/v1/bbtree/NumericIndexWriterTest.java |   8 +-
 .../sai/disk/v1/bitpack/NumericValuesTest.java |   6 +-
 .../index/sai/disk/v1/keystore/KeyLookupTest.java  | 413 
 .../sai/disk/v1/sortedterms/SortedTermsTest.java   | 415 -
 .../sai/disk/v1/trie/TriePrefixSearcherTest.java   | 160 
 .../sai/disk/v1/trie/TrieTermsDictionaryTest.java  |   6 +-
 .../index/sai/disk/v1/trie/TrieValidationTest.java |  93 -
 .../index/sai/functional/GroupComponentsTest.java  |   6 +-
 .../sai/iterators/KeyRangeConcatIteratorTest.java  |  22 +-
 .../index/sai/metrics/IndexGroupMetricsTest.java   |   4 +-
 .../index/sai/utils/AbstractPrimaryKeyTester.java  |  36 +-
 .../cassandra/index/sai/utils/PrimaryKeyTest.java  |  42 +--
 .../index/sai/utils/SAIRandomizedTester.java   |  21 +-
 56 files changed, 2414 insertions(+), 1733 deletions(-)

diff --cc CHANGES.txt
index 82c91d9902,f954f08550..a4a5ea0870
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -5.0-alpha1
 +5.1
 +Merged from 5.0:
+  * Reduce size of per-SSTable index components for SAI (CASSANDRA-18673)
   * Remove unnecessary Netty dependencies after upgrade to version 4.1.96 
(CASSANDRA-18729)
   * Prevent InaccessibleObjectException when the Leak Detector is traversing 
objects (CASSANDRA-18708)
   * Remove legacy command line options from cassandra-stress (CASSANDRA-18529)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Updated] (CASSANDRASC-69) Refactor Configuration

2023-08-18 Thread Francisco Guerrero (Jira)


 [ 
https://issues.apache.org/jira/browse/CASSANDRASC-69?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Francisco Guerrero updated CASSANDRASC-69:
--
Test and Documentation Plan: Added tests to validate parsing of yaml 
configuration files. Updated existing test that use configuration
 Status: Patch Available  (was: In Progress)

> Refactor Configuration
> --
>
> Key: CASSANDRASC-69
> URL: https://issues.apache.org/jira/browse/CASSANDRASC-69
> Project: Sidecar for Apache Cassandra
>  Issue Type: Improvement
>  Components: Configuration
>Reporter: Francisco Guerrero
>Assignee: Francisco Guerrero
>Priority: Normal
>  Labels: pull-request-available
>
> Currently, the Sidecar Configuration is provided via a yaml file. The yaml 
> file is parsed and a the configuration is used during the Sidecar application 
> runtime.
> The configuration parsing is done manually, and adding a new configuration to 
> the yaml file has become a big task where multiple files need to be touched. 
> Ideally, we should add the configuration POJOs needed for new configurations 
> and add the new fields in the yaml file.
> Additionally, we are leaking the configuration implementation to the 
> {{InstancesConfig}}. We should improve the separation of concerns from the 
> yaml configuration and the instances configuration.



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Commented] (CASSANDRASC-69) Refactor Configuration

2023-08-18 Thread Francisco Guerrero (Jira)


[ 
https://issues.apache.org/jira/browse/CASSANDRASC-69?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17756108#comment-17756108
 ] 

Francisco Guerrero commented on CASSANDRASC-69:
---

CI: https://app.circleci.com/pipelines/github/frankgh/cassandra-sidecar/227

> Refactor Configuration
> --
>
> Key: CASSANDRASC-69
> URL: https://issues.apache.org/jira/browse/CASSANDRASC-69
> Project: Sidecar for Apache Cassandra
>  Issue Type: Improvement
>  Components: Configuration
>Reporter: Francisco Guerrero
>Assignee: Francisco Guerrero
>Priority: Normal
>  Labels: pull-request-available
>
> Currently, the Sidecar Configuration is provided via a yaml file. The yaml 
> file is parsed and a the configuration is used during the Sidecar application 
> runtime.
> The configuration parsing is done manually, and adding a new configuration to 
> the yaml file has become a big task where multiple files need to be touched. 
> Ideally, we should add the configuration POJOs needed for new configurations 
> and add the new fields in the yaml file.
> Additionally, we are leaking the configuration implementation to the 
> {{InstancesConfig}}. We should improve the separation of concerns from the 
> yaml configuration and the instances configuration.



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Comment Edited] (CASSANDRA-18673) Reduce size of per-SSTable index components

2023-08-18 Thread Caleb Rackliffe (Jira)


[ 
https://issues.apache.org/jira/browse/CASSANDRA-18673?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17756105#comment-17756105
 ] 

Caleb Rackliffe edited comment on CASSANDRA-18673 at 8/18/23 7:30 PM:
--

An [additional repeat 
run|https://app.circleci.com/pipelines/github/adelapena/cassandra?branch=18673-trunk-review-repro]
 for {{StorageAttachedIndexDDLTest}} looks green, and all other failures are 
existing/unrelated. Moving to commit...


was (Author: maedhroz):
An additional repeat run for \{{StorageAttachedIndexDDLTest}} looks green, and 
all other failures are existing/unrelated. Moving to commit...

> Reduce size of per-SSTable index components
> ---
>
> Key: CASSANDRA-18673
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18673
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Feature/SAI
>Reporter: Mike Adamson
>Assignee: Mike Adamson
>Priority: Urgent
> Fix For: 5.0.x, 5.x
>
>  Time Spent: 6.5h
>  Remaining Estimate: 0h
>
> The current per-SSTable index components are large because the primary keys 
> that are stored in them include the token as part of the byte comparable. The 
> byte comparable puts the token first meaning that we get very little prefix 
> compression from either the trie or the sorted terms store. 
> We can fix this by removing the token from the primary key serialization. 
> This would allow us to get the prefix compression from the trie and the 
> sorted terms store.



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Commented] (CASSANDRA-18673) Reduce size of per-SSTable index components

2023-08-18 Thread Caleb Rackliffe (Jira)


[ 
https://issues.apache.org/jira/browse/CASSANDRA-18673?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17756105#comment-17756105
 ] 

Caleb Rackliffe commented on CASSANDRA-18673:
-

An additional repeat run for \{{StorageAttachedIndexDDLTest}} looks green, and 
all other failures are existing/unrelated. Moving to commit...

> Reduce size of per-SSTable index components
> ---
>
> Key: CASSANDRA-18673
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18673
> Project: Cassandra
>  Issue Type: Improvement
>  Components: Feature/SAI
>Reporter: Mike Adamson
>Assignee: Mike Adamson
>Priority: Urgent
> Fix For: 5.0.x, 5.x
>
>  Time Spent: 6.5h
>  Remaining Estimate: 0h
>
> The current per-SSTable index components are large because the primary keys 
> that are stored in them include the token as part of the byte comparable. The 
> byte comparable puts the token first meaning that we get very little prefix 
> compression from either the trie or the sorted terms store. 
> We can fix this by removing the token from the primary key serialization. 
> This would allow us to get the prefix compression from the trie and the 
> sorted terms store.



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] branch trunk updated (3884eaf47e -> 1e19887f72)

2023-08-18 Thread brandonwilliams
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git


from 3884eaf47e Merge branch 'cassandra-5.0' into trunk
 new 0b34ff6a0b ninja: fix format arg order
 new b21645474a Merge branch 'cassandra-3.0' into cassandra-3.11
 new bf9d334f54 Merge branch 'cassandra-3.11' into cassandra-4.0
 new a2af87de8a Merge branch 'cassandra-4.0' into cassandra-4.1
 new ef2903f20f Merge branch 'cassandra-4.1' into cassandra-5.0
 new 1e19887f72 Merge branch 'cassandra-5.0' into trunk

The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pylib/cqlshlib/cqlshmain.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] branch cassandra-5.0 updated (efad24e997 -> ef2903f20f)

2023-08-18 Thread brandonwilliams
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a change to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git


from efad24e997 Merge branch 'cassandra-4.1' into cassandra-5.0
 new 0b34ff6a0b ninja: fix format arg order
 new b21645474a Merge branch 'cassandra-3.0' into cassandra-3.11
 new bf9d334f54 Merge branch 'cassandra-3.11' into cassandra-4.0
 new a2af87de8a Merge branch 'cassandra-4.0' into cassandra-4.1
 new ef2903f20f Merge branch 'cassandra-4.1' into cassandra-5.0

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pylib/cqlshlib/cqlshmain.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] branch cassandra-3.11 updated (da3c400675 -> b21645474a)

2023-08-18 Thread brandonwilliams
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git


from da3c400675 Merge branch 'cassandra-3.0' into cassandra-3.11
 new 0b34ff6a0b ninja: fix format arg order
 new b21645474a Merge branch 'cassandra-3.0' into cassandra-3.11

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 bin/cqlsh.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] 01/01: Merge branch 'cassandra-5.0' into trunk

2023-08-18 Thread brandonwilliams
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 1e19887f72e534232d628e1e01cf324e320dc3f8
Merge: 3884eaf47e ef2903f20f
Author: Brandon Williams 
AuthorDate: Fri Aug 18 14:00:41 2023 -0500

Merge branch 'cassandra-5.0' into trunk

 pylib/cqlshlib/cqlshmain.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] branch cassandra-3.0 updated: ninja: fix format arg order

2023-08-18 Thread brandonwilliams
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git


The following commit(s) were added to refs/heads/cassandra-3.0 by this push:
 new 0b34ff6a0b ninja: fix format arg order
0b34ff6a0b is described below

commit 0b34ff6a0bce3089664c87e5f61dd02b4a1d6b5e
Author: Brandon Williams 
AuthorDate: Fri Aug 18 13:56:51 2023 -0500

ninja: fix format arg order
---
 bin/cqlsh.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index f9fcc656d5..d4b3bfc473 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -825,7 +825,7 @@ class Shell(cmd.Cmd):
 if extra:
 baseversion = baseversion[0:extra]
 if baseversion != build_version:
-print("WARNING: cqlsh was built against {}, but this server is {}. 
 All features may not work!".format(baseversion, build_version))
+print("WARNING: cqlsh was built against {}, but this server is {}. 
 All features may not work!".format(build_version, baseversion))
 
 @property
 def is_using_utf8(self):


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] 01/01: Merge branch 'cassandra-4.0' into cassandra-4.1

2023-08-18 Thread brandonwilliams
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit a2af87de8a05af387442344cac87c50a46ba6dd8
Merge: 2aef55b2a0 bf9d334f54
Author: Brandon Williams 
AuthorDate: Fri Aug 18 13:57:28 2023 -0500

Merge branch 'cassandra-4.0' into cassandra-4.1

 bin/cqlsh.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc bin/cqlsh.py
index ca381a904f,f717807e41..ddaaf78fd4
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -546,11 -541,20 +546,11 @@@ class Shell(cmd.Cmd)
  if extra:
  baseversion = baseversion[0:extra]
  if baseversion != build_version:
- print("WARNING: cqlsh was built against {}, but this server is 
{}.  All features may not work!".format(baseversion, build_version))
+ print("WARNING: cqlsh was built against {}, but this server is 
{}.  All features may not work!".format(build_version, baseversion))
  
  @property
 -def is_using_utf8(self):
 -# utf8 encodings from 
https://docs.python.org/{2,3}/library/codecs.html
 -return self.encoding.replace('-', '_').lower() in ['utf', 'utf_8', 
'u8', 'utf8', CP65001]
 -
 -def check_windows_encoding(self):
 -if is_win and os.name == 'nt' and self.tty and \
 -   self.is_using_utf8 and sys.stdout.encoding != CP65001:
 -self.printerr("\nWARNING: console codepage must be set to cp65001 
"
 -  "to support {} encoding on Windows platforms.\n"
 -  "If you experience encoding problems, change your 
console"
 -  " codepage with 'chcp 65001' before starting 
cqlsh.\n".format(self.encoding))
 +def batch_mode(self):
 +return not self.tty
  
  def set_expanded_cql_version(self, ver):
  ver, vertuple = full_cql_version(ver)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] branch cassandra-4.1 updated (2aef55b2a0 -> a2af87de8a)

2023-08-18 Thread brandonwilliams
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a change to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git


from 2aef55b2a0 Merge branch 'cassandra-4.0' into cassandra-4.1
 new 0b34ff6a0b ninja: fix format arg order
 new b21645474a Merge branch 'cassandra-3.0' into cassandra-3.11
 new bf9d334f54 Merge branch 'cassandra-3.11' into cassandra-4.0
 new a2af87de8a Merge branch 'cassandra-4.0' into cassandra-4.1

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 bin/cqlsh.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] 01/01: Merge branch 'cassandra-4.1' into cassandra-5.0

2023-08-18 Thread brandonwilliams
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit ef2903f20f1eee4dc4a419342703ee20d5b545e0
Merge: efad24e997 a2af87de8a
Author: Brandon Williams 
AuthorDate: Fri Aug 18 13:58:09 2023 -0500

Merge branch 'cassandra-4.1' into cassandra-5.0

 pylib/cqlshlib/cqlshmain.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc pylib/cqlshlib/cqlshmain.py
index b5536084a9,00..a9d726cadd
mode 100755,00..100755
--- a/pylib/cqlshlib/cqlshmain.py
+++ b/pylib/cqlshlib/cqlshmain.py
@@@ -1,2404 -1,0 +1,2404 @@@
 +# Licensed to the Apache Software Foundation (ASF) under one
 +# or more contributor license agreements.  See the NOTICE file
 +# distributed with this work for additional information
 +# regarding copyright ownership.  The ASF licenses this file
 +# to you under the Apache License, Version 2.0 (the
 +# "License"); you may not use this file except in compliance
 +# with the License.  You may obtain a copy of the License at
 +#
 +# http://www.apache.org/licenses/LICENSE-2.0
 +#
 +# Unless required by applicable law or agreed to in writing, software
 +# distributed under the License is distributed on an "AS IS" BASIS,
 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 +# See the License for the specific language governing permissions and
 +# limitations under the License.
 +
 +import cmd
 +import codecs
 +import configparser
 +import csv
 +import getpass
 +import argparse
 +import os
 +import re
 +import subprocess
 +import sys
 +import traceback
 +import warnings
 +import webbrowser
 +from contextlib import contextmanager
 +from io import StringIO
 +from uuid import UUID
 +
 +UTF8 = 'utf-8'
 +
 +description = "CQL Shell for Apache Cassandra"
 +version = "6.2.0"
 +
 +readline = None
 +try:
 +# check if tty first, cause readline doesn't check, and only cares
 +# about $TERM. we don't want the funky escape code stuff to be
 +# output if not a tty.
 +if sys.stdin.isatty():
 +import readline
 +except ImportError:
 +pass
 +
 +# On Linux, the Python webbrowser module uses the 'xdg-open' executable
 +# to open a file/URL. But that only works, if the current session has been
 +# opened from _within_ a desktop environment. I.e. 'xdg-open' will fail,
 +# if the session's been opened via ssh to a remote box.
 +#
 +try:
 +webbrowser.register_standard_browsers()  # registration is otherwise lazy 
in Python3
 +except AttributeError:
 +pass
 +if webbrowser._tryorder and webbrowser._tryorder[0] == 'xdg-open' and 
os.environ.get('XDG_DATA_DIRS', '') == '':
 +# only on Linux (some OS with xdg-open)
 +webbrowser._tryorder.remove('xdg-open')
 +webbrowser._tryorder.append('xdg-open')
 +
 +warnings.filterwarnings("ignore", r".*blist.*")
 +
 +import cassandra
 +from cassandra.auth import PlainTextAuthProvider
 +from cassandra.cluster import Cluster
 +from cassandra.cqltypes import cql_typename
 +from cassandra.marshal import int64_unpack
 +from cassandra.metadata import (ColumnMetadata, KeyspaceMetadata, 
TableMetadata)
 +from cassandra.policies import WhiteListRoundRobinPolicy
 +from cassandra.query import SimpleStatement, ordered_dict_factory, 
TraceUnavailable
 +from cassandra.util import datetime_from_timestamp
 +
 +from cqlshlib import cql3handling, pylexotron, sslhandling, cqlshhandling, 
authproviderhandling
 +from cqlshlib.copyutil import ExportTask, ImportTask
 +from cqlshlib.displaying import (ANSI_RESET, BLUE, COLUMN_NAME_COLORS, CYAN,
 + RED, WHITE, FormattedValue, colorme)
 +from cqlshlib.formatting import (DEFAULT_DATE_FORMAT, DEFAULT_NANOTIME_FORMAT,
 + DEFAULT_TIMESTAMP_FORMAT, CqlType, 
DateTimeFormat,
 + format_by_type)
 +from cqlshlib.tracing import print_trace, print_trace_session
 +from cqlshlib.util import get_file_encoding_bomsize, is_file_secure
 +from cqlshlib.serverversion import version as build_version
 +
 +DEFAULT_HOST = '127.0.0.1'
 +DEFAULT_PORT = 9042
 +DEFAULT_SSL = False
 +DEFAULT_CONNECT_TIMEOUT_SECONDS = 5
 +DEFAULT_REQUEST_TIMEOUT_SECONDS = 10
 +
 +DEFAULT_FLOAT_PRECISION = 5
 +DEFAULT_DOUBLE_PRECISION = 5
 +DEFAULT_MAX_TRACE_WAIT = 10
 +
 +if readline is not None and readline.__doc__ is not None and 'libedit' in 
readline.__doc__:
 +DEFAULT_COMPLETEKEY = '\t'
 +else:
 +DEFAULT_COMPLETEKEY = 'tab'
 +
 +cqldocs = None
 +cqlruleset = None
 +CASSANDRA_CQL_HTML = None
 +
 +epilog = """Connects to %(DEFAULT_HOST)s:%(DEFAULT_PORT)d by default. These
 +defaults can be changed by setting $CQLSH_HOST and/or $CQLSH_PORT. When a
 +host (and optional port number) are given on the command line, they take
 +precedence over any defaults.""" % globals()
 +
 +
 +parser = argparse.ArgumentParser(description=description, epilog=epilog,
 +   

[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0

2023-08-18 Thread brandonwilliams
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit bf9d334f54e1114e7df4cc6c9ef6e4bb6bde1054
Merge: 197e806f64 b21645474a
Author: Brandon Williams 
AuthorDate: Fri Aug 18 13:57:18 2023 -0500

Merge branch 'cassandra-3.11' into cassandra-4.0

 bin/cqlsh.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc bin/cqlsh.py
index 4ca4469604,e1a7ea8561..f717807e41
mode 100755,100644..100755
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11

2023-08-18 Thread brandonwilliams
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit b21645474addd65bea60d77b14e6848819c0da27
Merge: da3c400675 0b34ff6a0b
Author: Brandon Williams 
AuthorDate: Fri Aug 18 13:57:06 2023 -0500

Merge branch 'cassandra-3.0' into cassandra-3.11

 bin/cqlsh.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] branch cassandra-4.0 updated (197e806f64 -> bf9d334f54)

2023-08-18 Thread brandonwilliams
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a change to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git


from 197e806f64 Merge branch 'cassandra-3.11' into cassandra-4.0
 new 0b34ff6a0b ninja: fix format arg order
 new b21645474a Merge branch 'cassandra-3.0' into cassandra-3.11
 new bf9d334f54 Merge branch 'cassandra-3.11' into cassandra-4.0

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 bin/cqlsh.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Comment Edited] (CASSANDRA-18717) Fix errors or remove ant javadoc task

2023-08-18 Thread Stefan Miklosovic (Jira)


[ 
https://issues.apache.org/jira/browse/CASSANDRA-18717?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17756101#comment-17756101
 ] 

Stefan Miklosovic edited comment on CASSANDRA-18717 at 8/18/23 6:53 PM:


ah I havent read your response as I was composing my next reply. Yeah we could 
add it into "ant check". So you say that ant check would just emit a warning 
but it would not fail?

So that would be on sole discretion of a committer if he is going to deal with 
these errors or not?

I can not imagine a scenario when committers would see errors but they would 
still decide to proceed with the commit.


was (Author: smiklosovic):
ah I havent read your response as I was composing my next reply. Yeah we could 
add it into "ant check". So you say that ant check would just emit a warning 
but it would not fail?

So that would be on sole discretion of a committer if he is going to deal with 
these errors or not?

I can not imagine a scenario when committers would see errors but they would 
still decided to proceed with the commit.

> Fix errors or remove ant javadoc task
> -
>
> Key: CASSANDRA-18717
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18717
> Project: Cassandra
>  Issue Type: Bug
>  Components: Documentation/Javadoc
>Reporter: Ekaterina Dimitrova
>Assignee: Maxim Muzafarov
>Priority: Normal
> Fix For: 5.0.x, 5.x
>
>  Time Spent: 0.5h
>  Remaining Estimate: 0h
>
> As discussed on CASSANDRA-17687, the javadoc task completes successfully, but 
> there are errors that deserve to be fixed if we keep the task around.
> If we do not plan to use it, we should remove it and reduce the clutter. 



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Commented] (CASSANDRA-18717) Fix errors or remove ant javadoc task

2023-08-18 Thread Stefan Miklosovic (Jira)


[ 
https://issues.apache.org/jira/browse/CASSANDRA-18717?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17756101#comment-17756101
 ] 

Stefan Miklosovic commented on CASSANDRA-18717:
---

ah I havent read your response as I was composing my next reply. Yeah we could 
add it into "ant check". So you say that ant check would just emit a warning 
but it would not fail?

So that would be on sole discretion of a committer if he is going to deal with 
these errors or not?

I can not imagine a scenario when committers would see errors but they would 
still decided to proceed with the commit.

> Fix errors or remove ant javadoc task
> -
>
> Key: CASSANDRA-18717
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18717
> Project: Cassandra
>  Issue Type: Bug
>  Components: Documentation/Javadoc
>Reporter: Ekaterina Dimitrova
>Assignee: Maxim Muzafarov
>Priority: Normal
> Fix For: 5.0.x, 5.x
>
>  Time Spent: 0.5h
>  Remaining Estimate: 0h
>
> As discussed on CASSANDRA-17687, the javadoc task completes successfully, but 
> there are errors that deserve to be fixed if we keep the task around.
> If we do not plan to use it, we should remove it and reduce the clutter. 



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Commented] (CASSANDRA-18717) Fix errors or remove ant javadoc task

2023-08-18 Thread Stefan Miklosovic (Jira)


[ 
https://issues.apache.org/jira/browse/CASSANDRA-18717?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17756100#comment-17756100
 ] 

Stefan Miklosovic commented on CASSANDRA-18717:
---

I would ask people on ML if your perception of problems on "big ceps" is 
actually relevant. I think we are doing assumptions without any verification. 
How I see it, we either want to have them valid (or at least no errors) or not. 
If not, we are moving in circles here as that was basically the state before. 
If we fix the errors but we dont prevent them from happening again, over time 
we will find ourselves on the same place, we will have errorneous rendering of 
Javadocs

> Fix errors or remove ant javadoc task
> -
>
> Key: CASSANDRA-18717
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18717
> Project: Cassandra
>  Issue Type: Bug
>  Components: Documentation/Javadoc
>Reporter: Ekaterina Dimitrova
>Assignee: Maxim Muzafarov
>Priority: Normal
> Fix For: 5.0.x, 5.x
>
>  Time Spent: 0.5h
>  Remaining Estimate: 0h
>
> As discussed on CASSANDRA-17687, the javadoc task completes successfully, but 
> there are errors that deserve to be fixed if we keep the task around.
> If we do not plan to use it, we should remove it and reduce the clutter. 



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Comment Edited] (CASSANDRA-18717) Fix errors or remove ant javadoc task

2023-08-18 Thread Ekaterina Dimitrova (Jira)


[ 
https://issues.apache.org/jira/browse/CASSANDRA-18717?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17756099#comment-17756099
 ] 

Ekaterina Dimitrova edited comment on CASSANDRA-18717 at 8/18/23 6:44 PM:
--

If we add it as part of 
{code:java}
ant check 
{code}
and find a way to notify people early on, we won't be where we are. 

bq.  Also, what consists of "big and fat" warning?

Some email sent or 
{code:java}
ant check 
{code}
finishing with some big warning at the bottom? Open to ideas

Failing peoples' builds on something that is not even marked with a warning or 
so in the IDE doesn't feel good. 


was (Author: e.dimitrova):
If we add it as part of 
{code:java}
ant check 
{code}
and find a way to notify people early on, we won't be where we are. 

bq.  Also, what consists of "big and fat" warning?

Some email sent or 
{code:java}
ant check 
{code}
finishing with some big warning at the bottom? Open to ideas

Failing peoples' builds on something that is not even marked with a warning or 
so in the IDE doesn't feel good. 

> Fix errors or remove ant javadoc task
> -
>
> Key: CASSANDRA-18717
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18717
> Project: Cassandra
>  Issue Type: Bug
>  Components: Documentation/Javadoc
>Reporter: Ekaterina Dimitrova
>Assignee: Maxim Muzafarov
>Priority: Normal
> Fix For: 5.0.x, 5.x
>
>  Time Spent: 0.5h
>  Remaining Estimate: 0h
>
> As discussed on CASSANDRA-17687, the javadoc task completes successfully, but 
> there are errors that deserve to be fixed if we keep the task around.
> If we do not plan to use it, we should remove it and reduce the clutter. 



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Comment Edited] (CASSANDRA-18717) Fix errors or remove ant javadoc task

2023-08-18 Thread Ekaterina Dimitrova (Jira)


[ 
https://issues.apache.org/jira/browse/CASSANDRA-18717?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17756099#comment-17756099
 ] 

Ekaterina Dimitrova edited comment on CASSANDRA-18717 at 8/18/23 6:44 PM:
--

If we add it as part of 
{code:java}
ant check 
{code}
and find a way to notify people early on, we won't be where we are. 

bq.  Also, what consists of "big and fat" warning?

Some email sent or 
{code:java}
ant check 
{code}
finishing with some big warning at the bottom? Open to ideas

Failing peoples' builds on something that is not even marked with a warning or 
so in the IDE doesn't feel good. 


was (Author: e.dimitrova):
If we add it as part of 
{code:java}
ant check 
{code}
and find a way to notify people early on, we won't be where we are. 

bq.  Also, what consists of "big and fat" warning?

Some email sent or 
{code:java}
ant check 
{code}
finishing with some big warning at the bottom? Open to ideas

> Fix errors or remove ant javadoc task
> -
>
> Key: CASSANDRA-18717
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18717
> Project: Cassandra
>  Issue Type: Bug
>  Components: Documentation/Javadoc
>Reporter: Ekaterina Dimitrova
>Assignee: Maxim Muzafarov
>Priority: Normal
> Fix For: 5.0.x, 5.x
>
>  Time Spent: 0.5h
>  Remaining Estimate: 0h
>
> As discussed on CASSANDRA-17687, the javadoc task completes successfully, but 
> there are errors that deserve to be fixed if we keep the task around.
> If we do not plan to use it, we should remove it and reduce the clutter. 



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Updated] (CASSANDRASC-69) Refactor Configuration

2023-08-18 Thread ASF GitHub Bot (Jira)


 [ 
https://issues.apache.org/jira/browse/CASSANDRASC-69?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

ASF GitHub Bot updated CASSANDRASC-69:
--
Labels: pull-request-available  (was: )

> Refactor Configuration
> --
>
> Key: CASSANDRASC-69
> URL: https://issues.apache.org/jira/browse/CASSANDRASC-69
> Project: Sidecar for Apache Cassandra
>  Issue Type: Improvement
>  Components: Configuration
>Reporter: Francisco Guerrero
>Assignee: Francisco Guerrero
>Priority: Normal
>  Labels: pull-request-available
>
> Currently, the Sidecar Configuration is provided via a yaml file. The yaml 
> file is parsed and a the configuration is used during the Sidecar application 
> runtime.
> The configuration parsing is done manually, and adding a new configuration to 
> the yaml file has become a big task where multiple files need to be touched. 
> Ideally, we should add the configuration POJOs needed for new configurations 
> and add the new fields in the yaml file.
> Additionally, we are leaking the configuration implementation to the 
> {{InstancesConfig}}. We should improve the separation of concerns from the 
> yaml configuration and the instances configuration.



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Commented] (CASSANDRA-18717) Fix errors or remove ant javadoc task

2023-08-18 Thread Ekaterina Dimitrova (Jira)


[ 
https://issues.apache.org/jira/browse/CASSANDRA-18717?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17756099#comment-17756099
 ] 

Ekaterina Dimitrova commented on CASSANDRA-18717:
-

If we add it as part of 
{code:java}
ant check 
{code}
and find a way to notify people early on, we won't be where we are. 

bq.  Also, what consists of "big and fat" warning?

Some email sent or 
{code:java}
ant check 
{code}
finishing with some big warning at the bottom? Open to ideas

> Fix errors or remove ant javadoc task
> -
>
> Key: CASSANDRA-18717
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18717
> Project: Cassandra
>  Issue Type: Bug
>  Components: Documentation/Javadoc
>Reporter: Ekaterina Dimitrova
>Assignee: Maxim Muzafarov
>Priority: Normal
> Fix For: 5.0.x, 5.x
>
>  Time Spent: 0.5h
>  Remaining Estimate: 0h
>
> As discussed on CASSANDRA-17687, the javadoc task completes successfully, but 
> there are errors that deserve to be fixed if we keep the task around.
> If we do not plan to use it, we should remove it and reduce the clutter. 



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Commented] (CASSANDRA-18717) Fix errors or remove ant javadoc task

2023-08-18 Thread Stefan Miklosovic (Jira)


[ 
https://issues.apache.org/jira/browse/CASSANDRA-18717?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17756098#comment-17756098
 ] 

Stefan Miklosovic commented on CASSANDRA-18717:
---

Well but then we are where we were. Also, what consists of "big and fat" 
warning? 

> Fix errors or remove ant javadoc task
> -
>
> Key: CASSANDRA-18717
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18717
> Project: Cassandra
>  Issue Type: Bug
>  Components: Documentation/Javadoc
>Reporter: Ekaterina Dimitrova
>Assignee: Maxim Muzafarov
>Priority: Normal
> Fix For: 5.0.x, 5.x
>
>  Time Spent: 0.5h
>  Remaining Estimate: 0h
>
> As discussed on CASSANDRA-17687, the javadoc task completes successfully, but 
> there are errors that deserve to be fixed if we keep the task around.
> If we do not plan to use it, we should remove it and reduce the clutter. 



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Comment Edited] (CASSANDRA-18717) Fix errors or remove ant javadoc task

2023-08-18 Thread Ekaterina Dimitrova (Jira)


[ 
https://issues.apache.org/jira/browse/CASSANDRA-18717?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17756092#comment-17756092
 ] 

Ekaterina Dimitrova edited comment on CASSANDRA-18717 at 8/18/23 6:26 PM:
--

I just reviewed the 5.0 PR.
Overall looks good to me. (except adding the javadoc check under the ant check 
is still missing, but this was discussed only yesterday on the ML, so it was 
expected)
But after reviewing the whole patch, I am inclined to suggest only big fat 
warnings on broken tasks and not to fail builds.
I can imagine how failing will slow down big CEPs as people will probably see 
it in CI when they run `check.` I would prefer follow-up tickets. IDE does not 
warn you on all potential errors; not sure if we can change that by default for 
the project. Some I see as errors, some I don't. More on the PR. With the 
current setup, this will slow down and annoy people who do big features 
development. Open to hearing opinions or suggestions on how to prevent that 
from happening.


was (Author: e.dimitrova):
I just reviewed the 5.0 PR.
Overall looks good to me. (except adding the javadoc check under ant check is 
still missing, but this was discussed only yesterday on the ML so it was 
expected)
But after reviewing the whole patch I am inclined to suggest only big fat 
warning on broken task and not to fail builds.
I can imagine how failing will slow down big CEPs as people will see it most 
probably in CI when they run `check`. I would prefer follow up tickets. IDE 
does not warn you on all potential errors, not sure if we can change that by 
default for the project? Some I see as errors, some I don't. More on the PR. 
With the current setup this will slow down and annoy people who do big features 
development. Open to hear opinions or suggestions how to prevent that from 
happening.

> Fix errors or remove ant javadoc task
> -
>
> Key: CASSANDRA-18717
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18717
> Project: Cassandra
>  Issue Type: Bug
>  Components: Documentation/Javadoc
>Reporter: Ekaterina Dimitrova
>Assignee: Maxim Muzafarov
>Priority: Normal
> Fix For: 5.0.x, 5.x
>
>  Time Spent: 0.5h
>  Remaining Estimate: 0h
>
> As discussed on CASSANDRA-17687, the javadoc task completes successfully, but 
> there are errors that deserve to be fixed if we keep the task around.
> If we do not plan to use it, we should remove it and reduce the clutter. 



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Comment Edited] (CASSANDRA-18717) Fix errors or remove ant javadoc task

2023-08-18 Thread Ekaterina Dimitrova (Jira)


[ 
https://issues.apache.org/jira/browse/CASSANDRA-18717?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17756092#comment-17756092
 ] 

Ekaterina Dimitrova edited comment on CASSANDRA-18717 at 8/18/23 6:21 PM:
--

I just reviewed the 5.0 PR.
Overall looks good to me. (except adding the javadoc check under ant check is 
still missing, but this was discussed only yesterday on the ML so it was 
expected)
But after reviewing the whole patch I am inclined to suggest only big fat 
warning on broken task and not to fail builds.
I can imagine how failing will slow down big CEPs as people will see it most 
probably in CI when they run `check`. I would prefer follow up tickets. IDE 
does not warn you on all potential errors, not sure if we can change that by 
default for the project? Some I see as errors, some I don't. More on the PR. 
With the current setup this will slow down and annoy people who do big features 
development. Open to hear opinions or suggestions how to prevent that from 
happening.


was (Author: e.dimitrova):
I just reviewed the 5.0 PR.
Overall looks good to me. (except adding the javadoc check under ant check is 
still missing, but this was discussed only yesterday)
But after reviewing the whole patch I am inclined to suggest only big fat 
warning on broken task and not to fail builds.
I can imagine how failing will slow down big CEPs as people will see it most 
probably in CI when they run `check`. I would prefer follow up tickets. IDE 
does not warn you on all potential errors, not sure if we can change that by 
default for the project? Some I see as errors, some I don't. More on the PR. 
With the current setup this will slow down and annoy people who do big features 
development. Open to hear opinions or suggestions how to prevent that from 
happening.

> Fix errors or remove ant javadoc task
> -
>
> Key: CASSANDRA-18717
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18717
> Project: Cassandra
>  Issue Type: Bug
>  Components: Documentation/Javadoc
>Reporter: Ekaterina Dimitrova
>Assignee: Maxim Muzafarov
>Priority: Normal
> Fix For: 5.0.x, 5.x
>
>  Time Spent: 0.5h
>  Remaining Estimate: 0h
>
> As discussed on CASSANDRA-17687, the javadoc task completes successfully, but 
> there are errors that deserve to be fixed if we keep the task around.
> If we do not plan to use it, we should remove it and reduce the clutter. 



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Comment Edited] (CASSANDRA-18717) Fix errors or remove ant javadoc task

2023-08-18 Thread Ekaterina Dimitrova (Jira)


[ 
https://issues.apache.org/jira/browse/CASSANDRA-18717?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17756092#comment-17756092
 ] 

Ekaterina Dimitrova edited comment on CASSANDRA-18717 at 8/18/23 6:21 PM:
--

I just reviewed the 5.0 PR.
Overall looks good to me. (except adding the javadoc check under ant check is 
still missing, but this was discussed only yesterday)
But after reviewing the whole patch I am inclined to suggest only big fat 
warning on broken task and not to fail builds.
I can imagine how failing will slow down big CEPs as people will see it most 
probably in CI when they run `check`. I would prefer follow up tickets. IDE 
does not warn you on all potential errors, not sure if we can change that by 
default for the project? Some I see as errors, some I don't. More on the PR. 
With the current setup this will slow down and annoy people who do big features 
development. Open to hear opinions or suggestions how to prevent that from 
happening.


was (Author: e.dimitrova):
I just reviewed the 5.0 PR.
Overall looks good to me.
But after reviewing the whole patch I am inclined to suggest only big fat 
warning on broken task and not to fail builds.
I can imagine how failing will slow down big CEPs as people will see it most 
probably in CI when they run `check`. I would prefer follow up tickets. IDE 
does not warn you on all potential errors, not sure if we can change that by 
default for the project? Some I see as errors, some I don't. More on the PR. 
With the current setup this will slow down and annoy people who do big features 
development. Open to hear opinions or suggestions how to prevent that from 
happening.

> Fix errors or remove ant javadoc task
> -
>
> Key: CASSANDRA-18717
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18717
> Project: Cassandra
>  Issue Type: Bug
>  Components: Documentation/Javadoc
>Reporter: Ekaterina Dimitrova
>Assignee: Maxim Muzafarov
>Priority: Normal
> Fix For: 5.0.x, 5.x
>
>  Time Spent: 0.5h
>  Remaining Estimate: 0h
>
> As discussed on CASSANDRA-17687, the javadoc task completes successfully, but 
> there are errors that deserve to be fixed if we keep the task around.
> If we do not plan to use it, we should remove it and reduce the clutter. 



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Updated] (CASSANDRA-18717) Fix errors or remove ant javadoc task

2023-08-18 Thread Ekaterina Dimitrova (Jira)


 [ 
https://issues.apache.org/jira/browse/CASSANDRA-18717?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Ekaterina Dimitrova updated CASSANDRA-18717:

Status: Changes Suggested  (was: Review In Progress)

> Fix errors or remove ant javadoc task
> -
>
> Key: CASSANDRA-18717
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18717
> Project: Cassandra
>  Issue Type: Bug
>  Components: Documentation/Javadoc
>Reporter: Ekaterina Dimitrova
>Assignee: Maxim Muzafarov
>Priority: Normal
> Fix For: 5.0.x, 5.x
>
>  Time Spent: 0.5h
>  Remaining Estimate: 0h
>
> As discussed on CASSANDRA-17687, the javadoc task completes successfully, but 
> there are errors that deserve to be fixed if we keep the task around.
> If we do not plan to use it, we should remove it and reduce the clutter. 



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Commented] (CASSANDRA-18717) Fix errors or remove ant javadoc task

2023-08-18 Thread Ekaterina Dimitrova (Jira)


[ 
https://issues.apache.org/jira/browse/CASSANDRA-18717?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17756092#comment-17756092
 ] 

Ekaterina Dimitrova commented on CASSANDRA-18717:
-

I just reviewed the 5.0 PR.
Overall looks good to me.
But after reviewing the whole patch I am inclined to suggest only big fat 
warning on broken task and not to fail builds.
I can imagine how failing will slow down big CEPs as people will see it most 
probably in CI when they run `check`. I would prefer follow up tickets. IDE 
does not warn you on all potential errors, not sure if we can change that by 
default for the project? Some I see as errors, some I don't. More on the PR. 
With the current setup this will slow down and annoy people who do big features 
development. Open to hear opinions or suggestions how to prevent that from 
happening.

> Fix errors or remove ant javadoc task
> -
>
> Key: CASSANDRA-18717
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18717
> Project: Cassandra
>  Issue Type: Bug
>  Components: Documentation/Javadoc
>Reporter: Ekaterina Dimitrova
>Assignee: Maxim Muzafarov
>Priority: Normal
> Fix For: 5.0.x, 5.x
>
>  Time Spent: 0.5h
>  Remaining Estimate: 0h
>
> As discussed on CASSANDRA-17687, the javadoc task completes successfully, but 
> there are errors that deserve to be fixed if we keep the task around.
> If we do not plan to use it, we should remove it and reduce the clutter. 



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Updated] (CASSANDRASC-69) Refactor Configuration

2023-08-18 Thread Francisco Guerrero (Jira)


 [ 
https://issues.apache.org/jira/browse/CASSANDRASC-69?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Francisco Guerrero updated CASSANDRASC-69:
--
Change Category: Semantic
 Complexity: Normal
Component/s: Configuration
 Status: Open  (was: Triage Needed)

> Refactor Configuration
> --
>
> Key: CASSANDRASC-69
> URL: https://issues.apache.org/jira/browse/CASSANDRASC-69
> Project: Sidecar for Apache Cassandra
>  Issue Type: Improvement
>  Components: Configuration
>Reporter: Francisco Guerrero
>Assignee: Francisco Guerrero
>Priority: Normal
>
> Currently, the Sidecar Configuration is provided via a yaml file. The yaml 
> file is parsed and a the configuration is used during the Sidecar application 
> runtime.
> The configuration parsing is done manually, and adding a new configuration to 
> the yaml file has become a big task where multiple files need to be touched. 
> Ideally, we should add the configuration POJOs needed for new configurations 
> and add the new fields in the yaml file.
> Additionally, we are leaking the configuration implementation to the 
> {{InstancesConfig}}. We should improve the separation of concerns from the 
> yaml configuration and the instances configuration.



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Created] (CASSANDRASC-69) Refactor Configuration

2023-08-18 Thread Francisco Guerrero (Jira)
Francisco Guerrero created CASSANDRASC-69:
-

 Summary: Refactor Configuration
 Key: CASSANDRASC-69
 URL: https://issues.apache.org/jira/browse/CASSANDRASC-69
 Project: Sidecar for Apache Cassandra
  Issue Type: Improvement
Reporter: Francisco Guerrero
Assignee: Francisco Guerrero


Currently, the Sidecar Configuration is provided via a yaml file. The yaml file 
is parsed and a the configuration is used during the Sidecar application 
runtime.

The configuration parsing is done manually, and adding a new configuration to 
the yaml file has become a big task where multiple files need to be touched. 
Ideally, we should add the configuration POJOs needed for new configurations 
and add the new fields in the yaml file.

Additionally, we are leaking the configuration implementation to the 
{{InstancesConfig}}. We should improve the separation of concerns from the yaml 
configuration and the instances configuration.



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Updated] (CASSANDRA-18760) Backport CASSANDRA-16905 to older branches

2023-08-18 Thread Stefan Miklosovic (Jira)


 [ 
https://issues.apache.org/jira/browse/CASSANDRA-18760?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Stefan Miklosovic updated CASSANDRA-18760:
--
Summary: Backport CASSANDRA-16905 to older branches  (was: Need to block 
the ability to DROP table column of 'map' type and add back as 'blob' type)

> Backport CASSANDRA-16905 to older branches
> --
>
> Key: CASSANDRA-18760
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18760
> Project: Cassandra
>  Issue Type: Bug
>  Components: Cluster/Schema
>Reporter: Paul Ayers
>Assignee: Stefan Miklosovic
>Priority: Urgent
>  Labels: 4.0.10
> Fix For: 3.0.30, 3.11.16, 4.0.12
>
>  Time Spent: 1h
>  Remaining Estimate: 0h
>
> Recently hit an un-recoverable situation in Cassandra 4.0.10 after dropping a 
> 'map' column and adding it back as a 'blob', which caused corruption that 
> neither offline nor online scrub could fix.
> When dropping a 'blob' column and attempting to add it back as a 'map' type, 
> the operation is blocked with:
> {code:java}
> InvalidRequest: Error from server: code=2200 [Invalid query] message="Cannot 
> re-add previously dropped column 'col1' of type map, 
> incompatible with previous type blob"
> {code}
> We need to do the same going from 'map' to 'blob' to avoid this potentially 
> very bad scenario that can cause data loss.



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Updated] (CASSANDRA-18760) Need to block the ability to DROP table column of 'map' type and add back as 'blob' type

2023-08-18 Thread Stefan Miklosovic (Jira)


 [ 
https://issues.apache.org/jira/browse/CASSANDRA-18760?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Stefan Miklosovic updated CASSANDRA-18760:
--
  Fix Version/s: 3.0.30
 3.11.16
 4.0.12
 (was: 3.0.x)
 (was: 3.11.x)
 (was: 5.x)
 (was: 4.0.x)
 (was: 4.1.x)
 (was: 5.0.x)
  Since Version: NA
Source Control Link: 
https://github.com/apache/cassandra/commit/f0280fb6f863582125bfd16b8a90c345972c4a8c
 Resolution: Fixed
 Status: Resolved  (was: Ready to Commit)

backport to 3.0, 3.11 and 4.0

https://github.com/apache/cassandra/commit/f0280fb6f863582125bfd16b8a90c345972c4a8c

tests 
https://github.com/apache/cassandra/commit/65a3d36eb9def5eb34bdb1fde1c452d365d45be8

note: do not remember to bump fix version of 3.11.16 to just released 3.11.17

> Need to block the ability to DROP table column of 'map' type and add back as 
> 'blob' type
> 
>
> Key: CASSANDRA-18760
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18760
> Project: Cassandra
>  Issue Type: Bug
>  Components: Cluster/Schema
>Reporter: Paul Ayers
>Assignee: Stefan Miklosovic
>Priority: Urgent
>  Labels: 4.0.10
> Fix For: 3.0.30, 3.11.16, 4.0.12
>
>  Time Spent: 1h
>  Remaining Estimate: 0h
>
> Recently hit an un-recoverable situation in Cassandra 4.0.10 after dropping a 
> 'map' column and adding it back as a 'blob', which caused corruption that 
> neither offline nor online scrub could fix.
> When dropping a 'blob' column and attempting to add it back as a 'map' type, 
> the operation is blocked with:
> {code:java}
> InvalidRequest: Error from server: code=2200 [Invalid query] message="Cannot 
> re-add previously dropped column 'col1' of type map, 
> incompatible with previous type blob"
> {code}
> We need to do the same going from 'map' to 'blob' to avoid this potentially 
> very bad scenario that can cause data loss.



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] branch cassandra-4.0 updated (b8454da17d -> 197e806f64)

2023-08-18 Thread smiklosovic
This is an automated email from the ASF dual-hosted git repository.

smiklosovic pushed a change to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git


from b8454da17d Merge branch 'cassandra-3.11' into cassandra-4.0
 add f0280fb6f8 Backport of CASSANDRA-16905 Further restrict schema column 
drop/recreate conversions
 add 141b85cfb7 Merge branch 'cassandra-3.0' into cassandra-3.11
 add a60fb98f65 Merge branch 'cassandra-3.11' into cassandra-4.0
 add 65a3d36eb9 Add more tests for CASSANDRA-16905
 add da3c400675 Merge branch 'cassandra-3.0' into cassandra-3.11
 add 197e806f64 Merge branch 'cassandra-3.11' into cassandra-4.0

No new revisions were added by this update.

Summary of changes:
 CHANGES.txt|  2 +-
 .../statements/schema/AlterTableStatement.java |  2 +-
 .../apache/cassandra/db/marshal/AbstractType.java  | 19 +-
 .../cassandra/db/marshal/CollectionType.java   | 11 +++-
 .../apache/cassandra/db/marshal/ReversedType.java  |  6 --
 .../cql3/validation/operations/AlterTest.java  | 73 ++
 6 files changed, 102 insertions(+), 11 deletions(-)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] branch cassandra-3.0 updated (ade85693d5 -> 65a3d36eb9)

2023-08-18 Thread smiklosovic
This is an automated email from the ASF dual-hosted git repository.

smiklosovic pushed a change to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git


from ade85693d5 gitignore serverversion.py
 add f0280fb6f8 Backport of CASSANDRA-16905 Further restrict schema column 
drop/recreate conversions
 add 65a3d36eb9 Add more tests for CASSANDRA-16905

No new revisions were added by this update.

Summary of changes:
 CHANGES.txt|  1 +
 .../cql3/statements/AlterTableStatement.java   |  2 +-
 .../apache/cassandra/db/marshal/AbstractType.java  | 19 +-
 .../cassandra/db/marshal/CollectionType.java   | 11 +++-
 .../apache/cassandra/db/marshal/ReversedType.java  |  6 --
 .../cql3/validation/operations/AlterTest.java  | 72 ++
 6 files changed, 101 insertions(+), 10 deletions(-)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] branch cassandra-3.11 updated (8ddfbb6a3c -> da3c400675)

2023-08-18 Thread smiklosovic
This is an automated email from the ASF dual-hosted git repository.

smiklosovic pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git


from 8ddfbb6a3c Increase version to 3.11.17
 add f0280fb6f8 Backport of CASSANDRA-16905 Further restrict schema column 
drop/recreate conversions
 add 141b85cfb7 Merge branch 'cassandra-3.0' into cassandra-3.11
 add 65a3d36eb9 Add more tests for CASSANDRA-16905
 add da3c400675 Merge branch 'cassandra-3.0' into cassandra-3.11

No new revisions were added by this update.

Summary of changes:
 CHANGES.txt|  2 +-
 .../cql3/statements/AlterTableStatement.java   |  2 +-
 .../apache/cassandra/db/marshal/AbstractType.java  | 19 +-
 .../cassandra/db/marshal/CollectionType.java   | 11 +++-
 .../apache/cassandra/db/marshal/ReversedType.java  |  6 --
 .../cql3/validation/operations/AlterTest.java  | 72 ++
 6 files changed, 101 insertions(+), 11 deletions(-)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] 01/02: Merge branch 'cassandra-5.0' into trunk

2023-08-18 Thread smiklosovic
This is an automated email from the ASF dual-hosted git repository.

smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 14f6e7898f5663822062fad511f616d738b61135
Merge: cdeb199f78 875211cbf3
Author: Stefan Miklosovic 
AuthorDate: Fri Aug 18 18:42:43 2023 +0200

Merge branch 'cassandra-5.0' into trunk



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] branch trunk updated (cdeb199f78 -> 3884eaf47e)

2023-08-18 Thread smiklosovic
This is an automated email from the ASF dual-hosted git repository.

smiklosovic pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git


from cdeb199f78 Merge branch 'cassandra-5.0' into trunk
 add f0280fb6f8 Backport of CASSANDRA-16905 Further restrict schema column 
drop/recreate conversions
 add 141b85cfb7 Merge branch 'cassandra-3.0' into cassandra-3.11
 add a60fb98f65 Merge branch 'cassandra-3.11' into cassandra-4.0
 add db0970c5aa Merge branch 'cassandra-4.0' into cassandra-4.1
 add 875211cbf3 Merge branch 'cassandra-4.1' into cassandra-5.0
 new 14f6e7898f Merge branch 'cassandra-5.0' into trunk
 add 65a3d36eb9 Add more tests for CASSANDRA-16905
 add da3c400675 Merge branch 'cassandra-3.0' into cassandra-3.11
 add 197e806f64 Merge branch 'cassandra-3.11' into cassandra-4.0
 add 2aef55b2a0 Merge branch 'cassandra-4.0' into cassandra-4.1
 add efad24e997 Merge branch 'cassandra-4.1' into cassandra-5.0
 new 3884eaf47e Merge branch 'cassandra-5.0' into trunk

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../cql3/validation/operations/AlterTest.java  | 64 +++---
 1 file changed, 56 insertions(+), 8 deletions(-)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] 02/02: Merge branch 'cassandra-5.0' into trunk

2023-08-18 Thread smiklosovic
This is an automated email from the ASF dual-hosted git repository.

smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 3884eaf47ec886324281ee8e9d9f7c0361e7d913
Merge: 14f6e7898f efad24e997
Author: Stefan Miklosovic 
AuthorDate: Fri Aug 18 19:34:26 2023 +0200

Merge branch 'cassandra-5.0' into trunk

 .../cql3/validation/operations/AlterTest.java  | 64 +++---
 1 file changed, 56 insertions(+), 8 deletions(-)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] branch cassandra-5.0 updated (a170016ca6 -> efad24e997)

2023-08-18 Thread smiklosovic
This is an automated email from the ASF dual-hosted git repository.

smiklosovic pushed a change to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git


from a170016ca6 Merge branch 'cassandra-4.1' into cassandra-5.0
 add f0280fb6f8 Backport of CASSANDRA-16905 Further restrict schema column 
drop/recreate conversions
 add 141b85cfb7 Merge branch 'cassandra-3.0' into cassandra-3.11
 add a60fb98f65 Merge branch 'cassandra-3.11' into cassandra-4.0
 add db0970c5aa Merge branch 'cassandra-4.0' into cassandra-4.1
 add 875211cbf3 Merge branch 'cassandra-4.1' into cassandra-5.0
 add 65a3d36eb9 Add more tests for CASSANDRA-16905
 add da3c400675 Merge branch 'cassandra-3.0' into cassandra-3.11
 add 197e806f64 Merge branch 'cassandra-3.11' into cassandra-4.0
 add 2aef55b2a0 Merge branch 'cassandra-4.0' into cassandra-4.1
 add efad24e997 Merge branch 'cassandra-4.1' into cassandra-5.0

No new revisions were added by this update.

Summary of changes:
 .../cql3/validation/operations/AlterTest.java  | 64 +++---
 1 file changed, 56 insertions(+), 8 deletions(-)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] branch cassandra-4.1 updated (02c64b31bd -> 2aef55b2a0)

2023-08-18 Thread smiklosovic
This is an automated email from the ASF dual-hosted git repository.

smiklosovic pushed a change to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git


from 02c64b31bd Merge branch 'cassandra-4.0' into cassandra-4.1
 add f0280fb6f8 Backport of CASSANDRA-16905 Further restrict schema column 
drop/recreate conversions
 add 141b85cfb7 Merge branch 'cassandra-3.0' into cassandra-3.11
 add a60fb98f65 Merge branch 'cassandra-3.11' into cassandra-4.0
 add db0970c5aa Merge branch 'cassandra-4.0' into cassandra-4.1
 add 65a3d36eb9 Add more tests for CASSANDRA-16905
 add da3c400675 Merge branch 'cassandra-3.0' into cassandra-3.11
 add 197e806f64 Merge branch 'cassandra-3.11' into cassandra-4.0
 add 2aef55b2a0 Merge branch 'cassandra-4.0' into cassandra-4.1

No new revisions were added by this update.

Summary of changes:
 .../cql3/validation/operations/AlterTest.java  | 64 +++---
 1 file changed, 56 insertions(+), 8 deletions(-)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra-website] branch asf-staging updated (7cd42fae -> e7f71254)

2023-08-18 Thread git-site-role
This is an automated email from the ASF dual-hosted git repository.

git-site-role pushed a change to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/cassandra-website.git


 discard 7cd42fae generate docs for cceb2c06
 new e7f71254 generate docs for cceb2c06

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (7cd42fae)
\
 N -- N -- N   refs/heads/asf-staging (e7f71254)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 content/search-index.js |   2 +-
 site-ui/build/ui-bundle.zip | Bin 4852435 -> 4852435 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Updated] (CASSANDRA-18717) Fix errors or remove ant javadoc task

2023-08-18 Thread Ekaterina Dimitrova (Jira)


 [ 
https://issues.apache.org/jira/browse/CASSANDRA-18717?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Ekaterina Dimitrova updated CASSANDRA-18717:

Status: Review In Progress  (was: Needs Committer)

> Fix errors or remove ant javadoc task
> -
>
> Key: CASSANDRA-18717
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18717
> Project: Cassandra
>  Issue Type: Bug
>  Components: Documentation/Javadoc
>Reporter: Ekaterina Dimitrova
>Assignee: Maxim Muzafarov
>Priority: Normal
> Fix For: 5.0.x, 5.x
>
>  Time Spent: 20m
>  Remaining Estimate: 0h
>
> As discussed on CASSANDRA-17687, the javadoc task completes successfully, but 
> there are errors that deserve to be fixed if we keep the task around.
> If we do not plan to use it, we should remove it and reduce the clutter. 



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Commented] (CASSANDRA-18749) Expose bootstrap failure state via JMX

2023-08-18 Thread Stefan Miklosovic (Jira)


[ 
https://issues.apache.org/jira/browse/CASSANDRA-18749?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17756059#comment-17756059
 ] 

Stefan Miklosovic commented on CASSANDRA-18749:
---

[j17|https://app.circleci.com/pipelines/github/instaclustr/cassandra/2951/workflows/57b2ac30-a3d7-48e0-8cee-3df05c22d2d5]

> Expose bootstrap failure state via JMX
> --
>
> Key: CASSANDRA-18749
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18749
> Project: Cassandra
>  Issue Type: Task
>  Components: Observability/JMX
>Reporter: Jaydeepkumar Chovatia
>Assignee: Jaydeepkumar Chovatia
>Priority: Normal
> Fix For: 5.x
>
>
> Similar to how we have exposed a node's decommissioning via JMX as part of 
> CASSANDRA-18555.
> This ticket will address the same when a new node joins (i.e., bootstrap). 
> When a node is bootstrapped, an error is thrown back to the caller if any 
> failure happens.
> But Cassandra's bootstrap takes considerable time ranging from minutes to 
> hours to days. There are various scenarios in that the caller may need to 
> probe the status again:
>  * The caller times out
>  * It is not possible to keep the caller hanging for such a long time
> And If the caller does not know what happened internally, then it cannot 
> retry, etc., leading to other issues.
> So, in this ticket, a new nodetool/JMX option will be exposed that can be 
> invoked by the caller anytime, and it will return the correct status.



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] branch cassandra-4.0 updated (ed4e6c4e21 -> b8454da17d)

2023-08-18 Thread smiklosovic
This is an automated email from the ASF dual-hosted git repository.

smiklosovic pushed a change to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git


from ed4e6c4e21 Merge branch 'cassandra-3.11' into cassandra-4.0
 add 8ddfbb6a3c Increase version to 3.11.17
 add b8454da17d Merge branch 'cassandra-3.11' into cassandra-4.0

No new revisions were added by this update.

Summary of changes:


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] branch cassandra-4.1 updated (e231dd5b83 -> 02c64b31bd)

2023-08-18 Thread smiklosovic
This is an automated email from the ASF dual-hosted git repository.

smiklosovic pushed a change to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git


from e231dd5b83 Merge branch 'cassandra-4.0' into cassandra-4.1
 add 8ddfbb6a3c Increase version to 3.11.17
 add b8454da17d Merge branch 'cassandra-3.11' into cassandra-4.0
 add 02c64b31bd Merge branch 'cassandra-4.0' into cassandra-4.1

No new revisions were added by this update.

Summary of changes:


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] 01/01: Merge branch 'cassandra-5.0' into trunk

2023-08-18 Thread smiklosovic
This is an automated email from the ASF dual-hosted git repository.

smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit cdeb199f78e614600b47c6ae49399dfb2f29c4ed
Merge: 91d40b2780 a170016ca6
Author: Stefan Miklosovic 
AuthorDate: Fri Aug 18 18:09:52 2023 +0200

Merge branch 'cassandra-5.0' into trunk



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] branch cassandra-3.11 updated (d173f57558 -> 8ddfbb6a3c)

2023-08-18 Thread smiklosovic
This is an automated email from the ASF dual-hosted git repository.

smiklosovic pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git


from d173f57558 Merge branch 'cassandra-3.0' into cassandra-3.11
 add 8ddfbb6a3c Increase version to 3.11.17

No new revisions were added by this update.

Summary of changes:
 build.xml| 2 +-
 debian/changelog | 6 ++
 2 files changed, 7 insertions(+), 1 deletion(-)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] branch cassandra-5.0 updated (87620d4693 -> a170016ca6)

2023-08-18 Thread smiklosovic
This is an automated email from the ASF dual-hosted git repository.

smiklosovic pushed a change to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git


from 87620d4693 Merge branch 'cassandra-4.1' into cassandra-5.0
 add 8ddfbb6a3c Increase version to 3.11.17
 add b8454da17d Merge branch 'cassandra-3.11' into cassandra-4.0
 add 02c64b31bd Merge branch 'cassandra-4.0' into cassandra-4.1
 add a170016ca6 Merge branch 'cassandra-4.1' into cassandra-5.0

No new revisions were added by this update.

Summary of changes:


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] branch trunk updated (91d40b2780 -> cdeb199f78)

2023-08-18 Thread smiklosovic
This is an automated email from the ASF dual-hosted git repository.

smiklosovic pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git


from 91d40b2780 Merge branch 'cassandra-5.0' into trunk
 add 8ddfbb6a3c Increase version to 3.11.17
 add b8454da17d Merge branch 'cassandra-3.11' into cassandra-4.0
 add 02c64b31bd Merge branch 'cassandra-4.0' into cassandra-4.1
 add a170016ca6 Merge branch 'cassandra-4.1' into cassandra-5.0
 new cdeb199f78 Merge branch 'cassandra-5.0' into trunk

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] 01/01: Merge branch 'cassandra-5.0' into trunk

2023-08-18 Thread brandonwilliams
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 91d40b2780f475feb18daa66cc445aae0168a056
Merge: 94c3cf74ef 87620d4693
Author: Brandon Williams 
AuthorDate: Fri Aug 18 10:41:50 2023 -0500

Merge branch 'cassandra-5.0' into trunk

 .gitignore | 1 +
 1 file changed, 1 insertion(+)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] branch cassandra-5.0 updated (9e0ccf0f95 -> 87620d4693)

2023-08-18 Thread brandonwilliams
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a change to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git


from 9e0ccf0f95 Merge branch 'cassandra-4.1' into cassandra-5.0
 new ade85693d5 gitignore serverversion.py
 new d173f57558 Merge branch 'cassandra-3.0' into cassandra-3.11
 new ed4e6c4e21 Merge branch 'cassandra-3.11' into cassandra-4.0
 new e231dd5b83 Merge branch 'cassandra-4.0' into cassandra-4.1
 new 87620d4693 Merge branch 'cassandra-4.1' into cassandra-5.0

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitignore | 1 +
 1 file changed, 1 insertion(+)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] branch trunk updated (94c3cf74ef -> 91d40b2780)

2023-08-18 Thread brandonwilliams
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git


from 94c3cf74ef Merge branch 'cassandra-5.0' into trunk
 new ade85693d5 gitignore serverversion.py
 new d173f57558 Merge branch 'cassandra-3.0' into cassandra-3.11
 new ed4e6c4e21 Merge branch 'cassandra-3.11' into cassandra-4.0
 new e231dd5b83 Merge branch 'cassandra-4.0' into cassandra-4.1
 new 87620d4693 Merge branch 'cassandra-4.1' into cassandra-5.0
 new 91d40b2780 Merge branch 'cassandra-5.0' into trunk

The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitignore | 1 +
 1 file changed, 1 insertion(+)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] branch cassandra-4.0 updated (ba50ec9cd9 -> ed4e6c4e21)

2023-08-18 Thread brandonwilliams
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a change to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git


from ba50ec9cd9 Merge branch 'cassandra-3.11' into cassandra-4.0
 new ade85693d5 gitignore serverversion.py
 new d173f57558 Merge branch 'cassandra-3.0' into cassandra-3.11
 new ed4e6c4e21 Merge branch 'cassandra-3.11' into cassandra-4.0

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitignore | 1 +
 1 file changed, 1 insertion(+)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] 01/01: Merge branch 'cassandra-4.0' into cassandra-4.1

2023-08-18 Thread brandonwilliams
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit e231dd5b832abc58334546869e870cd34b4a4da0
Merge: f4ee77ceba ed4e6c4e21
Author: Brandon Williams 
AuthorDate: Fri Aug 18 10:41:37 2023 -0500

Merge branch 'cassandra-4.0' into cassandra-4.1

 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --cc .gitignore
index 916ab0de99,72d8b93167..044a47c44b
--- a/.gitignore
+++ b/.gitignore
@@@ -13,9 -13,8 +13,10 @@@ doc/cql3/CQL.htm
  doc/build/
  lib/
  pylib/src/
 +**/cqlshlib.xml
+ pylib/cqlshlib/serverversion.py
  !lib/cassandra-driver-internal-only-*.zip
 +!lib/puresasl-*.zip
  
  # C* debs
  build-stamp


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] 01/01: Merge branch 'cassandra-4.1' into cassandra-5.0

2023-08-18 Thread brandonwilliams
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 87620d4693be6609236605dc7c18fa03b3bd1998
Merge: 9e0ccf0f95 e231dd5b83
Author: Brandon Williams 
AuthorDate: Fri Aug 18 10:41:43 2023 -0500

Merge branch 'cassandra-4.1' into cassandra-5.0

 .gitignore | 1 +
 1 file changed, 1 insertion(+)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] branch cassandra-3.11 updated (1dd38998a0 -> d173f57558)

2023-08-18 Thread brandonwilliams
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git


from 1dd38998a0 Merge branch 'cassandra-3.0' into cassandra-3.11
 new ade85693d5 gitignore serverversion.py
 new d173f57558 Merge branch 'cassandra-3.0' into cassandra-3.11

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitignore | 1 +
 1 file changed, 1 insertion(+)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] branch cassandra-4.1 updated (f4ee77ceba -> e231dd5b83)

2023-08-18 Thread brandonwilliams
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a change to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git


from f4ee77ceba Merge branch 'cassandra-4.0' into cassandra-4.1
 new ade85693d5 gitignore serverversion.py
 new d173f57558 Merge branch 'cassandra-3.0' into cassandra-3.11
 new ed4e6c4e21 Merge branch 'cassandra-3.11' into cassandra-4.0
 new e231dd5b83 Merge branch 'cassandra-4.0' into cassandra-4.1

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitignore | 1 +
 1 file changed, 1 insertion(+)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11

2023-08-18 Thread brandonwilliams
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit d173f57558c7e9e2866499cb194beab3371ddd0d
Merge: 1dd38998a0 ade85693d5
Author: Brandon Williams 
AuthorDate: Fri Aug 18 10:40:39 2023 -0500

Merge branch 'cassandra-3.0' into cassandra-3.11

 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --cc .gitignore
index 71dadaae89,782ec71a37..bf4213f97f
--- a/.gitignore
+++ b/.gitignore
@@@ -9,8 -9,8 +9,9 @@@ logs
  data/
  conf/hotspot_compiler
  doc/cql3/CQL.html
 +doc/build/
  pylib/src/
+ pylib/cqlshlib/serverversion.py
  lib/
  
  # C* debs


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] branch cassandra-3.0 updated: gitignore serverversion.py

2023-08-18 Thread brandonwilliams
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git


The following commit(s) were added to refs/heads/cassandra-3.0 by this push:
 new ade85693d5 gitignore serverversion.py
ade85693d5 is described below

commit ade85693d56282867922c9bcac4ca5e99833a063
Author: Brandon Williams 
AuthorDate: Fri Aug 18 10:40:33 2023 -0500

gitignore serverversion.py
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 310be77217..782ec71a37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ data/
 conf/hotspot_compiler
 doc/cql3/CQL.html
 pylib/src/
+pylib/cqlshlib/serverversion.py
 lib/
 
 # C* debs


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0

2023-08-18 Thread brandonwilliams
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit ed4e6c4e211354771f5f9f58f554723de95caf21
Merge: ba50ec9cd9 d173f57558
Author: Brandon Williams 
AuthorDate: Fri Aug 18 10:41:16 2023 -0500

Merge branch 'cassandra-3.11' into cassandra-4.0

 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --cc .gitignore
index 318f2006db,bf4213f97f..72d8b93167
--- a/.gitignore
+++ b/.gitignore
@@@ -11,9 -10,9 +11,10 @@@ data
  conf/hotspot_compiler
  doc/cql3/CQL.html
  doc/build/
 +lib/
  pylib/src/
+ pylib/cqlshlib/serverversion.py
 -lib/
 +!lib/cassandra-driver-internal-only-*.zip
  
  # C* debs
  build-stamp


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Updated] (CASSANDRA-18745) cqlsh should warn on server version mismatch

2023-08-18 Thread Brandon Williams (Jira)


 [ 
https://issues.apache.org/jira/browse/CASSANDRA-18745?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Brandon Williams updated CASSANDRA-18745:
-
  Fix Version/s: 3.0.30
 3.11.16
 4.0.12
 4.1.4
 5.0
 5.1
 (was: 3.0.x)
 (was: 3.11.x)
 (was: 5.x)
 (was: 4.0.x)
 (was: 4.1.x)
Source Control Link: 
https://github.com/apache/cassandra/commit/6bb585bf5db106322c9569d76f3178c79ed53d5c
 Resolution: Fixed
 Status: Resolved  (was: Ready to Commit)

Committed, thanks!

> cqlsh should warn on server version mismatch
> 
>
> Key: CASSANDRA-18745
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18745
> Project: Cassandra
>  Issue Type: Improvement
>  Components: CQL/Interpreter
>Reporter: Brandon Williams
>Assignee: Brandon Williams
>Priority: Normal
> Fix For: 3.0.30, 3.11.16, 4.0.12, 4.1.4, 5.0, 5.1
>
>
> When cqlsh is used against a different version of the server than the one 
> that it shipped with, it should emit a warning so that users aren't confused 
> when some things don't work correctly.



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Updated] (CASSANDRA-18745) cqlsh should warn on server version mismatch

2023-08-18 Thread Brandon Williams (Jira)


 [ 
https://issues.apache.org/jira/browse/CASSANDRA-18745?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Brandon Williams updated CASSANDRA-18745:
-
Status: Ready to Commit  (was: Review In Progress)

> cqlsh should warn on server version mismatch
> 
>
> Key: CASSANDRA-18745
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18745
> Project: Cassandra
>  Issue Type: Improvement
>  Components: CQL/Interpreter
>Reporter: Brandon Williams
>Assignee: Brandon Williams
>Priority: Normal
> Fix For: 3.0.x, 3.11.x, 4.0.x, 4.1.x, 5.x
>
>
> When cqlsh is used against a different version of the server than the one 
> that it shipped with, it should emit a warning so that users aren't confused 
> when some things don't work correctly.



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0

2023-08-18 Thread brandonwilliams
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit ba50ec9cd9f82a65cb70d08fbb30a1f41428d98a
Merge: fb395c6b8b 1dd38998a0
Author: Brandon Williams 
AuthorDate: Fri Aug 18 10:10:11 2023 -0500

Merge branch 'cassandra-3.11' into cassandra-4.0

 .build/build-cqlsh.xml | 24 
 CHANGES.txt|  2 ++
 bin/cqlsh.py   | 11 +++
 build.xml  |  3 ++-
 4 files changed, 39 insertions(+), 1 deletion(-)

diff --cc CHANGES.txt
index 90f8f99dfe,7ee07ec953..a96137164e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,12 +1,26 @@@
 -3.11.17
 +4.0.12
 + * Fix NTS log message when an unrecognized strategy option is passed 
(CASSANDRA-18679)
 + * Fix BulkLoader ignoring cipher suites options (CASSANDRA-18582)
 + * Migrate Python optparse to argparse (CASSANDRA-17914)
 +Merged from 3.11:
 + * Moved jflex from runtime to build dependencies (CASSANDRA-18664)
  Merged from 3.0:
+ 3.0.30
+  * CQLSH emits a warning when the server version doesn't match 
(CASSANDRA-18745)
   * Fix missing speculative retries in tablestats (CASSANDRA-18767)
 + * Fix Requires for Java for RPM package (CASSANDRA-18751)
 + * Fix CQLSH online help topic link (CASSANDRA-17534)
 + * Remove unused suppressions (CASSANDRA-18724)
  
  
 -3.11.16
 - * Moved jflex from runtime to build dependencies (CASSANDRA-18664)
 +4.0.11
 + * Revert CASSANDRA-16718 (CASSANDRA-18560)
 + * Upgrade snappy to 1.1.10.1 (CASSANDRA-18608)
 + * Fix assertion error when describing mv as table (CASSANDRA-18596)
 + * Track the amount of read data per row (CASSANDRA-18513)
 + * Fix Down nodes counter in nodetool describecluster (CASSANDRA-18512)
 + * Remove unnecessary shuffling of GossipDigests in 
Gossiper#makeRandomGossipDigest (CASSANDRA-18546)
 +Merged from 3.11:
   * Fix CAST function for float to decimal (CASSANDRA-18647)
   * Suppress CVE-2022-45688 (CASSANDRA-18643)
   * Remove unrepaired SSTables from garbage collection when 
only_purge_repaired_tombstones is true (CASSANDRA-14204)
diff --cc bin/cqlsh.py
index 00bd00d134,a2f1a9e5ed..4ca4469604
mode 100755,100644..100755
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -511,11 -532,12 +512,13 @@@ class Shell(cmd.Cmd)
  if stdin is None:
  stdin = sys.stdin
  
+ self.check_build_versions()
+ 
  if tty:
  self.reset_prompt()
 +self.maybe_warn_py2()
  self.report_connection()
 -print 'Use HELP for help.'
 +print('Use HELP for help.')
  else:
  self.show_line_nums = True
  self.stdin = stdin
diff --cc build.xml
index ec1aba8368,aa1fc02afc..0b914175bb
--- a/build.xml
+++ b/build.xml
@@@ -863,8 -660,42 +863,8 @@@
  
  
  
 -
 -
 -  
 -
 -
 -  Generating Thrift Java code from 
${basedir}/interface/cassandra.thrift...
 -  
 -
 -
 -
 -  
 -  
 -
 -
 -
 -  Generating Thrift Python code from 
${basedir}/interface/cassandra.thrift...
 -  
 -
 -
 -
 -  
 -  
 -
 -
 -
 -  
 -
 -
  
- 
+ 





-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] branch trunk updated (56f351ec2e -> 94c3cf74ef)

2023-08-18 Thread brandonwilliams
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git


from 56f351ec2e Merge branch 'cassandra-5.0' into trunk
 new 6bb585bf5d Warn when cqlsh does not match the server version it was 
built with
 new 1dd38998a0 Merge branch 'cassandra-3.0' into cassandra-3.11
 new ba50ec9cd9 Merge branch 'cassandra-3.11' into cassandra-4.0
 new f4ee77ceba Merge branch 'cassandra-4.0' into cassandra-4.1
 new 9e0ccf0f95 Merge branch 'cassandra-4.1' into cassandra-5.0
 new 94c3cf74ef Merge branch 'cassandra-5.0' into trunk

The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .build/build-cqlsh.xml  | 24 
 CHANGES.txt |  5 +
 build.xml   |  3 ++-
 pylib/cqlshlib/cqlshmain.py | 15 ---
 4 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 .build/build-cqlsh.xml


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] branch cassandra-5.0 updated (0b593776d5 -> 9e0ccf0f95)

2023-08-18 Thread brandonwilliams
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a change to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git


from 0b593776d5 Merge branch 'cassandra-4.1' into cassandra-5.0
 new 6bb585bf5d Warn when cqlsh does not match the server version it was 
built with
 new 1dd38998a0 Merge branch 'cassandra-3.0' into cassandra-3.11
 new ba50ec9cd9 Merge branch 'cassandra-3.11' into cassandra-4.0
 new f4ee77ceba Merge branch 'cassandra-4.0' into cassandra-4.1
 new 9e0ccf0f95 Merge branch 'cassandra-4.1' into cassandra-5.0

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .build/build-cqlsh.xml  | 24 
 CHANGES.txt |  1 +
 build.xml   |  3 ++-
 pylib/cqlshlib/cqlshmain.py | 15 ---
 4 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 .build/build-cqlsh.xml


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] 01/01: Merge branch 'cassandra-5.0' into trunk

2023-08-18 Thread brandonwilliams
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 94c3cf74ef90b6f1493d1876ecb82ba44ee916eb
Merge: 56f351ec2e 9e0ccf0f95
Author: Brandon Williams 
AuthorDate: Fri Aug 18 10:15:46 2023 -0500

Merge branch 'cassandra-5.0' into trunk

 .build/build-cqlsh.xml  | 24 
 CHANGES.txt |  5 +
 build.xml   |  3 ++-
 pylib/cqlshlib/cqlshmain.py | 15 ---
 4 files changed, 43 insertions(+), 4 deletions(-)



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] 01/01: Merge branch 'cassandra-4.0' into cassandra-4.1

2023-08-18 Thread brandonwilliams
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit f4ee77ceba8042b71e48c830380899f21b096d71
Merge: cd3e564fb2 ba50ec9cd9
Author: Brandon Williams 
AuthorDate: Fri Aug 18 10:11:12 2023 -0500

Merge branch 'cassandra-4.0' into cassandra-4.1

 .build/build-cqlsh.xml | 24 
 CHANGES.txt|  1 +
 bin/cqlsh.py   | 11 +++
 build.xml  |  3 ++-
 4 files changed, 38 insertions(+), 1 deletion(-)

diff --cc CHANGES.txt
index e7b058cfa2,a96137164e..ecb58c25ca
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -5,7 -3,10 +5,8 @@@ Merged from 4.0
   * Fix BulkLoader ignoring cipher suites options (CASSANDRA-18582)
   * Migrate Python optparse to argparse (CASSANDRA-17914)
  Merged from 3.11:
 - * Moved jflex from runtime to build dependencies (CASSANDRA-18664)
  Merged from 3.0:
 -3.0.30
+  * CQLSH emits a warning when the server version doesn't match 
(CASSANDRA-18745)
   * Fix missing speculative retries in tablestats (CASSANDRA-18767)
   * Fix Requires for Java for RPM package (CASSANDRA-18751)
   * Fix CQLSH online help topic link (CASSANDRA-17534)
diff --cc bin/cqlsh.py
index 0a656c2d32,4ca4469604..ca381a904f
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -151,12 -162,11 +151,13 @@@ from cqlshlib.displaying import (ANSI_R
   RED, WHITE, FormattedValue, colorme)
  from cqlshlib.formatting import (DEFAULT_DATE_FORMAT, DEFAULT_NANOTIME_FORMAT,
   DEFAULT_TIMESTAMP_FORMAT, CqlType, 
DateTimeFormat,
 - format_by_type, formatter_for)
 + format_by_type)
  from cqlshlib.tracing import print_trace, print_trace_session
 -from cqlshlib.util import get_file_encoding_bomsize, trim_if_present
 +from cqlshlib.util import get_file_encoding_bomsize
 +from cqlshlib.util import is_file_secure
+ from cqlshlib.serverversion import version as build_version
  
 +
  DEFAULT_HOST = '127.0.0.1'
  DEFAULT_PORT = 9042
  DEFAULT_SSL = False
@@@ -521,8 -512,11 +522,10 @@@ class Shell(cmd.Cmd)
  if stdin is None:
  stdin = sys.stdin
  
+ self.check_build_versions()
+ 
  if tty:
  self.reset_prompt()
 -self.maybe_warn_py2()
  self.report_connection()
  print('Use HELP for help.')
  else:
@@@ -537,9 -531,30 +540,17 @@@
  self.single_statement = single_statement
  self.is_subshell = is_subshell
  
 -@property
 -def batch_mode(self):
 -return not self.tty
 -
+ def check_build_versions(self):
+ baseversion = self.connection_versions['build']
+ extra = baseversion.rfind('-')
+ if extra:
+ baseversion = baseversion[0:extra]
+ if baseversion != build_version:
+ print("WARNING: cqlsh was built against {}, but this server is 
{}.  All features may not work!".format(baseversion, build_version))
+ 
  @property
 -def is_using_utf8(self):
 -# utf8 encodings from 
https://docs.python.org/{2,3}/library/codecs.html
 -return self.encoding.replace('-', '_').lower() in ['utf', 'utf_8', 
'u8', 'utf8', CP65001]
 -
 -def check_windows_encoding(self):
 -if is_win and os.name == 'nt' and self.tty and \
 -   self.is_using_utf8 and sys.stdout.encoding != CP65001:
 -self.printerr("\nWARNING: console codepage must be set to cp65001 
"
 -  "to support {} encoding on Windows platforms.\n"
 -  "If you experience encoding problems, change your 
console"
 -  " codepage with 'chcp 65001' before starting 
cqlsh.\n".format(self.encoding))
 +def batch_mode(self):
 +return not self.tty
  
  def set_expanded_cql_version(self, ver):
  ver, vertuple = full_cql_version(ver)
diff --cc build.xml
index f99fe469f4,0b914175bb..3593d4bd70
--- a/build.xml
+++ b/build.xml
@@@ -2403,7 -2220,8 +2403,8 @@@
  

  
 -  
 -  
 -  
 -  
 +  
 +  
 +  
++  
  


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] branch cassandra-4.1 updated (cd3e564fb2 -> f4ee77ceba)

2023-08-18 Thread brandonwilliams
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a change to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git


from cd3e564fb2 Merge branch 'cassandra-4.0' into cassandra-4.1
 new 6bb585bf5d Warn when cqlsh does not match the server version it was 
built with
 new 1dd38998a0 Merge branch 'cassandra-3.0' into cassandra-3.11
 new ba50ec9cd9 Merge branch 'cassandra-3.11' into cassandra-4.0
 new f4ee77ceba Merge branch 'cassandra-4.0' into cassandra-4.1

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .build/build-cqlsh.xml | 24 
 CHANGES.txt|  1 +
 bin/cqlsh.py   | 11 +++
 build.xml  |  3 ++-
 4 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 .build/build-cqlsh.xml


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11

2023-08-18 Thread brandonwilliams
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 1dd38998a06887f47aa619bb84e98e531b9bf8fb
Merge: c870641475 6bb585bf5d
Author: Brandon Williams 
AuthorDate: Fri Aug 18 10:09:49 2023 -0500

Merge branch 'cassandra-3.0' into cassandra-3.11

 .build/build-cqlsh.xml | 24 
 CHANGES.txt|  2 ++
 bin/cqlsh.py   | 11 +++
 build.xml  |  3 ++-
 4 files changed, 39 insertions(+), 1 deletion(-)

diff --cc CHANGES.txt
index b8f489b183,702733eaaf..7ee07ec953
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,6 +1,20 @@@
 +3.11.17
 +Merged from 3.0:
+ 3.0.30
+  * CQLSH emits a warning when the server version doesn't match 
(CASSANDRA-18745)
   * Fix missing speculative retries in tablestats (CASSANDRA-18767)
 +
 +
 +3.11.16
 + * Moved jflex from runtime to build dependencies (CASSANDRA-18664)
 + * Fix CAST function for float to decimal (CASSANDRA-18647)
 + * Suppress CVE-2022-45688 (CASSANDRA-18643)
 + * Remove unrepaired SSTables from garbage collection when 
only_purge_repaired_tombstones is true (CASSANDRA-14204)
 + * Wait for live endpoints in gossip waiting to settle (CASSANDRA-18543)
 + * Fix error message handling when trying to use CLUSTERING ORDER with 
non-clustering column (CASSANDRA-17818
 + * Add keyspace and table name to exception message during ColumnSubselection 
deserialization (CASSANDRA-18346)
 + * Remove unnecessary String.format invocation in QueryProcessor when getting 
a prepared statement from cache (CASSANDRA-17202)
 +Merged from 3.0:
   * Fix Requires for Java for RPM package (CASSANDRA-18751)
   * Fix CQLSH online help topic link (CASSANDRA-17534)
   * Remove unused suppressions (CASSANDRA-18724)
diff --cc bin/cqlsh.py
index ba32369529,f9fcc656d5..a2f1a9e5ed
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -166,15 -161,17 +166,16 @@@ cqlshlibdir = os.path.join(CASSANDRA_PA
  if os.path.isdir(cqlshlibdir):
  sys.path.insert(0, cqlshlibdir)
  
 -from cqlshlib import cql3handling, cqlhandling, pylexotron, sslhandling
 +from cqlshlib import cql3handling, cqlhandling, pylexotron, sslhandling, 
cqlshhandling
  from cqlshlib.copyutil import ExportTask, ImportTask
  from cqlshlib.displaying import (ANSI_RESET, BLUE, COLUMN_NAME_COLORS, CYAN,
 - RED, FormattedValue, colorme)
 + RED, WHITE, FormattedValue, colorme)
  from cqlshlib.formatting import (DEFAULT_DATE_FORMAT, DEFAULT_NANOTIME_FORMAT,
 - DEFAULT_TIMESTAMP_FORMAT, DateTimeFormat,
 - format_by_type, format_value_utype,
 - formatter_for)
 + DEFAULT_TIMESTAMP_FORMAT, CqlType, 
DateTimeFormat,
 + format_by_type, formatter_for)
  from cqlshlib.tracing import print_trace, print_trace_session
  from cqlshlib.util import get_file_encoding_bomsize, trim_if_present
+ from cqlshlib.serverversion import version as build_version
  
  DEFAULT_HOST = '127.0.0.1'
  DEFAULT_PORT = 9042


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] branch cassandra-3.11 updated (c870641475 -> 1dd38998a0)

2023-08-18 Thread brandonwilliams
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git


from c870641475 Merge branch 'cassandra-3.0' into cassandra-3.11
 new 6bb585bf5d Warn when cqlsh does not match the server version it was 
built with
 new 1dd38998a0 Merge branch 'cassandra-3.0' into cassandra-3.11

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .build/build-cqlsh.xml | 24 
 CHANGES.txt|  2 ++
 bin/cqlsh.py   | 11 +++
 build.xml  |  3 ++-
 4 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 .build/build-cqlsh.xml


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] branch cassandra-4.0 updated (fb395c6b8b -> ba50ec9cd9)

2023-08-18 Thread brandonwilliams
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a change to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git


from fb395c6b8b Merge branch 'cassandra-3.11' into cassandra-4.0
 new 6bb585bf5d Warn when cqlsh does not match the server version it was 
built with
 new 1dd38998a0 Merge branch 'cassandra-3.0' into cassandra-3.11
 new ba50ec9cd9 Merge branch 'cassandra-3.11' into cassandra-4.0

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .build/build-cqlsh.xml | 24 
 CHANGES.txt|  2 ++
 bin/cqlsh.py   | 11 +++
 build.xml  |  3 ++-
 4 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 .build/build-cqlsh.xml


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] branch cassandra-3.0 updated: Warn when cqlsh does not match the server version it was built with

2023-08-18 Thread brandonwilliams
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git


The following commit(s) were added to refs/heads/cassandra-3.0 by this push:
 new 6bb585bf5d Warn when cqlsh does not match the server version it was 
built with
6bb585bf5d is described below

commit 6bb585bf5db106322c9569d76f3178c79ed53d5c
Author: Brandon Williams 
AuthorDate: Thu Aug 17 13:23:47 2023 -0500

Warn when cqlsh does not match the server version it was built with

Patch by brandonwilliams; reviewed by bereng for CASSANDRA-18745
---
 .build/build-cqlsh.xml | 24 
 CHANGES.txt|  1 +
 bin/cqlsh.py   | 11 +++
 build.xml  |  3 ++-
 4 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/.build/build-cqlsh.xml b/.build/build-cqlsh.xml
new file mode 100644
index 00..45e0e46a49
--- /dev/null
+++ b/.build/build-cqlsh.xml
@@ -0,0 +1,24 @@
+
+
+
+
+version = 
"${base.version}"${line.separator}
+
+
diff --git a/CHANGES.txt b/CHANGES.txt
index ea9b1024e3..702733eaaf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.30
+ * CQLSH emits a warning when the server version doesn't match 
(CASSANDRA-18745)
  * Fix missing speculative retries in tablestats (CASSANDRA-18767)
  * Fix Requires for Java for RPM package (CASSANDRA-18751)
  * Fix CQLSH online help topic link (CASSANDRA-17534)
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index 3e5cac1470..f9fcc656d5 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -171,6 +171,7 @@ from cqlshlib.formatting import (DEFAULT_DATE_FORMAT, 
DEFAULT_NANOTIME_FORMAT,
  formatter_for)
 from cqlshlib.tracing import print_trace, print_trace_session
 from cqlshlib.util import get_file_encoding_bomsize, trim_if_present
+from cqlshlib.serverversion import version as build_version
 
 DEFAULT_HOST = '127.0.0.1'
 DEFAULT_PORT = 9042
@@ -797,6 +798,8 @@ class Shell(cmd.Cmd):
 if stdin is None:
 stdin = sys.stdin
 
+self.check_build_versions()
+
 if tty:
 self.reset_prompt()
 self.report_connection()
@@ -816,6 +819,14 @@ class Shell(cmd.Cmd):
 def batch_mode(self):
 return not self.tty
 
+def check_build_versions(self):
+baseversion = self.connection_versions['build']
+extra = baseversion.rfind('-')
+if extra:
+baseversion = baseversion[0:extra]
+if baseversion != build_version:
+print("WARNING: cqlsh was built against {}, but this server is {}. 
 All features may not work!".format(baseversion, build_version))
+
 @property
 def is_using_utf8(self):
 # utf8 encodings from https://docs.python.org/{2,3}/library/codecs.html
diff --git a/build.xml b/build.xml
index dd75f1746c..76525e35d4 100644
--- a/build.xml
+++ b/build.xml
@@ -684,7 +684,7 @@
 
 
 
-
+
   
   
   
@@ -1970,4 +1970,5 @@
   
   
   
+  
 


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Commented] (CASSANDRA-18739) UDF functions fail to load on rolling restart

2023-08-18 Thread Stefan Miklosovic (Jira)


[ 
https://issues.apache.org/jira/browse/CASSANDRA-18739?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17756009#comment-17756009
 ] 

Stefan Miklosovic commented on CASSANDRA-18739:
---

Yep I ll do that, I am aware of that. I ll add the builds in next days.

> UDF functions fail to load on rolling restart
> -
>
> Key: CASSANDRA-18739
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18739
> Project: Cassandra
>  Issue Type: Bug
>  Components: Feature/UDF
>Reporter: Claude Warren
>Assignee: Claude Warren
>Priority: High
> Fix For: 4.0.x, 4.1.x, 5.x
>
> Attachments: udf_error.cql, udf_error_data.cql
>
>  Time Spent: 1h 20m
>  Remaining Estimate: 0h
>
> UDFs fail to reload properly after a rolling restart.
> h3. *Symptom:*
> NPE thrown when used after restart.
> h3. *Steps to recreate:*
>  # Create a cluster as per cql file
>  # Populate the cluster with data.cql.
>  # Execute SELECT city_measurements(city, measurement, 16.5) AS m FROM current
>  # expect min and max values for cities.
>  # Performing a rolling restart on one server.
>  # When the server is back up
>  # Execute SELECT city_measurements(city, measurement, 16.5) AS m FROM current
>  # expect: error result with NPE message.
> {*}Analysis{*}:
> During system restart the SchemaKeyspace.fetchNonSystemKeyspaces() is called, 
> when a keyspace with a UDF is loaded the SchemaKeyspace method 
> createUDFFromRow() is called, this in turn calls UDFunction.create() which 
> eventually calls back to UDFunction constructor where the 
> Schema.instance.getKeyspaceMetadata() is called with the keyspace for the UDF 
> name as the argument. However, the keyspace for the UDF name is being 
> constructed and is not yet in the instance so the method returns null for the 
> KeyspaceMetadata. That null KeyspaceMetadata is then used in the udfContext.
> Later when the UDF method is called, if there is a need to call a method on 
> the keyspaceMetadata, such as udfContext.newUDTValue() where the 
> implementation uses keyspaceMetadata.types, a null pointer is thrown.
> I have verified this affects version 4.0, 4.1 and trunk. I have not verified 
> 3.x but I suspect it is the same there.
> I modified UDFunction constructor to assert that the metadata was not null 
> and received the following stack trace
> ERROR [main] 2023-08-09 11:44:46,408 CassandraDaemon.java:911 - Exception 
> encountered during startup
> java.lang.AssertionError: No metadata for temperatures.city_measurements_sfunc
>     at 
> org.apache.cassandra.cql3.functions.UDFunction.(UDFunction.java:240)
>     at 
> org.apache.cassandra.cql3.functions.JavaBasedUDFunction.(JavaBasedUDFunction.java:195)
>     at 
> org.apache.cassandra.cql3.functions.UDFunction.create(UDFunction.java:276)
>     at 
> org.apache.cassandra.schema.SchemaKeyspace.createUDFFromRow(SchemaKeyspace.java:1182)
>     at 
> org.apache.cassandra.schema.SchemaKeyspace.fetchUDFs(SchemaKeyspace.java:1131)
>     at 
> org.apache.cassandra.schema.SchemaKeyspace.fetchFunctions(SchemaKeyspace.java:1119)
>     at 
> org.apache.cassandra.schema.SchemaKeyspace.fetchKeyspace(SchemaKeyspace.java:859)
>     at 
> org.apache.cassandra.schema.SchemaKeyspace.fetchKeyspacesWithout(SchemaKeyspace.java:848)
>     at 
> org.apache.cassandra.schema.SchemaKeyspace.fetchNonSystemKeyspaces(SchemaKeyspace.java:836)
>     at org.apache.cassandra.schema.Schema.loadFromDisk(Schema.java:132)
>     at org.apache.cassandra.schema.Schema.loadFromDisk(Schema.java:121)
>     at 
> org.apache.cassandra.service.CassandraDaemon.setup(CassandraDaemon.java:287)
>     at 
> org.apache.cassandra.service.CassandraDaemon.activate(CassandraDaemon.java:765)
>     at 
> org.apache.cassandra.service.CassandraDaemon.main(CassandraDaemon.java:889)
>  
> {{*Possible solution:*}}
> *Version 4.x*
> Create a KeyspaceMetadata.Builder class that uses accepts the types, tables 
> and views but uses a builder for the functions.
> Add a KeyspaceMetadata constructor to accept the KeyspaceMetadata.Builder so 
> that the function builder keyspaceMetadata value can be set correctly during 
> construction of the KeyspaceMetadata.
> Modify SchemaKeyspace.fetchKeyspace(string) so that it uses the 
> KeyspaceMetadata.Builder.
>  
> *Version 5.x*
> Similar to 4.x except that the KeyspaceMetadata.Builder will have to have 
> builders for Views and Tables because the functions necessary to construct 
> those objects will not be available until the KeyspaceMetadata.Builder 
> constructs it.
>  



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Commented] (CASSANDRA-18739) UDF functions fail to load on rolling restart

2023-08-18 Thread Jira


[ 
https://issues.apache.org/jira/browse/CASSANDRA-18739?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17756007#comment-17756007
 ] 

Andres de la Peña commented on CASSANDRA-18739:
---

The new {{UDFTest}} class in the PRs for 4.0 and 4.1 contains some bits that 
don't match the code style, and a couple of unused imports that would break CI: 
[https://github.com/adelapena/cassandra/commit/43fbc2dd2a2e8ae8b603c4121ab0d75ef783229a]

I see that those are fixed Stefan's PR for 5.0.

We are also missing a PR for trunk.

> UDF functions fail to load on rolling restart
> -
>
> Key: CASSANDRA-18739
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18739
> Project: Cassandra
>  Issue Type: Bug
>  Components: Feature/UDF
>Reporter: Claude Warren
>Assignee: Claude Warren
>Priority: High
> Fix For: 4.0.x, 4.1.x, 5.x
>
> Attachments: udf_error.cql, udf_error_data.cql
>
>  Time Spent: 1h 20m
>  Remaining Estimate: 0h
>
> UDFs fail to reload properly after a rolling restart.
> h3. *Symptom:*
> NPE thrown when used after restart.
> h3. *Steps to recreate:*
>  # Create a cluster as per cql file
>  # Populate the cluster with data.cql.
>  # Execute SELECT city_measurements(city, measurement, 16.5) AS m FROM current
>  # expect min and max values for cities.
>  # Performing a rolling restart on one server.
>  # When the server is back up
>  # Execute SELECT city_measurements(city, measurement, 16.5) AS m FROM current
>  # expect: error result with NPE message.
> {*}Analysis{*}:
> During system restart the SchemaKeyspace.fetchNonSystemKeyspaces() is called, 
> when a keyspace with a UDF is loaded the SchemaKeyspace method 
> createUDFFromRow() is called, this in turn calls UDFunction.create() which 
> eventually calls back to UDFunction constructor where the 
> Schema.instance.getKeyspaceMetadata() is called with the keyspace for the UDF 
> name as the argument. However, the keyspace for the UDF name is being 
> constructed and is not yet in the instance so the method returns null for the 
> KeyspaceMetadata. That null KeyspaceMetadata is then used in the udfContext.
> Later when the UDF method is called, if there is a need to call a method on 
> the keyspaceMetadata, such as udfContext.newUDTValue() where the 
> implementation uses keyspaceMetadata.types, a null pointer is thrown.
> I have verified this affects version 4.0, 4.1 and trunk. I have not verified 
> 3.x but I suspect it is the same there.
> I modified UDFunction constructor to assert that the metadata was not null 
> and received the following stack trace
> ERROR [main] 2023-08-09 11:44:46,408 CassandraDaemon.java:911 - Exception 
> encountered during startup
> java.lang.AssertionError: No metadata for temperatures.city_measurements_sfunc
>     at 
> org.apache.cassandra.cql3.functions.UDFunction.(UDFunction.java:240)
>     at 
> org.apache.cassandra.cql3.functions.JavaBasedUDFunction.(JavaBasedUDFunction.java:195)
>     at 
> org.apache.cassandra.cql3.functions.UDFunction.create(UDFunction.java:276)
>     at 
> org.apache.cassandra.schema.SchemaKeyspace.createUDFFromRow(SchemaKeyspace.java:1182)
>     at 
> org.apache.cassandra.schema.SchemaKeyspace.fetchUDFs(SchemaKeyspace.java:1131)
>     at 
> org.apache.cassandra.schema.SchemaKeyspace.fetchFunctions(SchemaKeyspace.java:1119)
>     at 
> org.apache.cassandra.schema.SchemaKeyspace.fetchKeyspace(SchemaKeyspace.java:859)
>     at 
> org.apache.cassandra.schema.SchemaKeyspace.fetchKeyspacesWithout(SchemaKeyspace.java:848)
>     at 
> org.apache.cassandra.schema.SchemaKeyspace.fetchNonSystemKeyspaces(SchemaKeyspace.java:836)
>     at org.apache.cassandra.schema.Schema.loadFromDisk(Schema.java:132)
>     at org.apache.cassandra.schema.Schema.loadFromDisk(Schema.java:121)
>     at 
> org.apache.cassandra.service.CassandraDaemon.setup(CassandraDaemon.java:287)
>     at 
> org.apache.cassandra.service.CassandraDaemon.activate(CassandraDaemon.java:765)
>     at 
> org.apache.cassandra.service.CassandraDaemon.main(CassandraDaemon.java:889)
>  
> {{*Possible solution:*}}
> *Version 4.x*
> Create a KeyspaceMetadata.Builder class that uses accepts the types, tables 
> and views but uses a builder for the functions.
> Add a KeyspaceMetadata constructor to accept the KeyspaceMetadata.Builder so 
> that the function builder keyspaceMetadata value can be set correctly during 
> construction of the KeyspaceMetadata.
> Modify SchemaKeyspace.fetchKeyspace(string) so that it uses the 
> KeyspaceMetadata.Builder.
>  
> *Version 5.x*
> Similar to 4.x except that the KeyspaceMetadata.Builder will have to have 
> builders for Views and Tables because the functions necessary to construct 
> those objects will not be available until the KeyspaceMetadata.Builder 
> constructs it.
>  



--

[jira] [Updated] (CASSANDRA-18702) Add jmh microbenchmarks to eclipse IDE

2023-08-18 Thread Ekaterina Dimitrova (Jira)


 [ 
https://issues.apache.org/jira/browse/CASSANDRA-18702?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Ekaterina Dimitrova updated CASSANDRA-18702:

Reviewers: Benjamin Lerer, Maxim Muzafarov  (was: Benjamin Lerer, Ekaterina 
Dimitrova, Maxim Muzafarov)

> Add jmh microbenchmarks to eclipse IDE
> --
>
> Key: CASSANDRA-18702
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18702
> Project: Cassandra
>  Issue Type: Bug
>  Components: Build
>Reporter: Berenguer Blasi
>Assignee: Berenguer Blasi
>Priority: Normal
> Fix For: 5.x
>
>
> Currently jmh tests are not being picked up by the Eclipse IDE.



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Updated] (CASSANDRA-18702) Add jmh microbenchmarks to eclipse IDE

2023-08-18 Thread Ekaterina Dimitrova (Jira)


 [ 
https://issues.apache.org/jira/browse/CASSANDRA-18702?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Ekaterina Dimitrova updated CASSANDRA-18702:

Reviewers: Benjamin Lerer, Maxim Muzafarov, Ekaterina Dimitrova  (was: 
Benjamin Lerer, Maxim Muzafarov)
   Benjamin Lerer, Maxim Muzafarov, Ekaterina Dimitrova  (was: 
Benjamin Lerer, Ekaterina Dimitrova, Maxim Muzafarov)
   Status: Review In Progress  (was: Patch Available)

> Add jmh microbenchmarks to eclipse IDE
> --
>
> Key: CASSANDRA-18702
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18702
> Project: Cassandra
>  Issue Type: Bug
>  Components: Build
>Reporter: Berenguer Blasi
>Assignee: Berenguer Blasi
>Priority: Normal
> Fix For: 5.x
>
>
> Currently jmh tests are not being picked up by the Eclipse IDE.



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Updated] (CASSANDRA-18776) Restore accidentally deleted documentation for DDM

2023-08-18 Thread Ekaterina Dimitrova (Jira)


 [ 
https://issues.apache.org/jira/browse/CASSANDRA-18776?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Ekaterina Dimitrova updated CASSANDRA-18776:

Reviewers: Brandon Williams  (was: Brandon Williams, Ekaterina Dimitrova)

> Restore accidentally deleted documentation for DDM
> --
>
> Key: CASSANDRA-18776
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18776
> Project: Cassandra
>  Issue Type: Bug
>  Components: Documentation
>Reporter: Andres de la Peña
>Assignee: Andres de la Peña
>Priority: Normal
> Fix For: 5.x
>
>  Time Spent: 20m
>  Remaining Estimate: 0h
>
> CASSANDRA-18228 seems to have deleted [the section of documentation about 
> dynamic data masking 
> (CEP-20)|https://github.com/apache/cassandra/blob/63ab8e09286e4b2076695f62e08a7f39cb6860d1/doc/modules/cassandra/pages/cql/dynamic_data_masking.adoc].
>  The code examples and the (broken) index entry are still present. This 
> ticket should add it back.



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Updated] (CASSANDRA-18776) Restore accidentally deleted documentation for DDM

2023-08-18 Thread Ekaterina Dimitrova (Jira)


 [ 
https://issues.apache.org/jira/browse/CASSANDRA-18776?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Ekaterina Dimitrova updated CASSANDRA-18776:

Reviewers: Brandon Williams, Ekaterina Dimitrova
   Status: Review In Progress  (was: Patch Available)

> Restore accidentally deleted documentation for DDM
> --
>
> Key: CASSANDRA-18776
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18776
> Project: Cassandra
>  Issue Type: Bug
>  Components: Documentation
>Reporter: Andres de la Peña
>Assignee: Andres de la Peña
>Priority: Normal
> Fix For: 5.x
>
>  Time Spent: 20m
>  Remaining Estimate: 0h
>
> CASSANDRA-18228 seems to have deleted [the section of documentation about 
> dynamic data masking 
> (CEP-20)|https://github.com/apache/cassandra/blob/63ab8e09286e4b2076695f62e08a7f39cb6860d1/doc/modules/cassandra/pages/cql/dynamic_data_masking.adoc].
>  The code examples and the (broken) index entry are still present. This 
> ticket should add it back.



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Commented] (CASSANDRA-18739) UDF functions fail to load on rolling restart

2023-08-18 Thread Stefan Miklosovic (Jira)


[ 
https://issues.apache.org/jira/browse/CASSANDRA-18739?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17755983#comment-17755983
 ] 

Stefan Miklosovic commented on CASSANDRA-18739:
---

[j17  
5.0|https://app.circleci.com/pipelines/github/instaclustr/cassandra/2947/workflows/fb635abb-33a5-4a21-96a5-412f1b7f66f1]

> UDF functions fail to load on rolling restart
> -
>
> Key: CASSANDRA-18739
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18739
> Project: Cassandra
>  Issue Type: Bug
>  Components: Feature/UDF
>Reporter: Claude Warren
>Assignee: Claude Warren
>Priority: High
> Fix For: 4.0.x, 4.1.x, 5.x
>
> Attachments: udf_error.cql, udf_error_data.cql
>
>  Time Spent: 1h 20m
>  Remaining Estimate: 0h
>
> UDFs fail to reload properly after a rolling restart.
> h3. *Symptom:*
> NPE thrown when used after restart.
> h3. *Steps to recreate:*
>  # Create a cluster as per cql file
>  # Populate the cluster with data.cql.
>  # Execute SELECT city_measurements(city, measurement, 16.5) AS m FROM current
>  # expect min and max values for cities.
>  # Performing a rolling restart on one server.
>  # When the server is back up
>  # Execute SELECT city_measurements(city, measurement, 16.5) AS m FROM current
>  # expect: error result with NPE message.
> {*}Analysis{*}:
> During system restart the SchemaKeyspace.fetchNonSystemKeyspaces() is called, 
> when a keyspace with a UDF is loaded the SchemaKeyspace method 
> createUDFFromRow() is called, this in turn calls UDFunction.create() which 
> eventually calls back to UDFunction constructor where the 
> Schema.instance.getKeyspaceMetadata() is called with the keyspace for the UDF 
> name as the argument. However, the keyspace for the UDF name is being 
> constructed and is not yet in the instance so the method returns null for the 
> KeyspaceMetadata. That null KeyspaceMetadata is then used in the udfContext.
> Later when the UDF method is called, if there is a need to call a method on 
> the keyspaceMetadata, such as udfContext.newUDTValue() where the 
> implementation uses keyspaceMetadata.types, a null pointer is thrown.
> I have verified this affects version 4.0, 4.1 and trunk. I have not verified 
> 3.x but I suspect it is the same there.
> I modified UDFunction constructor to assert that the metadata was not null 
> and received the following stack trace
> ERROR [main] 2023-08-09 11:44:46,408 CassandraDaemon.java:911 - Exception 
> encountered during startup
> java.lang.AssertionError: No metadata for temperatures.city_measurements_sfunc
>     at 
> org.apache.cassandra.cql3.functions.UDFunction.(UDFunction.java:240)
>     at 
> org.apache.cassandra.cql3.functions.JavaBasedUDFunction.(JavaBasedUDFunction.java:195)
>     at 
> org.apache.cassandra.cql3.functions.UDFunction.create(UDFunction.java:276)
>     at 
> org.apache.cassandra.schema.SchemaKeyspace.createUDFFromRow(SchemaKeyspace.java:1182)
>     at 
> org.apache.cassandra.schema.SchemaKeyspace.fetchUDFs(SchemaKeyspace.java:1131)
>     at 
> org.apache.cassandra.schema.SchemaKeyspace.fetchFunctions(SchemaKeyspace.java:1119)
>     at 
> org.apache.cassandra.schema.SchemaKeyspace.fetchKeyspace(SchemaKeyspace.java:859)
>     at 
> org.apache.cassandra.schema.SchemaKeyspace.fetchKeyspacesWithout(SchemaKeyspace.java:848)
>     at 
> org.apache.cassandra.schema.SchemaKeyspace.fetchNonSystemKeyspaces(SchemaKeyspace.java:836)
>     at org.apache.cassandra.schema.Schema.loadFromDisk(Schema.java:132)
>     at org.apache.cassandra.schema.Schema.loadFromDisk(Schema.java:121)
>     at 
> org.apache.cassandra.service.CassandraDaemon.setup(CassandraDaemon.java:287)
>     at 
> org.apache.cassandra.service.CassandraDaemon.activate(CassandraDaemon.java:765)
>     at 
> org.apache.cassandra.service.CassandraDaemon.main(CassandraDaemon.java:889)
>  
> {{*Possible solution:*}}
> *Version 4.x*
> Create a KeyspaceMetadata.Builder class that uses accepts the types, tables 
> and views but uses a builder for the functions.
> Add a KeyspaceMetadata constructor to accept the KeyspaceMetadata.Builder so 
> that the function builder keyspaceMetadata value can be set correctly during 
> construction of the KeyspaceMetadata.
> Modify SchemaKeyspace.fetchKeyspace(string) so that it uses the 
> KeyspaceMetadata.Builder.
>  
> *Version 5.x*
> Similar to 4.x except that the KeyspaceMetadata.Builder will have to have 
> builders for Views and Tables because the functions necessary to construct 
> those objects will not be available until the KeyspaceMetadata.Builder 
> constructs it.
>  



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional 

[jira] [Updated] (CASSANDRA-18760) Need to block the ability to DROP table column of 'map' type and add back as 'blob' type

2023-08-18 Thread Stefan Miklosovic (Jira)


 [ 
https://issues.apache.org/jira/browse/CASSANDRA-18760?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Stefan Miklosovic updated CASSANDRA-18760:
--
Status: Ready to Commit  (was: Review In Progress)

> Need to block the ability to DROP table column of 'map' type and add back as 
> 'blob' type
> 
>
> Key: CASSANDRA-18760
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18760
> Project: Cassandra
>  Issue Type: Bug
>  Components: Cluster/Schema
>Reporter: Paul Ayers
>Assignee: Stefan Miklosovic
>Priority: Urgent
>  Labels: 4.0.10
> Fix For: 3.0.x, 3.11.x, 4.0.x, 4.1.x, 5.0.x, 5.x
>
>  Time Spent: 1h
>  Remaining Estimate: 0h
>
> Recently hit an un-recoverable situation in Cassandra 4.0.10 after dropping a 
> 'map' column and adding it back as a 'blob', which caused corruption that 
> neither offline nor online scrub could fix.
> When dropping a 'blob' column and attempting to add it back as a 'map' type, 
> the operation is blocked with:
> {code:java}
> InvalidRequest: Error from server: code=2200 [Invalid query] message="Cannot 
> re-add previously dropped column 'col1' of type map, 
> incompatible with previous type blob"
> {code}
> We need to do the same going from 'map' to 'blob' to avoid this potentially 
> very bad scenario that can cause data loss.



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Commented] (CASSANDRA-18760) Need to block the ability to DROP table column of 'map' type and add back as 'blob' type

2023-08-18 Thread Jira


[ 
https://issues.apache.org/jira/browse/CASSANDRA-18760?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17755932#comment-17755932
 ] 

Andres de la Peña commented on CASSANDRA-18760:
---

Went through the rest of the CI failures and none of them seem caused by the 
changes:
 * {{test_move_backwards_and_cleanup}} in 4.1 is CASSANDRA-18686
 * {{testFailingMessage}} in 4.0 is CASSANDRA-18366
 * {{test_dead_sync_initiator}} in 3.11 and 3.0 is CASSANDRA-17702
 * {{test_multiple_concurrent_repairs}} in 3.11 is in 
[Butler|https://butler.cassandra.apache.org/#/ci/upstream/workflow/Cassandra-3.11/failure/repair_tests.repair_test/TestRepair/test_multiple_concurrent_repairs]
 * {{test_readrepair}} in 3.11 is in 
[Butler|https://butler.cassandra.apache.org/#/ci/upstream/workflow/Cassandra-3.11/failure/consistency_test/TestConsistency/test_readrepair]
 * {{test_compactionstats}} in 3.11 and 3.0 is in 
[Butler|https://butler.cassandra.apache.org/#/ci/upstream/workflow/Cassandra-3.11/failure/jmx_test/TestJMX/test_compactionstats]
 * {{test_sstable_marking}} in 3.11 is in 
[Butler|https://butler.cassandra.apache.org/#/ci/upstream/workflow/Cassandra-3.11/failure/repair_tests.incremental_repair_test/TestIncRepair/test_sstable_marking]
 * {{testReprepareMixedVersionWithoutReset}} in 3.11 is CASSANDRA-18021

> Need to block the ability to DROP table column of 'map' type and add back as 
> 'blob' type
> 
>
> Key: CASSANDRA-18760
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18760
> Project: Cassandra
>  Issue Type: Bug
>  Components: Cluster/Schema
>Reporter: Paul Ayers
>Assignee: Stefan Miklosovic
>Priority: Urgent
>  Labels: 4.0.10
> Fix For: 3.0.x, 3.11.x, 4.0.x, 4.1.x, 5.0.x, 5.x
>
>  Time Spent: 1h
>  Remaining Estimate: 0h
>
> Recently hit an un-recoverable situation in Cassandra 4.0.10 after dropping a 
> 'map' column and adding it back as a 'blob', which caused corruption that 
> neither offline nor online scrub could fix.
> When dropping a 'blob' column and attempting to add it back as a 'map' type, 
> the operation is blocked with:
> {code:java}
> InvalidRequest: Error from server: code=2200 [Invalid query] message="Cannot 
> re-add previously dropped column 'col1' of type map, 
> incompatible with previous type blob"
> {code}
> We need to do the same going from 'map' to 'blob' to avoid this potentially 
> very bad scenario that can cause data loss.



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Commented] (CASSANDRA-18745) cqlsh should warn on server version mismatch

2023-08-18 Thread Berenguer Blasi (Jira)


[ 
https://issues.apache.org/jira/browse/CASSANDRA-18745?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17755930#comment-17755930
 ] 

Berenguer Blasi commented on CASSANDRA-18745:
-

Yep LGTM +1

> cqlsh should warn on server version mismatch
> 
>
> Key: CASSANDRA-18745
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18745
> Project: Cassandra
>  Issue Type: Improvement
>  Components: CQL/Interpreter
>Reporter: Brandon Williams
>Assignee: Brandon Williams
>Priority: Normal
> Fix For: 3.0.x, 3.11.x, 4.0.x, 4.1.x, 5.x
>
>
> When cqlsh is used against a different version of the server than the one 
> that it shipped with, it should emit a warning so that users aren't confused 
> when some things don't work correctly.



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Commented] (CASSANDRA-18776) Restore accidentally deleted documentation for DDM

2023-08-18 Thread Jira


[ 
https://issues.apache.org/jira/browse/CASSANDRA-18776?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17755928#comment-17755928
 ] 

Andres de la Peña commented on CASSANDRA-18776:
---

CASSANDRA-18606 already addresses the issue of the broken links, so I'm 
limiting this to restoring the missing DDM section:
||PR||CI||
|[trunk|https://github.com/apache/cassandra/pull/2609]|[j11|https://app.circleci.com/pipelines/github/adelapena/cassandra/3109/workflows/a17d9106-3d2c-4833-8d5c-acc1269edc0b]
 
[j17|https://app.circleci.com/pipelines/github/adelapena/cassandra/3109/workflows/8bdca181-bd75-42b0-b6a4-daa0ac274f23]|

> Restore accidentally deleted documentation for DDM
> --
>
> Key: CASSANDRA-18776
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18776
> Project: Cassandra
>  Issue Type: Bug
>  Components: Documentation
>Reporter: Andres de la Peña
>Assignee: Andres de la Peña
>Priority: Normal
> Fix For: 5.x
>
>  Time Spent: 10m
>  Remaining Estimate: 0h
>
> CASSANDRA-18228 seems to have deleted [the section of documentation about 
> dynamic data masking 
> (CEP-20)|https://github.com/apache/cassandra/blob/63ab8e09286e4b2076695f62e08a7f39cb6860d1/doc/modules/cassandra/pages/cql/dynamic_data_masking.adoc].
>  The code examples and the (broken) index entry are still present. This 
> ticket should add it back.



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Commented] (CASSANDRA-18228) Reorganize Apache C* docs in trunk branch to match the IA

2023-08-18 Thread Jira


[ 
https://issues.apache.org/jira/browse/CASSANDRA-18228?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17755926#comment-17755926
 ] 

Andres de la Peña commented on CASSANDRA-18228:
---

Ah, I see that CASSANDRA-18606 already addresses the issue of the broken links, 
so I'll limit CASSANDRA-18776 to the missing DDM section.

> Reorganize Apache C* docs in trunk branch to match the IA
> -
>
> Key: CASSANDRA-18228
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18228
> Project: Cassandra
>  Issue Type: New Feature
>  Components: Documentation
>Reporter: Lorina Poland
>Assignee: Lorina Poland
>Priority: Normal
> Fix For: 5.0
>
>
> An agreed-upon Information Architecture will be used to reorganize the C* 5.0 
> docs.
> IA doc: 
> https://docs.google.com/document/d/1A96K73vj9MbJoD7wJNgIKWrOkLq-ZL2cNZAEXSWrciY/edit?usp=sharing



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Comment Edited] (CASSANDRA-18776) Restore accidentally deleted documentation for DDM

2023-08-18 Thread Jira


[ 
https://issues.apache.org/jira/browse/CASSANDRA-18776?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17755922#comment-17755922
 ] 

Andres de la Peña edited comment on CASSANDRA-18776 at 8/18/23 11:01 AM:
-

This PR adds the deleted doc section:
||PR||CI||
|[trunk|https://github.com/apache/cassandra/pull/2609]|[j11|https://app.circleci.com/pipelines/github/adelapena/cassandra/3106/workflows/d6f7de9b-e5c9-48bb-b59e-a96d242e003b]
 
[j17|https://app.circleci.com/pipelines/github/adelapena/cassandra/3106/workflows/b9ee4b49-004f-4991-bcdb-bd39af036eb3]|

Also, I have noticed that CASSANDRA-18228 moved the sections {{cql}} and 
{{data-modeling}} into a new {{developing}} section. However, all the links to 
the pages in those sections haven't been updated. The [second 
commit|https://github.com/apache/cassandra/pull/2609/commits/6272442fed00d8a4aa8751e87e646148286e3fab]
 of the PR tries to fix this.

CC [~polandll] [~mck] [~smiklosovic]
 


was (Author: adelapena):
This PR adds the deleted doc section:
||PR||CI||
|[trunk|https://github.com/apache/cassandra/pull/2609]|[j11|https://app.circleci.com/pipelines/github/adelapena/cassandra/3106/workflows/d6f7de9b-e5c9-48bb-b59e-a96d242e003b]
 
[j17|https://app.circleci.com/pipelines/github/adelapena/cassandra/3106/workflows/b9ee4b49-004f-4991-bcdb-bd39af036eb3]|

Also, I have noticed that CASSANDRA-18228 moved the sections {{cql}} and 
{{data-modeling}} into a new {{developing}} section. However, all the links to 
the pages in those sections haven't been updated. The [second 
commit|https://github.com/apache/cassandra/pull/2609/commits/6272442fed00d8a4aa8751e87e646148286e3fab]
 of the PR tries to fix this.

CC [~polandll] [~mck] [smiklosovic]
 

> Restore accidentally deleted documentation for DDM
> --
>
> Key: CASSANDRA-18776
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18776
> Project: Cassandra
>  Issue Type: Bug
>  Components: Documentation
>Reporter: Andres de la Peña
>Assignee: Andres de la Peña
>Priority: Normal
> Fix For: 5.x
>
>  Time Spent: 10m
>  Remaining Estimate: 0h
>
> CASSANDRA-18228 seems to have deleted [the section of documentation about 
> dynamic data masking 
> (CEP-20)|https://github.com/apache/cassandra/blob/63ab8e09286e4b2076695f62e08a7f39cb6860d1/doc/modules/cassandra/pages/cql/dynamic_data_masking.adoc].
>  The code examples and the (broken) index entry are still present. This 
> ticket should add it back.



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Commented] (CASSANDRA-18228) Reorganize Apache C* docs in trunk branch to match the IA

2023-08-18 Thread Jira


[ 
https://issues.apache.org/jira/browse/CASSANDRA-18228?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17755923#comment-17755923
 ] 

Andres de la Peña commented on CASSANDRA-18228:
---

I have also noticed that the sections {{cql}} and {{data-modeling}} nested into 
a new {{developing}} section, but apparently all the links to the pages in 
those sections haven't been updated. CASSANDRA-18776 tries to fix that too.

> Reorganize Apache C* docs in trunk branch to match the IA
> -
>
> Key: CASSANDRA-18228
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18228
> Project: Cassandra
>  Issue Type: New Feature
>  Components: Documentation
>Reporter: Lorina Poland
>Assignee: Lorina Poland
>Priority: Normal
> Fix For: 5.0
>
>
> An agreed-upon Information Architecture will be used to reorganize the C* 5.0 
> docs.
> IA doc: 
> https://docs.google.com/document/d/1A96K73vj9MbJoD7wJNgIKWrOkLq-ZL2cNZAEXSWrciY/edit?usp=sharing



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[jira] [Updated] (CASSANDRA-18776) Restore accidentally deleted documentation for DDM

2023-08-18 Thread Jira


 [ 
https://issues.apache.org/jira/browse/CASSANDRA-18776?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Andres de la Peña updated CASSANDRA-18776:
--
Test and Documentation Plan: 
||PR||CI||
|[trunk|https://github.com/apache/cassandra/pull/2609]|[j11|https://app.circleci.com/pipelines/github/adelapena/cassandra/3106/workflows/d6f7de9b-e5c9-48bb-b59e-a96d242e003b]
 
[j17|https://app.circleci.com/pipelines/github/adelapena/cassandra/3106/workflows/b9ee4b49-004f-4991-bcdb-bd39af036eb3]|
 Status: Patch Available  (was: In Progress)

> Restore accidentally deleted documentation for DDM
> --
>
> Key: CASSANDRA-18776
> URL: https://issues.apache.org/jira/browse/CASSANDRA-18776
> Project: Cassandra
>  Issue Type: Bug
>  Components: Documentation
>Reporter: Andres de la Peña
>Assignee: Andres de la Peña
>Priority: Normal
> Fix For: 5.x
>
>  Time Spent: 10m
>  Remaining Estimate: 0h
>
> CASSANDRA-18228 seems to have deleted [the section of documentation about 
> dynamic data masking 
> (CEP-20)|https://github.com/apache/cassandra/blob/63ab8e09286e4b2076695f62e08a7f39cb6860d1/doc/modules/cassandra/pages/cql/dynamic_data_masking.adoc].
>  The code examples and the (broken) index entry are still present. This 
> ticket should add it back.



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



  1   2   >