rocksdb

History

Adam Retter 4926b33742 Improvements to Env::GetChildren (#7819 ) Summary: The main improvement here is to not include `.` or `..` in the results of `Env::GetChildren`. The occurrence of `.` or `..`; it is non-portable, dependent on the Operating System and the File System. See: https://www.gnu.org/software/libc/manual/html_node/Reading_002fClosing-Directory.html There were lots of duplicate checks spread through the RocksDB codebase previously to skip `.` and `..`. This new removes the need for those at the source. Also some minor fixes to `Env::GetChildren`: * Improve error handling in POSIX implementation * Remove unnecessary array allocation on Windows * Fix struct name for Windows Non-UTF-8 API Pull Request resolved: https://github.com/facebook/rocksdb/pull/7819 Reviewed By: ajkr Differential Revision: D25837394 Pulled By: jay-zhuang fbshipit-source-id: 1e137e7218d38b450af9c083f73d5357abcbba2e		2021-01-09 09:44:34 -08:00
..
blob	Create a CustomEnv class; Add WinFileSystem; Make LegacyFileSystemWrapper private (#7703 )	2021-01-06 10:49:32 -08:00
compaction	Add more tests to ASSERT_STATUS_CHECKED (3), API change (#7715 )	2021-01-06 14:15:02 -08:00
db_impl	Add more tests to ASSERT_STATUS_CHECKED (3), API change (#7715 )	2021-01-06 14:15:02 -08:00
arena_wrapped_db_iter.cc	Add blob support to DBIter (#7731 )	2020-12-04 21:29:38 -08:00
arena_wrapped_db_iter.h	Add blob support to DBIter (#7731 )	2020-12-04 21:29:38 -08:00
builder.cc	Add full_history_ts_low_ to FlushJob (#7655 )	2020-11-12 18:44:34 -08:00
builder.h	Add full_history_ts_low_ to FlushJob (#7655 )	2020-11-12 18:44:34 -08:00
c_test.c	Add more tests to ASSERT_STATUS_CHECKED (3), API change (#7715 )	2021-01-06 14:15:02 -08:00
c.cc	Add more tests to ASSERT_STATUS_CHECKED (3), API change (#7715 )	2021-01-06 14:15:02 -08:00
column_family_test.cc	Improvements to Env::GetChildren (#7819 )	2021-01-09 09:44:34 -08:00
column_family.cc	No elide constructors (#7798 )	2020-12-23 16:55:53 -08:00
column_family.h	Track WAL obsoletion when updating empty CF's log number (#7781 )	2020-12-18 21:34:36 -08:00
compact_files_test.cc	Add more tests for assert status checked (#7524 )	2020-12-22 23:45:58 -08:00
compacted_db_impl.cc	Periodically flush info log out of application buffer (#7488 )	2020-10-01 19:14:14 -07:00
compacted_db_impl.h	SyncWAL shouldn't be supported in compacted db (#7788 )	2020-12-22 14:53:43 -08:00
comparator_db_test.cc	Remove unused includes (#7604 )	2020-10-28 23:22:27 -07:00
convenience.cc	sst_dump to reduce number of file reads (#6836 )	2020-05-12 18:23:33 -07:00
corruption_test.cc	No elide constructors (#7798 )	2020-12-23 16:55:53 -08:00
cuckoo_table_db_test.cc	Add more tests for assert status checked (#7524 )	2020-12-22 23:45:58 -08:00
db_basic_test.cc	Create a CustomEnv class; Add WinFileSystem; Make LegacyFileSystemWrapper private (#7703 )	2021-01-06 10:49:32 -08:00
db_block_cache_test.cc	Add further tests to ASSERT_STATUS_CHECKED (2) (#7698 )	2020-12-09 21:21:16 -08:00
db_bloom_filter_test.cc	Add more tests for assert status checked (#7524 )	2020-12-22 23:45:58 -08:00
db_compaction_filter_test.cc	Add more tests to ASSERT_STATUS_CHECKED (3), API change (#7715 )	2021-01-06 14:15:02 -08:00
db_compaction_test.cc	Add more tests to ASSERT_STATUS_CHECKED (3), API change (#7715 )	2021-01-06 14:15:02 -08:00
db_dynamic_level_test.cc	Add more tests to ASSERT_STATUS_CHECKED (3), API change (#7715 )	2021-01-06 14:15:02 -08:00
db_encryption_test.cc	Improvements to Env::GetChildren (#7819 )	2021-01-09 09:44:34 -08:00
db_filesnapshot.cc	Fix checkpoint file deletion race with avoid_unnecessary_blocking_io (#7369 )	2020-09-10 22:35:25 -07:00
db_flush_test.cc	Write min_log_number_to_keep to MANIFEST during atomic flush under 2 phase commit (#7570 )	2020-12-03 19:22:24 -08:00
db_info_dumper.cc	Make FileType Public and Replace kLogFile with kWalFile (#7580 )	2020-10-22 17:06:20 -07:00
db_info_dumper.h	Add a DB Session ID (#6959 )	2020-06-15 10:47:02 -07:00
db_inplace_update_test.cc	Whole DBTest to skip fsync (#7274 )	2020-08-17 18:42:25 -07:00
db_io_failure_test.cc	Add more tests to ASSERT_STATUS_CHECKED (3), API change (#7715 )	2021-01-06 14:15:02 -08:00
db_iter_stress_test.cc	Add blob support to DBIter (#7731 )	2020-12-04 21:29:38 -08:00
db_iter_test.cc	Add more tests for assert status checked (#7524 )	2020-12-22 23:45:58 -08:00
db_iter.cc	Add further tests to ASSERT_STATUS_CHECKED (2) (#7698 )	2020-12-09 21:21:16 -08:00
db_iter.h	Add blob support to DBIter (#7731 )	2020-12-04 21:29:38 -08:00
db_iterator_test.cc	Add further tests to ASSERT_STATUS_CHECKED (1) (#7679 )	2020-12-08 15:55:04 -08:00
db_log_iter_test.cc	Add more tests for assert status checked (#7524 )	2020-12-22 23:45:58 -08:00
db_logical_block_size_cache_test.cc	Add further tests to ASSERT_STATUS_CHECKED (2) (#7698 )	2020-12-09 21:21:16 -08:00
db_memtable_test.cc	Add further tests to ASSERT_STATUS_CHECKED (1) (#7679 )	2020-12-08 15:55:04 -08:00
db_merge_operand_test.cc	Add further tests to ASSERT_STATUS_CHECKED (1) (#7679 )	2020-12-08 15:55:04 -08:00
db_merge_operator_test.cc	Add further tests to ASSERT_STATUS_CHECKED (1) (#7679 )	2020-12-08 15:55:04 -08:00
db_options_test.cc	No elide constructors (#7798 )	2020-12-23 16:55:53 -08:00
db_properties_test.cc	Fix many tests to run with MEM_ENV and ENCRYPTED_ENV; Introduce a MemoryFileSystem class (#7566 )	2020-10-27 10:33:09 -07:00
db_range_del_test.cc	Add more tests to ASSERT_STATUS_CHECKED (4) (#7718 )	2020-12-22 15:09:39 -08:00
db_sst_test.cc	Add more tests to ASSERT_STATUS_CHECKED (3), API change (#7715 )	2021-01-06 14:15:02 -08:00
db_statistics_test.cc	Add more tests for assert status checked (#7524 )	2020-12-22 23:45:58 -08:00
db_table_properties_test.cc	Add more tests for assert status checked (#7524 )	2020-12-22 23:45:58 -08:00
db_tailing_iter_test.cc	Add more tests to ASSERT_STATUS_CHECKED (3), API change (#7715 )	2021-01-06 14:15:02 -08:00
db_test2.cc	Improvements to Env::GetChildren (#7819 )	2021-01-09 09:44:34 -08:00
db_test_util.cc	Add more tests to ASSERT_STATUS_CHECKED (3), API change (#7715 )	2021-01-06 14:15:02 -08:00
db_test_util.h	Add more tests to ASSERT_STATUS_CHECKED (3), API change (#7715 )	2021-01-06 14:15:02 -08:00
db_test.cc	Add more tests to ASSERT_STATUS_CHECKED (3), API change (#7715 )	2021-01-06 14:15:02 -08:00
db_universal_compaction_test.cc	No elide constructors (#7798 )	2020-12-23 16:55:53 -08:00
db_wal_test.cc	Improvements to Env::GetChildren (#7819 )	2021-01-09 09:44:34 -08:00
db_with_timestamp_basic_test.cc	Add more tests to ASSERT_STATUS_CHECKED (3), API change (#7715 )	2021-01-06 14:15:02 -08:00
db_with_timestamp_compaction_test.cc	Whole DBTest to skip fsync (#7274 )	2020-08-17 18:42:25 -07:00
db_write_test.cc	Add more tests to ASSERT_STATUS_CHECKED (4) (#7718 )	2020-12-22 15:09:39 -08:00
dbformat_test.cc	Remove unused includes (#7604 )	2020-10-28 23:22:27 -07:00
dbformat.cc	Make CompactRange and GetApproximateSizes work with timestamp (#7684 )	2020-12-02 13:00:53 -08:00
dbformat.h	Make CompactRange and GetApproximateSizes work with timestamp (#7684 )	2020-12-02 13:00:53 -08:00
deletefile_test.cc	Add more tests to ASSERT_STATUS_CHECKED (4) (#7718 )	2020-12-22 15:09:39 -08:00
error_handler_fs_test.cc	Treat File Scope Write IO Error the same as Retryable IO Error (#7840 )	2021-01-07 16:31:33 -08:00
error_handler.cc	Treat File Scope Write IO Error the same as Retryable IO Error (#7840 )	2021-01-07 16:31:33 -08:00
error_handler.h	Change ErrorHandler methods to return const Status& (#7539 )	2020-12-07 20:11:35 -08:00
event_helpers.cc	Add more tests to ASSERT_STATUS_CHECKED (3), API change (#7715 )	2021-01-06 14:15:02 -08:00
event_helpers.h	Pass SST file checksum information through OnTableFileCreated (#7108 )	2020-08-25 10:46:11 -07:00
experimental.cc	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
external_sst_file_basic_test.cc	Add further tests to ASSERT_STATUS_CHECKED (2) (#7698 )	2020-12-09 21:21:16 -08:00
external_sst_file_ingestion_job.cc	Add rate_limiter to GenerateOneFileChecksum (#7811 )	2020-12-26 22:07:24 -08:00
external_sst_file_ingestion_job.h	Store FSSequentialFilePtr object in SequenceFileReader (#7190 )	2020-08-18 16:20:54 -07:00
external_sst_file_test.cc	Add more tests to ASSERT_STATUS_CHECKED (4) (#7718 )	2020-12-22 15:09:39 -08:00
fault_injection_test.cc	Add more tests for assert status checked (#7524 )	2020-12-22 23:45:58 -08:00
file_indexer_test.cc	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
file_indexer.cc	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
file_indexer.h	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
filename_test.cc	Remove unused includes (#7604 )	2020-10-28 23:22:27 -07:00
flush_job_test.cc	Create a CustomEnv class; Add WinFileSystem; Make LegacyFileSystemWrapper private (#7703 )	2021-01-06 10:49:32 -08:00
flush_job.cc	Fix assertion failure in bg flush (#7362 )	2020-12-02 09:31:14 -08:00
flush_job.h	Fix assertion failure in bg flush (#7362 )	2020-12-02 09:31:14 -08:00
flush_scheduler.cc	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
flush_scheduler.h	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
forward_iterator_bench.cc	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
forward_iterator.cc	Add more tests for assert status checked (#7524 )	2020-12-22 23:45:58 -08:00
forward_iterator.h	Properly report IO errors when IndexType::kBinarySearchWithFirstKey is used (#6621 )	2020-04-15 17:40:44 -07:00
import_column_family_job.cc	In ParseInternalKey(), include corrupt key info in Status (#7515 )	2020-10-28 10:12:58 -07:00
import_column_family_job.h	Store FSSequentialFilePtr object in SequenceFileReader (#7190 )	2020-08-18 16:20:54 -07:00
import_column_family_test.cc	No elide constructors (#7798 )	2020-12-23 16:55:53 -08:00
internal_stats.cc	aggregated-table-properties with GetMapProperty (#7779 )	2020-12-19 08:00:14 -08:00
internal_stats.h	aggregated-table-properties with GetMapProperty (#7779 )	2020-12-19 08:00:14 -08:00
job_context.h	Expose the set of live blob files from Version/VersionSet (#6785 )	2020-05-04 15:08:13 -07:00
listener_test.cc	Add more tests for assert status checked (#7524 )	2020-12-22 23:45:58 -08:00
log_format.h	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
log_reader.cc	Fix kPointInTimeRecovery handling of truncated WAL (#7701 )	2020-11-30 18:11:38 -08:00
log_reader.h	Real fix for race in backup custom checksum checking (#7309 )	2020-08-26 10:39:20 -07:00
log_test.cc	Make StringEnv, StringSink, StringSource use FS classes (#7786 )	2021-01-04 16:01:01 -08:00
log_writer.cc	No elide constructors (#7798 )	2020-12-23 16:55:53 -08:00
log_writer.h	Pass IOStatus to write path and set retryable IO Error as hard error in BG jobs (#6487 )	2020-03-27 16:04:43 -07:00
logs_with_prep_tracker.cc	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
logs_with_prep_tracker.h	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
lookup_key.h	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
malloc_stats.cc	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
malloc_stats.h	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
manual_compaction_test.cc	Add more tests for assert status checked (#7524 )	2020-12-22 23:45:58 -08:00
memtable_list_test.cc	No elide constructors (#7798 )	2020-12-23 16:55:53 -08:00
memtable_list.cc	Add initial blob support to batched MultiGet (#7766 )	2020-12-14 13:48:22 -08:00
memtable_list.h	Add initial blob support to batched MultiGet (#7766 )	2020-12-14 13:48:22 -08:00
memtable.cc	Add initial blob support to batched MultiGet (#7766 )	2020-12-14 13:48:22 -08:00
memtable.h	Add initial blob support to batched MultiGet (#7766 )	2020-12-14 13:48:22 -08:00
merge_context.h	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
merge_helper_test.cc	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
merge_helper.cc	In ParseInternalKey(), include corrupt key info in Status (#7515 )	2020-10-28 10:12:58 -07:00
merge_helper.h	In ParseInternalKey(), include corrupt key info in Status (#7515 )	2020-10-28 10:12:58 -07:00
merge_operator.cc	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
merge_test.cc	Add more tests to ASSERT_STATUS_CHECKED (4) (#7718 )	2020-12-22 15:09:39 -08:00
obsolete_files_test.cc	Add more tests for assert status checked (#7524 )	2020-12-22 23:45:58 -08:00
options_file_test.cc	No elide constructors (#7798 )	2020-12-23 16:55:53 -08:00
output_validator.cc	Use NPHash64 in more places (#7632 )	2020-11-10 23:42:13 -08:00
output_validator.h	Use NPHash64 in more places (#7632 )	2020-11-10 23:42:13 -08:00
perf_context_test.cc	Add more tests for assert status checked (#7524 )	2020-12-22 23:45:58 -08:00
periodic_work_scheduler_test.cc	Add more tests for assert status checked (#7524 )	2020-12-22 23:45:58 -08:00
periodic_work_scheduler.cc	Remove unused includes (#7604 )	2020-10-28 23:22:27 -07:00
periodic_work_scheduler.h	Periodically flush info log out of application buffer (#7488 )	2020-10-01 19:14:14 -07:00
pinned_iterators_manager.h	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
plain_table_db_test.cc	Make StringEnv, StringSink, StringSource use FS classes (#7786 )	2021-01-04 16:01:01 -08:00
pre_release_callback.h	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
prefix_test.cc	No elide constructors (#7798 )	2020-12-23 16:55:53 -08:00
range_del_aggregator_bench.cc	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
range_del_aggregator_test.cc	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
range_del_aggregator.cc	In ParseInternalKey(), include corrupt key info in Status (#7515 )	2020-10-28 10:12:58 -07:00
range_del_aggregator.h	In ParseInternalKey(), include corrupt key info in Status (#7515 )	2020-10-28 10:12:58 -07:00
range_tombstone_fragmenter_test.cc	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
range_tombstone_fragmenter.cc	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
range_tombstone_fragmenter.h	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
read_callback.h	Get() with timestamp should respect snapshot (#7227 )	2020-08-14 19:20:58 -07:00
repair_test.cc	Create a CustomEnv class; Add WinFileSystem; Make LegacyFileSystemWrapper private (#7703 )	2021-01-06 10:49:32 -08:00
repair.cc	Create a CustomEnv class; Add WinFileSystem; Make LegacyFileSystemWrapper private (#7703 )	2021-01-06 10:49:32 -08:00
snapshot_checker.h	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
snapshot_impl.cc	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
snapshot_impl.h	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
table_cache.cc	Fix MultiGet unable to query timestamp data issue (#7589 )	2020-11-03 09:45:41 -08:00
table_cache.h	Store FSRandomAccessPtr object in RandomAccessFileReader (#7192 )	2020-08-27 11:21:52 -07:00
table_properties_collector_test.cc	Make StringEnv, StringSink, StringSource use FS classes (#7786 )	2021-01-04 16:01:01 -08:00
table_properties_collector.cc	In ParseInternalKey(), include corrupt key info in Status (#7515 )	2020-10-28 10:12:58 -07:00
table_properties_collector.h	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
transaction_log_impl.cc	Add more tests for assert status checked (#7524 )	2020-12-22 23:45:58 -08:00
transaction_log_impl.h	Store FileSystemPtr object that contains FileSystem ptr (#7180 )	2020-08-12 17:31:23 -07:00
trim_history_scheduler.cc	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
trim_history_scheduler.h	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
version_builder_test.cc	Remove unused includes (#7604 )	2020-10-28 23:22:27 -07:00
version_builder.cc	Log sst number in Corruption status (#7767 )	2020-12-14 14:07:52 -08:00
version_builder.h	make L0 index/filter pinned memory usage predictable (#6911 )	2020-06-09 16:51:23 -07:00
version_edit_handler.cc	Add more tests to the ASC pass list (#7834 )	2021-01-07 15:22:53 -08:00
version_edit_handler.h	Refactor with VersionEditHandler (#6581 )	2020-11-11 08:00:14 -08:00
version_edit_test.cc	Add full_history_ts_low to column family (#7740 )	2020-12-05 14:18:22 -08:00
version_edit.cc	Add full_history_ts_low to column family (#7740 )	2020-12-05 14:18:22 -08:00
version_edit.h	Add full_history_ts_low to column family (#7740 )	2020-12-05 14:18:22 -08:00
version_set_test.cc	Add more tests for assert status checked (#7524 )	2020-12-22 23:45:58 -08:00
version_set.cc	Add initial blob support to batched MultiGet (#7766 )	2020-12-14 13:48:22 -08:00
version_set.h	Track WAL obsoletion when updating empty CF's log number (#7781 )	2020-12-18 21:34:36 -08:00
wal_edit_test.cc	Always track WAL obsoletion (#7759 )	2020-12-09 16:02:12 -08:00
wal_edit.cc	Always track WAL obsoletion (#7759 )	2020-12-09 16:02:12 -08:00
wal_edit.h	Always track WAL obsoletion (#7759 )	2020-12-09 16:02:12 -08:00
wal_manager_test.cc	Create a CustomEnv class; Add WinFileSystem; Make LegacyFileSystemWrapper private (#7703 )	2021-01-06 10:49:32 -08:00
wal_manager.cc	Add more tests for assert status checked (#7524 )	2020-12-22 23:45:58 -08:00
wal_manager.h	Store FileSystemPtr object that contains FileSystem ptr (#7180 )	2020-08-12 17:31:23 -07:00
write_batch_base.cc	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
write_batch_internal.h	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
write_batch_test.cc	Add further tests to ASSERT_STATUS_CHECKED (1) (#7679 )	2020-12-08 15:55:04 -08:00
write_batch.cc	Return `Status` from `MemTable` mutation functions (#7656 )	2020-11-23 16:29:04 -08:00
write_callback_test.cc	Add more tests for assert status checked (#7524 )	2020-12-22 23:45:58 -08:00
write_callback.h	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
write_controller_test.cc	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
write_controller.cc	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
write_controller.h	Replace namespace name "rocksdb" with ROCKSDB_NAMESPACE (#6433 )	2020-02-20 12:09:57 -08:00
write_thread.cc	Add further tests to ASSERT_STATUS_CHECKED (2) (#7698 )	2020-12-09 21:21:16 -08:00
write_thread.h	Remove the status.PermitUncheckedError() from WriteGroup Destructor (#7555 )	2020-10-14 10:47:58 -07:00