Commit 934d778d authored by feng's avatar feng

Stripes 12

parent 4f32ec54
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="05d59ada-3cd7-4c26-9a9f-8ed545f37173" name="Default" comment=""> <list default="true" id="05d59ada-3cd7-4c26-9a9f-8ed545f37173" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/fr/eurecom/dsg/mapreduce/StringToIntMapWritable.java" afterPath="$PROJECT_DIR$/src/main/java/fr/eurecom/dsg/mapreduce/StringToIntMapWritable.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/fr/eurecom/dsg/mapreduce/StringToIntMapWritable.java" afterPath="$PROJECT_DIR$/src/main/java/fr/eurecom/dsg/mapreduce/StringToIntMapWritable.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list> </list>
<ignored path="labs.iws" /> <ignored path="labs.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
...@@ -25,15 +26,15 @@ ...@@ -25,15 +26,15 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf>
<file leaf-file-name="StringToIntMapWritable.java" pinned="false" current-in-tab="false"> <file leaf-file-name="StringToIntMapWritable.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/fr/eurecom/dsg/mapreduce/StringToIntMapWritable.java"> <entry file="file://$PROJECT_DIR$/src/main/java/fr/eurecom/dsg/mapreduce/StringToIntMapWritable.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-2.0625"> <state vertical-scroll-proportion="0.30141845">
<caret line="50" column="33" selection-start-line="50" selection-start-column="33" selection-end-line="50" selection-end-column="33" /> <caret line="29" column="33" selection-start-line="29" selection-start-column="33" selection-end-line="29" selection-end-column="33" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#1705#1706#0" expanded="true" /> <element signature="e#1702#1703#0" expanded="true" />
<element signature="e#1730#1731#0" expanded="true" /> <element signature="e#1727#1728#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -51,10 +52,10 @@ ...@@ -51,10 +52,10 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="DistributedCacheJoin.java" pinned="false" current-in-tab="true"> <file leaf-file-name="DistributedCacheJoin.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/fr/eurecom/dsg/mapreduce/DistributedCacheJoin.java"> <entry file="file://$PROJECT_DIR$/src/main/java/fr/eurecom/dsg/mapreduce/DistributedCacheJoin.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.20501138"> <state vertical-scroll-proportion="0.0">
<caret line="24" column="27" selection-start-line="24" selection-start-column="27" selection-end-line="24" selection-end-column="27" /> <caret line="24" column="27" selection-start-line="24" selection-start-column="27" selection-end-line="24" selection-end-column="27" />
<folding /> <folding />
</state> </state>
...@@ -556,8 +557,8 @@ ...@@ -556,8 +557,8 @@
<caret line="22" column="28" selection-start-line="22" selection-start-column="28" selection-end-line="22" selection-end-column="28" /> <caret line="22" column="28" selection-start-line="22" selection-start-column="28" selection-end-line="22" selection-end-column="28" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#1705#1706#0" expanded="true" /> <element signature="e#1702#1703#0" expanded="true" />
<element signature="e#1730#1731#0" expanded="true" /> <element signature="e#1727#1728#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -853,18 +854,6 @@ ...@@ -853,18 +854,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/fr/eurecom/dsg/mapreduce/StringToIntMapWritable.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-2.0625">
<caret line="50" column="33" selection-start-line="50" selection-start-column="33" selection-end-line="50" selection-end-column="33" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1705#1706#0" expanded="true" />
<element signature="e#1730#1731#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/fr/eurecom/dsg/mapreduce/Stripes.java"> <entry file="file://$PROJECT_DIR$/src/main/java/fr/eurecom/dsg/mapreduce/Stripes.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
...@@ -877,11 +866,23 @@ ...@@ -877,11 +866,23 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/fr/eurecom/dsg/mapreduce/DistributedCacheJoin.java"> <entry file="file://$PROJECT_DIR$/src/main/java/fr/eurecom/dsg/mapreduce/DistributedCacheJoin.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.20501138"> <state vertical-scroll-proportion="0.0">
<caret line="24" column="27" selection-start-line="24" selection-start-column="27" selection-end-line="24" selection-end-column="27" /> <caret line="24" column="27" selection-start-line="24" selection-start-column="27" selection-end-line="24" selection-end-column="27" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/fr/eurecom/dsg/mapreduce/StringToIntMapWritable.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.30141845">
<caret line="29" column="33" selection-start-line="29" selection-start-column="33" selection-end-line="29" selection-end-column="33" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1702#1703#0" expanded="true" />
<element signature="e#1727#1728#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component> </component>
</project> </project>
\ No newline at end of file
...@@ -30,7 +30,7 @@ public class StringToIntMapWritable implements Writable { ...@@ -30,7 +30,7 @@ public class StringToIntMapWritable implements Writable {
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
// TODO: implement deserialization // TODO: implement deserialization
hashMap.clear(); this.clear();
int size = in.readInt(); int size = in.readInt();
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
word.readFields(in); word.readFields(in);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment