Skip to content

Commit

Permalink
Merge 654be57 into 7c5a013
Browse files Browse the repository at this point in the history
  • Loading branch information
@jingjingwang
jingjingwang committed Jan 6, 2017
2 parents 7c5a013 + 654be57 commit 06ef3ce
Show file tree
Hide file tree
Showing 112 changed files with 1,663 additions and 2,479 deletions.
12 changes: 6 additions & 6 deletions jsonQueries/broadcastJoin_shumo/partition_join.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
},
{
"argChild": 1,
"argPf": {
"index": 1,
"type": "SingleFieldHash"
"distributeFunction": {
"indexes": [1],
"type": "Hash"
},
"opId": 3,
"opType": "ShuffleProducer"
Expand All @@ -35,9 +35,9 @@
},
{
"argChild": 2,
"argPf": {
"index": 1,
"type": "SingleFieldHash"
"distributeFunction": {
"indexes": [1],
"type": "Hash"
},
"opId": 4,
"opType": "ShuffleProducer"
Expand Down
6 changes: 3 additions & 3 deletions jsonQueries/broadcastJoin_shumo/plan_fragment.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@ def scan_and_shuffle(relation_key, relation_name):
"argOperatorId": "Shuffle("+relation_name+")",
"opId": "Shuffle("+relation_name+")",
"opType": "ShuffleProducer",
"argPf": {
"index": 1,
"type": "SingleFieldHash"
"distributeFunction": {
"indexes": [1],
"type": "Hash"
}
}
fragment = {
Expand Down
18 changes: 9 additions & 9 deletions jsonQueries/come_to_the_party_jwang/party.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
},
{
"argChild": 5,
"argPf": {
"index": "0",
"type": "SingleFieldHash"
"distributeFunction": {
"indexes": [0],
"type": "Hash"
},
"opId": 6,
"opType": "ShuffleProducer"
Expand Down Expand Up @@ -103,9 +103,9 @@
},
{
"argChild": 12,
"argPf": {
"index": "0",
"type": "SingleFieldHash"
"distributeFunction": {
"indexes": [0],
"type": "Hash"
},
"opId": 13,
"opType": "ShuffleProducer"
Expand Down Expand Up @@ -137,9 +137,9 @@
},
{
"argChild": 16,
"argPf": {
"index": "0",
"type": "SingleFieldHash"
"distributeFunction": {
"indexes": [0],
"type": "Hash"
},
"opId": 17,
"opType": "ShuffleProducer"
Expand Down
18 changes: 9 additions & 9 deletions jsonQueries/connected_components_jwang/connected_components.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
"opId" : 18,
"opType" : "ShuffleProducer",
"argChild" : 20,
"argPf" : {
"type" : "SingleFieldHash",
"index" : 0
"distributeFunction" : {
"type" : "Hash",
"indexes" : [0]
}
}
]
Expand All @@ -64,9 +64,9 @@
"opId" : 17,
"opType" : "ShuffleProducer",
"argChild" : 19,
"argPf" : {
"type" : "SingleFieldHash",
"index" : 1
"distributeFunction" : {
"type" : "Hash",
"indexes" : [1]
}
}
]
Expand Down Expand Up @@ -143,9 +143,9 @@
"opId" : 10,
"opType" : "ShuffleProducer",
"argChild" : 11,
"argPf" : {
"type" : "SingleFieldHash",
"index" : 0
"distributeFunction" : {
"type" : "Hash",
"indexes" : [0]
}
}
]
Expand Down
34 changes: 17 additions & 17 deletions jsonQueries/galaxy_evolution_jwang/galaxy_evolution.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@
"opName" : "spG",
"opType" : "ShuffleProducer",
"argChild" : 5,
"argPf" : {
"type" : "MultiFieldHash",
"indexes" : [0, 1]
"distributeFunction" : {
"type" : "Hash",
"indexes" : [0,1]
}
}
]
Expand Down Expand Up @@ -94,9 +94,9 @@
"opName" : "spP1",
"opType" : "ShuffleProducer",
"argChild" : 13,
"argPf" : {
"type" : "MultiFieldHash",
"indexes" : [2, 1]
"distributeFunction" : {
"type" : "Hash",
"indexes" : [2,1]
}
}
]
Expand Down Expand Up @@ -155,9 +155,9 @@
"opName" : "spP2",
"opType" : "ShuffleProducer",
"argChild" : 35,
"argPf" : {
"type" : "MultiFieldHash",
"indexes" : [2, 0]
"distributeFunction" : {
"type" : "Hash",
"indexes" : [2,0]
}
}
]
Expand Down Expand Up @@ -209,8 +209,8 @@
"opName" : "spE",
"opType" : "ShuffleProducer",
"argChild" : 20,
"argPf" : {
"type" : "MultiFieldHash",
"distributeFunction" : {
"type" : "Hash",
"indexes" : [0,1]
}
}
Expand Down Expand Up @@ -322,8 +322,8 @@
"opName" : "spJoinG",
"opType" : "ShuffleProducer",
"argChild" : 32,
"argPf" : {
"type" : "MultiFieldHash",
"distributeFunction" : {
"type" : "Hash",
"indexes" : [0,1]
}
}
Expand Down Expand Up @@ -362,8 +362,8 @@
"opName" : "spJoinE1",
"opType" : "ShuffleProducer",
"argChild" : 34,
"argPf" : {
"type" : "MultiFieldHash",
"distributeFunction" : {
"type" : "Hash",
"indexes" : [0,2]
}
}
Expand Down Expand Up @@ -402,8 +402,8 @@
"opName" : "spJoinE2",
"opType" : "ShuffleProducer",
"argChild" : 39,
"argPf" : {
"type" : "MultiFieldHash",
"distributeFunction" : {
"type" : "Hash",
"indexes" : [0,1,2]
}
}
Expand Down
12 changes: 6 additions & 6 deletions jsonQueries/getting_started/global_join.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
},
{
"argChild": 7,
"argPf": {
"index": 0,
"type": "SingleFieldHash"
"distributeFunction": {
"indexes": [0],
"type": "Hash"
},
"opId": 0,
"opType": "ShuffleProducer"
Expand All @@ -35,9 +35,9 @@
},
{
"argChild": 1,
"argPf": {
"index": 1,
"type": "SingleFieldHash"
"distributeFunction": {
"indexes": [1],
"type": "Hash"
},
"opId": 6,
"opType": "ShuffleProducer"
Expand Down
12 changes: 6 additions & 6 deletions jsonQueries/globalJoin_jwang/global_join.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
},
{
"argChild": 6,
"argPf": {
"index": 0,
"type": "SingleFieldHash"
"distributeFunction": {
"indexes": [0],
"type": "Hash"
},
"opId": 0,
"opType": "ShuffleProducer"
Expand All @@ -35,9 +35,9 @@
},
{
"argChild": 1,
"argPf": {
"index": 1,
"type": "SingleFieldHash"
"distributeFunction": {
"indexes": [1],
"type": "Hash"
},
"opId": 6,
"opType": "ShuffleProducer"
Expand Down
4 changes: 2 additions & 2 deletions jsonQueries/globalJoin_jwang/ingest_smallTable.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"bytes" : "MSA0NAoyIDUxCjQ2IDE3CjYzIDM0CjU0IDYzCjIwIDk0CjEyIDY2Cjc5IDQyCjEgMTAKODggMjAKMTAgNDIKNTYgNDQKMTAgMTIKNzkgMzcKMzAgNjYKODMgMTMKMzEgMQozMSA5OQo4MSAzNQo3MCAyNgo0IDUxCjE1IDY2Cjg4IDY2CjI3IDE3CjMxIDgyCjc2IDc0Cjk2IDY1CjYyIDIyCjkwIDU5CjEzIDI5CjQ0IDQyCjM1IDYyCjk5IDE1Cjk1IDc3CjEwIDcwCjI0IDMwCjgyIDY0CjQ0IDQ4CjY1IDc0CjE4IDg1CjQ5IDE0Cjc1IDk5CjU3IDk1CjQyIDk2CjQxIDY5CjE0IDY1CjE2IDExCjcyIDIyCjc2IDgyCjY2IDY4Cjc0IDg4CjQ3IDYKNTYgMAo2IDkKNTAgODAKNiAzMQo3NiA0NAo0OSAzMAo0NyAxNgo4MiA3NwoxIDgxCjIwIDQwCjE4IDU2CjI4IDkyCjU4IDE2CjgyIDEzCjcxIDc1CjYwIDQxCjIzIDkKMiA1MQo4NiA5NQo4IDgxCjk3IDc5CjE4IDQxCjg5IDQ4CjU5IDUxCjIxIDg2CjYzIDc2CjQyIDIyCjczIDM4CjI0IDE3CjggMzQKNzggMTUKOTMgMTUKMzEgMjIKNzMgMjkKOTMgMTYKODcgOTUKNSA1Nwo0MiA4OAoxNSA4NwozOCA5NwowIDc2CjU3IDUxCjMwIDE5CjUyIDI4CjQyIDE0CjczIDI4CjM3IDY5CjQzIDQ3Cg=="
},
"partitionFunction": {
"type": "SingleFieldHash",
"index": 0
"type": "Hash",
"indexes": [0]
},
"overwrite": true,
"delimiter":" "
Expand Down
12 changes: 6 additions & 6 deletions jsonQueries/join_for_vis_dominik/join.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@
{
"opName": "MyriaShuffleProducer(h($1))",
"opId": 4,
"argPf": {
"type": "SingleFieldHash",
"index": 1
"distributeFunction": {
"type": "Hash",
"indexes": [1]
},
"opType": "ShuffleProducer",
"argChild": 7
Expand Down Expand Up @@ -134,9 +134,9 @@
{
"opName": "MyriaShuffleProducer(h($0))",
"opId": 2,
"argPf": {
"type": "SingleFieldHash",
"index": 0
"distributeFunction": {
"type": "Hash",
"indexes": [0]
},
"opType": "ShuffleProducer",
"argChild": 9
Expand Down
30 changes: 15 additions & 15 deletions jsonQueries/lca_jwang/lca.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@
"opName" : "spP",
"opType" : "ShuffleProducer",
"argChild" : 5,
"argPf" : {
"type" : "SingleFieldHash",
"index" : 0
"distributeFunction" : {
"type" : "Hash",
"indexes" : [0]
}
}
]
Expand Down Expand Up @@ -94,9 +94,9 @@
"opName" : "spC1",
"opType" : "ShuffleProducer",
"argChild" : 9,
"argPf" : {
"type" : "SingleFieldHash",
"index" : 0
"distributeFunction" : {
"type" : "Hash",
"indexes" : [0]
}
}
]
Expand Down Expand Up @@ -147,8 +147,8 @@
"opName" : "spC2",
"opType" : "ShuffleProducer",
"argChild" : 18,
"argPf" : {
"type" : "MultiFieldHash",
"distributeFunction" : {
"type" : "Hash",
"indexes" : [0,1]
}
}
Expand Down Expand Up @@ -194,9 +194,9 @@
"opName" : "spA",
"opType" : "ShuffleProducer",
"argChild" : 20,
"argPf" : {
"type" : "SingleFieldHash",
"index" : 1
"distributeFunction" : {
"type" : "Hash",
"indexes" : [1]
}
}
]
Expand Down Expand Up @@ -341,8 +341,8 @@
"opName" : "spJoinA",
"opType" : "ShuffleProducer",
"argChild" : 40,
"argPf" : {
"type" : "MultiFieldHash",
"distributeFunction" : {
"type" : "Hash",
"indexes" : [0,1]
}
}
Expand Down Expand Up @@ -514,8 +514,8 @@
"opName" : "spJoinL2",
"opType" : "ShuffleProducer",
"argChild" : 45,
"argPf" : {
"type" : "MultiFieldHash",
"distributeFunction" : {
"type" : "Hash",
"indexes" : [0,1]
}
}
Expand Down
18 changes: 6 additions & 12 deletions jsonQueries/lsst_vaspol/lsstQuery_oneIteration.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,9 @@
},
{
"argChild": 1,
"argPf": {
"indexes": [
"0",
"1"
],
"type": "MultiFieldHash"
"distributeFunction": {
"indexes": [0,1],
"type": "Hash"
},
"opId": 3,
"opType": "ShuffleProducer"
Expand All @@ -43,12 +40,9 @@
},
{
"argChild": 2,
"argPf": {
"indexes": [
"0",
"1"
],
"type": "MultiFieldHash"
"distributeFunction": {
"indexes": [0,1],
"type": "Hash"
},
"opId": 7,
"opType": "ShuffleProducer"
Expand Down
Loading

0 comments on commit 06ef3ce

Please sign in to comment.