vitalif/vitastor
5
6
Fork 12
Code Issues 4 Pull Requests 6 Actions Releases 112 Wiki Activity

Fix patch to use "git am" #5

Closed
shaba wants to merge 117 commits from (deleted):master into master
pull from: (deleted):master
merge into: vitalif:master
Conversation 1 Commits 117 Files Changed 36 +4943 -21
shaba commented 2021-07-11 21:03:57 +03:00
First-time contributor
Copy Link
No description provided.
shaba added 117 commits 2021-07-11 21:04:02 +03:00
Initial checkin of C++ btree code, has some useless google3-specific 1a14ff58c9 
bits to be removed and needs a Makefile.
Fix for kTargetNodeSize too large dd97f135d0
support for >= 256 values per node 9fe3bb3b33
Simplify btree_base_field_type<> 89a0af9086
Updates from google3; adding safe_btree comments, container (in)equality operators eaf6eb103d
Remove files that are very google-specific 9783752d62
Build outside of Google; add CMakeLists.txt, README 88853fbc9e
Make btree_bench work; compiled & tested on OS X 10.7.5 using gcc 4.7.2 -std=c++11 2fd7ed36a9
Build fixes ce6c9fd34c
Update README; remove benchmarks.awk 7aad0f28fd
Update copyright notices; scrub a few references to Cord, StringPiece 5633058db4
Fix several range constructor bugs: (a) btree_multiset's range constructor did not compile (b) btree_map's range constructor ignored the inputs! These bugs were masked by the test, which due to an oversight skipped the use of range constructors as part of the {base,unique,multi}_checker testing types. Verified that the corrected test fails without the fix, added an additional sanity check (which made the problem stand out independent of the problems discovered in btree_test.h) c790956d18
Fixes for open-source build following upstream bug fix f85129d4d7
Update README / CMakeLists.txt; fix for -Wformat warning in btree_bench.cc 54f346f981
Fix the printf problem -- use std::cout :) 92ec61e4b8
Initial commit fe5e2167a5
Add LICENSE.txt; some minor cleanups 979cb4ca76 
- Add LICENSE.txt
- Add a comment about how we handle numbers
- Add more test code
- Fix a narrowing-conversion issue
- Fix a comment typo
Spacing fix d2e5485973
Make Json safe to use during static initialization. 277e1b166f
Add const to comparisons 731322c2b8
Merge pull request #1 from CodeFridge/feature/const 80578664de 
Add const to comparisons
Limit maximum nesting depth (issue reported by Jeff Larson) d9bdd84c76
Identify map- and vector-like objects in a VS14-compatible way 7103522344
Another VS14 fix 679e4b83d2
Style fixes 73baf7e677
fix int->double->int conversion in JsonInt 6de4c29e76
Use string::compare to improve performance. c6a8736171
Use static_cast instead of reinterpret_cast for hierarchy navigation. 37ca641d82
Merge pull request #23 from masamitsu-murase/use_static_cast_for_hierarchy_navigation e31ac4ebb4 
Use static_cast instead of reinterpret_cast for hierarchy navigation.
Merge pull request #24 from masamitsu-murase/use_compare be631169db 
Use string::compare to improve performance.
iterate over pair of const string and Json 7fd738ae42
Merge pull request #27 from k0zmo/const-pair 51166ddca6 
iterate over pair of const string and Json
in encode_utf8, there is an implicit truncating cast that VS2015CTP6 is ae9542cc35 
warning about.  I've added static_cast<char> to silence the warning and
express the intent.
Use strtod not atof cfdd67577c
For extra safety, add an explicit bounds check in utf8 parsing. e15ff418dd
Merge pull request #35 from akrieger/working 0193642bf8 
For extra safety, add an explicit bounds check in utf8 parsing.
When dumping non-finite floating point values, output 'null'. 0e8c5ba68f 
In JSON the float point special values NaN and Infinity should serialised to 'null'.
Previously, 'snprintf' in 'dump' was giving a string that isn't compliant to the JSON standard.
Merge pull request #36 from jcmonnin/master 2aa22aab4b 
When dumping non-finite floating point values, output 'null'.
Test to demonstrate compiler behavior change in Xcode 7 / clang 3.7. 50ed8c90e5
Make test.cpp compilable with GCC. 61ba0a1dd2 
Add clean rule to Makefile.
Add cmake support 0c6e9d77a4 
This uses cmake to allow building as a static library and to build the tests

To use `cmake`

```
$ mkdir build
$ cd build
$ cmake ..
 .
 .
-- Build files have been written to: ~/json11/build
$ make
Scanning dependencies of target json11
[ 20%] Building CXX object CMakeFiles/json11.dir/json11.cpp.o
[ 40%] Linking CXX static library libjson11.a
[ 40%] Built target json11
Scanning dependencies of target json11_test
[ 60%] Building CXX object CMakeFiles/json11_test.dir/json11.cpp.o
[ 80%] Building CXX object CMakeFiles/json11_test.dir/test.cpp.o
[100%] Linking CXX executable json11_test
[100%] Built target json11_test
$ make test
running tests...
Test project /Users/paul/dev/json11/build
    Start 1: json11_test
    1/1 Test #1: json11_test ......................   Passed    0.00 sec

    100% tests passed, 0 tests failed out of 1

    Total Test time (real) =   0.01 sec
$
```
Fixes bug in parse_from_stdin a021c3fbe2 
Handles end of file correctly
Merge pull request #40 from PollRobots/fix-stdin-test b1e78cb1e4 
Fixes bug in parse_from_stdin
Merge pull request #39 from PollRobots/use-cmake 765cee3ed1 
Add cmake support
add routine to detect c-style comments 2d1d176a55
introduce consume_garbage() 08c391f89a 
new routine that consumes whitespaces and comments.
activated by JSON11_COMMENTS pre-processor flag.
add testing for comment functionality de098c4d52
add bool to detect comments as run-time option. 882feb56ac
detect multiple comments with a loop instead of using recursion b05e655c0a
detect malformed comments 2f5c64225d
improve comment test. d292fce9f2 
test also for nested and mixed comments.
whitespaces/newlines are already intermixed between comments.
add malformed comment tests. f21b8c360e 
add 3 testes for:
- unended multi-line comment,
- malformed single-line comment,
- trailing slash
check for end of input on every increment of the cursor 4b0f5cfd77
improve testing for bad inline comments 982b2d8885
fix test where the trailing / was not reached due to a previous error aa270ad5b7
add test for inline comment without trailing newline c6c6fcfeff
add test for unfinished multi-line comment f9833b1e7d
use an enum to select strategy on comment parsing 49a6197d08
make JsonParser::strategy const 988a8fc249
watch out for i+1 to overflow the buffer ebc3a6b038
Merge pull request #42 from capitalaslash/detect_comments a6a661e924 
Detect and ignore comments
This fixes a “No previous prototype for function” warning. e1d5bcc94d
Merge pull request #47 from PSPDFKit-labs/fix-warnings afcc8d0d82 
This fixes a “No previous prototype for function” warning.
Update CMakeLists to 3.x style 5e664c99d8
Merge pull request #52 from kirisetsz/master 3ae180068d 
Update CMakeLists to 3.x style
Generate pkg-config File & Add Install 8076ba74e0 
...to the CMake build script. The pkg-config file needs a version number (which
it takes from the CMakeLists.txt variable), which I've set to 1.0.0. The cmake
project declaration needs to be after the minimum-requirement declaration to
avoid errors from the cmake's change in VERSION semantics.
Merge pull request #53 from njwhite/master eefbd630ec 
Generate pkg-config File & Add Install Target
implement parsing of chunked json 33bca8e178 
Update: add more tests + use parser.failed
make parser invisible from outside 0e4ace7e40
Merge pull request #56 from Dushistov/json_parser_anonymous a1409a9a1a 
make JsonParser invisible from outside
Merge pull request #55 from Dushistov/parse_not_full_json 8452587160 
Parse half ready json
Don't assume in-tree builds when installing json11.pc 05b5514400
Merge pull request #57 from ChrisKitching/fixpkgconfigInstall df1fdbfd79 
Don't assume in-tree builds when installing json11.pc
Fix sign comparison warnings, and parser confusion 4597f98abe
Make the DR1467 canary test code optional a20878aaa5
MSVS 2013 compatibility changes. f6c0f68737
Merge pull request #64 from shrikant-dropbox/master 913269c7a4 
MSVS 2013 compatibility changes.
Add option to disable unit tests 3704671508
Fixes warning C4800: 'int': forcing value to bool 'true' or 'false' on MSVC 14 467dc6ae05
Merge pull request #66 from 4brunu/master d9867d8ab3 
Add option to disable unit tests
Use false instead of 0 + conversion. 40f10bd28d
Merge pull request #68 from AustinBrunkhorst/master 78e43a9ea7 
[MSVC 14] int to bool conversion performance warning
Allow json11 tests to be customized with pre-processor defines 200c98aede
Remove extraneous parentheses 7a947c1e2f
Merge pull request #69 from dropbox/atwyman/pre-processor-customization fb6cc808e0 
Allow json11 tests to be customized with pre-processor defines
Use CXX_STANDARD to specify c++11 compile flags 580fd44b5f
Merge pull request #71 from admsyn/fix-cmake-c++11-flag 787809178d 
Use CXX_STANDARD to specify c++11 compile flags
添加int64类型，但是还是会溢出 f6b4188933
using longlong for internel storage eb4d67a68e
ADDING INT64 UINT64 test cases f4ffe052d9
update readme a4da043b17
ull 88de39206d
Fix "Dereferencing type-punned pointer will break strict aliasing rules..." 5dc108754a
Add string->number conversions 97f06cb20c
Merge branches 'upstream/json11' and 'upstream/cpp-btree' 0772dea061
Update node js modules b2dbd5fa67
Drop build qemu driver 66004b2c8e
Drop build fio driver 278f37c00f
Add VERSION to cmake project() 17c6a562b0
Add SOVERSION to libs 37d716973d
0.5.10-alt1 247597e927 
- Initial build.
Merge tag 'v0.6.2' 42dd3dce29
Update VERSION dd8b12d9e4
Fix undefined symbol 8c411e38da
Make with verbose 5dfd1cae0c
Do not redefine FLAGS for RelWithDebInfo 7febcabdb5
0.6.2-alt1 04580ce355 
- 0.6.2
gear-remotes-save cc2763d7d8
Merge tag 'v0.6.3' 5edb0b8607 
# Conflicts:
#	src/CMakeLists.txt
0.6.3-alt1 d37b4603dd 
- 0.6.3
Merge tag 'v0.6.4' a6ec1ac7a8
0.6.4-alt1 15e8595b00 
- 0.6.4
Merge remote-tracking branch 'upstream/vitastor/master' 886ab48d26 
# Conflicts:
#	src/CMakeLists.txt
0.6.4-alt2 d541387172 
- build master snapshot 30bb602681
- package client header to devel package
- merge blk and client devel packages
Merge tag 'v0.6.5' c74f8b5c87
0.6.5-alt1 e157e1544e 
- 0.6.5
Fix patch to use "git am" c6b967ce6b
shaba closed this pull request 2021-07-11 21:05:26 +03:00
shaba commented 2021-07-11 21:06:27 +03:00
Author
First-time contributor
Copy Link

Please ignore this PR.

Please ignore this PR.

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Assignees
Clear assignees
vitalif
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: vitalif/vitastor#5
No description provided.
Delete Branch "(deleted):master"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?