Snappy library was removed

orientechnologies · Dec 29, 2017 · bd9ff47 · bd9ff47
1 parent 6e980ba
commit bd9ff47
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 79 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -37,7 +37,6 @@
             javax.imageio.spi,sun.misc;resolution:=optional,
             com.orientechnologies.orient.client.remote;resolution:=optional,
             com.sun.jna;resolution:=optional,
-            org.xerial.snappy;resolution:=optional,
             sun.nio.ch;resolution:=optional,
             com.orientechnologies.orient.server.distributed.impl;resolution:=optional,
             com.orientechnologies.orient.server.distributed.impl.task;resolution:=optional,
@@ -240,12 +239,6 @@
             <version>4.5.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.xerial.snappy</groupId>
-            <artifactId>snappy-java</artifactId>
-            <version>1.1.0.1</version>
-        </dependency>
-
         <dependency>
             <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
             <artifactId>concurrentlinkedhashmap-lru</artifactId>

diff --git a/core/src/main/java/com/orientechnologies/orient/core/compression/OCompressionFactory.java b/core/src/main/java/com/orientechnologies/orient/core/compression/OCompressionFactory.java
@@ -26,7 +26,6 @@
 import com.orientechnologies.orient.core.compression.impl.OHighZIPCompression;
 import com.orientechnologies.orient.core.compression.impl.OLowZIPCompression;
 import com.orientechnologies.orient.core.compression.impl.ONothingCompression;
-import com.orientechnologies.orient.core.compression.impl.OSnappyCompression;
 import com.orientechnologies.orient.core.exception.OSecurityException;
 
 import java.util.HashMap;
@@ -52,7 +51,6 @@ public OCompressionFactory() {
     register(new OHighZIPCompression());
     register(new OLowZIPCompression());
     register(new OGZIPCompression());
-    register(new OSnappyCompression());
     register(new ONothingCompression());
   }
 

diff --git a/.../src/main/java/com/orientechnologies/orient/core/compression/impl/OSnappyCompression.java b/.../src/main/java/com/orientechnologies/orient/core/compression/impl/OSnappyCompression.java
diff --git a/core/src/main/java/com/orientechnologies/orient/core/config/OGlobalConfiguration.java b/core/src/main/java/com/orientechnologies/orient/core/config/OGlobalConfiguration.java
@@ -195,7 +195,7 @@ public void change(Object currentValue, Object newValue) {
       "Indicates a force sync should be performed for each update on the storage configuration", Boolean.class, true),
 
   STORAGE_COMPRESSION_METHOD("storage.compressionMethod", "Record compression method used in storage"
-      + " Possible values : gzip, nothing, snappy, snappy-native. Default is 'nothing' that means no compression", String.class,
+      + " Possible values : gzip, nothing. Default is 'nothing' that means no compression", String.class,
       "nothing"),
 
   STORAGE_ENCRYPTION_METHOD("storage.encryptionMethod",

diff --git a/tools/src/main/java/com/orientechnologies/orient/console/OConsoleDatabaseApp.java b/tools/src/main/java/com/orientechnologies/orient/console/OConsoleDatabaseApp.java
@@ -268,7 +268,7 @@ public void createDatabase(
       @ConsoleParameter(name = "password", optional = true, description = "Server administrator password") String userPassword,
       @ConsoleParameter(name = "storage-type", optional = true, description = "The type of the storage: 'plocal' for disk-based databases and 'memory' for in-memory database") String storageType,
       @ConsoleParameter(name = "db-type", optional = true, description = "The type of the database used between 'document' and 'graph'. By default is graph.") String databaseType,
-      @ConsoleParameter(name = "[options]", optional = true, description = "Additional options, example: -encryption=aes -compression=snappy") final String options)
+      @ConsoleParameter(name = "[options]", optional = true, description = "Additional options, example: -encryption=aes -compression=nothing") final String options)
       throws IOException {
 
     disconnect();
@@ -321,7 +321,7 @@ else if ("-compression".equalsIgnoreCase(oentry.getKey()))
   }
 
   protected Map<String, String> parseCommandOptions(
-      @ConsoleParameter(name = "[options]", optional = true, description = "Additional options, example: -encryption=aes -compression=snappy") String options) {
+      @ConsoleParameter(name = "[options]", optional = true, description = "Additional options, example: -encryption=aes -compression=nothing") String options) {
     final Map<String, String> omap = new HashMap<String, String>();
     if (options != null) {
       final List<String> kvOptions = OStringSerializerHelper.smartSplit(options, ',', false);