Major rework if IR persistence and schema to reflect new meta attributes.

Author: mjpt777

build.xml

@@ -259,6 +259,17 @@
  </java>
  </target>
 
+ <target name="examples:java:ir-gen"
+ description="Generate codec stubs for SBE IR"
+ depends="dist">
+ <java classname="uk.co.real_logic.sbe.SbeTool">
+ <classpath refid="examples.classpath"/>
+ <sysproperty key="sbe.output.dir" value="${dir.main.src}"/>
+ <sysproperty key="sbe.target.language" value="Java"/>
+ <arg value="${dir.main.resources}/sbe-ir.xml"/>
+ </java>
+ </target>
+
  <target name="cpp:examples:gen" depends="dist" description="Generate and run C++ generated code example">
  <mkdir dir="${dir.gen.cpp98}"/>
  <java classname="uk.co.real_logic.sbe.SbeTool">

main/java/uk/co/real_logic/sbe/ir/Decoder.java

@@ -17,8 +17,9 @@
 
 import uk.co.real_logic.sbe.PrimitiveType;
 import uk.co.real_logic.sbe.codec.java.DirectBuffer;
-import uk.co.real_logic.sbe.ir.generated.SerializedFrame;
-import uk.co.real_logic.sbe.ir.generated.SerializedToken;
+import uk.co.real_logic.sbe.ir.generated.FrameCodec;
+
+import uk.co.real_logic.sbe.ir.generated.TokenCodec;
 
 import java.io.*;
 import java.nio.ByteBuffer;
@@ -27,14 +28,16 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static uk.co.real_logic.sbe.ir.IrUtil.*;
+
 public class Decoder implements Closeable
 {
  private static final int CAPACITY = 4096;
 
  private final FileChannel channel;
  private final DirectBuffer directBuffer;
- private final SerializedFrame serializedFrame = new SerializedFrame();
- private final SerializedToken serializedToken = new SerializedToken();
+ private final FrameCodec frameCodec = new FrameCodec();
+ private final TokenCodec tokenCodec = new TokenCodec();
  private int offset;
  private final long size;
  private String irPackageName = null;
@@ -139,20 +142,19 @@ private int captureMessage(final List<Token> tokens, int index, final Intermedia
 
  private void decodeFrame()
  {
- serializedFrame.wrapForDecode(directBuffer, offset, serializedFrame.blockLength(), 0);
+ frameCodec.wrapForDecode(directBuffer, offset, frameCodec.blockLength(), 0);
 
- if (serializedFrame.sbeIrVersion() != 0)
+ if (frameCodec.sbeIrVersion() != 0)
  {
- throw new IllegalStateException("Unknown SBE version: " + serializedFrame.sbeIrVersion());
+ throw new IllegalStateException("Unknown SBE version: " + frameCodec.sbeIrVersion());
  }
 
- final byte[] byteArray = new byte[1024];
-
- irVersion = serializedFrame.schemaVersion();
+ final byte[] buffer = new byte[1024];
 
- irPackageName = new String(byteArray, 0, serializedFrame.getPackageVal(byteArray, 0, byteArray.length));
+ irVersion = frameCodec.schemaVersion();
+ irPackageName = new String(buffer, 0, frameCodec.getPackageVal(buffer, 0, buffer.length));
 
- offset += serializedFrame.size();
+ offset += frameCodec.size();
  }
 
  private Token decodeToken()
@@ -161,32 +163,46 @@ private Token decodeToken()
  final Token.Builder tokenBuilder = new Token.Builder();
  final Encoding.Builder encBuilder = new Encoding.Builder();
 
- final byte[] byteArray = new byte[1024];
+ final byte[] buffer = new byte[1024];
+
+ tokenCodec.wrapForDecode(directBuffer, offset, tokenCodec.blockLength(), 0);
+
+ tokenBuilder.offset(tokenCodec.tokenOffset())
+ .size(tokenCodec.tokenSize())
+ .schemaId(tokenCodec.schemaId())
+ .version(tokenCodec.tokenVersion())
+ .signal(mapSignal(tokenCodec.signal()));
+
+ final PrimitiveType type = mapPrimitiveType(tokenCodec.primitiveType());
 
- serializedToken.wrapForDecode(directBuffer, offset, serializedToken.blockLength(), 0);
+ encBuilder.primitiveType(mapPrimitiveType(tokenCodec.primitiveType()))
+ .byteOrder(mapByteOrder(tokenCodec.byteOrder()))
+ .presence(mapPresence(tokenCodec.presence()));
 
- tokenBuilder.offset(serializedToken.tokenOffset())
- .size(serializedToken.tokenSize())
- .schemaId(serializedToken.schemaID())
- .version(serializedToken.tokenVersion())
- .signal(IrUtil.signal(serializedToken.signal()));
+ tokenBuilder.name(new String(buffer, 0, tokenCodec.getName(buffer, 0, buffer.length), TokenCodec.nameCharacterEncoding()));
 
- final PrimitiveType type = IrUtil.primitiveType(serializedToken.primitiveType());
+ encBuilder.constVal(get(valBuffer, type, tokenCodec.getConstVal(valArray, 0, valArray.length)));
+ encBuilder.minVal(get(valBuffer, type, tokenCodec.getMinVal(valArray, 0, valArray.length)));
+ encBuilder.maxVal(get(valBuffer, type, tokenCodec.getMaxVal(valArray, 0, valArray.length)));
+ encBuilder.nullVal(get(valBuffer, type, tokenCodec.getNullVal(valArray, 0, valArray.length)));
 
- encBuilder.primitiveType(type)
- .byteOrder(IrUtil.byteOrder(serializedToken.byteOrder()));
+ final String characterEncoding = new String(buffer, 0, tokenCodec.getCharacterEncoding(buffer, 0, buffer.length),
+ TokenCodec.characterEncodingCharacterEncoding());
+ encBuilder.characterEncoding(characterEncoding.isEmpty() ? null : characterEncoding);
 
- tokenBuilder.name(new String(byteArray, 0, serializedToken.getName(byteArray, 0, byteArray.length), SerializedToken.nameCharacterEncoding()));
+ final String epoch = new String(buffer, 0, tokenCodec.getEpoch(buffer, 0, buffer.length),
+ TokenCodec.epochCharacterEncoding());
+ encBuilder.epoch(epoch.isEmpty() ? null : epoch);
 
- encBuilder.constVal(IrUtil.getVal(valBuffer, type, serializedToken.getConstVal(valArray, 0, valArray.length)));
- encBuilder.minVal(IrUtil.getVal(valBuffer, type, serializedToken.getMinVal(valArray, 0, valArray.length)));
- encBuilder.maxVal(IrUtil.getVal(valBuffer, type, serializedToken.getMaxVal(valArray, 0, valArray.length)));
- encBuilder.nullVal(IrUtil.getVal(valBuffer, type, serializedToken.getNullVal(valArray, 0, valArray.length)));
+ final String timeUnit = new String(buffer, 0, tokenCodec.getTimeUnit(buffer, 0, buffer.length),
+ TokenCodec.timeUnitCharacterEncoding());
+ encBuilder.timeUnit(timeUnit.isEmpty() ? null : timeUnit);
 
- final int charEncodingSize = serializedToken.getCharacterEncoding(byteArray, 0, byteArray.length);
- encBuilder.characterEncoding(new String(byteArray, 0, charEncodingSize, SerializedToken.characterEncodingCharacterEncoding()));
+ final String semanticType = new String(buffer, 0, tokenCodec.getSemanticType(buffer, 0, buffer.length),
+ TokenCodec.semanticTypeCharacterEncoding());
+ encBuilder.semanticType(semanticType.isEmpty() ? null : semanticType);
 
- offset += serializedToken.size();
+ offset += tokenCodec.size();
 
  return tokenBuilder.encoding(encBuilder.build()).build();
  }

main/java/uk/co/real_logic/sbe/ir/Encoder.java

@@ -17,15 +17,17 @@
 
 import uk.co.real_logic.sbe.PrimitiveType;
 import uk.co.real_logic.sbe.codec.java.DirectBuffer;
-import uk.co.real_logic.sbe.ir.generated.SerializedFrame;
-import uk.co.real_logic.sbe.ir.generated.SerializedToken;
+import uk.co.real_logic.sbe.ir.generated.FrameCodec;
+import uk.co.real_logic.sbe.ir.generated.TokenCodec;
 import uk.co.real_logic.sbe.util.Verify;
 
 import java.io.*;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.util.List;
 
+import static uk.co.real_logic.sbe.ir.IrUtil.*;
+
 public class Encoder implements Closeable
 {
  private static final int CAPACITY = 4096;
@@ -35,8 +37,8 @@ public class Encoder implements Closeable
  private final ByteBuffer buffer;
  private final DirectBuffer directBuffer;
  private final IntermediateRepresentation ir;
- private final SerializedFrame serializedFrame = new SerializedFrame();
- private final SerializedToken serializedToken = new SerializedToken();
+ private final FrameCodec frameCodec = new FrameCodec();
+ private final TokenCodec tokenCodec = new TokenCodec();
  private final byte[] valArray = new byte[CAPACITY];
  private final DirectBuffer valBuffer = new DirectBuffer(valArray);
  private int totalSize = 0;
@@ -115,40 +117,51 @@ else if (resultBuffer != null)
 
  private int encodeFrame()
  {
- serializedFrame.wrapForEncode(directBuffer, 0)
-  .sbeIrVersion(0)
-  .schemaVersion(ir.version());
+ frameCodec.wrapForEncode(directBuffer, 0)
+ .sbeIrVersion(0)
+ .schemaVersion(ir.version());
 
- serializedFrame.putPackageVal(ir.packageName().getBytes(), 0, ir.packageName().getBytes().length);
+ frameCodec.putPackageVal(ir.packageName().getBytes(), 0, ir.packageName().getBytes().length);
 
- return serializedFrame.size();
+ return frameCodec.size();
  }
 
  private int encodeToken(final Token token)
  throws UnsupportedEncodingException
  {
- final PrimitiveType type = token.encoding().primitiveType();
+ final Encoding encoding = token.encoding();
+ final PrimitiveType type = encoding.primitiveType();
+
+ tokenCodec.wrapForEncode(directBuffer, 0)
+ .tokenOffset(token.offset())
+ .tokenSize(token.size())
+ .schemaId(token.schemaId())
+ .tokenVersion(token.version())
+ .signal(mapSignal(token.signal()))
+ .primitiveType(mapPrimitiveType(type))
+ .byteOrder(mapByteOrder(encoding.byteOrder()))
+ .presence(mapPresence(encoding.presence()));
+
+ final byte[] nameBytes = token.name().getBytes(TokenCodec.nameCharacterEncoding());
+ tokenCodec.putName(nameBytes, 0, nameBytes.length);
+
+ tokenCodec.putConstVal(valArray, 0, put(valBuffer, encoding.constVal(), type));
+ tokenCodec.putMinVal(valArray, 0, put(valBuffer, encoding.minVal(), type));
+ tokenCodec.putMaxVal(valArray, 0, put(valBuffer, encoding.maxVal(), type));
+ tokenCodec.putNullVal(valArray, 0, put(valBuffer, encoding.nullVal(), type));
 
- serializedToken.wrapForEncode(directBuffer, 0)
- .tokenOffset(token.offset())
- .tokenSize(token.size())
- .schemaID(token.schemaId())
- .tokenVersion(token.version())
- .signal(IrUtil.signal(token.signal()))
- .primitiveType(IrUtil.primitiveType(type))
- .byteOrder(IrUtil.byteOrder(token.encoding().byteOrder()));
+ final byte[] charEncodingBytes = getBytes(encoding.characterEncoding(), TokenCodec.characterEncodingCharacterEncoding());
+ tokenCodec.putCharacterEncoding(charEncodingBytes, 0, charEncodingBytes.length);
 
- final byte[] nameBytes = token.name().getBytes(SerializedToken.nameCharacterEncoding());
- serializedToken.putName(nameBytes, 0, nameBytes.length);
+ final byte[] epochBytes = getBytes(encoding.epoch(), TokenCodec.epochCharacterEncoding());
+ tokenCodec.putEpoch(epochBytes, 0, epochBytes.length);
 
- serializedToken.putConstVal(valArray, 0, IrUtil.putVal(valBuffer, token.encoding().constVal(), type));
- serializedToken.putMinVal(valArray, 0, IrUtil.putVal(valBuffer, token.encoding().minVal(), type));
- serializedToken.putMaxVal(valArray, 0, IrUtil.putVal(valBuffer, token.encoding().maxVal(), type));
- serializedToken.putNullVal(valArray, 0, IrUtil.putVal(valBuffer, token.encoding().nullVal(), type));
+ final byte[] timeUnitBytes = getBytes(encoding.timeUnit(), TokenCodec.timeUnitCharacterEncoding());
+ tokenCodec.putTimeUnit(timeUnitBytes, 0, timeUnitBytes.length);
 
- final byte[] charBytes = token.encoding().characterEncoding().getBytes(SerializedToken.characterEncodingCharacterEncoding());
- serializedToken.putCharacterEncoding(charBytes, 0, charBytes.length);
+ final byte[] semanticTypeBytes = getBytes(encoding.semanticType(), TokenCodec.semanticTypeCharacterEncoding());
+ tokenCodec.putSemanticType(semanticTypeBytes, 0, semanticTypeBytes.length);
 
- return serializedToken.size();
+ return tokenCodec.size();
  }
 }

main/java/uk/co/real_logic/sbe/ir/Encoding.java

@@ -62,7 +62,7 @@ public Encoding()
  maxVal = null;
  nullVal = null;
  constVal = null;
- characterEncoding = "";
+ characterEncoding = null;
  epoch = null;
  timeUnit = null;
  semanticType = null;
@@ -281,7 +281,7 @@ public static class Builder
  private PrimitiveValue maxVal = null;
  private PrimitiveValue nullVal = null;
  private PrimitiveValue constVal = null;
- private String characterEncoding = "";
+ private String characterEncoding = null;
  private String epoch = null;
  private String timeUnit = null;
  private String semanticType = null;