diff --git a/modules/core/src/main/scala/com.snowplowanalytics/iglu.schemaddl/redshift/ShredModelEntry.scala b/modules/core/src/main/scala/com.snowplowanalytics/iglu.schemaddl/redshift/ShredModelEntry.scala index 5a72dfba..4912c3d5 100644 --- a/modules/core/src/main/scala/com.snowplowanalytics/iglu.schemaddl/redshift/ShredModelEntry.scala +++ b/modules/core/src/main/scala/com.snowplowanalytics/iglu.schemaddl/redshift/ShredModelEntry.scala @@ -35,11 +35,9 @@ case class ShredModelEntry( .flatMap(_.apply(subSchema)) .getOrElse(ShredModelEntry.ColumnType.RedshiftVarchar(ShredModelEntry.VARCHAR_SIZE)) - lazy val compressionEncoding: ShredModelEntry.CompressionEncoding = (subSchema.`enum`, columnType) match { - case (Some(_), ShredModelEntry.ColumnType.RedshiftVarchar(size)) if size <= 255 => - ShredModelEntry.CompressionEncoding.Text255Encoding - case (_, ShredModelEntry.ColumnType.RedshiftBoolean) => ShredModelEntry.CompressionEncoding.RunLengthEncoding - case (_, ShredModelEntry.ColumnType.RedshiftDouble) => ShredModelEntry.CompressionEncoding.RawEncoding + lazy val compressionEncoding: ShredModelEntry.CompressionEncoding = columnType match { + case ShredModelEntry.ColumnType.RedshiftBoolean => ShredModelEntry.CompressionEncoding.RunLengthEncoding + case ShredModelEntry.ColumnType.RedshiftDouble => ShredModelEntry.CompressionEncoding.RawEncoding case _ => ShredModelEntry.CompressionEncoding.ZstdEncoding } @@ -169,7 +167,6 @@ object ShredModelEntry { implicit val compressionEncodingShow: Show[CompressionEncoding] = Show.show { case RawEncoding => s"ENCODE RAW" - case Text255Encoding => s"ENCODE TEXT255" case ZstdEncoding => s"ENCODE ZSTD" case RunLengthEncoding => "ENCODE RUNLENGTH" } @@ -178,8 +175,6 @@ object ShredModelEntry { case object RunLengthEncoding extends CompressionEncoding - case object Text255Encoding extends CompressionEncoding - case object ZstdEncoding extends CompressionEncoding } diff --git a/modules/core/src/test/scala/com/snowplowanalytics/iglu/schemaddl/redshift/internal/ShredModelEntrySpec.scala b/modules/core/src/test/scala/com/snowplowanalytics/iglu/schemaddl/redshift/internal/ShredModelEntrySpec.scala index 3d4e6408..cd23d0d9 100644 --- a/modules/core/src/test/scala/com/snowplowanalytics/iglu/schemaddl/redshift/internal/ShredModelEntrySpec.scala +++ b/modules/core/src/test/scala/com/snowplowanalytics/iglu/schemaddl/redshift/internal/ShredModelEntrySpec.scala @@ -85,9 +85,9 @@ class ShredModelEntrySpec extends Specification { } "suggest compression" should { - "suggest Text255Encoding for enums less then 255 in length" in { + "suggest zstd for enums less then 255 in length" in { val props = json"""{"type": "string", "enum": ["one", "two"], "maxLength": 42}""".schema - ShredModelEntry(dummyPtr, props).compressionEncoding must beEqualTo(Text255Encoding) + ShredModelEntry(dummyPtr, props).compressionEncoding must beEqualTo(ZstdEncoding) } "suggest RunLengthEncoding for booleans" in {