Skip to content

Commit

Permalink
Merge pull request IBMStreams#25 from scotts/master
Browse files Browse the repository at this point in the history
copyright clause + endline issue.
  • Loading branch information
hildrum committed Aug 3, 2015
2 parents d5f1a79 + 69e01ec commit 7eda90b
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
6 changes: 5 additions & 1 deletion Performance/ParallelParse/ParallelParse.spl
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
/*
* Licensed Materials - Property of IBM
* Copyright IBM Corp. 2015
*/
type ManyAttributes = tuple <
rstring str00, rstring str01, rstring str02, rstring str03, rstring str04,
rstring str05, rstring str06, rstring str07, rstring str08, rstring str09,
Expand Down Expand Up @@ -88,7 +92,7 @@ composite ParallelParse {
}

stream<blob bytes> LinesAsBytes = Functor(Lines) {
output LinesAsBytes: bytes = convertToBlob(Lines.line);
output LinesAsBytes: bytes = convertToBlob(Lines.line + "\n");
}

@parallel(width=(int32)getSubmissionTimeValue("parallelism"))
Expand Down
3 changes: 3 additions & 0 deletions Performance/ParallelParse/makedata.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/usr/bin/env python

# Licensed Materials - Property of IBM
# Copyright IBM Corp. 2015

import csv, random

tuples = 1000000
Expand Down
3 changes: 3 additions & 0 deletions Performance/ParallelParse/run.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/usr/bin/env python

# Licensed Materials - Property of IBM
# Copyright IBM Corp. 2015

import sys, time, collections, csv
from subprocess import call, Popen, PIPE

Expand Down

0 comments on commit 7eda90b

Please sign in to comment.