Merge changes to fork

.circleci/config.yml

@@ -55,7 +55,7 @@ workflows:
 executors:
   build:
     docker:
-      - image : prestocpp/velox-circleci:kpai-20220401
+      - image : prestocpp/velox-circleci:kevinwilfong-20220426
     resource_class: 2xlarge
     environment:
         CC:  /opt/rh/gcc-toolset-9/root/bin/gcc

CMakeLists.txt

@@ -33,6 +33,7 @@ option(VELOX_ENABLE_DUCKDB "Build duckDB to enable differential testing." ON)
 option(VELOX_ENABLE_EXEC "Build exec." ON)
 option(VELOX_ENABLE_AGGREGATES "Build aggregates." ON)
 option(VELOX_ENABLE_HIVE_CONNECTOR "Build Hive connector." ON)
+option(VELOX_ENABLE_TPCH_CONNECTOR "Build TPC-H connector." ON)
 option(VELOX_ENABLE_PRESTO_FUNCTIONS "Build Presto SQL functions." ON)
 option(VELOX_ENABLE_SPARK_FUNCTIONS "Build Spark SQL functions." ON)
 option(VELOX_ENABLE_EXPRESSION "Build expression." ON)
@@ -57,6 +58,7 @@ if(${VELOX_BUILD_MINIMAL})
   set(VELOX_ENABLE_EXEC OFF)
   set(VELOX_ENABLE_AGGREGATES OFF)
   set(VELOX_ENABLE_HIVE_CONNECTOR OFF)
+  set(VELOX_ENABLE_TPCH_CONNECTOR OFF)
   set(VELOX_ENABLE_SPARK_FUNCTIONS OFF)
   set(VELOX_ENABLE_EXAMPLES OFF)
   set(VELOX_ENABLE_S3 OFF)
@@ -73,6 +75,7 @@ if(${VELOX_BUILD_TESTING})
   set(VELOX_ENABLE_EXEC ON)
   set(VELOX_ENABLE_AGGREGATES ON)
   set(VELOX_ENABLE_HIVE_CONNECTOR ON)
+  set(VELOX_ENABLE_TPCH_CONNECTOR ON)
   set(VELOX_ENABLE_SPARK_FUNCTIONS ON)
   set(VELOX_ENABLE_TEST_UTILS OFF)
   set(VELOX_ENABLE_EXAMPLES ON)
@@ -144,7 +147,7 @@ set(POSITION_INDEPENDENT_CODE True)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 set(CMAKE_CXX_FLAGS
-    "${CMAKE_CXX_FLAGS} -mavx2 -mfma -mavx -mf16c -mbmi2 -march=native -D USE_VELOX_COMMON_BASE"
+    "${CMAKE_CXX_FLAGS} -mavx2 -mfma -mavx -mf16c -mbmi2 -mbmi -D USE_VELOX_COMMON_BASE"
 )
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D HAS_UNCAUGHT_EXCEPTIONS")
@@ -288,6 +291,7 @@ endif()
 include_directories(SYSTEM velox)
 include_directories(SYSTEM velox/external)
 include_directories(SYSTEM velox/external/duckdb)
+include_directories(SYSTEM velox/external/duckdb/tpch/dbgen/include)
 
 include(CTest) # include after project() but before add_subdirectory()
 

CODING_STYLE.md

@@ -173,7 +173,7 @@ About comment style:
     stack. Note that most types that perform large allocations already store
     their bulk memory on-heap.
 
-## Constants
+## Constants
 
 * Always use `nullptr` if you need a constant that represents a null pointer
   (`T*` for some `T`); use `0` otherwise for a zero value.
@@ -339,3 +339,22 @@ myFunc();
   * Use `using namespace anything_else;` somewhat sparingly – the whole point
     of namespaces is obliterated when the code starts doing this prolifically.
     Frequently, `using foo::bar::BazClass;` is better.
+
+## Type Aliases
+
+* For types widely used together with std::shared_ptr, consider introducing
+  aliases for std::shared_ptr<Xxx> using naming convention XxxPtr. In some
+  cases it makes sense to alias std::shared_ptr<const Xxx>. Here are some
+  examples of existing aliases: TypePtr, VectorPtr, FlatVectorPtr,
+  ArrayVectorPtr, MapVectorPtr, RowVectorPtr, TypedExprPtr, PlanNodePtr.
+
+```
+using TypePtr = std::shared_ptr<const Type>;
+```
+* Similarly, widely used template types also benefit from shorter or clearer
+  aliases.
+
+```
+using ContinueFuture = folly::SemiFuture<bool>;
+using ContinuePromise = VeloxPromise<bool>;
+```

README.md

@@ -93,6 +93,20 @@ Run `make` in the root directory to compile the sources. For development, use
 `make debug` to build a non-optimized debug version, or `make release` to build
 an optimized version.  Use `make unittest` to build and run tests.
 
+Note that,
+* Velox requires C++17 , thus minimum supported compiler is GCC 5.0 and Clang 5.0.
+* Velox requires the CPU to support instruction sets:
+  * bmi
+  * bmi2
+  * f16c
+* Velox tries to use the following (or equivalent) instruction sets where available:
+  * On Intel CPUs
+    * avx  
+    * avx2
+    * sse
+  * On ARM
+    * Neon
+
 ## Contributing
 
 Check our [contributing guide](CONTRIBUTING.md) to learn about how to

build/deps/github_hashes/facebook/folly-rev.txt

@@ -1 +1 @@
-Subproject commit c12758ea770997bf10424070e89d9c9d6f00ae78
+Subproject commit 6eeb20f6e8085c9b31ea1247cf23008322e78b6b

build/fbcode_builder/CMake/FBThriftCppLibrary.cmake

@@ -112,7 +112,7 @@ function(add_fbthrift_cpp_library LIB_NAME THRIFT_FILE)
       "${CMAKE_COMMAND}" -E make_directory "${output_dir}"
     COMMAND
       "${FBTHRIFT_COMPILER}"
-      --strict
+      --legacy-strict
       --gen "mstch_cpp2:${GEN_ARG_STR}"
       "${thrift_include_options}"
       -o "${output_dir}"

build/fbcode_builder/CMake/FBThriftPyLibrary.cmake

@@ -84,7 +84,7 @@ function(add_fbthrift_py_library LIB_NAME THRIFT_FILE)
       "${CMAKE_COMMAND}" -E make_directory "${output_dir}"
     COMMAND
       "${FBTHRIFT_COMPILER}"
-      --strict
+      --legacy-strict
       --gen "py:${GEN_ARG_STR}"
       "${thrift_include_options}"
       -o "${output_dir}"