[Issue pixelsdb#542] reorganize the pixels c++ reader (pixelsdb#554)

1. Integrate protobuf into pixels c++. Don't need to install protobuf anymore!
2. Remove pixels-reader directory. Now cpp is the top directory of c++ code
3. Set a separate pixels-cxx.properties for pixels c++ reader

Author: yuly16

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "cpp/duckdb"]
-	path = cpp/duckdb
+	path = cpp/third_party/duckdb
 	url = https://github.com/yuly16/duckdb
+[submodule "cpp/third_party/protobuf"]
+	path = cpp/third_party/protobuf
+	url = https://github.com/protocolbuffers/protobuf

cpp/CMakeLists.txt

@@ -1,5 +1,5 @@
-cmake_minimum_required(VERSION 2.8.12)
-
+cmake_minimum_required(VERSION 3.16)
+set(CMAKE_CXX_STANDARD 14)
 # Set extension name here
 set(TARGET_NAME pixels)
 
@@ -13,13 +13,20 @@ set(EXTENSION_SOURCES
         )
 add_library(${EXTENSION_NAME} STATIC ${EXTENSION_SOURCES})
 
+find_package(Protobuf REQUIRED)
+include_directories(${Protobuf_INCLUDE_DIRS})
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+add_subdirectory(pixels-common)
+add_subdirectory(pixels-core)
+add_subdirectory(tests)
 
-include_directories(pixels-reader/pixels-common/include)
-include_directories(pixels-reader/pixels-core/include)
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/pixels-reader)
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/pixels-reader/pixels-common/liburing/src/include)
+include_directories(pixels-common/include)
+include_directories(pixels-core/include)
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/pixels-common/liburing/src/include)
 
-add_subdirectory(pixels-reader)
 
 
 target_link_libraries(
@@ -32,7 +39,7 @@ set(PARAMETERS "-warnings")
 build_loadable_extension(${TARGET_NAME} ${PARAMETERS} ${EXTENSION_SOURCES})
 
 install(
-  TARGETS ${EXTENSION_NAME} pixels-core pixels-common
-  EXPORT "${DUCKDB_EXPORT_SET}"
-  LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
-  ARCHIVE DESTINATION "${INSTALL_LIB_DIR}")
+        TARGETS ${EXTENSION_NAME} pixels-core pixels-common
+        EXPORT "${DUCKDB_EXPORT_SET}"
+        LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
+        ARCHIVE DESTINATION "${INSTALL_LIB_DIR}")

cpp/Makefile

@@ -1,4 +1,4 @@
-.PHONY: all clean debug release pull update
+.PHONY: all clean debug release pull update deps
 
 all: release
 
@@ -18,32 +18,41 @@ ifeq ($(GEN),ninja)
 	FORCE_COLOR=-DFORCE_COLORED_OUTPUT=1
 endif
 
-BUILD_FLAGS=-DEXTENSION_STATIC_BUILD=1 -DBUILD_TPCH_EXTENSION=1 -DBUILD_BENCHMARKS=1 -DBUILD_PARQUET_EXTENSION=1 ${OSX_BUILD_UNIVERSAL_FLAG} ${STATIC_LIBCPP}
+PROTOBUF_DIR=third_party/protobuf
+BUILD_FLAGS=-DEXTENSION_STATIC_BUILD=1 -DBUILD_TPCH_EXTENSION=1 -DBUILD_BENCHMARKS=1 -DBUILD_PARQUET_EXTENSION=1 \
+${OSX_BUILD_UNIVERSAL_FLAG} ${STATIC_LIBCPP}
 
 CLIENT_FLAGS :=
 
 # These flags will make DuckDB build the extension
-EXTENSION_FLAGS=-DDUCKDB_OOT_EXTENSION_NAMES="pixels" -DDUCKDB_OOT_EXTENSION_PIXELS_PATH="$(PROJ_DIR)" -DDUCKDB_OOT_EXTENSION_PIXELS_SHOULD_LINK="TRUE" -DDUCKDB_OOT_EXTENSION_PIXELS_INCLUDE_PATH="$(PROJ_DIR)include"
+EXTENSION_FLAGS=-DDUCKDB_OOT_EXTENSION_NAMES="pixels" -DDUCKDB_OOT_EXTENSION_PIXELS_PATH="$(PROJ_DIR)" \
+-DDUCKDB_OOT_EXTENSION_PIXELS_SHOULD_LINK="TRUE" -DDUCKDB_OOT_EXTENSION_PIXELS_INCLUDE_PATH="$(PROJ_DIR)include" \
+-DCMAKE_PREFIX_PATH=$(PROJ_DIR)third_party/protobuf/cmake/build
 
 pull:
 	git submodule init
-	git submodule update --recursive --remote
+	git submodule update --recursive --init
 
 update:
 	git submodule update --remote --merge
 
+deps: pull
+	mkdir -p "${PROTOBUF_DIR}/cmake/build" && cd "third_party/protobuf/cmake/build" && \
+	cmake -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release ../.. -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
+		-Dprotobuf_BUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=./ && \
+	make -j install
+
 clean:
 	rm -rf build
-	rm -rf testext
-	cd duckdb && make clean
+	cd third_party/duckdb && make clean
 
 # Main build
-debug:
+debug: deps
 	mkdir -p  build/debug && \
-	cmake $(GENERATOR) $(FORCE_COLOR) $(EXTENSION_FLAGS) ${CLIENT_FLAGS} -DEXTENSION_STATIC_BUILD=1 -DCMAKE_BUILD_TYPE=Debug ${BUILD_FLAGS} -S ./duckdb/ -B build/debug && \
+	cmake $(GENERATOR) $(FORCE_COLOR) $(EXTENSION_FLAGS) ${CLIENT_FLAGS} -DEXTENSION_STATIC_BUILD=1 -DCMAKE_BUILD_TYPE=Debug ${BUILD_FLAGS} -S third_party/duckdb/ -B build/debug && \
 	cmake --build build/debug --config Debug
 
-release:
+release: deps
 	mkdir -p build/release && \
-	cmake $(GENERATOR) $(FORCE_COLOR) $(EXTENSION_FLAGS) ${CLIENT_FLAGS} -DEXTENSION_STATIC_BUILD=1 -DCMAKE_BUILD_TYPE=Release ${BUILD_FLAGS} -S ./duckdb/ -B build/release && \
+	cmake $(GENERATOR) $(FORCE_COLOR) $(EXTENSION_FLAGS) ${CLIENT_FLAGS} -DEXTENSION_STATIC_BUILD=1 -DCMAKE_BUILD_TYPE=Release ${BUILD_FLAGS} -S third_party/duckdb/ -B build/release && \
 	cmake --build build/release --config Release