Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
194 changes: 0 additions & 194 deletions docs/src/main/sphinx/connector/hive-caching.md

This file was deleted.

3 changes: 0 additions & 3 deletions docs/src/main/sphinx/connector/hive.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ Amazon S3 <hive-s3>
Azure Storage <hive-azure>
Google Cloud Storage <hive-gcs-tutorial>
IBM Cloud Object Storage <hive-cos>
Storage Caching <hive-caching>
Alluxio <hive-alluxio>
Object storage file formats <object-storage-file-formats>
```
Expand Down Expand Up @@ -351,8 +350,6 @@ The Hive connector supports the following storage options:
- {doc}`Google Cloud Storage <hive-gcs-tutorial>`
- {doc}`IBM Cloud Object Storage <hive-cos>`

The Hive connector also supports {doc}`storage caching <hive-caching>`.

## Security

Please see the {doc}`/connector/hive-security` section for information on the
Expand Down
2 changes: 1 addition & 1 deletion docs/src/main/sphinx/release/release-372.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@

* Allow redirects of Iceberg or Delta tables which have no ``StorageDescriptor``
in the Glue metastore. ({issue}`11092`)
* Stop logging spurious failures when [storage caching](/connector/hive-caching)
* Stop logging spurious failures when storage caching
is used. ({issue}`11101`)
* Allow reading Zstandard compressed Avro files. ({issue}`11090`)
* Fix incorrect query results after writes to a table when directory caching is
Expand Down
10 changes: 0 additions & 10 deletions lib/trino-hdfs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,6 @@
<artifactId>guice</artifactId>
</dependency>

<dependency>
<groupId>com.qubole.rubix</groupId>
<artifactId>rubix-presto-shaded</artifactId>
</dependency>

<dependency>
<groupId>dev.failsafe</groupId>
<artifactId>failsafe</artifactId>
</dependency>

<dependency>
<groupId>io.airlift</groupId>
<artifactId>bootstrap</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
import io.trino.hdfs.azure.HiveAzureModule;
import io.trino.hdfs.cos.HiveCosModule;
import io.trino.hdfs.gcs.HiveGcsModule;
import io.trino.hdfs.rubix.RubixEnabledConfig;
import io.trino.hdfs.rubix.RubixModule;
import io.trino.hdfs.s3.HiveS3Module;
import io.trino.plugin.base.CatalogName;
import io.trino.plugin.base.jmx.ConnectorObjectNameGeneratorModule;
Expand All @@ -38,8 +36,6 @@
import java.util.Map;
import java.util.Set;

import static io.airlift.configuration.ConditionalModule.conditionalModule;

public final class HdfsFileSystemManager
{
private final Bootstrap bootstrap;
Expand All @@ -64,9 +60,6 @@ public HdfsFileSystemManager(
modules.add(new HdfsModule());
modules.add(new HdfsAuthenticationModule());
modules.add(new HiveCosModule());

modules.add(conditionalModule(RubixEnabledConfig.class, RubixEnabledConfig::isCacheEnabled, new RubixModule()));

modules.add(binder -> {
binder.bind(NodeManager.class).toInstance(nodeManager);
binder.bind(OpenTelemetry.class).toInstance(openTelemetry);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@
import io.airlift.configuration.AbstractConfigurationAwareModule;
import io.trino.hdfs.ConfigurationInitializer;
import io.trino.hdfs.DynamicConfigurationProvider;
import io.trino.hdfs.rubix.RubixEnabledConfig;

import static com.google.common.base.Preconditions.checkArgument;
import static com.google.inject.multibindings.Multibinder.newSetBinder;
import static io.airlift.configuration.ConfigBinder.configBinder;

Expand All @@ -35,7 +33,6 @@ protected void setup(Binder binder)
newSetBinder(binder, ConfigurationInitializer.class).addBinding().to(GoogleGcsConfigurationInitializer.class).in(Scopes.SINGLETON);

if (buildConfigObject(HiveGcsConfig.class).isUseGcsAccessToken()) {
checkArgument(!buildConfigObject(RubixEnabledConfig.class).isCacheEnabled(), "Use of GCS access token is not compatible with Hive caching");
newSetBinder(binder, DynamicConfigurationProvider.class).addBinding().to(GcsConfigurationProvider.class).in(Scopes.SINGLETON);
}

Expand Down

This file was deleted.

Loading