Skip to content

Pass credentials in SqlFunctionProperties #17222

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.

Sign up for GitHub

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

Merged
highker merged 1 commit into from
Jan 27, 2022
Merged

Pass credentials in SqlFunctionProperties #17222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 26 additions & 4 deletions presto-common/src/main/java/com/facebook/presto/common/function/SqlFunctionProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@
import com.facebook.presto.common.type.TimeZoneKey;

import java.util.Locale;
import java.util.Map;
import java.util.Objects;

import static java.util.Collections.emptyMap;
import static java.util.Collections.unmodifiableMap;
import static java.util.Objects.requireNonNull;

public class SqlFunctionProperties
Expand All @@ -31,6 +34,7 @@ public class SqlFunctionProperties
private final long sessionStartTime;
private final Locale sessionLocale;
private final String sessionUser;
private final Map<String, String> extraCredentials;

private SqlFunctionProperties(
boolean parseDecimalLiteralAsDouble,
Expand All @@ -41,7 +45,8 @@ private SqlFunctionProperties(
boolean legacyMapSubscript,
long sessionStartTime,
Locale sessionLocale,
String sessionUser)
String sessionUser,
Map<String, String> extraCredentials)
{
this.parseDecimalLiteralAsDouble = parseDecimalLiteralAsDouble;
this.legacyRowFieldOrdinalAccessEnabled = legacyRowFieldOrdinalAccessEnabled;
Expand All @@ -52,6 +57,7 @@ private SqlFunctionProperties(
this.sessionStartTime = sessionStartTime;
this.sessionLocale = requireNonNull(sessionLocale, "sessionLocale is null");
this.sessionUser = requireNonNull(sessionUser, "sessionUser is null");
this.extraCredentials = requireNonNull(extraCredentials, "extraCredentials is null");
}

public boolean isParseDecimalLiteralAsDouble()
Expand Down Expand Up @@ -100,6 +106,11 @@ public String getSessionUser()
return sessionUser;
}

public Map<String, String> getExtraCredentials()
{
return extraCredentials;
}

@Override
public boolean equals(Object o)
{
Expand All @@ -114,13 +125,17 @@ public boolean equals(Object o)
Objects.equals(legacyRowFieldOrdinalAccessEnabled, that.legacyRowFieldOrdinalAccessEnabled) &&
Objects.equals(timeZoneKey, that.timeZoneKey) &&
Objects.equals(legacyTimestamp, that.legacyTimestamp) &&
Objects.equals(legacyMapSubscript, that.legacyMapSubscript);
Objects.equals(legacyMapSubscript, that.legacyMapSubscript) &&
Objects.equals(sessionStartTime, that.sessionStartTime) &&
Objects.equals(sessionLocale, that.sessionLocale) &&
Objects.equals(sessionUser, that.sessionUser) &&
Objects.equals(extraCredentials, that.extraCredentials);
}

@Override
public int hashCode()
{
return Objects.hash(parseDecimalLiteralAsDouble, legacyRowFieldOrdinalAccessEnabled, timeZoneKey, legacyTimestamp, legacyMapSubscript);
return Objects.hash(parseDecimalLiteralAsDouble, legacyRowFieldOrdinalAccessEnabled, timeZoneKey, legacyTimestamp, legacyMapSubscript, sessionStartTime, sessionLocale, sessionUser, extraCredentials);
}

public static Builder builder()
Expand All @@ -139,6 +154,7 @@ public static class Builder
private long sessionStartTime;
private Locale sessionLocale;
private String sessionUser;
private Map<String, String> extraCredentials = emptyMap();

private Builder() {}

Expand Down Expand Up @@ -196,9 +212,15 @@ public Builder setSessionUser(String sessionUser)
return this;
}

public Builder setExtraCredentials(Map<String, String> extraCredentials)
{
this.extraCredentials = unmodifiableMap(extraCredentials);
return this;
}

public SqlFunctionProperties build()
{
return new SqlFunctionProperties(parseDecimalLiteralAsDouble, legacyRowFieldOrdinalAccessEnabled, legacyTypeCoercionWarningEnabled, timeZoneKey, legacyTimestamp, legacyMapSubscript, sessionStartTime, sessionLocale, sessionUser);
return new SqlFunctionProperties(parseDecimalLiteralAsDouble, legacyRowFieldOrdinalAccessEnabled, legacyTypeCoercionWarningEnabled, timeZoneKey, legacyTimestamp, legacyMapSubscript, sessionStartTime, sessionLocale, sessionUser, extraCredentials);
}
}
}
1 change: 1 addition & 0 deletions presto-main/src/main/java/com/facebook/presto/Session.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,7 @@ public SqlFunctionProperties getSqlFunctionProperties()
.setSessionStartTime(getStartTime())
.setSessionLocale(getLocale())
.setSessionUser(getUser())
.setExtraCredentials(identity.getExtraCredentials())
.build();
}

Expand Down