mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-22 07:31:57 +00:00
More fixes
This commit is contained in:
parent
b7b21426b9
commit
f4f6e17bcd
@ -96,8 +96,6 @@
|
|||||||
#pragma GCC optimize("-fno-var-tracking-assignments")
|
#pragma GCC optimize("-fno-var-tracking-assignments")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/// http://en.wikipedia.org/wiki/ANSI_escape_code
|
|
||||||
#define CLEAR_TO_END_OF_LINE "\033[K"
|
|
||||||
|
|
||||||
|
|
||||||
namespace DB
|
namespace DB
|
||||||
@ -2202,7 +2200,7 @@ private:
|
|||||||
current_format = "Vertical";
|
current_format = "Vertical";
|
||||||
|
|
||||||
/// It is not clear how to write progress with parallel formatting. It may increase code complexity significantly.
|
/// It is not clear how to write progress with parallel formatting. It may increase code complexity significantly.
|
||||||
if (!need_render_progress)
|
if (!progress_bar.getNeedRenderProgress())
|
||||||
block_out_stream = context->getOutputStreamParallelIfPossible(current_format, *out_buf, block);
|
block_out_stream = context->getOutputStreamParallelIfPossible(current_format, *out_buf, block);
|
||||||
else
|
else
|
||||||
block_out_stream = context->getOutputStream(current_format, *out_buf, block);
|
block_out_stream = context->getOutputStream(current_format, *out_buf, block);
|
||||||
@ -2735,8 +2733,6 @@ public:
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
#pragma GCC diagnostic ignored "-Wunused-function"
|
#pragma GCC diagnostic ignored "-Wunused-function"
|
||||||
#pragma GCC diagnostic ignored "-Wmissing-declarations"
|
#pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||||
|
|
||||||
@ -2765,3 +2761,4 @@ int mainEntryClickHouseClient(int argc, char ** argv)
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
@ -42,8 +42,6 @@ private:
|
|||||||
void setupUsers();
|
void setupUsers();
|
||||||
void cleanup();
|
void cleanup();
|
||||||
|
|
||||||
void updateProgress(const Progress &value);
|
|
||||||
void writeProgress();
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
SharedContextHolder shared_context;
|
SharedContextHolder shared_context;
|
||||||
|
@ -5,8 +5,7 @@
|
|||||||
#include <Databases/DatabaseMemory.h>
|
#include <Databases/DatabaseMemory.h>
|
||||||
|
|
||||||
|
|
||||||
/// http://en.wikipedia.org/wiki/ANSI_escape_code
|
|
||||||
#define CLEAR_TO_END_OF_LINE "\033[K"
|
|
||||||
|
|
||||||
|
|
||||||
namespace DB {
|
namespace DB {
|
||||||
|
@ -3,6 +3,8 @@
|
|||||||
#include "../Common/Stopwatch.h"
|
#include "../Common/Stopwatch.h"
|
||||||
#include "../IO/Progress.h"
|
#include "../IO/Progress.h"
|
||||||
|
|
||||||
|
/// http://en.wikipedia.org/wiki/ANSI_escape_code
|
||||||
|
#define CLEAR_TO_END_OF_LINE "\033[K"
|
||||||
|
|
||||||
namespace DB
|
namespace DB
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user