Skip to content
This repository was archived by the owner on Mar 3, 2023. It is now read-only.

Commit ee73293

Browse files
authored
Unvendor (#3603)
* Unvendor kashmir * Unvendor cpplint * Fix cpplint issues
1 parent c3b6433 commit ee73293

25 files changed

+55
-7751
lines changed

LICENSE

-13
Original file line numberDiff line numberDiff line change
@@ -311,19 +311,6 @@ See project link for details.
311311
-> heron/tools/ui/resources/static/js/JSXTransformer.0.10.0.js
312312
autogen.sh
313313
-> config/autogen.sh
314-
cpplint(https://github.com/cpplint/cpplint/blob/master/LICENSE)
315-
-> third_party/python/cpplint/cpplint.py
316314
d3(v3.4.11, https://github.com/d3/d3/blob/master/LICENSE)
317315
-> heron/tools/ui/resources/static/js/d3.min.3.4.11.js
318316

319-
========================================================================
320-
Third party Boost Software License, Version 1.0 licenses
321-
========================================================================
322-
323-
The following components are provided under the Boost Software License, Version 1.0.
324-
See project link for details.
325-
326-
kashmir(https://github.com/Corvusoft/kashmir-dependency/blob/master/LICENSE_1_0.txt)
327-
-> third_party/kashmir/*
328-
329-

WORKSPACE

+10
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,16 @@ http_archive(
326326
urls = ["https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.6.2.tar.gz"],
327327
)
328328

329+
http_archive(
330+
name = "com_github_corvusoft_kashmir_cpp",
331+
build_file = "@//:third_party/kashmir/kashmir.BUILD",
332+
patch_args = ["-p1"],
333+
patches = ["//third_party/kashmir:kashmir-random-fix.patch"],
334+
sha256 = "c3515d6c7a470663f06b79bb23cbb2ff2f3feab4c2a333f783edc0a802f1d062",
335+
strip_prefix = "kashmir-dependency-19fb1d5c14866bd5202c2458baf50263001a9cb0",
336+
urls = ["https://github.com/Corvusoft/kashmir-dependency/archive/19fb1d5c14866bd5202c2458baf50263001a9cb0.zip"],
337+
)
338+
329339
http_archive(
330340
name = "com_github_danmar_cppcheck",
331341
build_file = "@//:third_party/cppcheck/cppcheck.BUILD",

heron/common/src/cpp/basics/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ cc_library(
5151
"@com_github_google_glog//:glog",
5252
"@com_github_gflags_gflags//:gflags",
5353
"@com_github_gperftools_gperftools//:tcmalloc",
54-
"//third_party/kashmir:kashmir-cxx",
54+
"@com_github_corvusoft_kashmir_cpp//:kashmir-cxx",
5555
"@com_google_protobuf//:protobuf",
5656
] + select({
5757
"//tools/platform:darwin": [],

heron/common/src/cpp/network/misc/echoclient.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
#include "core/network/misc/echoclient.h"
20+
#include "heron/common/src/cpp/network/misc/echoclient.h"
2121
#include <stdio.h>
2222
#include <iostream>
2323

@@ -46,7 +46,7 @@ void EchoClient::CreateAndSendRequest()
4646
line[strlen(line) - 1] = '\0';
4747
}
4848
} else {
49-
strcpy(buf, "I love you");
49+
snprintf(buf, sizeof(buf), "I love you");
5050
}
5151
std::string tosend(buf);
5252
EchoServerRequest* request = new EchoServerRequest();

heron/common/src/cpp/network/misc/echoserver.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
#include "core/network/misc/echoserver.h"
20+
#include "heron/common/src/cpp/network/misc/echoserver.h"
2121
#include <iostream>
2222

2323
EchoServer::EchoServer(EventLoopImpl* eventLoop, const NetworkOptions& _options)

heron/common/src/cpp/network/misc/samplehttpserver.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#include <iostream>
2121

22-
#include "core/network/misc/samplehttpserver.h"
22+
#include "heron/common/src/cpp/network/misc/samplehttpserver.h"
2323
#include "core/common/public/common.h"
2424
#include "core/errors/public/errors.h"
2525
#include "core/threads/public/threads.h"

heron/statemgrs/tests/cpp/statetest.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
*/
1919

2020
#include <iostream>
21+
#include <string>
2122

2223
#include "common/common.h"
2324
#include "errors/errors.h"
2425
#include "threads/threads.h"
2526
#include "network/network.h"
2627
#include "statemgr/heron-zkstatemgr.h"
27-
#include <string>
2828

2929
using heron::common::HeronStateMgr;
3030

licenses/LICENSE-cpplint.txt

-27
This file was deleted.

licenses/LICENSE-kashmir.txt

-23
This file was deleted.

third_party/kashmir/BUILD

-28
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,3 @@
1-
load("@rules_cc//cc:defs.bzl", "cc_library")
2-
31
licenses(["notice"])
42

53
package(default_visibility = ["//visibility:public"])
6-
7-
include_files = [
8-
"abstractrandomstream.h",
9-
"iofwd.h",
10-
"iostate.h",
11-
"polydevrandom.h",
12-
"randomstream.h",
13-
"devrandom.h",
14-
"uuid.h",
15-
]
16-
17-
cc_library(
18-
name = "kashmir-cxx",
19-
srcs = ["empty.cc"],
20-
hdrs = include_files,
21-
copts = [
22-
"-Ithird_party",
23-
"-I.",
24-
],
25-
linkstatic = 1,
26-
)
27-
28-
filegroup(
29-
name = "kashmir-files",
30-
srcs = include_files,
31-
)

third_party/kashmir/abstractrandomstream.h

-32
This file was deleted.

third_party/kashmir/devrandom.h

-49
This file was deleted.

third_party/kashmir/empty.cc

-2
This file was deleted.

third_party/kashmir/iofwd.h

-68
This file was deleted.

0 commit comments

Comments
 (0)