Skip to content

Commit d898f7a

Browse files
gbaydingbaydin
committed
flatbuffers 2.0, remove replace
1 parent a69aec4 commit d898f7a

File tree

182 files changed

+4354
-6349
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

182 files changed

+4354
-6349
lines changed

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ ENV CC=gcc-5
55
ENV CXX=g++-5
66

77
WORKDIR /home
8-
RUN git clone --branch v1.12.0 https://github.com/google/flatbuffers.git
8+
RUN git clone --branch v2.0.0 https://github.com/google/flatbuffers.git
99
RUN cd flatbuffers && cmake -G "Unix Makefiles" && make install && cp flatc /usr/local/bin/

‎compile.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ echo Compiling PPX to Java...
2626
rm -rf java
2727
flatc --java -o java ppx.fbs
2828

29-
echo Compiling PPX to JavaScript...
30-
rm -rf js
31-
flatc --js -o js ppx.fbs
29+
# echo Compiling PPX to JavaScript...
30+
# rm -rf js
31+
# flatc --js -o js ppx.fbs
3232

3333
echo Compiling PPX to Json schema...
3434
rm -rf jsonschema

‎cpp/ppx_generated.h

Lines changed: 6 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ struct BinomialBuilder;
8080
struct Weibull;
8181
struct WeibullBuilder;
8282

83-
enum MessageBody {
83+
enum MessageBody : uint8_t {
8484
MessageBody_NONE = 0,
8585
MessageBody_Handshake = 1,
8686
MessageBody_HandshakeResult = 2,
@@ -191,7 +191,7 @@ template<> struct MessageBodyTraits<ppx::Reset> {
191191
bool VerifyMessageBody(flatbuffers::Verifier &verifier, const void *obj, MessageBody type);
192192
bool VerifyMessageBodyVector(flatbuffers::Verifier &verifier, const flatbuffers::Vector<flatbuffers::Offset<void>> *values, const flatbuffers::Vector<uint8_t> *types);
193193

194-
enum Distribution {
194+
enum Distribution : uint8_t {
195195
Distribution_NONE = 0,
196196
Distribution_Normal = 1,
197197
Distribution_Uniform = 2,
@@ -415,7 +415,6 @@ struct MessageBuilder {
415415
: fbb_(_fbb) {
416416
start_ = fbb_.StartTable();
417417
}
418-
MessageBuilder &operator=(const MessageBuilder &);
419418
flatbuffers::Offset<Message> Finish() {
420419
const auto end = fbb_.EndTable(start_);
421420
auto o = flatbuffers::Offset<Message>(end);
@@ -469,7 +468,6 @@ struct TensorBuilder {
469468
: fbb_(_fbb) {
470469
start_ = fbb_.StartTable();
471470
}
472-
TensorBuilder &operator=(const TensorBuilder &);
473471
flatbuffers::Offset<Tensor> Finish() {
474472
const auto end = fbb_.EndTable(start_);
475473
auto o = flatbuffers::Offset<Tensor>(end);
@@ -526,7 +524,6 @@ struct HandshakeBuilder {
526524
: fbb_(_fbb) {
527525
start_ = fbb_.StartTable();
528526
}
529-
HandshakeBuilder &operator=(const HandshakeBuilder &);
530527
flatbuffers::Offset<Handshake> Finish() {
531528
const auto end = fbb_.EndTable(start_);
532529
auto o = flatbuffers::Offset<Handshake>(end);
@@ -587,7 +584,6 @@ struct HandshakeResultBuilder {
587584
: fbb_(_fbb) {
588585
start_ = fbb_.StartTable();
589586
}
590-
HandshakeResultBuilder &operator=(const HandshakeResultBuilder &);
591587
flatbuffers::Offset<HandshakeResult> Finish() {
592588
const auto end = fbb_.EndTable(start_);
593589
auto o = flatbuffers::Offset<HandshakeResult>(end);
@@ -633,7 +629,6 @@ struct RunBuilder {
633629
: fbb_(_fbb) {
634630
start_ = fbb_.StartTable();
635631
}
636-
RunBuilder &operator=(const RunBuilder &);
637632
flatbuffers::Offset<Run> Finish() {
638633
const auto end = fbb_.EndTable(start_);
639634
auto o = flatbuffers::Offset<Run>(end);
@@ -674,7 +669,6 @@ struct RunResultBuilder {
674669
: fbb_(_fbb) {
675670
start_ = fbb_.StartTable();
676671
}
677-
RunResultBuilder &operator=(const RunResultBuilder &);
678672
flatbuffers::Offset<RunResult> Finish() {
679673
const auto end = fbb_.EndTable(start_);
680674
auto o = flatbuffers::Offset<RunResult>(end);
@@ -697,8 +691,7 @@ struct Sample FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
697691
VT_NAME = 6,
698692
VT_DISTRIBUTION_TYPE = 8,
699693
VT_DISTRIBUTION = 10,
700-
VT_CONTROL = 12,
701-
VT_REPLACE = 14
694+
VT_CONTROL = 12
702695
};
703696
const flatbuffers::String *address() const {
704697
return GetPointer<const flatbuffers::String *>(VT_ADDRESS);
@@ -749,9 +742,6 @@ struct Sample FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
749742
bool control() const {
750743
return GetField<uint8_t>(VT_CONTROL, 1) != 0;
751744
}
752-
bool replace() const {
753-
return GetField<uint8_t>(VT_REPLACE, 0) != 0;
754-
}
755745
bool Verify(flatbuffers::Verifier &verifier) const {
756746
return VerifyTableStart(verifier) &&
757747
VerifyOffset(verifier, VT_ADDRESS) &&
@@ -762,7 +752,6 @@ struct Sample FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
762752
VerifyOffset(verifier, VT_DISTRIBUTION) &&
763753
VerifyDistribution(verifier, distribution(), distribution_type()) &&
764754
VerifyField<uint8_t>(verifier, VT_CONTROL) &&
765-
VerifyField<uint8_t>(verifier, VT_REPLACE) &&
766755
verifier.EndTable();
767756
}
768757
};
@@ -830,14 +819,10 @@ struct SampleBuilder {
830819
void add_control(bool control) {
831820
fbb_.AddElement<uint8_t>(Sample::VT_CONTROL, static_cast<uint8_t>(control), 1);
832821
}
833-
void add_replace(bool replace) {
834-
fbb_.AddElement<uint8_t>(Sample::VT_REPLACE, static_cast<uint8_t>(replace), 0);
835-
}
836822
explicit SampleBuilder(flatbuffers::FlatBufferBuilder &_fbb)
837823
: fbb_(_fbb) {
838824
start_ = fbb_.StartTable();
839825
}
840-
SampleBuilder &operator=(const SampleBuilder &);
841826
flatbuffers::Offset<Sample> Finish() {
842827
const auto end = fbb_.EndTable(start_);
843828
auto o = flatbuffers::Offset<Sample>(end);
@@ -851,13 +836,11 @@ inline flatbuffers::Offset<Sample> CreateSample(
851836
flatbuffers::Offset<flatbuffers::String> name = 0,
852837
ppx::Distribution distribution_type = ppx::Distribution_NONE,
853838
flatbuffers::Offset<void> distribution = 0,
854-
bool control = true,
855-
bool replace = false) {
839+
bool control = true) {
856840
SampleBuilder builder_(_fbb);
857841
builder_.add_distribution(distribution);
858842
builder_.add_name(name);
859843
builder_.add_address(address);
860-
builder_.add_replace(replace);
861844
builder_.add_control(control);
862845
builder_.add_distribution_type(distribution_type);
863846
return builder_.Finish();
@@ -869,8 +852,7 @@ inline flatbuffers::Offset<Sample> CreateSampleDirect(
869852
const char *name = nullptr,
870853
ppx::Distribution distribution_type = ppx::Distribution_NONE,
871854
flatbuffers::Offset<void> distribution = 0,
872-
bool control = true,
873-
bool replace = false) {
855+
bool control = true) {
874856
auto address__ = address ? _fbb.CreateString(address) : 0;
875857
auto name__ = name ? _fbb.CreateString(name) : 0;
876858
return ppx::CreateSample(
@@ -879,8 +861,7 @@ inline flatbuffers::Offset<Sample> CreateSampleDirect(
879861
name__,
880862
distribution_type,
881863
distribution,
882-
control,
883-
replace);
864+
control);
884865
}
885866

886867
struct SampleResult FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
@@ -910,7 +891,6 @@ struct SampleResultBuilder {
910891
: fbb_(_fbb) {
911892
start_ = fbb_.StartTable();
912893
}
913-
SampleResultBuilder &operator=(const SampleResultBuilder &);
914894
flatbuffers::Offset<SampleResult> Finish() {
915895
const auto end = fbb_.EndTable(start_);
916896
auto o = flatbuffers::Offset<SampleResult>(end);
@@ -1066,7 +1046,6 @@ struct ObserveBuilder {
10661046
: fbb_(_fbb) {
10671047
start_ = fbb_.StartTable();
10681048
}
1069-
ObserveBuilder &operator=(const ObserveBuilder &);
10701049
flatbuffers::Offset<Observe> Finish() {
10711050
const auto end = fbb_.EndTable(start_);
10721051
auto o = flatbuffers::Offset<Observe>(end);
@@ -1124,7 +1103,6 @@ struct ObserveResultBuilder {
11241103
: fbb_(_fbb) {
11251104
start_ = fbb_.StartTable();
11261105
}
1127-
ObserveResultBuilder &operator=(const ObserveResultBuilder &);
11281106
flatbuffers::Offset<ObserveResult> Finish() {
11291107
const auto end = fbb_.EndTable(start_);
11301108
auto o = flatbuffers::Offset<ObserveResult>(end);
@@ -1183,7 +1161,6 @@ struct TagBuilder {
11831161
: fbb_(_fbb) {
11841162
start_ = fbb_.StartTable();
11851163
}
1186-
TagBuilder &operator=(const TagBuilder &);
11871164
flatbuffers::Offset<Tag> Finish() {
11881165
const auto end = fbb_.EndTable(start_);
11891166
auto o = flatbuffers::Offset<Tag>(end);
@@ -1233,7 +1210,6 @@ struct TagResultBuilder {
12331210
: fbb_(_fbb) {
12341211
start_ = fbb_.StartTable();
12351212
}
1236-
TagResultBuilder &operator=(const TagResultBuilder &);
12371213
flatbuffers::Offset<TagResult> Finish() {
12381214
const auto end = fbb_.EndTable(start_);
12391215
auto o = flatbuffers::Offset<TagResult>(end);
@@ -1263,7 +1239,6 @@ struct ResetBuilder {
12631239
: fbb_(_fbb) {
12641240
start_ = fbb_.StartTable();
12651241
}
1266-
ResetBuilder &operator=(const ResetBuilder &);
12671242
flatbuffers::Offset<Reset> Finish() {
12681243
const auto end = fbb_.EndTable(start_);
12691244
auto o = flatbuffers::Offset<Reset>(end);
@@ -1313,7 +1288,6 @@ struct NormalBuilder {
13131288
: fbb_(_fbb) {
13141289
start_ = fbb_.StartTable();
13151290
}
1316-
NormalBuilder &operator=(const NormalBuilder &);
13171291
flatbuffers::Offset<Normal> Finish() {
13181292
const auto end = fbb_.EndTable(start_);
13191293
auto o = flatbuffers::Offset<Normal>(end);
@@ -1367,7 +1341,6 @@ struct UniformBuilder {
13671341
: fbb_(_fbb) {
13681342
start_ = fbb_.StartTable();
13691343
}
1370-
UniformBuilder &operator=(const UniformBuilder &);
13711344
flatbuffers::Offset<Uniform> Finish() {
13721345
const auto end = fbb_.EndTable(start_);
13731346
auto o = flatbuffers::Offset<Uniform>(end);
@@ -1412,7 +1385,6 @@ struct CategoricalBuilder {
14121385
: fbb_(_fbb) {
14131386
start_ = fbb_.StartTable();
14141387
}
1415-
CategoricalBuilder &operator=(const CategoricalBuilder &);
14161388
flatbuffers::Offset<Categorical> Finish() {
14171389
const auto end = fbb_.EndTable(start_);
14181390
auto o = flatbuffers::Offset<Categorical>(end);
@@ -1455,7 +1427,6 @@ struct PoissonBuilder {
14551427
: fbb_(_fbb) {
14561428
start_ = fbb_.StartTable();
14571429
}
1458-
PoissonBuilder &operator=(const PoissonBuilder &);
14591430
flatbuffers::Offset<Poisson> Finish() {
14601431
const auto end = fbb_.EndTable(start_);
14611432
auto o = flatbuffers::Offset<Poisson>(end);
@@ -1498,7 +1469,6 @@ struct BernoulliBuilder {
14981469
: fbb_(_fbb) {
14991470
start_ = fbb_.StartTable();
15001471
}
1501-
BernoulliBuilder &operator=(const BernoulliBuilder &);
15021472
flatbuffers::Offset<Bernoulli> Finish() {
15031473
const auto end = fbb_.EndTable(start_);
15041474
auto o = flatbuffers::Offset<Bernoulli>(end);
@@ -1550,7 +1520,6 @@ struct BetaBuilder {
15501520
: fbb_(_fbb) {
15511521
start_ = fbb_.StartTable();
15521522
}
1553-
BetaBuilder &operator=(const BetaBuilder &);
15541523
flatbuffers::Offset<Beta> Finish() {
15551524
const auto end = fbb_.EndTable(start_);
15561525
auto o = flatbuffers::Offset<Beta>(end);
@@ -1595,7 +1564,6 @@ struct ExponentialBuilder {
15951564
: fbb_(_fbb) {
15961565
start_ = fbb_.StartTable();
15971566
}
1598-
ExponentialBuilder &operator=(const ExponentialBuilder &);
15991567
flatbuffers::Offset<Exponential> Finish() {
16001568
const auto end = fbb_.EndTable(start_);
16011569
auto o = flatbuffers::Offset<Exponential>(end);
@@ -1647,7 +1615,6 @@ struct GammaBuilder {
16471615
: fbb_(_fbb) {
16481616
start_ = fbb_.StartTable();
16491617
}
1650-
GammaBuilder &operator=(const GammaBuilder &);
16511618
flatbuffers::Offset<Gamma> Finish() {
16521619
const auto end = fbb_.EndTable(start_);
16531620
auto o = flatbuffers::Offset<Gamma>(end);
@@ -1701,7 +1668,6 @@ struct LogNormalBuilder {
17011668
: fbb_(_fbb) {
17021669
start_ = fbb_.StartTable();
17031670
}
1704-
LogNormalBuilder &operator=(const LogNormalBuilder &);
17051671
flatbuffers::Offset<LogNormal> Finish() {
17061672
const auto end = fbb_.EndTable(start_);
17071673
auto o = flatbuffers::Offset<LogNormal>(end);
@@ -1755,7 +1721,6 @@ struct BinomialBuilder {
17551721
: fbb_(_fbb) {
17561722
start_ = fbb_.StartTable();
17571723
}
1758-
BinomialBuilder &operator=(const BinomialBuilder &);
17591724
flatbuffers::Offset<Binomial> Finish() {
17601725
const auto end = fbb_.EndTable(start_);
17611726
auto o = flatbuffers::Offset<Binomial>(end);
@@ -1809,7 +1774,6 @@ struct WeibullBuilder {
18091774
: fbb_(_fbb) {
18101775
start_ = fbb_.StartTable();
18111776
}
1812-
WeibullBuilder &operator=(const WeibullBuilder &);
18131777
flatbuffers::Offset<Weibull> Finish() {
18141778
const auto end = fbb_.EndTable(start_);
18151779
auto o = flatbuffers::Offset<Weibull>(end);

‎csharp/ppx/Bernoulli.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public struct Bernoulli : IFlatbufferObject
1313
{
1414
private Table __p;
1515
public ByteBuffer ByteBuffer { get { return __p.bb; } }
16-
public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_1_12_0(); }
16+
public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_2_0_0(); }
1717
public static Bernoulli GetRootAsBernoulli(ByteBuffer _bb) { return GetRootAsBernoulli(_bb, new Bernoulli()); }
1818
public static Bernoulli GetRootAsBernoulli(ByteBuffer _bb, Bernoulli obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); }
1919
public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); }

‎csharp/ppx/Beta.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public struct Beta : IFlatbufferObject
1313
{
1414
private Table __p;
1515
public ByteBuffer ByteBuffer { get { return __p.bb; } }
16-
public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_1_12_0(); }
16+
public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_2_0_0(); }
1717
public static Beta GetRootAsBeta(ByteBuffer _bb) { return GetRootAsBeta(_bb, new Beta()); }
1818
public static Beta GetRootAsBeta(ByteBuffer _bb, Beta obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); }
1919
public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); }

‎csharp/ppx/Binomial.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public struct Binomial : IFlatbufferObject
1313
{
1414
private Table __p;
1515
public ByteBuffer ByteBuffer { get { return __p.bb; } }
16-
public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_1_12_0(); }
16+
public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_2_0_0(); }
1717
public static Binomial GetRootAsBinomial(ByteBuffer _bb) { return GetRootAsBinomial(_bb, new Binomial()); }
1818
public static Binomial GetRootAsBinomial(ByteBuffer _bb, Binomial obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); }
1919
public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); }

‎csharp/ppx/Categorical.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public struct Categorical : IFlatbufferObject
1313
{
1414
private Table __p;
1515
public ByteBuffer ByteBuffer { get { return __p.bb; } }
16-
public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_1_12_0(); }
16+
public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_2_0_0(); }
1717
public static Categorical GetRootAsCategorical(ByteBuffer _bb) { return GetRootAsCategorical(_bb, new Categorical()); }
1818
public static Categorical GetRootAsCategorical(ByteBuffer _bb, Categorical obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); }
1919
public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); }

‎csharp/ppx/Exponential.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public struct Exponential : IFlatbufferObject
1313
{
1414
private Table __p;
1515
public ByteBuffer ByteBuffer { get { return __p.bb; } }
16-
public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_1_12_0(); }
16+
public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_2_0_0(); }
1717
public static Exponential GetRootAsExponential(ByteBuffer _bb) { return GetRootAsExponential(_bb, new Exponential()); }
1818
public static Exponential GetRootAsExponential(ByteBuffer _bb, Exponential obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); }
1919
public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); }

‎csharp/ppx/Gamma.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public struct Gamma : IFlatbufferObject
1313
{
1414
private Table __p;
1515
public ByteBuffer ByteBuffer { get { return __p.bb; } }
16-
public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_1_12_0(); }
16+
public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_2_0_0(); }
1717
public static Gamma GetRootAsGamma(ByteBuffer _bb) { return GetRootAsGamma(_bb, new Gamma()); }
1818
public static Gamma GetRootAsGamma(ByteBuffer _bb, Gamma obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); }
1919
public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); }

‎csharp/ppx/Handshake.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public struct Handshake : IFlatbufferObject
1313
{
1414
private Table __p;
1515
public ByteBuffer ByteBuffer { get { return __p.bb; } }
16-
public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_1_12_0(); }
16+
public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_2_0_0(); }
1717
public static Handshake GetRootAsHandshake(ByteBuffer _bb) { return GetRootAsHandshake(_bb, new Handshake()); }
1818
public static Handshake GetRootAsHandshake(ByteBuffer _bb, Handshake obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); }
1919
public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); }

0 commit comments

Comments
 (0)