remove useless codes

apache · Nov 29, 2023 · 362677c · 362677c
1 parent 9caaebb
commit 362677c
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 7 deletions.
diff --git a/cpp-ch/local-engine/Parser/SerializedPlanParser.cpp b/cpp-ch/local-engine/Parser/SerializedPlanParser.cpp
@@ -440,8 +440,8 @@ QueryPlanPtr SerializedPlanParser::parse(std::unique_ptr<substrait::Plan> plan)
         pb_util::JsonOptions options;
         std::string json;
         auto s = pb_util::MessageToJsonString(*plan, &json, options);
-        // if (!s.ok())
-            // throw Exception(ErrorCodes::LOGICAL_ERROR, "Can not convert Substrait Plan to Json");
+        if (!s.ok())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Can not convert Substrait Plan to Json");
         LOG_DEBUG(&Poco::Logger::get("SerializedPlanParser"), "substrait plan:\n{}", json);
     }
     parseExtensions(plan->extensions());

diff --git a/cpp-ch/local-engine/Shuffle/CachedShuffleWriter.h b/cpp-ch/local-engine/Shuffle/CachedShuffleWriter.h
@@ -47,7 +47,6 @@ class CachedShuffleWriter : public ShuffleWriterBase
     void initOutputIfNeeded(DB::Block & block);
 
     bool stopped = false;
-    // PartitionInfo partition_info;
     DB::Block output_header;
     SplitOptions options;
     SplitResult split_result;

diff --git a/cpp-ch/local-engine/Shuffle/PartitionWriter.cpp b/cpp-ch/local-engine/Shuffle/PartitionWriter.cpp
@@ -220,7 +220,6 @@ PartitionWriter::PartitionWriter(CachedShuffleWriter * shuffle_writer_)
     , partition_block_buffer(options->partition_num)
     , partition_buffer(options->partition_num)
 {
-    // std::cout << "throw_if_memory_exceed: " << options->throw_if_memory_exceed << std::endl;
     for (size_t partition_i = 0; partition_i < options->partition_num; ++partition_i)
     {
         partition_block_buffer[partition_i] = std::make_shared<ColumnsBuffer>(options->split_size);

diff --git a/cpp-ch/local-engine/Shuffle/PartitionWriter.h b/cpp-ch/local-engine/Shuffle/PartitionWriter.h
@@ -80,7 +80,7 @@ class PartitionWriter : boost::noncopyable
 
     size_t total_partition_buffer_size = 0;
 
-    std::atomic<bool> evicting_or_writing{false};
+    bool evicting_or_writing{false};
 };
 
 class LocalPartitionWriter : public PartitionWriter
@@ -109,7 +109,6 @@ class CelebornPartitionWriter : public PartitionWriter
     size_t unsafeEvictPartitions(bool for_memory_spill) override;
     void unsafeStop() override;
 
-    std::atomic<bool> evicting_or_writing = 0;
     std::unique_ptr<CelebornClient> celeborn_client;
 };
 }

diff --git a/cpp-ch/local-engine/Storages/SubstraitSource/ReadBufferBuilder.cpp b/cpp-ch/local-engine/Storages/SubstraitSource/ReadBufferBuilder.cpp
@@ -419,7 +419,7 @@ class S3FileReadBufferBuilder : public ReadBufferBuilder
                 /* restricted_seek */ true);
         };
 
-        DB::StoredObjects stored_objects{DB::StoredObject{key, "", object_size}};
+        DB::StoredObjects stored_objects{DB::StoredObject{key, object_size}};
         auto s3_impl = std::make_unique<DB::ReadBufferFromRemoteFSGather>(
             std::move(read_buffer_creator), stored_objects, new_settings, /* cache_log */ nullptr, /* use_external_buffer */ true);