aboutsummaryrefslogtreecommitdiffstats
path: root/document
diff options
context:
space:
mode:
authorArne H Juul <arnej@yahooinc.com>2022-06-02 10:23:29 +0000
committergjoranv <gv@verizonmedia.com>2022-06-08 11:45:24 +0200
commitbab6cee587fc7605c86a146467c307b0fe2cda83 (patch)
tree2d3c6576eb66ae29d55d399db2857e320e5f6df1 /document
parent7ac67f70bc53de2030dee9bd2a8de2f2ed375cf0 (diff)
remove unused compressor config api
Diffstat (limited to 'document')
-rw-r--r--document/abi-spec.json7
-rwxr-xr-xdocument/src/main/java/com/yahoo/document/BaseStructDataType.java21
-rw-r--r--document/src/main/java/com/yahoo/document/DocumentTypeManagerConfigurer.java10
-rw-r--r--document/src/main/java/com/yahoo/document/datatypes/Struct.java16
4 files changed, 0 insertions, 54 deletions
diff --git a/document/abi-spec.json b/document/abi-spec.json
index d7cc513619f..7748a927c6d 100644
--- a/document/abi-spec.json
+++ b/document/abi-spec.json
@@ -42,9 +42,6 @@
"public boolean hasField(java.lang.String)",
"public java.util.Collection getFields()",
"public int getFieldCount()",
- "public com.yahoo.compress.Compressor getCompressor()",
- "public com.yahoo.document.CompressionConfig getCompressionConfig()",
- "public void setCompressionConfig(com.yahoo.document.CompressionConfig)",
"public bridge synthetic com.yahoo.document.DataType clone()",
"public bridge synthetic com.yahoo.vespa.objects.Identifiable clone()",
"public bridge synthetic java.lang.Object clone()"
@@ -534,7 +531,6 @@
],
"methods": [
"public void <init>(com.yahoo.document.DocumentTypeManager)",
- "public static com.yahoo.compress.CompressionType toCompressorType(com.yahoo.document.config.DocumentmanagerConfig$Datatype$Structtype$Compresstype$Enum)",
"public static com.yahoo.config.subscription.ConfigSubscriber configure(com.yahoo.document.DocumentTypeManager, java.lang.String)",
"public com.yahoo.config.subscription.ConfigSubscriber configure(java.lang.String)",
"public static com.yahoo.document.DocumentTypeManager configureNewManager(com.yahoo.document.config.DocumentmanagerConfig)",
@@ -2245,9 +2241,6 @@
"public com.yahoo.document.StructDataType getDataType()",
"public void setVersion(int)",
"public int getVersion()",
- "public com.yahoo.compress.CompressionType getCompressionType()",
- "public int getCompressionLevel()",
- "public float getCompressionThreshold()",
"public com.yahoo.document.datatypes.Struct clone()",
"public void clear()",
"public java.util.Iterator iterator()",
diff --git a/document/src/main/java/com/yahoo/document/BaseStructDataType.java b/document/src/main/java/com/yahoo/document/BaseStructDataType.java
index 1bce5d716a4..a84a08c5677 100755
--- a/document/src/main/java/com/yahoo/document/BaseStructDataType.java
+++ b/document/src/main/java/com/yahoo/document/BaseStructDataType.java
@@ -99,25 +99,4 @@ public abstract class BaseStructDataType extends StructuredDataType {
return fields.size();
}
- /** Returns the compressor to use to compress data of this type
- * @deprecated Will go away on Vespa 8
- */
- @Deprecated
- public Compressor getCompressor() { return new Compressor(CompressionType.NONE); }
-
- /** Returns a view of the configuration of the compressor used to compress this type
- * @deprecated Will go away on Vespa 8
- */
- @Deprecated
- public CompressionConfig getCompressionConfig() {
- return new CompressionConfig();
- }
-
- /**
- * Set the config to the compressor used to compress data of this type
- * @deprecated Ignored and will go away on Vespa 8
- */
- @Deprecated
- public void setCompressionConfig(CompressionConfig config) { }
-
}
diff --git a/document/src/main/java/com/yahoo/document/DocumentTypeManagerConfigurer.java b/document/src/main/java/com/yahoo/document/DocumentTypeManagerConfigurer.java
index 76dac2bdc20..3ecf7503013 100644
--- a/document/src/main/java/com/yahoo/document/DocumentTypeManagerConfigurer.java
+++ b/document/src/main/java/com/yahoo/document/DocumentTypeManagerConfigurer.java
@@ -35,16 +35,6 @@ public class DocumentTypeManagerConfigurer implements ConfigSubscriber.SingleSub
this.managerToConfigure = manager;
}
- /** Deprecated and will go away on Vespa 8 */
- @Deprecated
- public static CompressionType toCompressorType(DocumentmanagerConfig.Datatype.Structtype.Compresstype.Enum value) {
- switch (value) {
- case NONE: return CompressionType.NONE;
- case LZ4: return CompressionType.LZ4;
- case UNCOMPRESSABLE: return CompressionType.INCOMPRESSIBLE;
- }
- throw new IllegalArgumentException("Compression type " + value + " is not supported");
- }
/**
* <p>Makes the DocumentTypeManager subscribe on its config.</p>
*
diff --git a/document/src/main/java/com/yahoo/document/datatypes/Struct.java b/document/src/main/java/com/yahoo/document/datatypes/Struct.java
index b47dbe69199..d522e8cda44 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/Struct.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/Struct.java
@@ -65,22 +65,6 @@ public class Struct extends StructuredFieldValue {
return this.version;
}
- /** @deprecated Will go away on Vespa 8 */
- @Deprecated
- public com.yahoo.compress.CompressionType getCompressionType() {
- return com.yahoo.compress.CompressionType.NONE;
- }
-
- /** @deprecated Will go away on Vespa 8 */
- @Deprecated
- public int getCompressionLevel() { return 9; }
-
- /** @deprecated Will go away on Vespa 8 */
- @Deprecated
- public float getCompressionThreshold() {
- return .95f;
- }
-
@Override
public Struct clone() {
Struct struct = (Struct) super.clone();