Skip to content

378 patch #1

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

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

378 patch #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99cb8be
Remove unused plugins, disable file desc check and hardcode note URI …
rdettai Nov 4, 2022
61eb98d
Also hardcode memory URI as localhost
rdettai Nov 4, 2022
f0418c0
Move hardcoded URI into InternalNode obj
rdettai Nov 4, 2022
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
8 changes: 7 additions & 1 deletion core/trino-main/src/main/java/io/trino/metadata/InternalNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import java.net.InetAddress;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.UnknownHostException;
import java.util.Optional;

Expand All @@ -43,7 +44,12 @@ public InternalNode(String nodeIdentifier, URI internalUri, NodeVersion nodeVers
{
nodeIdentifier = emptyToNull(nullToEmpty(nodeIdentifier).trim());
this.nodeIdentifier = requireNonNull(nodeIdentifier, "nodeIdentifier is null or empty");
this.internalUri = requireNonNull(internalUri, "internalUri is null");
try {
this.internalUri = new URI("http", null, "localhost", 8080, null, null, null);
}
catch (URISyntaxException e) {
throw new IllegalArgumentException(e);
}
this.nodeVersion = requireNonNull(nodeVersion, "nodeVersion is null");
this.coordinator = coordinator;
}
Expand Down
2 changes: 0 additions & 2 deletions core/trino-main/src/main/java/io/trino/server/Server.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@
import static com.google.common.collect.ImmutableSet.toImmutableSet;
import static io.airlift.discovery.client.ServiceAnnouncement.ServiceAnnouncementBuilder;
import static io.airlift.discovery.client.ServiceAnnouncement.serviceAnnouncement;
import static io.trino.server.TrinoSystemRequirements.verifyJvmRequirements;
import static io.trino.server.TrinoSystemRequirements.verifySystemTimeIsReasonable;
import static java.lang.String.format;
import static java.nio.file.LinkOption.NOFOLLOW_LINKS;
Expand All @@ -82,7 +81,6 @@ public final void start(String trinoVersion)

private void doStart(String trinoVersion)
{
verifyJvmRequirements();
verifySystemTimeIsReasonable();

Logger log = Logger.get(Server.class);
Expand Down
245 changes: 0 additions & 245 deletions core/trino-server/src/main/provisio/trino.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,254 +32,9 @@
</artifact>
</artifactSet>

<artifactSet to="plugin/password-authenticators">
<artifact id="${project.groupId}:trino-password-authenticators:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/session-property-managers">
<artifact id="${project.groupId}:trino-session-property-managers:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/jmx">
<artifact id="${project.groupId}:trino-jmx:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/cassandra">
<artifact id="${project.groupId}:trino-cassandra:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/clickhouse">
<artifact id="${project.groupId}:trino-clickhouse:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/example-http">
<artifact id="${project.groupId}:trino-example-http:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/hive">
<artifact id="${project.groupId}:trino-hive-hadoop2:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/iceberg">
<artifact id="${project.groupId}:trino-iceberg:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/memory">
<artifact id="${project.groupId}:trino-memory:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/blackhole">
<artifact id="${project.groupId}:trino-blackhole:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/kafka">
<artifact id="${project.groupId}:trino-kafka:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/kudu">
<artifact id="${project.groupId}:trino-kudu:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/atop">
<artifact id="${project.groupId}:trino-atop:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/ml">
<artifact id="${project.groupId}:trino-ml:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/geospatial">
<artifact id="${project.groupId}:trino-geospatial:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/singlestore">
<artifact id="${project.groupId}:trino-singlestore:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/mysql">
<artifact id="${project.groupId}:trino-mysql:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/oracle">
<artifact id="${project.groupId}:trino-oracle:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/phoenix">
<artifact id="${project.groupId}:trino-phoenix:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/phoenix5">
<artifact id="${project.groupId}:trino-phoenix5:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/postgresql">
<artifact id="${project.groupId}:trino-postgresql:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/prometheus">
<artifact id="${project.groupId}:trino-prometheus:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/http-event-listener">
<artifact id="${project.groupId}:trino-http-event-listener:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/redshift">
<artifact id="${project.groupId}:trino-redshift:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/sqlserver">
<artifact id="${project.groupId}:trino-sqlserver:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/raptor-legacy">
<artifact id="${project.groupId}:trino-raptor-legacy:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/redis">
<artifact id="${project.groupId}:trino-redis:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/tpch">
<artifact id="${project.groupId}:trino-tpch:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/tpcds">
<artifact id="${project.groupId}:trino-tpcds:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/teradata-functions">
<artifact id="${project.groupId}:trino-teradata-functions:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/mongodb">
<artifact id="${project.groupId}:trino-mongodb:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/local-file">
<artifact id="${project.groupId}:trino-local-file:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/accumulo">
<artifact id="${project.groupId}:trino-accumulo:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/thrift">
<artifact id="${project.groupId}:trino-thrift:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/elasticsearch">
<artifact id="${project.groupId}:trino-elasticsearch:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/google-sheets">
<artifact id="${project.groupId}:trino-google-sheets:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/kinesis">
<artifact id="${project.groupId}:trino-kinesis:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/bigquery">
<artifact id="${project.groupId}:trino-bigquery:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>
<artifactSet to="plugin/pinot">
<artifact id="${project.groupId}:trino-pinot:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/druid">
<artifact id="${project.groupId}:trino-druid:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/delta-lake">
<artifact id="${project.groupId}:trino-delta-lake:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>

<artifactSet to="plugin/exchange">
<artifact id="${project.groupId}:trino-exchange:zip:${project.version}">
<unpack />
</artifact>
</artifactSet>
</runtime>