Merge branch 'master' of https://github.com/real-logic/simple-binary-encoding

Author: Todd L. Montgomery

perf/cpp/SbeCarCodecBench.hpp

@@ -81,7 +81,7 @@ class SbeCarCodecBench : public CodecBench<SbeCarCodecBench>
 
  virtual int decode(const char *buffer)
  {
- car.wrapForDecode((char *)buffer, 0, Car::blockLength(), Car::templateVersion());
+ car.wrapForDecode((char *)buffer, 0, Car::sbeBlockLength(), Car::sbeSchemaVersion());
 
  int64_t tmpInt;
  const char *tmpChar;

perf/cpp/SbeMarketDataCodecBench.hpp

@@ -28,9 +28,10 @@ class SbeMarketDataCodecBench : public CodecBench<SbeMarketDataCodecBench>
  virtual int encode(char *buffer)
  {
  messageHeader_.wrap(buffer, 0, 0);
- messageHeader_.templateId(marketData_.templateId());
- messageHeader_.version(marketData_.templateVersion());
- messageHeader_.blockLength(marketData_.blockLength());
+ messageHeader_.blockLength(marketData_.sbeBlockLength());
+ messageHeader_.templateId(marketData_.sbeTemplateId());
+ messageHeader_.schemaId(marketData_.sbeSchemaId());
+ messageHeader_.version(marketData_.sbeSchemaVersion());
 
  marketData_.wrapForEncode(buffer + messageHeader_.size(), 0);
  marketData_.transactTime(1234L);
@@ -71,8 +72,9 @@ class SbeMarketDataCodecBench : public CodecBench<SbeMarketDataCodecBench>
 
  messageHeader_.wrap((char *)buffer, 0, 0);
 
- actingVersion = messageHeader_.version();
  actingBlockLength = messageHeader_.blockLength();
+ actingVersion = messageHeader_.version();
+
 
  marketData_.wrapForDecode((char *)buffer, messageHeader_.size(), actingBlockLength, actingVersion);
 

perf/java/uk/co/real_logic/sbe/CarBenchmark.java

@@ -96,10 +96,10 @@ public static void encode(final MessageHeader messageHeader,
  final int bufferIndex)
  {
  messageHeader.wrap(buffer, bufferIndex, 0)
- .templateId(car.templateId())
- .schemaId(car.schemaId())
- .version(car.schemaVersion())
- .blockLength(car.blockLength());
+ .blockLength(car.sbeBlockLength())
+ .templateId(car.sbeTemplateId())
+ .schemaId(car.sbeSchemaId())
+ .version(car.sbeSchemaVersion());
 
  car.wrapForEncode(buffer, bufferIndex + messageHeader.size())
  .code(Model.A)

perf/java/uk/co/real_logic/sbe/MarketDataBenchmark.java

@@ -71,10 +71,10 @@ public static void encode(final MessageHeader messageHeader,
  final int bufferIndex)
  {
  messageHeader.wrap(buffer, bufferIndex, 0)
- .templateId(marketData.templateId())
- .schemaId(marketData.schemaId())
- .version(marketData.schemaVersion())
- .blockLength(marketData.blockLength());
+ .blockLength(marketData.sbeBlockLength())
+ .templateId(marketData.sbeTemplateId())
+ .schemaId(marketData.sbeSchemaId())
+ .version(marketData.sbeSchemaVersion());
 
  marketData.wrapForEncode(buffer, bufferIndex + messageHeader.size())
  .transactTime(1234L)