diff --git a/extensions/parquet/table/src/test/e0.py b/extensions/parquet/table/src/test/e0.py index 09416337baa..f6cc32c323d 100644 --- a/extensions/parquet/table/src/test/e0.py +++ b/extensions/parquet/table/src/test/e0.py @@ -8,7 +8,8 @@ "c": np.arange(3, 6).astype("u1"), "d": np.arange(4.0, 7.0, dtype="float64"), "e": [True, False, True], - "f": pd.date_range("20130101", periods=3), + # TODO(deephaven-core#976): Unable to read parquet TimestampLogicalTypeAnnotation that is not adjusted to UTC + # "f": pd.date_range("20130101", periods=3), "g": pd.date_range("20130101", periods=3, tz="US/Eastern"), "h": pd.Categorical(list("abc")), "i": pd.Categorical(list("abc"), ordered=True), diff --git a/extensions/parquet/table/src/test/e1.py b/extensions/parquet/table/src/test/e1.py index 408c327f3a8..450179b49e1 100644 --- a/extensions/parquet/table/src/test/e1.py +++ b/extensions/parquet/table/src/test/e1.py @@ -8,7 +8,8 @@ "c": np.arange(3, 6).astype("u1"), "d": np.arange(4.0, 7.0, dtype="float64"), "e": [True, False, True], - "f": pd.date_range("20130101", periods=3), + # TODO(deephaven-core#976): Unable to read parquet TimestampLogicalTypeAnnotation that is not adjusted to UTC + # "f": pd.date_range("20130101", periods=3), "g": pd.date_range("20130101", periods=3, tz="US/Eastern"), "h": pd.Categorical(list("abc")), "i": pd.Categorical(list("abc"), ordered=True), diff --git a/extensions/parquet/table/src/test/e2.py b/extensions/parquet/table/src/test/e2.py index 446fb28519a..9fa3560a1e0 100644 --- a/extensions/parquet/table/src/test/e2.py +++ b/extensions/parquet/table/src/test/e2.py @@ -8,7 +8,8 @@ "c": np.arange(3, 6).astype("u1"), "d": np.arange(4.0, 7.0, dtype="float64"), "e": [True, False, True], - "f": pd.date_range("20130101", periods=3), + # TODO(deephaven-core#976): Unable to read parquet TimestampLogicalTypeAnnotation that is not adjusted to UTC + # "f": pd.date_range("20130101", periods=3), "g": pd.date_range("20130101", periods=3, tz="US/Eastern"), "h": pd.Categorical(list("abc")), "i": pd.Categorical(list("abc"), ordered=True), diff --git a/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/TestParquetTools.java b/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/TestParquetTools.java index ba2741bdadf..e116b65bc0f 100644 --- a/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/TestParquetTools.java +++ b/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/TestParquetTools.java @@ -23,8 +23,6 @@ import java.io.File; import java.io.IOException; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.nio.file.Files; import java.util.ArrayList; @@ -432,8 +430,9 @@ public void e0() { final Table gzip = ParquetTools.readTable(TestParquetTools.class.getResource("/e0/gzip.parquet").getFile()); assertTableEquals(uncompressed, gzip); - final Table lz4 = ParquetTools.readTable(TestParquetTools.class.getResource("/e0/lz4.parquet").getFile()); - assertTableEquals(uncompressed, lz4); + // TODO(deephaven-core#3585): LZ4_RAW parquet support + // final Table lz4 = ParquetTools.readTable(TestParquetTools.class.getResource("/e0/lz4.parquet").getFile()); + // assertTableEquals(uncompressed, lz4); final Table snappy = ParquetTools.readTable(TestParquetTools.class.getResource("/e0/snappy.parquet").getFile()); assertTableEquals(uncompressed, snappy); @@ -461,24 +460,24 @@ public void e1() { assertTableEquals(uncompressed, zstd); } - // TODO(deephaven-core#3588): Unable to read parquet TimestampLogicalTypeAnnotation that is not adjusted to UTC - // @Test - // public void e2() { - // final Table uncompressed = - // ParquetTools.readTable(TestParquetTools.class.getResource("/e2/uncompressed.parquet").getFile()); - // - // final Table gzip = ParquetTools.readTable(TestParquetTools.class.getResource("/e2/gzip.parquet").getFile()); - // assertTableEquals(uncompressed, gzip); - // - // final Table lz4 = ParquetTools.readTable(TestParquetTools.class.getResource("/e2/lz4.parquet").getFile()); - // assertTableEquals(uncompressed, lz4); - // - // final Table snappy = ParquetTools.readTable(TestParquetTools.class.getResource("/e2/snappy.parquet").getFile()); - // assertTableEquals(uncompressed, snappy); - // - // final Table zstd = ParquetTools.readTable(TestParquetTools.class.getResource("/e2/zstd.parquet").getFile()); - // assertTableEquals(uncompressed, zstd); - // } + @Test + public void e2() { + final Table uncompressed = + ParquetTools.readTable(TestParquetTools.class.getResource("/e2/uncompressed.parquet").getFile()); + + final Table gzip = ParquetTools.readTable(TestParquetTools.class.getResource("/e2/gzip.parquet").getFile()); + assertTableEquals(uncompressed, gzip); + + // TODO(deephaven-core#3585): LZ4_RAW parquet support + // final Table lz4 = ParquetTools.readTable(TestParquetTools.class.getResource("/e2/lz4.parquet").getFile()); + // assertTableEquals(uncompressed, lz4); + + final Table snappy = ParquetTools.readTable(TestParquetTools.class.getResource("/e2/snappy.parquet").getFile()); + assertTableEquals(uncompressed, snappy); + + final Table zstd = ParquetTools.readTable(TestParquetTools.class.getResource("/e2/zstd.parquet").getFile()); + assertTableEquals(uncompressed, zstd); + } private void testWriteRead(Table source, Function transform) { final File f2w = new File(testRoot, "testWriteRead.parquet"); diff --git a/extensions/parquet/table/src/test/resources/e0/brotli.parquet b/extensions/parquet/table/src/test/resources/e0/brotli.parquet index 01e7d994f64..d61ea1754fd 100644 Binary files a/extensions/parquet/table/src/test/resources/e0/brotli.parquet and b/extensions/parquet/table/src/test/resources/e0/brotli.parquet differ diff --git a/extensions/parquet/table/src/test/resources/e0/gzip.parquet b/extensions/parquet/table/src/test/resources/e0/gzip.parquet index b68912d7cdb..4e89b8a24aa 100644 Binary files a/extensions/parquet/table/src/test/resources/e0/gzip.parquet and b/extensions/parquet/table/src/test/resources/e0/gzip.parquet differ diff --git a/extensions/parquet/table/src/test/resources/e0/lz4.parquet b/extensions/parquet/table/src/test/resources/e0/lz4.parquet index 7762b171369..788ddbab312 100644 Binary files a/extensions/parquet/table/src/test/resources/e0/lz4.parquet and b/extensions/parquet/table/src/test/resources/e0/lz4.parquet differ diff --git a/extensions/parquet/table/src/test/resources/e0/snappy.parquet b/extensions/parquet/table/src/test/resources/e0/snappy.parquet index 70610211695..b85548c45f5 100644 Binary files a/extensions/parquet/table/src/test/resources/e0/snappy.parquet and b/extensions/parquet/table/src/test/resources/e0/snappy.parquet differ diff --git a/extensions/parquet/table/src/test/resources/e0/uncompressed.parquet b/extensions/parquet/table/src/test/resources/e0/uncompressed.parquet index a10b74a8ab6..7eb988e9288 100644 Binary files a/extensions/parquet/table/src/test/resources/e0/uncompressed.parquet and b/extensions/parquet/table/src/test/resources/e0/uncompressed.parquet differ diff --git a/extensions/parquet/table/src/test/resources/e0/zstd.parquet b/extensions/parquet/table/src/test/resources/e0/zstd.parquet index 39047596648..e543c4e2962 100644 Binary files a/extensions/parquet/table/src/test/resources/e0/zstd.parquet and b/extensions/parquet/table/src/test/resources/e0/zstd.parquet differ diff --git a/extensions/parquet/table/src/test/resources/e1/brotli.parquet b/extensions/parquet/table/src/test/resources/e1/brotli.parquet index bbda7e06fb9..d61ea1754fd 100644 Binary files a/extensions/parquet/table/src/test/resources/e1/brotli.parquet and b/extensions/parquet/table/src/test/resources/e1/brotli.parquet differ diff --git a/extensions/parquet/table/src/test/resources/e1/gzip.parquet b/extensions/parquet/table/src/test/resources/e1/gzip.parquet index fcd8ba59e75..4e89b8a24aa 100644 Binary files a/extensions/parquet/table/src/test/resources/e1/gzip.parquet and b/extensions/parquet/table/src/test/resources/e1/gzip.parquet differ diff --git a/extensions/parquet/table/src/test/resources/e1/lz4.parquet b/extensions/parquet/table/src/test/resources/e1/lz4.parquet index 2b474d731ac..788ddbab312 100644 Binary files a/extensions/parquet/table/src/test/resources/e1/lz4.parquet and b/extensions/parquet/table/src/test/resources/e1/lz4.parquet differ diff --git a/extensions/parquet/table/src/test/resources/e1/snappy.parquet b/extensions/parquet/table/src/test/resources/e1/snappy.parquet index 36a55927719..b85548c45f5 100644 Binary files a/extensions/parquet/table/src/test/resources/e1/snappy.parquet and b/extensions/parquet/table/src/test/resources/e1/snappy.parquet differ diff --git a/extensions/parquet/table/src/test/resources/e1/uncompressed.parquet b/extensions/parquet/table/src/test/resources/e1/uncompressed.parquet index 79700941900..7eb988e9288 100644 Binary files a/extensions/parquet/table/src/test/resources/e1/uncompressed.parquet and b/extensions/parquet/table/src/test/resources/e1/uncompressed.parquet differ diff --git a/extensions/parquet/table/src/test/resources/e1/zstd.parquet b/extensions/parquet/table/src/test/resources/e1/zstd.parquet index 52317b0f204..e543c4e2962 100644 Binary files a/extensions/parquet/table/src/test/resources/e1/zstd.parquet and b/extensions/parquet/table/src/test/resources/e1/zstd.parquet differ diff --git a/extensions/parquet/table/src/test/resources/e2/brotli.parquet b/extensions/parquet/table/src/test/resources/e2/brotli.parquet index f0def9676f0..d61ea1754fd 100644 Binary files a/extensions/parquet/table/src/test/resources/e2/brotli.parquet and b/extensions/parquet/table/src/test/resources/e2/brotli.parquet differ diff --git a/extensions/parquet/table/src/test/resources/e2/gzip.parquet b/extensions/parquet/table/src/test/resources/e2/gzip.parquet index 30d83fc0cbd..4e89b8a24aa 100644 Binary files a/extensions/parquet/table/src/test/resources/e2/gzip.parquet and b/extensions/parquet/table/src/test/resources/e2/gzip.parquet differ diff --git a/extensions/parquet/table/src/test/resources/e2/lz4.parquet b/extensions/parquet/table/src/test/resources/e2/lz4.parquet index c7416517a78..788ddbab312 100644 Binary files a/extensions/parquet/table/src/test/resources/e2/lz4.parquet and b/extensions/parquet/table/src/test/resources/e2/lz4.parquet differ diff --git a/extensions/parquet/table/src/test/resources/e2/snappy.parquet b/extensions/parquet/table/src/test/resources/e2/snappy.parquet index f06e8ff2cf5..b85548c45f5 100644 Binary files a/extensions/parquet/table/src/test/resources/e2/snappy.parquet and b/extensions/parquet/table/src/test/resources/e2/snappy.parquet differ diff --git a/extensions/parquet/table/src/test/resources/e2/uncompressed.parquet b/extensions/parquet/table/src/test/resources/e2/uncompressed.parquet index 50855c72df8..7eb988e9288 100644 Binary files a/extensions/parquet/table/src/test/resources/e2/uncompressed.parquet and b/extensions/parquet/table/src/test/resources/e2/uncompressed.parquet differ diff --git a/extensions/parquet/table/src/test/resources/e2/zstd.parquet b/extensions/parquet/table/src/test/resources/e2/zstd.parquet index 29d4295166d..e543c4e2962 100644 Binary files a/extensions/parquet/table/src/test/resources/e2/zstd.parquet and b/extensions/parquet/table/src/test/resources/e2/zstd.parquet differ