nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject nifi-minifi-cpp git commit: MINIFI-372: Resolve issues with missed commits
Date Fri, 20 Oct 2017 20:22:08 GMT
Repository: nifi-minifi-cpp
Updated Branches:
  refs/heads/master 3781b52f4 -> dd1024081


MINIFI-372: Resolve issues with missed commits

MINIFI-372: remove shared build from rocksdb
This closes #150
Signed-off-by: Bin Qiu <bqiu@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/commit/dd102408
Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/dd102408
Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/dd102408

Branch: refs/heads/master
Commit: dd1024081e7b9b55656b60876354484869b37d8f
Parents: 3781b52
Author: Marc Parisi <phrocker@apache.org>
Authored: Thu Oct 19 19:20:57 2017 +0000
Committer: Bin Qiu <bqiu@apache.org>
Committed: Fri Oct 20 13:19:55 2017 -0700

----------------------------------------------------------------------
 thirdparty/rocksdb/CMakeLists.txt               | 14 --------------
 thirdparty/rocksdb/util/testharness.h           | 12 ------------
 thirdparty/rocksdb/utilities/cassandra/format.h | 11 -----------
 3 files changed, 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/dd102408/thirdparty/rocksdb/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/thirdparty/rocksdb/CMakeLists.txt b/thirdparty/rocksdb/CMakeLists.txt
index d8c4306..925b126 100644
--- a/thirdparty/rocksdb/CMakeLists.txt
+++ b/thirdparty/rocksdb/CMakeLists.txt
@@ -573,24 +573,12 @@ else()
 endif()
 
 set(ROCKSDB_STATIC_LIB rocksdb${ARTIFACT_SUFFIX})
-set(ROCKSDB_SHARED_LIB rocksdb-shared${ARTIFACT_SUFFIX})
-set(ROCKSDB_IMPORT_LIB ${ROCKSDB_SHARED_LIB})
 if(WIN32)
   set(SYSTEM_LIBS ${SYSTEM_LIBS} Shlwapi.lib Rpcrt4.lib)
   set(LIBS ${ROCKSDB_STATIC_LIB} ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
 else()
   set(SYSTEM_LIBS ${CMAKE_THREAD_LIBS_INIT})
-  set(LIBS ${ROCKSDB_SHARED_LIB} ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
 
-  add_library(${ROCKSDB_SHARED_LIB} SHARED ${SOURCES})
-  target_link_libraries(${ROCKSDB_SHARED_LIB}
-    ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
-  set_target_properties(${ROCKSDB_SHARED_LIB} PROPERTIES
-                        LINKER_LANGUAGE CXX
-                        VERSION ${ROCKSDB_VERSION}
-                        SOVERSION ${ROCKSDB_VERSION_MAJOR}
-                        CXX_STANDARD 11
-                        OUTPUT_NAME "rocksdb")
 endif()
 
 option(WITH_LIBRADOS "Build with librados" OFF)
@@ -605,7 +593,6 @@ target_link_libraries(${ROCKSDB_STATIC_LIB}
   ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
 
 if(WIN32)
-  add_library(${ROCKSDB_IMPORT_LIB} SHARED ${SOURCES})
   target_link_libraries(${ROCKSDB_IMPORT_LIB}
     ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
   set_target_properties(${ROCKSDB_IMPORT_LIB} PROPERTIES
@@ -634,7 +621,6 @@ add_subdirectory(tools)
 # Installation and packaging for Linux
 if(NOT WIN32)
 install(TARGETS ${ROCKSDB_STATIC_LIB} COMPONENT devel ARCHIVE DESTINATION lib64)
-install(TARGETS ${ROCKSDB_SHARED_LIB} COMPONENT runtime DESTINATION lib64)
 install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/rocksdb/"
         COMPONENT devel
         DESTINATION include/rocksdb)

http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/dd102408/thirdparty/rocksdb/util/testharness.h
----------------------------------------------------------------------
diff --git a/thirdparty/rocksdb/util/testharness.h b/thirdparty/rocksdb/util/testharness.h
index 8da5681..68dcfae 100644
--- a/thirdparty/rocksdb/util/testharness.h
+++ b/thirdparty/rocksdb/util/testharness.h
@@ -9,12 +9,6 @@
 
 #pragma once
 
-#ifdef OS_AIX
-#include "gtest/gtest.h"
-#else
-#include <gtest/gtest.h>
-#endif
-
 #include <string>
 #include "rocksdb/env.h"
 
@@ -29,12 +23,6 @@ std::string TmpDir(Env* env = Env::Default());
 // runs may be able to vary the seed.
 int RandomSeed();
 
-::testing::AssertionResult AssertStatus(const char* s_expr, const Status& s);
-
-#define ASSERT_OK(s) ASSERT_PRED_FORMAT1(rocksdb::test::AssertStatus, s)
-#define ASSERT_NOK(s) ASSERT_FALSE((s).ok())
-#define EXPECT_OK(s) EXPECT_PRED_FORMAT1(rocksdb::test::AssertStatus, s)
-#define EXPECT_NOK(s) EXPECT_FALSE((s).ok())
 
 }  // namespace test
 }  // namespace rocksdb

http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/dd102408/thirdparty/rocksdb/utilities/cassandra/format.h
----------------------------------------------------------------------
diff --git a/thirdparty/rocksdb/utilities/cassandra/format.h b/thirdparty/rocksdb/utilities/cassandra/format.h
index d8f51df..fad6df4 100644
--- a/thirdparty/rocksdb/utilities/cassandra/format.h
+++ b/thirdparty/rocksdb/utilities/cassandra/format.h
@@ -177,17 +177,6 @@ private:
   Columns columns_;
   int64_t last_modified_time_;
 
-  FRIEND_TEST(RowValueTest, PurgeTtlShouldRemvoeAllColumnsExpired);
-  FRIEND_TEST(RowValueTest, ExpireTtlShouldConvertExpiredColumnsToTombstones);
-  FRIEND_TEST(RowValueMergeTest, Merge);
-  FRIEND_TEST(RowValueMergeTest, MergeWithRowTombstone);
-  FRIEND_TEST(CassandraFunctionalTest, SimpleMergeTest);
-  FRIEND_TEST(
-    CassandraFunctionalTest, CompactionShouldConvertExpiredColumnsToTombstone);
-  FRIEND_TEST(
-    CassandraFunctionalTest, CompactionShouldPurgeExpiredColumnsIfPurgeTtlIsOn);
-  FRIEND_TEST(
-    CassandraFunctionalTest, CompactionShouldRemoveRowWhenAllColumnExpiredIfPurgeTtlIsOn);
 };
 
 } // namepsace cassandrda


Mime
View raw message