Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove excessive empty lines #9476

Merged
merged 2 commits into from
Mar 3, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion base/common/iostream_debug_helpers.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ dumpImpl(Out & out, T && x)
}



/// Tuple, pair
template <size_t N, typename Out, typename T>
Out & dumpTupleImpl(Out & out, T && x)
Expand Down
2 changes: 0 additions & 2 deletions base/memcpy/impl/FastMemcpy.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ typedef __attribute__((__aligned__(1))) uint32_t uint32_unaligned_t;
typedef __attribute__((__aligned__(1))) uint64_t uint64_unaligned_t;



//---------------------------------------------------------------------
// fast copy for different sizes
//---------------------------------------------------------------------
Expand Down Expand Up @@ -694,4 +693,3 @@ static INLINE void* memcpy_fast(void *destination, const void *source, size_t si
#endif



1 change: 0 additions & 1 deletion dbms/programs/copier/Internals.h
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ struct TaskStateWithOwner
};



struct ShardPriority
{
UInt8 is_remote = 1;
Expand Down
1 change: 0 additions & 1 deletion dbms/programs/performance-test/StopConditionsSet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,4 @@ void StopConditionsSet::report(UInt64 value, StopConditionsSet::StopCondition &
}



}
1 change: 0 additions & 1 deletion dbms/src/Access/IAccessStorage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ bool IAccessStorage::exists(const UUID & id) const
}



AccessEntityPtr IAccessStorage::tryReadBase(const UUID & id) const
{
try
Expand Down
1 change: 0 additions & 1 deletion dbms/src/Access/Quota.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include <chrono>



namespace DB
{
/** Quota for resources consumption for specific interval.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ struct MovingAvgData
};



template <typename T, typename Tlimit_num_elems, typename Data>
class MovingImpl final
: public IAggregateFunctionDataHelper<Data, MovingImpl<T, Tlimit_num_elems, Data>>
Expand Down
1 change: 0 additions & 1 deletion dbms/src/Columns/ColumnLowCardinality.h
Original file line number Diff line number Diff line change
Expand Up @@ -287,5 +287,4 @@ class ColumnLowCardinality final : public COWHelper<IColumn, ColumnLowCardinalit
};



}
1 change: 0 additions & 1 deletion dbms/src/Common/Macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include <map>



namespace Poco
{
namespace Util
Expand Down
1 change: 0 additions & 1 deletion dbms/src/Common/MemoryTracker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ static void logMemoryUsage(Int64 amount)
}



void MemoryTracker::alloc(Int64 size)
{
if (blocker.isCancelled())
Expand Down
1 change: 0 additions & 1 deletion dbms/src/Common/RadixSort.h
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ struct RadixSortIdentityTransform
};



template <typename TElement>
struct RadixSortUIntTraits
{
Expand Down
1 change: 0 additions & 1 deletion dbms/src/Common/UInt128.h
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ struct UInt128TrivialHash
};



/** Used for aggregation, for putting a large number of constant-length keys in a hash table.
*/
struct UInt256
Expand Down
1 change: 0 additions & 1 deletion dbms/src/Common/ZooKeeper/ZooKeeperImpl.h
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ using namespace DB;
struct ZooKeeperRequest;



/** Usage scenario: look at the documentation for IKeeper class.
*/
class ZooKeeper : public IKeeper
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,4 +200,3 @@ TEST(zkutil, multi_create_sequential)
}



1 change: 0 additions & 1 deletion dbms/src/Common/getNumberOfPhysicalCPUCores.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
#endif



unsigned getNumberOfPhysicalCPUCores()
{
#if USE_CPUID
Expand Down
1 change: 0 additions & 1 deletion dbms/src/Common/parseRemoteDescription.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ static bool parseNumber(const String & description, size_t l, size_t r, size_t &
}



/* Parse a string that generates shards and replicas. Separator - one of two characters | or ,
* depending on whether shards or replicas are generated.
* For example:
Expand Down
1 change: 0 additions & 1 deletion dbms/src/Common/tests/hash_table.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include <Common/HashTable/HashSet.h>



int main(int, char **)
{
{
Expand Down
2 changes: 0 additions & 2 deletions dbms/src/Common/tests/integer_hash_tables_and_hashes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ using Key = UInt64;
using Value = UInt64;



/// Various hash functions to test

namespace Hashes
Expand Down Expand Up @@ -336,7 +335,6 @@ static void NO_INLINE testForEachMapAndHash(const Key * data, size_t size)
}



int main(int argc, char ** argv)
{
if (argc < 2)
Expand Down
1 change: 0 additions & 1 deletion dbms/src/Common/tests/parallel_aggregation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,6 @@ void aggregate5(Map & local_map, MapSmallLocks & global_map, Source::const_itera
}*/



int main(int argc, char ** argv)
{
size_t n = atoi(argv[1]);
Expand Down
1 change: 0 additions & 1 deletion dbms/src/Common/tests/parallel_aggregation2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@ struct Merger
};



int main(int argc, char ** argv)
{
size_t n = atoi(argv[1]);
Expand Down
1 change: 0 additions & 1 deletion dbms/src/Common/tests/small_table.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include <Common/HashTable/SmallTable.h>



int main(int, char **)
{
{
Expand Down
1 change: 0 additions & 1 deletion dbms/src/Core/Block.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,6 @@ void Block::setColumns(const Columns & columns)
}



Block Block::cloneWithColumns(MutableColumns && columns) const
{
Block res;
Expand Down
1 change: 0 additions & 1 deletion dbms/src/Core/Block.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include <Core/ColumnsWithTypeAndName.h>



namespace DB
{

Expand Down
1 change: 0 additions & 1 deletion dbms/src/Core/SettingsCollection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,6 @@ void SettingEnum<EnumType, Tag>::set(const Field & x)
}



String SettingURI::toString() const
{
return value.toString();
Expand Down
1 change: 0 additions & 1 deletion dbms/src/Core/callOnTypeIndex.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ struct TypePair
};



template <typename T, bool _int, bool _float, bool _decimal, bool _datetime, typename F>
bool callOnBasicType(TypeIndex number, F && f)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ VersionedCollapsingSortedBlockInputStream::VersionedCollapsingSortedBlockInputSt
}



inline ALWAYS_INLINE static void writeRowSourcePart(WriteBuffer & buffer, RowSourcePart row_source)
{
if constexpr (sizeof(RowSourcePart) == 1)
Expand Down
1 change: 0 additions & 1 deletion dbms/src/DataTypes/DataTypeTuple.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ DataTypeTuple::DataTypeTuple(const DataTypes & elems_, const Strings & names_)
}



std::string DataTypeTuple::doGetName() const
{
size_t size = elems.size();
Expand Down
1 change: 0 additions & 1 deletion dbms/src/DataTypes/DataTypesDecimal.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ std::string DataTypeDecimal<T>::doGetName() const
}



template <typename T>
bool DataTypeDecimal<T>::equals(const IDataType & rhs) const
{
Expand Down
1 change: 0 additions & 1 deletion dbms/src/Databases/DatabaseLazy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ namespace ErrorCodes
}



DatabaseLazy::DatabaseLazy(const String & name_, const String & metadata_path_, time_t expiration_time_, const Context & context_)
: DatabaseOnDisk(name_, metadata_path_, "DatabaseLazy (" + name_ + ")")
, expiration_time(expiration_time_)
Expand Down
1 change: 0 additions & 1 deletion dbms/src/Databases/DatabaseMySQL.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#include <Poco/DirectoryIterator.h>



namespace DB
{

Expand Down
1 change: 0 additions & 1 deletion dbms/src/Databases/DatabaseOnDisk.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#include <Poco/DirectoryIterator.h>



namespace DB
{

Expand Down
2 changes: 0 additions & 2 deletions dbms/src/Formats/ProtobufReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,6 @@ class ProtobufReader::ConverterBaseImpl : public ProtobufReader::IConverter
};



class ProtobufReader::ConverterFromString : public ConverterBaseImpl
{
public:
Expand Down Expand Up @@ -864,7 +863,6 @@ PROTOBUF_READER_CREATE_CONVERTER_SPECIALIZATION_FOR_NUMBERS(google::protobuf::Fi
#undef PROTOBUF_READER_CREATE_CONVERTER_SPECIALIZATION_FOR_NUMBERS



class ProtobufReader::ConverterFromBool : public ConverterBaseImpl
{
public:
Expand Down
1 change: 0 additions & 1 deletion dbms/src/Functions/FunctionBinaryArithmetic.h
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ struct FixedStringOperationImpl
};



template <typename A, typename B, typename Op, typename ResultType = typename Op::ResultType>
struct BinaryOperationImpl : BinaryOperationImplBase<A, B, Op, ResultType>
{
Expand Down
1 change: 0 additions & 1 deletion dbms/src/Functions/FunctionsLogical.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#endif



/** Logical functions AND, OR, XOR and NOT support three-valued (or ternary) logic
* https://en.wikibooks.org/wiki/Structured_Query_Language/NULLs_and_the_Three_Valued_Logic
*
Expand Down
1 change: 0 additions & 1 deletion dbms/src/Functions/GatherUtils/Algorithms.h
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ inline ALWAYS_INLINE void writeSlice(const NumericValueSlice<T> & slice, Generic
}



template <typename SourceA, typename SourceB, typename Sink>
void NO_INLINE concat(SourceA && src_a, SourceB && src_b, Sink && sink)
{
Expand Down
2 changes: 0 additions & 2 deletions dbms/src/Functions/caseWithExpression.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -124,5 +124,3 @@ void registerFunctionCaseWithExpression(FunctionFactory & factory)
}




1 change: 0 additions & 1 deletion dbms/src/Functions/generateUUIDv4.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,3 @@ void registerFunctionGenerateUUIDv4(FunctionFactory & factory)
}



1 change: 0 additions & 1 deletion dbms/src/Functions/multiIf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -242,4 +242,3 @@ void registerFunctionMultiIf(FunctionFactory & factory)
}



1 change: 0 additions & 1 deletion dbms/src/Functions/reinterpretStringAs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -152,4 +152,3 @@ void registerFunctionsReinterpretStringAs(FunctionFactory & factory)
}



1 change: 0 additions & 1 deletion dbms/src/Functions/timeSlot.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ void registerFunctionTimeSlot(FunctionFactory & factory)
}



2 changes: 0 additions & 2 deletions dbms/src/IO/WriteHelpers.h
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,6 @@ void writeAnyQuotedString(const char * begin, const char * end, WriteBuffer & bu
}



template <char quote_character>
void writeAnyQuotedString(const String & s, WriteBuffer & buf)
{
Expand Down Expand Up @@ -1020,7 +1019,6 @@ void writeText(const std::vector<T> & x, WriteBuffer & buf)
}



/// Serialize exception (so that it can be transferred over the network)
void writeException(const Exception & e, WriteBuffer & buf, bool with_stack_trace);

Expand Down
1 change: 0 additions & 1 deletion dbms/src/Interpreters/BloomFilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,4 @@ using BloomFilterPtr = std::shared_ptr<BloomFilter>;
bool operator== (const BloomFilter & a, const BloomFilter & b);



}
1 change: 0 additions & 1 deletion dbms/src/Interpreters/InternalTextLogsQueue.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,3 @@ using InternalTextLogsQueuePtr = std::shared_ptr<InternalTextLogsQueue>;
}



1 change: 0 additions & 1 deletion dbms/src/Interpreters/InterpreterKillQueryQuery.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ static QueryDescriptors extractQueriesExceptMeAndCheckAccess(const Block & proce
}



class SyncKillQueryInputStream : public IBlockInputStream
{
public:
Expand Down
1 change: 0 additions & 1 deletion dbms/src/Interpreters/QueryThreadLog.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,3 @@ class QueryThreadLog : public SystemLog<QueryThreadLogElement>
}



2 changes: 0 additions & 2 deletions dbms/src/Interpreters/tests/hash_map_string_2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,6 @@ inline bool operator==(StringRef_Compare8_1_byUInt64 lhs, StringRef_Compare8_1_b
}



inline bool compare_byMemcmp(const char * p1, const char * p2)
{
return 0 == memcmp(p1, p2, 16);
Expand Down Expand Up @@ -576,7 +575,6 @@ inline bool operator==(StringRef_CompareAlmostAlwaysTrue lhs, StringRef_CompareA
}



using Value = UInt64;


Expand Down
1 change: 0 additions & 1 deletion dbms/src/Parsers/ASTColumnsMatcher.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include <re2/re2.h>



namespace DB
{
namespace ErrorCodes
Expand Down
1 change: 0 additions & 1 deletion dbms/src/Parsers/ASTDictionary.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ void ASTDictionaryRange::formatImpl(const FormatSettings & settings,
}



ASTPtr ASTDictionaryLifetime::clone() const
{
auto res = std::make_shared<ASTDictionaryLifetime>(*this);
Expand Down
2 changes: 0 additions & 2 deletions dbms/src/Parsers/ASTSampleRatio.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,4 @@ String ASTSampleRatio::toString(Rational ratio)
}




}