-
Notifications
You must be signed in to change notification settings - Fork 34
[CASSANALYTICS-183] - Pass quoted identifiers to sidecar API calls for mixed-case keyspace/table restore #226
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
bianca-stanciu29
wants to merge
6
commits into
apache:trunk
Choose a base branch
from
bianca-stanciu29:CASSANALYTICS-183
base: trunk
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
4578c9a
[CASSANALYTICS-183] - Mixed-case keyspace restore fails with Keyspace…
bianca-stanciu29 ea64e1c
Fixing the tests
bianca-stanciu29 e59fe5b
Fix checkstyle violation and add changelog entry
bianca-stanciu29 21e44dc
Merge branch 'trunk' into CASSANALYTICS-183
bianca-stanciu29 8b55387
Merge branch 'trunk' into CASSANALYTICS-183
bianca-stanciu29 cc23f9d
CASSANALYTICS-183: Cover quoted identifiers across Sidecar APIs
bianca-stanciu29 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
84 changes: 84 additions & 0 deletions
84
...nalytics-common/src/test/java/org/apache/cassandra/spark/data/QualifiedTableNameTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
|
|
||
| package org.apache.cassandra.spark.data; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| class QualifiedTableNameTest | ||
| { | ||
| @Test | ||
| void testUnquotedIdentifiersReturnedAsIs() | ||
| { | ||
| QualifiedTableName name = new QualifiedTableName("mykeyspace", "mytable", false); | ||
| assertThat(name.keyspace()).isEqualTo("mykeyspace"); | ||
| assertThat(name.table()).isEqualTo("mytable"); | ||
| assertThat(name.maybeQuotedKeyspace()).isEqualTo("mykeyspace"); | ||
| assertThat(name.maybeQuotedTable()).isEqualTo("mytable"); | ||
| } | ||
|
|
||
| @Test | ||
| void testQuotedIdentifiersWrappedInDoubleQuotes() | ||
| { | ||
| QualifiedTableName name = new QualifiedTableName("MyKeyspace", "MyTable", true); | ||
| assertThat(name.maybeQuotedKeyspace()).isEqualTo("\"MyKeyspace\""); | ||
| assertThat(name.maybeQuotedTable()).isEqualTo("\"MyTable\""); | ||
| } | ||
|
|
||
| @Test | ||
| void testRawAccessorsUnaffectedByQuoteFlag() | ||
| { | ||
| QualifiedTableName name = new QualifiedTableName("MyKeyspace", "MyTable", true); | ||
| assertThat(name.keyspace()).isEqualTo("MyKeyspace"); | ||
| assertThat(name.table()).isEqualTo("MyTable"); | ||
| } | ||
|
|
||
| @Test | ||
| void testToStringQuotesBothWhenFlagSet() | ||
| { | ||
| QualifiedTableName name = new QualifiedTableName("MyKeyspace", "MyTable", true); | ||
| assertThat(name.toString()).isEqualTo("\"MyKeyspace\".\"MyTable\""); | ||
| } | ||
|
|
||
| @Test | ||
| void testToStringUnquotedWhenFlagNotSet() | ||
| { | ||
| QualifiedTableName name = new QualifiedTableName("mykeyspace", "mytable", false); | ||
| assertThat(name.toString()).isEqualTo("mykeyspace.mytable"); | ||
| } | ||
|
|
||
| @Test | ||
| void testDefaultConstructorDoesNotQuote() | ||
| { | ||
| QualifiedTableName name = new QualifiedTableName("MyKeyspace", "MyTable"); | ||
| assertThat(name.quoteIdentifiers()).isFalse(); | ||
| assertThat(name.maybeQuotedKeyspace()).isEqualTo("MyKeyspace"); | ||
| assertThat(name.maybeQuotedTable()).isEqualTo("MyTable"); | ||
| } | ||
|
|
||
| @Test | ||
| void testReservedWordIdentifiersQuoted() | ||
| { | ||
| QualifiedTableName name = new QualifiedTableName("keyspace", "table", true); | ||
| assertThat(name.maybeQuotedKeyspace()).isEqualTo("\"keyspace\""); | ||
| assertThat(name.maybeQuotedTable()).isEqualTo("\"table\""); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wondering here if we really need wrappers with the "maybe*" prefix, or we can just use this as default for keyspace() and table(). What do you think @yifan-c / @frankgh ?
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@bbotella @yifan-c @frankgh I think we should keep keyspace() and table() as raw-name accessors. They’re also used for SSTable metadata, local data-layer setup, and job statistics, so returning quoted names would require checking those callers too. The separate maybeQuoted accessors let us apply quoting when building Sidecar requests without changing other uses. CASSSIDECAR-475 fixes the metadata lookup inside Sidecar, but that’s separate from what these analytics accessors return. What do you think?