Skip to content

Commit db784f6

Browse files
Krishna Paifacebook-github-bot
authored andcommitted
Buckify various external filesystems used in HiveConnector (facebookincubator#10479)
Summary: Pull Request resolved: facebookincubator#10479 This change allows us to unblock : prestodb/presto#23082 . We can now add various external Register*Filesystem as buck dependencies which are gated by their respective flags and only enabled in OSS. Reviewed By: amitkdutta Differential Revision: D59814148 fbshipit-source-id: eb7d9478e446db5184b97f1be80dc402713b8f28
1 parent afd6753 commit db784f6

File tree

8 files changed

+22
-44
lines changed

8 files changed

+22
-44
lines changed

velox/connectors/hive/HiveConnector.cpp

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,15 @@
2424
#include "velox/dwio/dwrf/RegisterDwrfReader.h"
2525
#include "velox/dwio/dwrf/RegisterDwrfWriter.h"
2626

27-
// Meta's buck build system needs this check.
28-
#ifdef VELOX_ENABLE_GCS
27+
#include "velox/connectors/hive/storage_adapters/abfs/RegisterAbfsFileSystem.h" // @manual
2928
#include "velox/connectors/hive/storage_adapters/gcs/RegisterGCSFileSystem.h" // @manual
30-
#endif
31-
#ifdef VELOX_ENABLE_HDFS3
3229
#include "velox/connectors/hive/storage_adapters/hdfs/RegisterHdfsFileSystem.h" // @manual
33-
#endif
34-
#ifdef VELOX_ENABLE_S3
3530
#include "velox/connectors/hive/storage_adapters/s3fs/RegisterS3FileSystem.h" // @manual
36-
#endif
37-
#ifdef VELOX_ENABLE_ABFS
38-
#include "velox/connectors/hive/storage_adapters/abfs/RegisterAbfsFileSystem.h" // @manual
39-
#endif
4031
#include "velox/dwio/dwrf/reader/DwrfReader.h"
4132
#include "velox/dwio/dwrf/writer/Writer.h"
4233
#include "velox/dwio/orc/reader/OrcReader.h"
43-
// Meta's buck build system needs this check.
44-
#ifdef VELOX_ENABLE_PARQUET
4534
#include "velox/dwio/parquet/RegisterParquetReader.h" // @manual
4635
#include "velox/dwio/parquet/RegisterParquetWriter.h" // @manual
47-
#endif
4836
#include "velox/expression/FieldReference.h"
4937

5038
#include <boost/lexical_cast.hpp>
@@ -138,24 +126,14 @@ void HiveConnectorFactory::initialize() {
138126
dwrf::registerDwrfReaderFactory();
139127
dwrf::registerDwrfWriterFactory();
140128
orc::registerOrcReaderFactory();
141-
// Meta's buck build system needs this check.
142-
#ifdef VELOX_ENABLE_PARQUET
129+
143130
parquet::registerParquetReaderFactory();
144131
parquet::registerParquetWriterFactory();
145-
#endif
146-
// Meta's buck build system needs this check.
147-
#ifdef VELOX_ENABLE_S3
132+
148133
filesystems::registerS3FileSystem();
149-
#endif
150-
#ifdef VELOX_ENABLE_HDFS3
151134
filesystems::registerHdfsFileSystem();
152-
#endif
153-
#ifdef VELOX_ENABLE_GCS
154135
filesystems::registerGCSFileSystem();
155-
#endif
156-
#ifdef VELOX_ENABLE_ABFS
157136
filesystems::abfs::registerAbfsFileSystem();
158-
#endif
159137
return true;
160138
}();
161139
}

velox/connectors/hive/storage_adapters/abfs/RegisterAbfsFileSystem.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616

1717
#ifdef VELOX_ENABLE_ABFS
18-
#include "velox/connectors/hive/storage_adapters/abfs/AbfsFileSystem.h"
19-
#include "velox/connectors/hive/storage_adapters/abfs/AbfsUtil.h"
18+
#include "velox/connectors/hive/storage_adapters/abfs/AbfsFileSystem.h" // @manual
19+
#include "velox/connectors/hive/storage_adapters/abfs/AbfsUtil.h" // @manual
2020
#include "velox/core/Config.h"
2121
#endif
2222

velox/connectors/hive/storage_adapters/gcs/RegisterGCSFileSystem.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616

1717
#ifdef VELOX_ENABLE_GCS
18-
#include "velox/connectors/hive/storage_adapters/gcs/GCSFileSystem.h"
19-
#include "velox/connectors/hive/storage_adapters/gcs/GCSUtil.h"
18+
#include "velox/connectors/hive/storage_adapters/gcs/GCSFileSystem.h" // @manual
19+
#include "velox/connectors/hive/storage_adapters/gcs/GCSUtil.h" // @manual
2020
#include "velox/core/Config.h"
2121
#endif
2222

velox/connectors/hive/storage_adapters/hdfs/RegisterHdfsFileSystem.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
#ifdef VELOX_ENABLE_HDFS3
1818
#include "folly/concurrency/ConcurrentHashMap.h"
1919

20-
#include "velox/connectors/hive/storage_adapters/hdfs/HdfsFileSystem.h"
21-
#include "velox/connectors/hive/storage_adapters/hdfs/HdfsUtil.h"
20+
#include "velox/connectors/hive/storage_adapters/hdfs/HdfsFileSystem.h" // @manual
21+
#include "velox/connectors/hive/storage_adapters/hdfs/HdfsUtil.h" // @manual
2222
#include "velox/core/Config.h"
2323
#include "velox/dwio/common/FileSink.h"
2424
#endif

velox/connectors/hive/storage_adapters/s3fs/RegisterS3FileSystem.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
*/
1616

1717
#ifdef VELOX_ENABLE_S3
18-
#include "velox/connectors/hive/HiveConfig.h"
19-
#include "velox/connectors/hive/storage_adapters/s3fs/S3FileSystem.h"
20-
#include "velox/connectors/hive/storage_adapters/s3fs/S3Util.h"
18+
#include "velox/connectors/hive/HiveConfig.h" // @manual
19+
#include "velox/connectors/hive/storage_adapters/s3fs/S3FileSystem.h" // @manual
20+
#include "velox/connectors/hive/storage_adapters/s3fs/S3Util.h" // @manual
2121
#include "velox/dwio/common/FileSink.h"
2222
#endif
2323

24-
#include "velox/connectors/hive/storage_adapters/s3fs/RegisterS3FileSystem.h"
24+
#include "velox/connectors/hive/storage_adapters/s3fs/RegisterS3FileSystem.h" // @manual
2525

2626
namespace facebook::velox::filesystems {
2727

velox/dwio/parquet/RegisterParquetReader.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
#ifdef VELOX_ENABLE_PARQUET
18-
#include "velox/dwio/parquet/reader/ParquetReader.h"
18+
#include "velox/dwio/parquet/reader/ParquetReader.h" // @manual
1919
#endif
2020

2121
namespace facebook::velox::parquet {

velox/dwio/parquet/RegisterParquetWriter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
#ifdef VELOX_ENABLE_PARQUET
18-
#include "velox/dwio/parquet/writer/Writer.h"
18+
#include "velox/dwio/parquet/writer/Writer.h" // @manual
1919
#endif
2020

2121
namespace facebook::velox::parquet {

velox/dwio/parquet/tests/reader/ParquetTableScanTest.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
#include <folly/init/Init.h>
1818

1919
#include "velox/common/base/tests/GTestUtils.h"
20-
#include "velox/dwio/common/tests/utils/DataFiles.h"
21-
#include "velox/dwio/parquet/RegisterParquetReader.h"
22-
#include "velox/dwio/parquet/reader/PageReader.h"
23-
#include "velox/dwio/parquet/reader/ParquetReader.h"
20+
#include "velox/dwio/common/tests/utils/DataFiles.h" // @manual
21+
#include "velox/dwio/parquet/RegisterParquetReader.h" // @manual
22+
#include "velox/dwio/parquet/reader/PageReader.h" // @manual
23+
#include "velox/dwio/parquet/reader/ParquetReader.h" // @manual=//velox/connectors/hive:velox_hive_connector_parquet
2424
#include "velox/exec/tests/utils/AssertQueryBuilder.h"
25-
#include "velox/exec/tests/utils/HiveConnectorTestBase.h"
25+
#include "velox/exec/tests/utils/HiveConnectorTestBase.h" // @manual
2626
#include "velox/exec/tests/utils/PlanBuilder.h"
2727
#include "velox/type/tests/SubfieldFiltersBuilder.h"
2828

29-
#include "velox/connectors/hive/HiveConfig.h"
30-
#include "velox/dwio/parquet/writer/Writer.h"
29+
#include "velox/connectors/hive/HiveConfig.h" // @manual=//velox/connectors/hive:velox_hive_connector_parquet
30+
#include "velox/dwio/parquet/writer/Writer.h" // @manual
3131

3232
using namespace facebook::velox;
3333
using namespace facebook::velox::exec;

0 commit comments

Comments
 (0)