Skip to content

Metrica sync2#80

Merged
alexey-milovidov merged 34 commits intomasterfrom
metrica-sync2
Aug 23, 2016
Merged

Metrica sync2#80
alexey-milovidov merged 34 commits intomasterfrom
metrica-sync2

Conversation

@PKartaviy
Copy link
Copy Markdown
Contributor

No description provided.

Pavel Kartavyy added 30 commits June 14, 2016 14:44
Conflicts:
	metrica/src/CMakeLists.txt
	metrica/src/ClickHouse/libs/libdaemon/include/daemon/GraphiteWriter.h
	metrica/src/ClickHouse/libs/libdaemon/src/GraphiteWriter.cpp
	metrica/src/libs/CMakeLists.txt
	metrica/src/libs/liblogbroker-client/src/LogBroker.cpp
	metrica/src/libs/liblogbroker-log-import/include/logbroker-log-import/LogBrokerLogImportTask-inl.h
	metrica/src/libs/libstatdaemons/include/statdaemons/write_destinations/ClickHouseCluster.h
	metrica/src/programs/cleanerd/src/config.xml
	metrica/src/programs/deduplicatord/src/Task.cpp
	metrica/src/programs/visit-log-processor/src/VisitLogHandler.h
	metrica/src/tools/ssqls/templates/header.tpl
Conflicts:
	metrica/src/ClickHouse/libs/libdaemon/include/daemon/GraphiteWriter.h
	metrica/src/ClickHouse/libs/libdaemon/src/GraphiteWriter.cpp
CMakeLists.txt Outdated
SET(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ ${GLIBC_COMPATIBILITY_LINK_FLAGS}")

SET(CMAKE_CXX_FLAGS_ASAN "-O3 -g -fsanitize=address -fno-omit-frame-pointer")
SET(CMAKE_CXX_FLAGS_TSAN "-O3 -g -fsanitize=thread -fno-omit-frame-pointer")
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BTW, for thread sanitizer it is not enough, because you need to pass this flag both for compiler and linker, and also remove -static-libgcc, -static-libstdc++
And also, thread sanitizer just don't work with libstdc++ (emits false positives, tested with gcc 6).
You need either:

  • rebuild libstdc++ with TSan;
  • rebuild with clang;
  • use libc++ instead of libstdc++.

So, this option is broken right now. Need to fix or remove.

Self & operator=(T && rhs) { t = std::move(rhs); return *this;}

operator const T & () const {return t; }
operator T & () { return t; }
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed. Supported move only types like unique_ptr and types without default ctor

@alexey-milovidov alexey-milovidov merged commit 9148209 into master Aug 23, 2016
alexey-milovidov pushed a commit that referenced this pull request Jan 20, 2020
alexey-milovidov pushed a commit that referenced this pull request Jan 20, 2020
bkuschel referenced this pull request in ClibMouse/ClickHouse Dec 21, 2021
@Felixoid Felixoid deleted the metrica-sync2 branch February 16, 2022 15:55
Onyx2406 pushed a commit to Onyx2406/ClickHouse that referenced this pull request Mar 19, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants