Skip to content

Commit

Permalink
gg-9791 - Communication fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Valentin Kulichenko committed Feb 20, 2015
1 parent 9c1e555 commit ad02d6e
Show file tree
Hide file tree
Showing 101 changed files with 1,063 additions and 999 deletions.
70 changes: 35 additions & 35 deletions modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
View file
Expand Up @@ -57,50 +57,50 @@ public class MessageCodeGenerator {
private static final String BUF_VAR = "buf";

/** */
private static final Map<Class<?>, MessageAdapter.Type> TYPES = U.newHashMap(30);
private static final Map<Class<?>, MessageCollectionItemType> TYPES = U.newHashMap(30);

static {
TYPES.put(byte.class, MessageAdapter.Type.BYTE);
TYPES.put(Byte.class, MessageAdapter.Type.BYTE);
TYPES.put(short.class, MessageAdapter.Type.SHORT);
TYPES.put(Short.class, MessageAdapter.Type.SHORT);
TYPES.put(int.class, MessageAdapter.Type.INT);
TYPES.put(Integer.class, MessageAdapter.Type.INT);
TYPES.put(long.class, MessageAdapter.Type.LONG);
TYPES.put(Long.class, MessageAdapter.Type.LONG);
TYPES.put(float.class, MessageAdapter.Type.FLOAT);
TYPES.put(Float.class, MessageAdapter.Type.FLOAT);
TYPES.put(double.class, MessageAdapter.Type.DOUBLE);
TYPES.put(Double.class, MessageAdapter.Type.DOUBLE);
TYPES.put(char.class, MessageAdapter.Type.CHAR);
TYPES.put(Character.class, MessageAdapter.Type.CHAR);
TYPES.put(boolean.class, MessageAdapter.Type.BOOLEAN);
TYPES.put(Boolean.class, MessageAdapter.Type.BOOLEAN);
TYPES.put(byte[].class, MessageAdapter.Type.BYTE_ARR);
TYPES.put(short[].class, MessageAdapter.Type.SHORT_ARR);
TYPES.put(int[].class, MessageAdapter.Type.INT_ARR);
TYPES.put(long[].class, MessageAdapter.Type.LONG_ARR);
TYPES.put(float[].class, MessageAdapter.Type.FLOAT_ARR);
TYPES.put(double[].class, MessageAdapter.Type.DOUBLE_ARR);
TYPES.put(char[].class, MessageAdapter.Type.CHAR_ARR);
TYPES.put(boolean[].class, MessageAdapter.Type.BOOLEAN_ARR);
TYPES.put(String.class, MessageAdapter.Type.STRING);
TYPES.put(BitSet.class, MessageAdapter.Type.BIT_SET);
TYPES.put(UUID.class, MessageAdapter.Type.UUID);
TYPES.put(IgniteUuid.class, MessageAdapter.Type.IGNITE_UUID);
TYPES.put(byte.class, MessageCollectionItemType.BYTE);
TYPES.put(Byte.class, MessageCollectionItemType.BYTE);
TYPES.put(short.class, MessageCollectionItemType.SHORT);
TYPES.put(Short.class, MessageCollectionItemType.SHORT);
TYPES.put(int.class, MessageCollectionItemType.INT);
TYPES.put(Integer.class, MessageCollectionItemType.INT);
TYPES.put(long.class, MessageCollectionItemType.LONG);
TYPES.put(Long.class, MessageCollectionItemType.LONG);
TYPES.put(float.class, MessageCollectionItemType.FLOAT);
TYPES.put(Float.class, MessageCollectionItemType.FLOAT);
TYPES.put(double.class, MessageCollectionItemType.DOUBLE);
TYPES.put(Double.class, MessageCollectionItemType.DOUBLE);
TYPES.put(char.class, MessageCollectionItemType.CHAR);
TYPES.put(Character.class, MessageCollectionItemType.CHAR);
TYPES.put(boolean.class, MessageCollectionItemType.BOOLEAN);
TYPES.put(Boolean.class, MessageCollectionItemType.BOOLEAN);
TYPES.put(byte[].class, MessageCollectionItemType.BYTE_ARR);
TYPES.put(short[].class, MessageCollectionItemType.SHORT_ARR);
TYPES.put(int[].class, MessageCollectionItemType.INT_ARR);
TYPES.put(long[].class, MessageCollectionItemType.LONG_ARR);
TYPES.put(float[].class, MessageCollectionItemType.FLOAT_ARR);
TYPES.put(double[].class, MessageCollectionItemType.DOUBLE_ARR);
TYPES.put(char[].class, MessageCollectionItemType.CHAR_ARR);
TYPES.put(boolean[].class, MessageCollectionItemType.BOOLEAN_ARR);
TYPES.put(String.class, MessageCollectionItemType.STRING);
TYPES.put(BitSet.class, MessageCollectionItemType.BIT_SET);
TYPES.put(UUID.class, MessageCollectionItemType.UUID);
TYPES.put(IgniteUuid.class, MessageCollectionItemType.IGNITE_UUID);
}

/**
* @param cls Class.
* @return Type enum value.
*/
private static MessageAdapter.Type typeEnum(Class<?> cls) {
MessageAdapter.Type type = TYPES.get(cls);
private static MessageCollectionItemType typeEnum(Class<?> cls) {
MessageCollectionItemType type = TYPES.get(cls);

if (type == null) {
assert MessageAdapter.class.isAssignableFrom(cls) : cls;

type = MessageAdapter.Type.MSG;
type = MessageCollectionItemType.MSG;
}

return type;
Expand Down Expand Up @@ -241,7 +241,7 @@ public void generateAndWrite(Class<? extends MessageAdapter> cls) throws Excepti

writeFound = true;
}
else if (line.contains("public boolean readFrom(ByteBuffer buf)")) {
else if (line.contains("public boolean readFrom(ByteBuffer buf, MessageReader reader)")) {
src.addAll(read);

skip = true;
Expand Down Expand Up @@ -418,7 +418,7 @@ private void start(Collection<String> code, @Nullable String superMtd, boolean w
}

if (!fields.isEmpty())
code.add(builder().a("switch (").a(write ? "writer.state()" : "readState").a(") {").toString());
code.add(builder().a("switch (").a(write ? "writer.state()" : "reader.state()").a(") {").toString());
}

/**
Expand Down Expand Up @@ -501,7 +501,7 @@ private void readField(Field field, int opt, @Nullable GridDirectCollection colA
mapAnn != null ? mapAnn.keyType() : null, mapAnn != null ? mapAnn.valueType() : null);

read.add(EMPTY);
read.add(builder().a("readState++;").toString());
read.add(builder().a("reader.incrementState();").toString());
read.add(EMPTY);

indent--;
Expand Down
10 changes: 5 additions & 5 deletions modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java
View file
Expand Up @@ -145,36 +145,36 @@ public boolean system() {
}

/** {@inheritDoc} */
@Override public boolean readFrom(ByteBuffer buf) {
@Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
reader.setBuffer(buf);

if (!reader.beforeMessageRead())
return false;

switch (readState) {
switch (reader.state()) {
case 0:
jobId = reader.readIgniteUuid("jobId");

if (!reader.isLastRead())
return false;

readState++;
reader.incrementState();

case 1:
sesId = reader.readIgniteUuid("sesId");

if (!reader.isLastRead())
return false;

readState++;
reader.incrementState();

case 2:
sys = reader.readBoolean("sys");

if (!reader.isLastRead())
return false;

readState++;
reader.incrementState();

}

Expand Down
54 changes: 27 additions & 27 deletions modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java
View file
Expand Up @@ -478,7 +478,7 @@ public UUID getSubjectId() {
writer.incrementState();

case 9:
if (!writer.writeMap("ldrParticipants", ldrParticipants, Type.UUID, Type.IGNITE_UUID))
if (!writer.writeMap("ldrParticipants", ldrParticipants, MessageCollectionItemType.UUID, MessageCollectionItemType.IGNITE_UUID))
return false;

writer.incrementState();
Expand Down Expand Up @@ -538,7 +538,7 @@ public UUID getSubjectId() {
writer.incrementState();

case 19:
if (!writer.writeCollection("top", top, Type.UUID))
if (!writer.writeCollection("top", top, MessageCollectionItemType.UUID))
return false;

writer.incrementState();
Expand All @@ -555,28 +555,28 @@ public UUID getSubjectId() {
}

/** {@inheritDoc} */
@Override public boolean readFrom(ByteBuffer buf) {
@Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
reader.setBuffer(buf);

if (!reader.beforeMessageRead())
return false;

switch (readState) {
switch (reader.state()) {
case 0:
clsLdrId = reader.readIgniteUuid("clsLdrId");

if (!reader.isLastRead())
return false;

readState++;
reader.incrementState();

case 1:
cpSpi = reader.readString("cpSpi");

if (!reader.isLastRead())
return false;

readState++;
reader.incrementState();

case 2:
byte depModeOrd;
Expand All @@ -588,151 +588,151 @@ public UUID getSubjectId() {

depMode = DeploymentMode.fromOrdinal(depModeOrd);

readState++;
reader.incrementState();

case 3:
dynamicSiblings = reader.readBoolean("dynamicSiblings");

if (!reader.isLastRead())
return false;

readState++;
reader.incrementState();

case 4:
forceLocDep = reader.readBoolean("forceLocDep");

if (!reader.isLastRead())
return false;

readState++;
reader.incrementState();

case 5:
internal = reader.readBoolean("internal");

if (!reader.isLastRead())
return false;

readState++;
reader.incrementState();

case 6:
jobAttrsBytes = reader.readByteArray("jobAttrsBytes");

if (!reader.isLastRead())
return false;

readState++;
reader.incrementState();

case 7:
jobBytes = reader.readByteArray("jobBytes");

if (!reader.isLastRead())
return false;

readState++;
reader.incrementState();

case 8:
jobId = reader.readIgniteUuid("jobId");

if (!reader.isLastRead())
return false;

readState++;
reader.incrementState();

case 9:
ldrParticipants = reader.readMap("ldrParticipants", Type.UUID, Type.IGNITE_UUID, false);
ldrParticipants = reader.readMap("ldrParticipants", MessageCollectionItemType.UUID, MessageCollectionItemType.IGNITE_UUID, false);

if (!reader.isLastRead())
return false;

readState++;
reader.incrementState();

case 10:
sesAttrsBytes = reader.readByteArray("sesAttrsBytes");

if (!reader.isLastRead())
return false;

readState++;
reader.incrementState();

case 11:
sesFullSup = reader.readBoolean("sesFullSup");

if (!reader.isLastRead())
return false;

readState++;
reader.incrementState();

case 12:
sesId = reader.readIgniteUuid("sesId");

if (!reader.isLastRead())
return false;

readState++;
reader.incrementState();

case 13:
siblingsBytes = reader.readByteArray("siblingsBytes");

if (!reader.isLastRead())
return false;

readState++;
reader.incrementState();

case 14:
startTaskTime = reader.readLong("startTaskTime");

if (!reader.isLastRead())
return false;

readState++;
reader.incrementState();

case 15:
subjId = reader.readUuid("subjId");

if (!reader.isLastRead())
return false;

readState++;
reader.incrementState();

case 16:
taskClsName = reader.readString("taskClsName");

if (!reader.isLastRead())
return false;

readState++;
reader.incrementState();

case 17:
taskName = reader.readString("taskName");

if (!reader.isLastRead())
return false;

readState++;
reader.incrementState();

case 18:
timeout = reader.readLong("timeout");

if (!reader.isLastRead())
return false;

readState++;
reader.incrementState();

case 19:
top = reader.readCollection("top", Type.UUID);
top = reader.readCollection("top", MessageCollectionItemType.UUID);

if (!reader.isLastRead())
return false;

readState++;
reader.incrementState();

case 20:
userVer = reader.readString("userVer");

if (!reader.isLastRead())
return false;

readState++;
reader.incrementState();

}

Expand Down

0 comments on commit ad02d6e

Please sign in to comment.