-
Notifications
You must be signed in to change notification settings - Fork 300
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
Revert various cleanup fixes (#2467) #2498
Merged
Merged
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
aimethed
reviewed
Dec 23, 2024
@@ -136,7 +134,7 @@ private MongoClient getOrCreateConn(MetadataRequest request) | |||
{ | |||
String connStr = getConnStr(request); | |||
if (configOptions.containsKey(SECRET_NAME) && !hasEmbeddedSecret(connStr)) { | |||
connStr = String.join(connStr.substring(0, DOCDB_CONN_STRING_PREFIX.length()), "${", configOptions.get(SECRET_NAME), "}@", connStr.substring(DOCDB_CONN_STRING_PREFIX.length())); | |||
connStr = connStr.substring(0, 10) + "${" + configOptions.get(SECRET_NAME) + "}@" + connStr.substring(10); |
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.
We will need to remember to go back here and get rid of the 10 magic number
aimethed
reviewed
Dec 23, 2024
@@ -161,7 +161,8 @@ public void getPartitions(final BlockWriter blockWriter, final GetTableLayoutReq | |||
LOGGER.debug("{}: Schema {}, table {}", getTableLayoutRequest.getQueryId(), transformString(getTableLayoutRequest.getTableName().getSchemaName(), true), | |||
transformString(getTableLayoutRequest.getTableName().getTableName(), true)); | |||
try (Connection connection = getJdbcConnectionFactory().getConnection(getCredentialProvider())) { | |||
List<String> parameters = Arrays.asList(transformString(getTableLayoutRequest.getTableName().getTableName(), true)); | |||
List<String> parameters = Arrays.asList(transformString(getTableLayoutRequest.getTableName().getTableName(), true)); | |||
//try (Statement statement = connection.createStatement(); ResultSet resultSet = statement.executeQuery(GET_PARTITIONS_QUERY + )) |
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.
one comment to remove
aimethed
approved these changes
Dec 23, 2024
AbdulR3hman
force-pushed
the
revert-2467
branch
from
December 23, 2024 20:32
027f408
to
27b9e3f
Compare
AbdulR3hman
force-pushed
the
revert-2467
branch
from
December 23, 2024 20:32
27b9e3f
to
bbb7590
Compare
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.
Issue #, if available:
partially reverts commit 0ffb7b8.
Description of changes:
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.