fix sort and memory manager fail

apache · Aug 16, 2024 · babe70b · babe70b
1 parent ab755e5
commit babe70b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/cpp/velox/memory/VeloxMemoryManager.cc b/cpp/velox/memory/VeloxMemoryManager.cc
@@ -63,11 +63,18 @@ class ListenableArbitrator : public velox::memory::MemoryArbitrator {
   ListenableArbitrator(const Config& config, AllocationListener* listener)
       : MemoryArbitrator(config),
         listener_(listener),
-        memoryPoolInitialCapacity_(
-            getConfig<uint64_t>(config.extraConfigs, kMemoryPoolInitialCapacity, kDefaultMemoryPoolInitialCapacity)),
-        memoryPoolTransferCapacity_(
-            getConfig<uint64_t>(config.extraConfigs, kMemoryPoolTransferCapacity, kDefaultMemoryPoolTransferCapacity)) {
-  }
+        memoryPoolInitialCapacity_(velox::config::toCapacity(
+            getConfig<std::string>(
+                config.extraConfigs,
+                kMemoryPoolInitialCapacity,
+                std::to_string(kDefaultMemoryPoolInitialCapacity)),
+            velox::config::CapacityUnit::BYTE)),
+        memoryPoolTransferCapacity_(velox::config::toCapacity(
+            getConfig<std::string>(
+                config.extraConfigs,
+                kMemoryPoolTransferCapacity,
+                std::to_string(kDefaultMemoryPoolTransferCapacity)),
+            velox::config::CapacityUnit::BYTE)) {}
   std::string kind() const override {
     return kind_;
   }

diff --git a/cpp/velox/shuffle/GlutenByteStream.h b/cpp/velox/shuffle/GlutenByteStream.h
@@ -25,7 +25,8 @@ class GlutenByteInputStream : public ByteInputStream {
   GlutenByteInputStream() {}
 
  public:
-  explicit GlutenByteInputStream(std::vector<ByteRange> ranges) : ranges_{std::move(ranges)} {
+  explicit GlutenByteInputStream(std::vector<ByteRange> ranges) {
+    ranges_ = std::move(ranges);
     VELOX_CHECK(!ranges_.empty());
     current_ = &ranges_[0];
   }
@@ -37,8 +38,7 @@ class GlutenByteInputStream : public ByteInputStream {
   GlutenByteInputStream& operator=(const GlutenByteInputStream& other) = delete;
 
   /// Enable move constructor.
-  GlutenByteInputStream(GlutenByteInputStream&& other) noexcept
-      : ranges_{std::move(other.ranges_)}, current_{other.current_} {}
+  GlutenByteInputStream(GlutenByteInputStream&& other) noexcept = delete;
 
   /// Enable move assignment operator.
   GlutenByteInputStream& operator=(GlutenByteInputStream&& other) noexcept {
@@ -249,12 +249,6 @@ class GlutenByteInputStream : public ByteInputStream {
     ranges_[0] = range;
     current_ = ranges_.data();
   }
-
- private:
-  std::vector<ByteRange> ranges_;
-
-  // Pointer to the current element of 'ranges_'.
-  ByteRange* current_{nullptr};
 };
 
 template <>

diff --git a/cpp/velox/tests/MemoryManagerTest.cc b/cpp/velox/tests/MemoryManagerTest.cc
@@ -331,7 +331,9 @@ class MultiMemoryManagerTest : public ::testing::Test {
     std::unordered_map<std::string, std::string> conf = {
         {kMemoryReservationBlockSize, std::to_string(kMemoryReservationBlockSizeDefault)},
         {kVeloxMemInitCapacity, std::to_string(kVeloxMemInitCapacityDefault)}};
+    std::cout << "create the velox backend" << std::endl;
     gluten::VeloxBackend::create(conf);
+    std::cout << "created the velox backend" << std::endl;
   }
 
   std::unique_ptr<VeloxMemoryManager> newVeloxMemoryManager(std::unique_ptr<AllocationListener> listener) {