Unvendor (#3603)

* Unvendor kashmir * Unvendor cpplint * Fix cpplint issues
apache · Aug 14, 2020 · ee73293 · ee73293
1 parent c3b6433
commit ee73293
Show file tree

Hide file tree

Showing 25 changed files with 55 additions and 7,751 deletions.
diff --git a/LICENSE b/LICENSE
@@ -311,19 +311,6 @@ See project link for details.
       -> heron/tools/ui/resources/static/js/JSXTransformer.0.10.0.js
     autogen.sh
       -> config/autogen.sh
-    cpplint(https://github.com/cpplint/cpplint/blob/master/LICENSE)
-      -> third_party/python/cpplint/cpplint.py
     d3(v3.4.11, https://github.com/d3/d3/blob/master/LICENSE)
       -> heron/tools/ui/resources/static/js/d3.min.3.4.11.js
 
-========================================================================
-Third party Boost Software License, Version 1.0 licenses
-========================================================================
-
-The following components are provided under the Boost Software License, Version 1.0.
-See project link for details.
-
-    kashmir(https://github.com/Corvusoft/kashmir-dependency/blob/master/LICENSE_1_0.txt)
-      -> third_party/kashmir/*
-
-
diff --git a/WORKSPACE b/WORKSPACE
@@ -326,6 +326,16 @@ http_archive(
     urls = ["https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.6.2.tar.gz"],
 )
 
+http_archive(
+    name = "com_github_corvusoft_kashmir_cpp",
+    build_file = "@//:third_party/kashmir/kashmir.BUILD",
+    patch_args = ["-p1"],
+    patches = ["//third_party/kashmir:kashmir-random-fix.patch"],
+    sha256 = "c3515d6c7a470663f06b79bb23cbb2ff2f3feab4c2a333f783edc0a802f1d062",
+    strip_prefix = "kashmir-dependency-19fb1d5c14866bd5202c2458baf50263001a9cb0",
+    urls = ["https://github.com/Corvusoft/kashmir-dependency/archive/19fb1d5c14866bd5202c2458baf50263001a9cb0.zip"],
+)
+
 http_archive(
     name = "com_github_danmar_cppcheck",
     build_file = "@//:third_party/cppcheck/cppcheck.BUILD",

diff --git a/heron/common/src/cpp/basics/BUILD b/heron/common/src/cpp/basics/BUILD
@@ -51,7 +51,7 @@ cc_library(
         "@com_github_google_glog//:glog",
         "@com_github_gflags_gflags//:gflags",
         "@com_github_gperftools_gperftools//:tcmalloc",
-        "//third_party/kashmir:kashmir-cxx",
+        "@com_github_corvusoft_kashmir_cpp//:kashmir-cxx",
         "@com_google_protobuf//:protobuf",
     ] + select({
         "//tools/platform:darwin": [],

diff --git a/heron/common/src/cpp/network/misc/echoclient.cpp b/heron/common/src/cpp/network/misc/echoclient.cpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include "core/network/misc/echoclient.h"
+#include "heron/common/src/cpp/network/misc/echoclient.h"
 #include <stdio.h>
 #include <iostream>
 
@@ -46,7 +46,7 @@ void EchoClient::CreateAndSendRequest()
       line[strlen(line) - 1] = '\0';
     }
   } else {
-    strcpy(buf, "I love you");
+    snprintf(buf, sizeof(buf), "I love you");
   }
   std::string tosend(buf);
   EchoServerRequest* request = new EchoServerRequest();

diff --git a/heron/common/src/cpp/network/misc/echoserver.cpp b/heron/common/src/cpp/network/misc/echoserver.cpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include "core/network/misc/echoserver.h"
+#include "heron/common/src/cpp/network/misc/echoserver.h"
 #include <iostream>
 
 EchoServer::EchoServer(EventLoopImpl* eventLoop, const NetworkOptions& _options)

diff --git a/heron/common/src/cpp/network/misc/samplehttpserver.cpp b/heron/common/src/cpp/network/misc/samplehttpserver.cpp
@@ -19,7 +19,7 @@
 
 #include <iostream>
 
-#include "core/network/misc/samplehttpserver.h"
+#include "heron/common/src/cpp/network/misc/samplehttpserver.h"
 #include "core/common/public/common.h"
 #include "core/errors/public/errors.h"
 #include "core/threads/public/threads.h"

diff --git a/heron/statemgrs/tests/cpp/statetest.cpp b/heron/statemgrs/tests/cpp/statetest.cpp
@@ -18,13 +18,13 @@
  */
 
 #include <iostream>
+#include <string>
 
 #include "common/common.h"
 #include "errors/errors.h"
 #include "threads/threads.h"
 #include "network/network.h"
 #include "statemgr/heron-zkstatemgr.h"
-#include <string>
 
 using heron::common::HeronStateMgr;
 

diff --git a/licenses/LICENSE-cpplint.txt b/licenses/LICENSE-cpplint.txt
diff --git a/licenses/LICENSE-kashmir.txt b/licenses/LICENSE-kashmir.txt
diff --git a/third_party/kashmir/BUILD b/third_party/kashmir/BUILD
@@ -1,31 +1,3 @@
-load("@rules_cc//cc:defs.bzl", "cc_library")
-
 licenses(["notice"])
 
 package(default_visibility = ["//visibility:public"])
-
-include_files = [
-    "abstractrandomstream.h",
-    "iofwd.h",
-    "iostate.h",
-    "polydevrandom.h",
-    "randomstream.h",
-    "devrandom.h",
-    "uuid.h",
-]
-
-cc_library(
-    name = "kashmir-cxx",
-    srcs = ["empty.cc"],
-    hdrs = include_files,
-    copts = [
-        "-Ithird_party",
-        "-I.",
-    ],
-    linkstatic = 1,
-)
-
-filegroup(
-    name = "kashmir-files",
-    srcs = include_files,
-)
diff --git a/third_party/kashmir/abstractrandomstream.h b/third_party/kashmir/abstractrandomstream.h
diff --git a/third_party/kashmir/devrandom.h b/third_party/kashmir/devrandom.h
diff --git a/third_party/kashmir/empty.cc b/third_party/kashmir/empty.cc
diff --git a/third_party/kashmir/iofwd.h b/third_party/kashmir/iofwd.h