Cut-off the relationship between RowReader and Meta-client. (Fix veso…

…ft-inc#234) (vesoft-inc#390)
defttycom · May 16, 2019 · 01fb9bc · 01fb9bc
1 parent 26310ca
commit 01fb9bc
Showing 1 changed file with 14 additions and 73 deletions.
diff --git a/src/dataman/test/CMakeLists.txt b/src/dataman/test/CMakeLists.txt
@@ -1,18 +1,19 @@
-add_executable(
-    row_reader_test
-    RowReaderTest.cpp
-    $<TARGET_OBJECTS:meta_client>
-    $<TARGET_OBJECTS:meta_thrift_obj>
+set(DATAMAN_TEST_LIBS
     $<TARGET_OBJECTS:common_thrift_obj>
     $<TARGET_OBJECTS:thrift_obj>
-
     $<TARGET_OBJECTS:dataman_obj>
-    $<TARGET_OBJECTS:schema_obj>
     $<TARGET_OBJECTS:base_obj>
     $<TARGET_OBJECTS:network_obj>
     $<TARGET_OBJECTS:fs_obj>
     $<TARGET_OBJECTS:thread_obj>
 )
+
+
+add_executable(
+    row_reader_test
+    RowReaderTest.cpp
+    ${DATAMAN_TEST_LIBS}
+)
 nebula_link_libraries(
     row_reader_test
     ${THRIFT_LIBRARIES}
@@ -25,17 +26,7 @@ nebula_add_test(row_reader_test)
 add_executable(
     row_writer_test
     RowWriterTest.cpp
-    $<TARGET_OBJECTS:meta_client>
-    $<TARGET_OBJECTS:meta_thrift_obj>
-    $<TARGET_OBJECTS:common_thrift_obj>
-    $<TARGET_OBJECTS:thrift_obj>
-
-    $<TARGET_OBJECTS:dataman_obj>
-    $<TARGET_OBJECTS:schema_obj>
-    $<TARGET_OBJECTS:base_obj>
-    $<TARGET_OBJECTS:network_obj>
-    $<TARGET_OBJECTS:fs_obj>
-    $<TARGET_OBJECTS:thread_obj>
+    ${DATAMAN_TEST_LIBS}
 )
 nebula_link_libraries(
     row_writer_test
@@ -49,17 +40,7 @@ nebula_add_test(row_writer_test)
 add_executable(
     row_updater_test
     RowUpdaterTest.cpp
-    $<TARGET_OBJECTS:meta_client>
-    $<TARGET_OBJECTS:meta_thrift_obj>
-    $<TARGET_OBJECTS:common_thrift_obj>
-    $<TARGET_OBJECTS:thrift_obj>
-
-    $<TARGET_OBJECTS:dataman_obj>
-    $<TARGET_OBJECTS:schema_obj>
-    $<TARGET_OBJECTS:base_obj>
-    $<TARGET_OBJECTS:network_obj>
-    $<TARGET_OBJECTS:fs_obj>
-    $<TARGET_OBJECTS:thread_obj>
+    ${DATAMAN_TEST_LIBS}
 )
 nebula_link_libraries(
     row_updater_test
@@ -73,17 +54,7 @@ nebula_add_test(row_updater_test)
 add_executable(
     rowset_reader_writer_test
     RowSetReaderWriterTest.cpp
-    $<TARGET_OBJECTS:meta_client>
-    $<TARGET_OBJECTS:meta_thrift_obj>
-    $<TARGET_OBJECTS:common_thrift_obj>
-    $<TARGET_OBJECTS:thrift_obj>
-
-    $<TARGET_OBJECTS:dataman_obj>
-    $<TARGET_OBJECTS:schema_obj>
-    $<TARGET_OBJECTS:base_obj>
-    $<TARGET_OBJECTS:network_obj>
-    $<TARGET_OBJECTS:fs_obj>
-    $<TARGET_OBJECTS:thread_obj>
+    ${DATAMAN_TEST_LIBS}
 )
 nebula_link_libraries(
     rowset_reader_writer_test
@@ -97,17 +68,7 @@ nebula_add_test(rowset_reader_writer_test)
 add_executable(
     row_writer_bm
     RowWriterBenchmark.cpp
-    $<TARGET_OBJECTS:meta_client>
-    $<TARGET_OBJECTS:meta_thrift_obj>
-    $<TARGET_OBJECTS:common_thrift_obj>
-    $<TARGET_OBJECTS:thrift_obj>
-
-    $<TARGET_OBJECTS:dataman_obj>
-    $<TARGET_OBJECTS:schema_obj>
-    $<TARGET_OBJECTS:base_obj>
-    $<TARGET_OBJECTS:network_obj>
-    $<TARGET_OBJECTS:fs_obj>
-    $<TARGET_OBJECTS:thread_obj>
+    ${DATAMAN_TEST_LIBS}
 )
 nebula_link_libraries(
     row_writer_bm
@@ -121,17 +82,7 @@ nebula_link_libraries(
 add_executable(
     row_reader_bm
     RowReaderBenchmark.cpp
-    $<TARGET_OBJECTS:meta_client>
-    $<TARGET_OBJECTS:meta_thrift_obj>
-    $<TARGET_OBJECTS:common_thrift_obj>
-    $<TARGET_OBJECTS:thrift_obj>
-
-    $<TARGET_OBJECTS:dataman_obj>
-    $<TARGET_OBJECTS:schema_obj>
-    $<TARGET_OBJECTS:base_obj>
-    $<TARGET_OBJECTS:network_obj>
-    $<TARGET_OBJECTS:fs_obj>
-    $<TARGET_OBJECTS:thread_obj>
+    ${DATAMAN_TEST_LIBS}
 )
 nebula_link_libraries(
     row_reader_bm
@@ -144,17 +95,7 @@ nebula_link_libraries(
 add_executable(
     nebula_codec_test
     NebulaCodecTest.cpp
-    $<TARGET_OBJECTS:meta_client>
-    $<TARGET_OBJECTS:meta_thrift_obj>
-    $<TARGET_OBJECTS:common_thrift_obj>
-    $<TARGET_OBJECTS:thrift_obj>
-
-    $<TARGET_OBJECTS:dataman_obj>
-    $<TARGET_OBJECTS:schema_obj>
-    $<TARGET_OBJECTS:base_obj>
-    $<TARGET_OBJECTS:network_obj>
-    $<TARGET_OBJECTS:fs_obj>
-    $<TARGET_OBJECTS:thread_obj>
+    ${DATAMAN_TEST_LIBS}
 )
 nebula_link_libraries(
     nebula_codec_test