Skip to content

Commit

Permalink
fix: Refactor package namespace in HdfsFileSystem (facebookincubator#…
Browse files Browse the repository at this point in the history
…11585)

Summary:
After merging PR facebookincubator#9835, Gluten encountered the following compilation error. This PR refactors the package namespace to resolve the ambiguity issue.

```
/mnt/DP_disk3/jk/projects/gluten/cpp/velox/memory/VeloxColumnarBatch.cc:33:5: error: reference to ‘velox’ is ambiguous
   33 |     velox::memory::MemoryPool* pool,
      |     ^~~~~
In file included from /mnt/DP_disk3/jk/projects/gluten/cpp/velox/operators/writer/VeloxParquetDataSource.h:43,
                 from /mnt/DP_disk3/jk/projects/gluten/cpp/velox/compute/VeloxRuntime.h:25,
                 from /mnt/DP_disk3/jk/projects/gluten/cpp/velox/memory/VeloxColumnarBatch.cc:18:
/mnt/DP_disk3/jk/projects/gluten/dev/../ep/build-velox/build/velox_ep/velox/connectors/hive/storage_adapters/hdfs/HdfsFileSystem.h:18:11: note: candidates are: ‘namespace velox { }’
   18 | namespace velox::filesystems::arrow::io::internal {
      |           ^~~~~
In file included from /mnt/DP_disk3/jk/projects/gluten/dev/../ep/build-velox/build/velox_ep/velox/common/base/VeloxException.h:29,
                 from /mnt/DP_disk3/jk/projects/gluten/dev/../ep/build-velox/build/velox_ep/velox/common/base/Exceptions.h:27,
                 from /mnt/DP_disk3/jk/projects/gluten/dev/../ep/build-velox/build/velox_ep/velox/common/base/BitUtil.h:19,
                 from /mnt/DP_disk3/jk/projects/gluten/dev/../ep/build-velox/build/velox_ep/velox/common/caching/AsyncDataCache.h:27,
                 from /mnt/DP_disk3/jk/projects/gluten/cpp/velox/compute/VeloxBackend.h:27,
                 from /mnt/DP_disk3/jk/projects/gluten/cpp/velox/memory/VeloxMemoryManager.h:20,
                 from /mnt/DP_disk3/jk/projects/gluten/cpp/velox/memory/VeloxColumnarBatch.h:21,
                 from /mnt/DP_disk3/jk/projects/gluten/cpp/velox/memory/VeloxColumnarBatch.cc:17:
```

Pull Request resolved: facebookincubator#11585

Reviewed By: xiaoxmeng

Differential Revision: D67119176

Pulled By: kgpai

fbshipit-source-id: d8eab6f8570ffa7b35bdc1b890c658f6926b8313
  • Loading branch information
JkSelf authored and facebook-github-bot committed Dec 12, 2024
1 parent 63fcb27 commit d9a6012
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions velox/connectors/hive/storage_adapters/hdfs/HdfsFileSystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
*/
#include "velox/common/file/FileSystems.h"

namespace velox::filesystems::arrow::io::internal {
namespace facebook::velox::filesystems {

namespace arrow::io::internal {
class LibHdfsShim;
}

namespace facebook::velox::filesystems {

struct HdfsServiceEndpoint {
HdfsServiceEndpoint(const std::string& hdfsHost, const std::string& hdfsPort)
: host(hdfsHost), port(hdfsPort) {}
Expand Down

0 comments on commit d9a6012

Please sign in to comment.