Revert "hack in zstd compression"

2 files changed, 24 insertions, 25 deletions

diff --git a/logserver/src/test/java/com/yahoo/logserver/handlers/archive/ArchiverHandlerTestCase.java b/logserver/src/test/java/com/yahoo/logserver/handlers/archive/ArchiverHandlerTestCase.java
index bffbde67fa4..f3153f7bc14 100644
--- a/logserver/src/test/java/com/yahoo/logserver/handlers/archive/ArchiverHandlerTestCase.java
+++ b/logserver/src/test/java/com/yahoo/logserver/handlers/archive/ArchiverHandlerTestCase.java
@@ -64,7 +64,7 @@ public class ArchiverHandlerTestCase {
         File tmpDir = temporaryFolder.newFolder();
 
         ArchiverHandler a = new ArchiverHandler(tmpDir.getAbsolutePath(),
-                                                1024, "gzip");
+                                                1024);
         long now = 1095159244095L;
         long midnight = 1095206400000L;
         assertEquals(2004091410, a.dateHash(now));
@@ -82,7 +82,7 @@ public class ArchiverHandlerTestCase {
         File tmpDir = temporaryFolder.newFolder();
         try {
             ArchiverHandler a = new ArchiverHandler(tmpDir.getAbsolutePath(),
-                                                    1024, "gzip");
+                                                    1024);
             LogMessage msg1 = LogMessage.parseNativeFormat("1139322725\thost\t1/1\tservice\tcomponent\tinfo\tpayload");
             LogMessage msg2 = LogMessage.parseNativeFormat("1161172200\thost\t1/1\tservice\tcomponent\tinfo\tpayload");
             assertEquals(tmpDir.getAbsolutePath() + "/2006/02/07/14", a.getPrefix(msg1));
@@ -103,7 +103,7 @@ public class ArchiverHandlerTestCase {
         File tmpDir = temporaryFolder.newFolder();
 
         ArchiverHandler a = new ArchiverHandler(tmpDir.getAbsolutePath(),
-                                                1024, "gzip");
+                                                1024);
 
         for (int i = 0; i < msg.length; i++) {
             a.handle(msg[i]);
@@ -168,8 +168,7 @@ public class ArchiverHandlerTestCase {
         File tmpDir = temporaryFolder.newFolder();
 
         ArchiverHandler a = new ArchiverHandler(tmpDir.getAbsolutePath(),
-                                                msg[1].toString().length() + 1,
-                                                "gzip");
+                                                msg[1].toString().length() + 1);
         // log the same message 4 times
         for (int i = 0; i < 4; i++) {
             a.handle(msg[1]);
@@ -206,7 +205,7 @@ public class ArchiverHandlerTestCase {
     public void testCacheEldestEntry() throws IOException {
         LogWriterLRUCache cache = new LogWriterLRUCache(5, (float) 0.75);
         String d = "target/tmp/logarchive";
-        FilesArchived archive = new FilesArchived(new File(d), "gzip");
+        FilesArchived archive = new FilesArchived(new File(d));
         for (int i = 0; i < cache.maxEntries + 10; i++) {
             cache.put(i, new LogWriter(d+"/2018/12/31/17", 5, archive));
         }
diff --git a/logserver/src/test/java/com/yahoo/logserver/handlers/archive/FilesArchivedTestCase.java b/logserver/src/test/java/com/yahoo/logserver/handlers/archive/FilesArchivedTestCase.java
index babe4b1479d..6004df88cfe 100644
--- a/logserver/src/test/java/com/yahoo/logserver/handlers/archive/FilesArchivedTestCase.java
+++ b/logserver/src/test/java/com/yahoo/logserver/handlers/archive/FilesArchivedTestCase.java
@@ -55,7 +55,7 @@ public class FilesArchivedTestCase {
         makeLogfile("2018/12/31/16-0", 1);
         makeLogfile("2018/12/31/17-0", 0);
         dumpFiles("before archive maintenance");
-        FilesArchived a = new FilesArchived(tmpDir, "zstd");
+        FilesArchived a = new FilesArchived(tmpDir);
         dumpFiles("also before archive maintenance");
 
         checkExist("foo/bar");
@@ -67,14 +67,14 @@ public class FilesArchivedTestCase {
         checkExist("2018/12/31/14-0");
         checkExist("2018/12/31/16-0");
         checkExist("2018/12/31/17-0");
-        checkNoExist("2018/11/20/13-0.zst");
-        checkNoExist("2018/11/21/13-0.zst");
-        checkNoExist("2018/12/28/13-0.zst");
-        checkNoExist("2018/12/29/13-0.zst");
-        checkNoExist("2018/12/30/13-0.zst");
-        checkNoExist("2018/12/31/14-0.zst");
-        checkNoExist("2018/12/31/16-0.zst");
-        checkNoExist("2018/12/31/17-0.zst");
+        checkNoExist("2018/11/20/13-0.gz");
+        checkNoExist("2018/11/21/13-0.gz");
+        checkNoExist("2018/12/28/13-0.gz");
+        checkNoExist("2018/12/29/13-0.gz");
+        checkNoExist("2018/12/30/13-0.gz");
+        checkNoExist("2018/12/31/14-0.gz");
+        checkNoExist("2018/12/31/16-0.gz");
+        checkNoExist("2018/12/31/17-0.gz");
 
         a.maintenance();
 
@@ -82,22 +82,22 @@ public class FilesArchivedTestCase {
         checkExist("foo/bar");
         checkExist("2018/12/31/17-0");
         checkExist("2018/12/31/16-0");
-        checkExist("2018/12/31/14-0.zst");
-        checkExist("2018/12/28/13-0.zst");
-        checkExist("2018/12/29/13-0.zst");
-        checkExist("2018/12/30/13-0.zst");
+        checkExist("2018/12/31/14-0.gz");
+        checkExist("2018/12/28/13-0.gz");
+        checkExist("2018/12/29/13-0.gz");
+        checkExist("2018/12/30/13-0.gz");
 
-        checkNoExist("2018/12/31/17-0.zst");
-        checkNoExist("2018/12/31/16-0.zst");
+        checkNoExist("2018/12/31/17-0.gz");
+        checkNoExist("2018/12/31/16-0.gz");
         checkNoExist("2018/12/31/14-0");
         checkNoExist("2018/12/28/13-0");
         checkNoExist("2018/12/29/13-0");
         checkNoExist("2018/12/30/13-0");
 
         checkNoExist("2018/11/20/13-0");
-        checkNoExist("2018/11/20/13-0.zst");
+        checkNoExist("2018/11/20/13-0.gz");
         checkNoExist("2018/11/21/13-0");
-        checkNoExist("2018/11/21/13-0.zst");
+        checkNoExist("2018/11/21/13-0.gz");
 
         makeLogfile("2018/12/31/16-0", 3);
         makeLogfile("2018/12/31/17-0", 3);
@@ -110,8 +110,8 @@ public class FilesArchivedTestCase {
 
         checkExist("2018/12/31/17-2");
         checkExist("2018/12/31/17-1");
-        checkExist("2018/12/31/16-0.zst");
-        checkExist("2018/12/31/17-0.zst");
+        checkExist("2018/12/31/16-0.gz");
+        checkExist("2018/12/31/17-0.gz");
 
         checkNoExist("2018/12/31/16-0");
         checkNoExist("2018/12/31/17-0");