PHOENIX-6271: Effective DDL generated by SchemaExtractionTool should … #1212
Conversation
This file contains 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
|
💔 -1 overall
This message was automatically generated. |
gokceni
reviewed
Apr 27, 2021
| @@ -1275,15 +1275,21 @@ public static String getPTableFullNameWithQuotes(String pSchemaName, String pTab | |||
| pTableName = "\""+pTableName+"\""; | |||
| } | |||
| if(tableNameNeedsQuotes || schemaNameNeedsQuotes) { | |||
| pTableFullName = pSchemaName + "." + pTableName; | |||
| if (pSchemaName != null && !pSchemaName.isEmpty()) { | |||
There was a problem hiding this comment.
nit: Strings.isNullOrEmpty
There was a problem hiding this comment.
Also do you need to think about namespaceenabled? I am guessing no
| return pTableFullName; | ||
| } | ||
|
|
||
| private static boolean isQuotesNeeded(String name) { | ||
| // first char numeric or non-underscore | ||
| if(!Character.isAlphabetic(name.charAt(0)) && name.charAt(0)!='_') { | ||
| if (name == null || name.isEmpty()) { |
There was a problem hiding this comment.
nit: Strings.isNullOrEmpty
gjacoby126
requested changes
Apr 27, 2021
There was a problem hiding this comment.
Maybe I'm misunderstanding what you're trying to do in this patch, but the results for indexes look incorrect to me. The effective DDL of an index shouldn't contain the PK suffix inherited from the base table or parent view. (I can see it being useful to include such a thing in a SQL comment or something, but not the CREATE INDEX statement itself)
| if (effectivePK.isEmpty()) { | ||
| effectivePK = indexPkSet; | ||
| // This is added because of PHOENIX-2340 | ||
| if (dataPTable.isMultiTenant() && indexPKName.contains(dataPKName.get(0))) { |
There was a problem hiding this comment.
nit: can we have a String tenantId = dataPKName.get(0); line and use that in the checks? I worry that if we ever implement PHOENIX-5248 that the current logic here will be too subtle for the implementer to realize that it needs to be changed if we can't depend on first column == tenantId.
phoenix-tools/src/it/java/org/apache/phoenix/schema/SchemaExtractionToolIT.java
Outdated
Show resolved
Hide resolved
phoenix-tools/src/it/java/org/apache/phoenix/schema/SchemaExtractionToolIT.java
Show resolved
Hide resolved
phoenix-tools/src/it/java/org/apache/phoenix/schema/SchemaExtractionToolIT.java
Show resolved
Hide resolved
phoenix-tools/src/it/java/org/apache/phoenix/schema/SchemaExtractionToolIT.java
Outdated
Show resolved
Hide resolved
phoenix-tools/src/it/java/org/apache/phoenix/schema/SchemaExtractionToolIT.java
Outdated
Show resolved
Hide resolved
…maintain the order of PK and other columns
|
💔 -1 overall
This message was automatically generated. |
gjacoby126
approved these changes
Apr 29, 2021
There was a problem hiding this comment.
+1, thanks for the patch and adding the extra test assertions, @swaroopak
| @@ -47,6 +47,7 @@ | |||
|
|
|||
| import javax.annotation.Nullable; | |||
|
|
|||
| import com.google.common.base.Strings; | |||
There was a problem hiding this comment.
Remember that you'll have to use the shaded version when you port to master.
phoenix-tools/src/it/java/org/apache/phoenix/schema/SchemaExtractionToolIT.java
Show resolved
Hide resolved
gokceni
approved these changes
Apr 29, 2021
|
Thank you for the review @gjacoby126 @gokceni |
swaroopak
added a commit
that referenced
this pull request
May 21, 2021
…maintain the order of PK and other columns (#1212) Co-authored-by: Swaroopa Kadam <s.kadam@apache.org>
stoty
pushed a commit
to stoty/phoenix
that referenced
this pull request
Jun 18, 2021
…maintain the order of PK and other columns (apache#1212) Co-authored-by: Swaroopa Kadam <s.kadam@apache.org>
asfgit
pushed a commit
that referenced
this pull request
Jun 18, 2021
…maintain the order of PK and other columns (#1212) Co-authored-by: Swaroopa Kadam <s.kadam@apache.org>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
…maintain the order of PK and other columns