This is an automated email from the ASF dual-hosted git repository.
changchen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 838372972 [GLUTEN-1632][CH]Daily Update Clickhouse Version (20240711)
(#6399)
838372972 is described below
commit 83837297231ae70283a0198ad6175e556db0eab4
Author: Kyligence Git <[email protected]>
AuthorDate: Thu Jul 11 01:10:55 2024 -0500
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20240711) (#6399)
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20240711)
* Fix build due to https://github.com/ClickHouse/ClickHouse/pull/66239
* Fix rebase fail due to https://github.com/ClickHouse/ClickHouse/pull/65687
---------
Co-authored-by: kyligence-git <[email protected]>
Co-authored-by: Chang Chen <[email protected]>
---
cpp-ch/clickhouse.version | 4 ++--
cpp-ch/local-engine/Parser/RelMetric.cpp | 8 ++++----
cpp-ch/local-engine/Parser/SerializedPlanParser.cpp | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
index f40e9a51d..6afd19152 100644
--- a/cpp-ch/clickhouse.version
+++ b/cpp-ch/clickhouse.version
@@ -1,4 +1,4 @@
CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20240710
-CH_COMMIT=feb85da32a5
+CH_BRANCH=rebase_ch/20240711
+CH_COMMIT=4ab4aa7fe04
diff --git a/cpp-ch/local-engine/Parser/RelMetric.cpp
b/cpp-ch/local-engine/Parser/RelMetric.cpp
index feb930dfc..7b8b4cfd9 100644
--- a/cpp-ch/local-engine/Parser/RelMetric.cpp
+++ b/cpp-ch/local-engine/Parser/RelMetric.cpp
@@ -61,9 +61,9 @@ RelMetricTimes RelMetric::getTotalTime() const
{
for (const auto & processor : step->getProcessors())
{
- timeMetrics.time += processor->getElapsedUs();
- timeMetrics.input_wait_elapsed_us +=
processor->getInputWaitElapsedUs();
- timeMetrics.output_wait_elapsed_us +=
processor->getOutputWaitElapsedUs();
+ timeMetrics.time += processor->getElapsedNs() / 1000U ;
+ timeMetrics.input_wait_elapsed_us +=
processor->getInputWaitElapsedNs() / 1000U;
+ timeMetrics.output_wait_elapsed_us +=
processor->getInputWaitElapsedNs() / 1000U;
}
}
}
@@ -104,7 +104,7 @@ void RelMetric::serialize(Writer<StringBuffer> & writer,
bool) const
writer.Key("name");
writer.String(processor->getName().c_str());
writer.Key("time");
- writer.Uint64(processor->getElapsedUs());
+ writer.Uint64(processor->getElapsedNs() / 1000U);
writer.Key("output_rows");
writer.Uint64(processor->getProcessorDataStats().output_rows);
writer.Key("output_bytes");
diff --git a/cpp-ch/local-engine/Parser/SerializedPlanParser.cpp
b/cpp-ch/local-engine/Parser/SerializedPlanParser.cpp
index c59166ddd..50431abd9 100644
--- a/cpp-ch/local-engine/Parser/SerializedPlanParser.cpp
+++ b/cpp-ch/local-engine/Parser/SerializedPlanParser.cpp
@@ -1781,9 +1781,9 @@ std::string LocalExecutor::dumpPipeline() const
WriteBufferFromOwnString buffer;
auto data_stats = processor->getProcessorDataStats();
buffer << "(";
- buffer << "\nexcution time: " << processor->getElapsedUs() << " us.";
- buffer << "\ninput wait time: " << processor->getInputWaitElapsedUs()
<< " us.";
- buffer << "\noutput wait time: " <<
processor->getOutputWaitElapsedUs() << " us.";
+ buffer << "\nexcution time: " << processor->getElapsedNs() / 1000U <<
" us.";
+ buffer << "\ninput wait time: " << processor->getInputWaitElapsedNs()
/ 1000U << " us.";
+ buffer << "\noutput wait time: " <<
processor->getOutputWaitElapsedNs() / 1000U << " us.";
buffer << "\ninput rows: " << data_stats.input_rows;
buffer << "\ninput bytes: " << data_stats.input_bytes;
buffer << "\noutput rows: " << data_stats.output_rows;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
