Skip to content

STORM-2121: Overriding StringKeyValueScheme.getOutputFields to contain both key and value #1822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ikashperskyi wants to merge 2 commits into from
Closed

STORM-2121: Overriding StringKeyValueScheme.getOutputFields to contain both key and value #1822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5bd246
Inlining deserialization and adding deserializeString as static import
ikashperskyi Dec 10, 2016
297fcaa
STORM-2121: Overriding StringKeyValueScheme.getOutputFields to contai…
ikashperskyi Dec 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions external/storm-kafka/src/jvm/org/apache/storm/kafka/StringKeyValueScheme.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,30 @@
*/
package org.apache.storm.kafka;

import org.apache.storm.tuple.Fields;
import org.apache.storm.tuple.Values;
import com.google.common.collect.ImmutableMap;

import java.nio.ByteBuffer;
import java.util.List;

import static org.apache.storm.kafka.StringScheme.deserializeString;
import static org.apache.storm.kafka.bolt.mapper.FieldNameBasedTupleToKafkaMapper.BOLT_KEY;
import static org.apache.storm.kafka.bolt.mapper.FieldNameBasedTupleToKafkaMapper.BOLT_MESSAGE;

public class StringKeyValueScheme extends StringScheme implements KeyValueScheme {

@Override
public List<Object> deserializeKeyAndValue(ByteBuffer key, ByteBuffer value) {
if ( key == null ) {
return deserialize(value);
}
String keyString = StringScheme.deserializeString(key);
String valueString = StringScheme.deserializeString(value);
return new Values(ImmutableMap.of(keyString, valueString));
return new Values(ImmutableMap.of(deserializeString(key), deserializeString(value)));
}

@Override
public Fields getOutputFields() {
return new Fields(BOLT_KEY, BOLT_MESSAGE);
}

}
9 changes: 4 additions & 5 deletions external/storm-kafka/src/test/org/apache/storm/kafka/StringKeyValueSchemeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,17 @@
*/
package org.apache.storm.kafka;

import org.apache.storm.tuple.Fields;
import com.google.common.collect.ImmutableMap;
import org.junit.Test;

import java.nio.ByteBuffer;
import java.nio.charset.Charset;
import java.util.Collections;

import static java.util.Arrays.asList;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.apache.storm.kafka.bolt.mapper.FieldNameBasedTupleToKafkaMapper.BOLT_KEY;
import static org.apache.storm.kafka.bolt.mapper.FieldNameBasedTupleToKafkaMapper.BOLT_MESSAGE;

public class StringKeyValueSchemeTest {

Expand All @@ -39,9 +40,7 @@ public void testDeserialize() throws Exception {

@Test
public void testGetOutputFields() throws Exception {
Fields outputFields = scheme.getOutputFields();
assertTrue(outputFields.contains(StringScheme.STRING_SCHEME_KEY));
assertEquals(1, outputFields.size());
assertEquals(asList(BOLT_KEY, BOLT_MESSAGE), scheme.getOutputFields().toList());
}

@Test
Expand Down