diff --git a/src/Parquet/File/DataColumnReader.cs b/src/Parquet/File/DataColumnReader.cs index 9bc5bcbe..81a62294 100644 --- a/src/Parquet/File/DataColumnReader.cs +++ b/src/Parquet/File/DataColumnReader.cs @@ -69,8 +69,6 @@ public DataColumn Read() _inputStream.Seek(fileOffset, SeekOrigin.Begin); - ParquetEventSource.Current.SeekColumn(_dataField.Path, fileOffset); - var colData = new ColumnRawData(); colData.maxCount = (int)_thriftColumnChunk.Meta_data.Num_values; @@ -193,8 +191,6 @@ private void ReadDataPage(Thrift.PageHeader ph, ColumnRawData cd, long maxValues //todo: this is ugly, but will be removed once other parts are migrated to System.Memory using (var ms = bytes.ToStream()) { - ParquetEventSource.Current.OpenDataPage(_dataField.Path, _thriftColumnChunk.Meta_data.Codec.ToString(), ms.Length); - int valueCount = ph.Data_page_header.Num_values; using (var reader = new BinaryReader(ms)) { diff --git a/src/Parquet/ParquetEventSource.cs b/src/Parquet/ParquetEventSource.cs deleted file mode 100644 index 45fb7590..00000000 --- a/src/Parquet/ParquetEventSource.cs +++ /dev/null @@ -1,57 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics.Tracing; -using System.Text; - -namespace Parquet -{ - [EventSource(Name = "Parquet.Net")] - internal sealed class ParquetEventSource : EventSource - { - public static readonly ParquetEventSource Current = new ParquetEventSource(); - - // Instance constructor is private to enforce singleton semantics - private ParquetEventSource() : base() { } - - // Event keywords can be used to categorize events. - // Each keyword is a bit flag. A single event can be associated with multiple keywords (via EventAttribute.Keywords property). - // Keywords must be defined as a public class named 'Keywords' inside EventSource that uses them. - static class Keywords - { - public const EventKeywords Read = (EventKeywords)0x1L; - public const EventKeywords Write = (EventKeywords)0x2L; - } - - [Event(1, Level = EventLevel.Informational, Message = "length: {2}, rows: {3}")] - public void OpenStream(long length, bool leaveOpen, int rowGroupCount, long numRows) - { - if (!IsEnabled()) return; - - WriteEvent(1, length, leaveOpen); - } - - [Event(2, Level = EventLevel.Informational, Message = "path: {0}")] - public void ReadColumn(string path) - { - if (!IsEnabled()) return; - - WriteEvent(2, path); - } - - [Event(3, Level = EventLevel.Verbose, Message = "seeking to column {0} start @ {1}")] - public void SeekColumn(string path, long offset) - { - if (!IsEnabled()) return; - - WriteEvent(3, path, offset); - } - - [Event(4, Level = EventLevel.Verbose, Message = "opened data page")] - public void OpenDataPage(string path, string compressionMethod, long length) - { - if (!IsEnabled()) return; - - WriteEvent(4, path, compressionMethod, length); - } - } -} diff --git a/src/Parquet/ParquetReader.cs b/src/Parquet/ParquetReader.cs index 284ee029..eea28591 100644 --- a/src/Parquet/ParquetReader.cs +++ b/src/Parquet/ParquetReader.cs @@ -46,8 +46,6 @@ public ParquetReader(Stream input, ParquetOptions parquetOptions = null, bool le _meta = ReadMetadata(); _footer = new ThriftFooter(_meta); - ParquetEventSource.Current.OpenStream(input.Length, leaveStreamOpen, _meta.Row_groups.Count, _meta.Num_rows); - InitRowGroupReaders(); } diff --git a/src/Parquet/ParquetRowGroupReader.cs b/src/Parquet/ParquetRowGroupReader.cs index 4647ddc5..3f172bbb 100644 --- a/src/Parquet/ParquetRowGroupReader.cs +++ b/src/Parquet/ParquetRowGroupReader.cs @@ -52,8 +52,6 @@ public DataColumn ReadColumn(DataField field) { if (field == null) throw new ArgumentNullException(nameof(field)); - ParquetEventSource.Current.ReadColumn(field.Path); - if (!_pathToChunk.TryGetValue(field.Path, out Thrift.ColumnChunk columnChunk)) { throw new ParquetException($"'{field.Path}' does not exist in this file");