From 9277569ba3006f90e8615470262ff445db212d2f Mon Sep 17 00:00:00 2001 From: sdong Date: Thu, 11 Aug 2022 12:45:50 -0700 Subject: [PATCH] Add some missing headers (#10519) Summary: Some files miss headers. Also some headers are irregular. Fix them to make an internal checkup tool happy. Pull Request resolved: https://github.com/facebook/rocksdb/pull/10519 Reviewed By: jay-zhuang Differential Revision: D38603291 fbshipit-source-id: 13b1bbd6d48f5ee15ba20da67544396de48238f1 --- db/import_column_family_job.cc | 6 ++++++ db/import_column_family_job.h | 6 ++++++ db/import_column_family_test.cc | 6 ++++++ db/table_cache_sync_and_async.h | 3 ++- fuzz/db_fuzzer.cc | 6 ++++++ fuzz/util.h | 6 ++++++ java/rocksjni/concurrent_task_limiter.cc | 6 ++++++ java/src/main/java/org/rocksdb/ByteBufferGetStatus.java | 6 ++++++ java/src/main/java/org/rocksdb/ConcurrentTaskLimiter.java | 6 ++++++ .../main/java/org/rocksdb/ConcurrentTaskLimiterImpl.java | 6 ++++++ java/src/main/java/org/rocksdb/ConfigOptions.java | 6 ++++++ java/src/main/java/org/rocksdb/SanityLevel.java | 6 ++++++ java/src/main/java/org/rocksdb/util/ByteUtil.java | 6 ++++++ .../test/java/org/rocksdb/ConcurrentTaskLimiterTest.java | 6 ++++++ .../test/java/org/rocksdb/util/ByteBufferAllocator.java | 6 ++++++ .../java/org/rocksdb/util/DirectByteBufferAllocator.java | 6 ++++++ .../java/org/rocksdb/util/HeapByteBufferAllocator.java | 6 ++++++ java/src/test/java/org/rocksdb/util/JNIComparatorTest.java | 6 ++++++ .../block_based/block_based_table_reader_sync_and_async.h | 3 ++- .../block_cache_trace_analyzer_plot.py | 7 +++++++ util/async_file_reader.cc | 3 ++- util/async_file_reader.h | 6 +++--- util/coro_utils.h | 3 ++- util/single_thread_executor.h | 3 ++- .../transactions/lock/point/point_lock_manager_test.h | 5 +++++ 25 files changed, 127 insertions(+), 8 deletions(-) diff --git a/db/import_column_family_job.cc b/db/import_column_family_job.cc index 12498b9e85..0832ff571a 100644 --- a/db/import_column_family_job.cc +++ b/db/import_column_family_job.cc @@ -1,3 +1,9 @@ +// Copyright (c) Meta Platforms, Inc. and affiliates. +// +// This source code is licensed under both the GPLv2 (found in the +// COPYING file in the root directory) and Apache 2.0 License +// (found in the LICENSE.Apache file in the root directory). + #ifndef ROCKSDB_LITE #include "db/import_column_family_job.h" diff --git a/db/import_column_family_job.h b/db/import_column_family_job.h index 59e85c7343..57c49c67ff 100644 --- a/db/import_column_family_job.h +++ b/db/import_column_family_job.h @@ -1,3 +1,9 @@ +// Copyright (c) Meta Platforms, Inc. and affiliates. +// +// This source code is licensed under both the GPLv2 (found in the +// COPYING file in the root directory) and Apache 2.0 License +// (found in the LICENSE.Apache file in the root directory). + #pragma once #include #include diff --git a/db/import_column_family_test.cc b/db/import_column_family_test.cc index c78ecfad6b..2847ea8da4 100644 --- a/db/import_column_family_test.cc +++ b/db/import_column_family_test.cc @@ -1,3 +1,9 @@ +// Copyright (c) Meta Platforms, Inc. and affiliates. +// +// This source code is licensed under both the GPLv2 (found in the +// COPYING file in the root directory) and Apache 2.0 License +// (found in the LICENSE.Apache file in the root directory). + #ifndef ROCKSDB_LITE #include diff --git a/db/table_cache_sync_and_async.h b/db/table_cache_sync_and_async.h index a89ec739ac..4b3ec6c77b 100644 --- a/db/table_cache_sync_and_async.h +++ b/db/table_cache_sync_and_async.h @@ -1,4 +1,5 @@ -// Copyright (c) Meta Platforms, Inc. and its affiliates. All Rights Reserved. +// Copyright (c) Meta Platforms, Inc. and affiliates. +// // This source code is licensed under both the GPLv2 (found in the // COPYING file in the root directory) and Apache 2.0 License // (found in the LICENSE.Apache file in the root directory). diff --git a/fuzz/db_fuzzer.cc b/fuzz/db_fuzzer.cc index 383a95096d..e6d5bb63c0 100644 --- a/fuzz/db_fuzzer.cc +++ b/fuzz/db_fuzzer.cc @@ -1,3 +1,9 @@ +// Copyright (c) Meta Platforms, Inc. and affiliates. +// +// This source code is licensed under both the GPLv2 (found in the +// COPYING file in the root directory) and Apache 2.0 License +// (found in the LICENSE.Apache file in the root directory). + #include #include "rocksdb/db.h" diff --git a/fuzz/util.h b/fuzz/util.h index 44ffaf536e..97011823a3 100644 --- a/fuzz/util.h +++ b/fuzz/util.h @@ -1,3 +1,9 @@ +// Copyright (c) Meta Platforms, Inc. and affiliates. +// +// This source code is licensed under both the GPLv2 (found in the +// COPYING file in the root directory) and Apache 2.0 License +// (found in the LICENSE.Apache file in the root directory). + #pragma once #define CHECK_OK(expression) \ diff --git a/java/rocksjni/concurrent_task_limiter.cc b/java/rocksjni/concurrent_task_limiter.cc index d88a323017..0b0b2d2717 100644 --- a/java/rocksjni/concurrent_task_limiter.cc +++ b/java/rocksjni/concurrent_task_limiter.cc @@ -1,3 +1,9 @@ +// Copyright (c) Meta Platforms, Inc. and affiliates. +// +// This source code is licensed under both the GPLv2 (found in the +// COPYING file in the root directory) and Apache 2.0 License +// (found in the LICENSE.Apache file in the root directory). + #include "rocksdb/concurrent_task_limiter.h" #include diff --git a/java/src/main/java/org/rocksdb/ByteBufferGetStatus.java b/java/src/main/java/org/rocksdb/ByteBufferGetStatus.java index b836480af0..8eef954478 100644 --- a/java/src/main/java/org/rocksdb/ByteBufferGetStatus.java +++ b/java/src/main/java/org/rocksdb/ByteBufferGetStatus.java @@ -1,3 +1,9 @@ +// Copyright (c) Meta Platforms, Inc. and affiliates. +// +// This source code is licensed under both the GPLv2 (found in the +// COPYING file in the root directory) and Apache 2.0 License +// (found in the LICENSE.Apache file in the root directory). + package org.rocksdb; import java.nio.ByteBuffer; diff --git a/java/src/main/java/org/rocksdb/ConcurrentTaskLimiter.java b/java/src/main/java/org/rocksdb/ConcurrentTaskLimiter.java index 3504264e79..b4e34303b5 100644 --- a/java/src/main/java/org/rocksdb/ConcurrentTaskLimiter.java +++ b/java/src/main/java/org/rocksdb/ConcurrentTaskLimiter.java @@ -1,3 +1,9 @@ +// Copyright (c) Meta Platforms, Inc. and affiliates. +// +// This source code is licensed under both the GPLv2 (found in the +// COPYING file in the root directory) and Apache 2.0 License +// (found in the LICENSE.Apache file in the root directory). + package org.rocksdb; public abstract class ConcurrentTaskLimiter extends RocksObject { diff --git a/java/src/main/java/org/rocksdb/ConcurrentTaskLimiterImpl.java b/java/src/main/java/org/rocksdb/ConcurrentTaskLimiterImpl.java index 0f6026dc2a..d28b9060a6 100644 --- a/java/src/main/java/org/rocksdb/ConcurrentTaskLimiterImpl.java +++ b/java/src/main/java/org/rocksdb/ConcurrentTaskLimiterImpl.java @@ -1,3 +1,9 @@ +// Copyright (c) Meta Platforms, Inc. and affiliates. +// +// This source code is licensed under both the GPLv2 (found in the +// COPYING file in the root directory) and Apache 2.0 License +// (found in the LICENSE.Apache file in the root directory). + package org.rocksdb; public class ConcurrentTaskLimiterImpl extends ConcurrentTaskLimiter { diff --git a/java/src/main/java/org/rocksdb/ConfigOptions.java b/java/src/main/java/org/rocksdb/ConfigOptions.java index 83f65db5cf..4d93f0c992 100644 --- a/java/src/main/java/org/rocksdb/ConfigOptions.java +++ b/java/src/main/java/org/rocksdb/ConfigOptions.java @@ -1,3 +1,9 @@ +// Copyright (c) Meta Platforms, Inc. and affiliates. +// +// This source code is licensed under both the GPLv2 (found in the +// COPYING file in the root directory) and Apache 2.0 License +// (found in the LICENSE.Apache file in the root directory). + package org.rocksdb; public class ConfigOptions extends RocksObject { diff --git a/java/src/main/java/org/rocksdb/SanityLevel.java b/java/src/main/java/org/rocksdb/SanityLevel.java index 645dbba417..30568c3633 100644 --- a/java/src/main/java/org/rocksdb/SanityLevel.java +++ b/java/src/main/java/org/rocksdb/SanityLevel.java @@ -1,3 +1,9 @@ +// Copyright (c) Meta Platforms, Inc. and affiliates. +// +// This source code is licensed under both the GPLv2 (found in the +// COPYING file in the root directory) and Apache 2.0 License +// (found in the LICENSE.Apache file in the root directory). + package org.rocksdb; public enum SanityLevel { diff --git a/java/src/main/java/org/rocksdb/util/ByteUtil.java b/java/src/main/java/org/rocksdb/util/ByteUtil.java index 9014fcba0a..5d64d5dcf2 100644 --- a/java/src/main/java/org/rocksdb/util/ByteUtil.java +++ b/java/src/main/java/org/rocksdb/util/ByteUtil.java @@ -1,3 +1,9 @@ +// Copyright (c) Meta Platforms, Inc. and affiliates. +// +// This source code is licensed under both the GPLv2 (found in the +// COPYING file in the root directory) and Apache 2.0 License +// (found in the LICENSE.Apache file in the root directory). + package org.rocksdb.util; import java.nio.ByteBuffer; diff --git a/java/src/test/java/org/rocksdb/ConcurrentTaskLimiterTest.java b/java/src/test/java/org/rocksdb/ConcurrentTaskLimiterTest.java index 9bbf1f1ede..165f4f24cc 100644 --- a/java/src/test/java/org/rocksdb/ConcurrentTaskLimiterTest.java +++ b/java/src/test/java/org/rocksdb/ConcurrentTaskLimiterTest.java @@ -1,3 +1,9 @@ +// Copyright (c) Meta Platforms, Inc. and affiliates. +// +// This source code is licensed under both the GPLv2 (found in the +// COPYING file in the root directory) and Apache 2.0 License +// (found in the LICENSE.Apache file in the root directory). + package org.rocksdb; import static org.junit.Assert.assertEquals; diff --git a/java/src/test/java/org/rocksdb/util/ByteBufferAllocator.java b/java/src/test/java/org/rocksdb/util/ByteBufferAllocator.java index e942444243..8d7956cf27 100644 --- a/java/src/test/java/org/rocksdb/util/ByteBufferAllocator.java +++ b/java/src/test/java/org/rocksdb/util/ByteBufferAllocator.java @@ -1,3 +1,9 @@ +// Copyright (c) Meta Platforms, Inc. and affiliates. +// +// This source code is licensed under both the GPLv2 (found in the +// COPYING file in the root directory) and Apache 2.0 License +// (found in the LICENSE.Apache file in the root directory). + package org.rocksdb.util; import java.nio.ByteBuffer; diff --git a/java/src/test/java/org/rocksdb/util/DirectByteBufferAllocator.java b/java/src/test/java/org/rocksdb/util/DirectByteBufferAllocator.java index 13955e73d1..d26fb578b9 100644 --- a/java/src/test/java/org/rocksdb/util/DirectByteBufferAllocator.java +++ b/java/src/test/java/org/rocksdb/util/DirectByteBufferAllocator.java @@ -1,3 +1,9 @@ +// Copyright (c) Meta Platforms, Inc. and affiliates. +// +// This source code is licensed under both the GPLv2 (found in the +// COPYING file in the root directory) and Apache 2.0 License +// (found in the LICENSE.Apache file in the root directory). + package org.rocksdb.util; import java.nio.ByteBuffer; diff --git a/java/src/test/java/org/rocksdb/util/HeapByteBufferAllocator.java b/java/src/test/java/org/rocksdb/util/HeapByteBufferAllocator.java index 7dc2ded6d0..ad6b8f6f4b 100644 --- a/java/src/test/java/org/rocksdb/util/HeapByteBufferAllocator.java +++ b/java/src/test/java/org/rocksdb/util/HeapByteBufferAllocator.java @@ -1,3 +1,9 @@ +// Copyright (c) Meta Platforms, Inc. and affiliates. +// +// This source code is licensed under both the GPLv2 (found in the +// COPYING file in the root directory) and Apache 2.0 License +// (found in the LICENSE.Apache file in the root directory). + package org.rocksdb.util; import java.nio.ByteBuffer; diff --git a/java/src/test/java/org/rocksdb/util/JNIComparatorTest.java b/java/src/test/java/org/rocksdb/util/JNIComparatorTest.java index 6ffa2785f5..a962b8d785 100644 --- a/java/src/test/java/org/rocksdb/util/JNIComparatorTest.java +++ b/java/src/test/java/org/rocksdb/util/JNIComparatorTest.java @@ -1,3 +1,9 @@ +// Copyright (c) Meta Platforms, Inc. and affiliates. +// +// This source code is licensed under both the GPLv2 (found in the +// COPYING file in the root directory) and Apache 2.0 License +// (found in the LICENSE.Apache file in the root directory). + package org.rocksdb.util; import org.junit.ClassRule; diff --git a/table/block_based/block_based_table_reader_sync_and_async.h b/table/block_based/block_based_table_reader_sync_and_async.h index 728efc55a3..4a035aeae5 100644 --- a/table/block_based/block_based_table_reader_sync_and_async.h +++ b/table/block_based/block_based_table_reader_sync_and_async.h @@ -1,4 +1,5 @@ -// Copyright (c) Meta Platforms, Inc. and its affiliates. All Rights Reserved. +// Copyright (c) Meta Platforms, Inc. and affiliates. +// // This source code is licensed under both the GPLv2 (found in the // COPYING file in the root directory) and Apache 2.0 License // (found in the LICENSE.Apache file in the root directory). diff --git a/tools/block_cache_analyzer/block_cache_trace_analyzer_plot.py b/tools/block_cache_analyzer/block_cache_trace_analyzer_plot.py index 0fdaa41586..aa6008ab94 100644 --- a/tools/block_cache_analyzer/block_cache_trace_analyzer_plot.py +++ b/tools/block_cache_analyzer/block_cache_trace_analyzer_plot.py @@ -1,4 +1,11 @@ +# Copyright (c) Meta Platforms, Inc. and affiliates. +# +# This source code is licensed under both the GPLv2 (found in the +# COPYING file in the root directory) and Apache 2.0 License +# (found in the LICENSE.Apache file in the root directory). + #!/usr/bin/env python3 + import csv import math import os diff --git a/util/async_file_reader.cc b/util/async_file_reader.cc index 83f6afc6e6..8401a6b44c 100644 --- a/util/async_file_reader.cc +++ b/util/async_file_reader.cc @@ -1,4 +1,5 @@ -// Copyright (c) Meta Platforms, Inc. and its affiliates. All Rights Reserved. +// Copyright (c) Meta Platforms, Inc. and affiliates. +// // This source code is licensed under both the GPLv2 (found in the // COPYING file in the root directory) and Apache 2.0 License // (found in the LICENSE.Apache file in the root directory). diff --git a/util/async_file_reader.h b/util/async_file_reader.h index 7ee72954c0..df69a840eb 100644 --- a/util/async_file_reader.h +++ b/util/async_file_reader.h @@ -1,8 +1,8 @@ -// Copyright (c) Meta Platforms, Inc. and its affiliates. All Rights Reserved. +// Copyright (c) Meta Platforms, Inc. and affiliates. +// // This source code is licensed under both the GPLv2 (found in the // COPYING file in the root directory) and Apache 2.0 License -// (found in the LICENSE.Apache file in the root directory). -// +// (found in the LICENSE.Apache file in the root directory).#pragma once #pragma once #if USE_COROUTINES diff --git a/util/coro_utils.h b/util/coro_utils.h index 38d278000b..5b4211135e 100644 --- a/util/coro_utils.h +++ b/util/coro_utils.h @@ -1,4 +1,5 @@ -// Copyright (c) Meta Platforms, Inc. and its affiliates. All Rights Reserved. +// Copyright (c) Meta Platforms, Inc. and affiliates. +// // This source code is licensed under both the GPLv2 (found in the // COPYING file in the root directory) and Apache 2.0 License // (found in the LICENSE.Apache file in the root directory). diff --git a/util/single_thread_executor.h b/util/single_thread_executor.h index b82ddda2bf..c69f2a2921 100644 --- a/util/single_thread_executor.h +++ b/util/single_thread_executor.h @@ -1,4 +1,5 @@ -// Copyright (c) Meta Platforms, Inc. and its affiliates. All Rights Reserved. +// Copyright (c) Meta Platforms, Inc. and affiliates. +// // This source code is licensed under both the GPLv2 (found in the // COPYING file in the root directory) and Apache 2.0 License // (found in the LICENSE.Apache file in the root directory). diff --git a/utilities/transactions/lock/point/point_lock_manager_test.h b/utilities/transactions/lock/point/point_lock_manager_test.h index 50b268ab16..ca9f46bf9d 100644 --- a/utilities/transactions/lock/point/point_lock_manager_test.h +++ b/utilities/transactions/lock/point/point_lock_manager_test.h @@ -1,3 +1,8 @@ +// Copyright (c) Meta Platforms, Inc. and affiliates. +// +// This source code is licensed under both the GPLv2 (found in the +// COPYING file in the root directory) and Apache 2.0 License +// (found in the LICENSE.Apache file in the root directory). #include "file/file_util.h" #include "port/port.h"