Skip to content

Commit

Permalink
updating all json queries, mostly changing opid and aggregators
Browse files Browse the repository at this point in the history
  • Loading branch information
jingjingwang committed Mar 9, 2015
1 parent a81afcf commit d2d62c7
Show file tree
Hide file tree
Showing 20 changed files with 8,877 additions and 679 deletions.
10 changes: 5 additions & 5 deletions jsonQueries/apply_dominik/apply.json
Expand Up @@ -5,7 +5,7 @@
"operators": [
{
"opType": "TableScan",
"opId": "V0",
"opId": 1,
"relationKey": {
"userName": "public",
"relationName": "TwitterK",
Expand All @@ -14,7 +14,7 @@
},
{
"opType": "Apply",
"opId": "V1",
"opId": 2,
"emitExpressions": [
{
"outputName": "log",
Expand All @@ -35,17 +35,17 @@
}
}
],
"argChild": "V0"
"argChild": 1
},
{
"opType": "DbInsert",
"opId": "root",
"opId": 3,
"relationKey": {
"userName": "public",
"relationName": "JustX",
"programName": "__TEMP__"
},
"argChild": "V1",
"argChild": 2,
"argOverwriteTable": true
}
]
Expand Down
10 changes: 5 additions & 5 deletions jsonQueries/apply_dominik/running_mean.json
Expand Up @@ -9,7 +9,7 @@
"relationName": "TwitterK",
"userName": "public"
},
"opId": "V1",
"opId": 1,
"opType": "TableScan"
},
{
Expand Down Expand Up @@ -44,7 +44,7 @@
"outputName": "sum"
}
],
"argChild": "V1",
"argChild": 1,
"initializerExpressions": [
{
"rootExpressionOperator": {
Expand Down Expand Up @@ -79,18 +79,18 @@
"outputName": "avg"
}
],
"opId": "V0",
"opId": 2,
"opType": "StatefulApply"
},
{
"argOverwriteTable": true,
"argChild": "V0",
"argChild": 2,
"relationKey": {
"programName": "adhoc",
"relationName": "RunningMean",
"userName": "public"
},
"opId": "Store",
"opId": 3,
"opType": "DbInsert"
}
]
Expand Down
12 changes: 6 additions & 6 deletions jsonQueries/apply_dominik/scan_apply_insert.json
Expand Up @@ -3,7 +3,7 @@
{
"operators": [
{
"opId": "Scan",
"opId": 2,
"opType": "TableScan",
"relationKey": {
"programName": "adhoc",
Expand All @@ -12,8 +12,8 @@
}
},
{
"argChild": "Scan",
"expressions": [
"argChild": 2,
"emitExpressions": [
{
"outputName": "EvalResult",
"rootExpressionOperator": {
Expand All @@ -33,13 +33,13 @@
}
}
],
"opId": "Apply",
"opId": 1,
"opType": "Apply"
},
{
"argChild": "Apply",
"argChild": 1,
"argOverwriteTable": true,
"opId": "Insert",
"opId": 3,
"opType": "DbInsert",
"relationKey": {
"programName": "adhoc",
Expand Down
41 changes: 11 additions & 30 deletions jsonQueries/broadcastJoin_shumo/broadcast_join.json
Expand Up @@ -3,16 +3,7 @@
{
"operators": [
{
"connectionInfo": {
"database": "mrbenchmarks",
"dbms": "vertica",
"driverClass": "com.vertica.jdbc.Driver",
"host": "localhost",
"password": "mrbenchmarks",
"port": "15433",
"username": "dbadmin"
},
"opId": "ScanR",
"opId": 1,
"opType": "TableScan",
"relationKey": {
"programName": "broadcastjoin",
Expand All @@ -21,25 +12,16 @@
}
},
{
"argChild": "ScanR",
"opId": "broadcast",
"argChild": 1,
"opId": 6,
"opType": "BroadcastProducer"
}
]
},
{
"operators": [
{
"connectionInfo": {
"database": "mrbenchmarks",
"dbms": "vertica",
"driverClass": "com.vertica.jdbc.Driver",
"host": "localhost",
"password": "mrbenchmarks",
"port": "15433",
"username": "dbadmin"
},
"opId": "ScanU",
"opId": 2,
"opType": "TableScan",
"relationKey": {
"programName": "broadcastjoin",
Expand All @@ -48,13 +30,13 @@
}
},
{
"argOperatorId": "broadcast",
"opId": "receive",
"argOperatorId": 6,
"opId": 3,
"opType": "BroadcastConsumer"
},
{
"argChild1": "receive",
"argChild2": "ScanU",
"argChild1": 3,
"argChild2": 2,
"argColumns1": [
1
],
Expand All @@ -67,14 +49,13 @@
"argSelect2": [
1
],
"opId": "Join",
"opId": 4,
"opType": "SymmetricHashJoin"
},
{
"argChild": "Join",
"argChild": 4,
"argOverwriteTable": true,
"connectionInfo": "localhost",
"opId": "Insert",
"opId": 5,
"opType": "DbInsert",
"relationKey": {
"programName": "broadcastjoin",
Expand Down
57 changes: 15 additions & 42 deletions jsonQueries/broadcastJoin_shumo/partition_join.json
Expand Up @@ -3,16 +3,7 @@
{
"operators": [
{
"connectionInfo": {
"database": "mrbenchmarks",
"dbms": "vertica",
"driverClass": "com.vertica.jdbc.Driver",
"host": "localhost",
"password": "mrbenchmarks",
"port": "15433",
"username": "dbadmin"
},
"opId": "Scan(R)",
"opId": 1,
"opType": "TableScan",
"relationKey": {
"programName": "broadcastjoin",
Expand All @@ -21,29 +12,20 @@
}
},
{
"argChild": "Scan(R)",
"argChild": 1,
"argPf": {
"index": 1,
"type": "SingleFieldHash"
},
"opId": "Shuffle(R)",
"opId": 3,
"opType": "ShuffleProducer"
}
]
},
{
"operators": [
{
"connectionInfo": {
"database": "mrbenchmarks",
"dbms": "vertica",
"driverClass": "com.vertica.jdbc.Driver",
"host": "localhost",
"password": "mrbenchmarks",
"port": "15433",
"username": "dbadmin"
},
"opId": "Scan(S)",
"opId": 2,
"opType": "TableScan",
"relationKey": {
"programName": "broadcastjoin",
Expand All @@ -52,31 +34,31 @@
}
},
{
"argChild": "Scan(S)",
"argChild": 2,
"argPf": {
"index": 1,
"type": "SingleFieldHash"
},
"opId": "Shuffle(S)",
"opId": 4,
"opType": "ShuffleProducer"
}
]
},
{
"operators": [
{
"argOperatorId": "Shuffle(R)",
"opId": "Gather(R)",
"argOperatorId": 3,
"opId": 5,
"opType": "ShuffleConsumer"
},
{
"argOperatorId": "Shuffle(S)",
"opId": "Gather(S)",
"argOperatorId": 4,
"opId": 6,
"opType": "ShuffleConsumer"
},
{
"argChild1": "Gather(R)",
"argChild2": "Gather(S)",
"argChild1": 5,
"argChild2": 6,
"argColumns1": [
1
],
Expand All @@ -89,22 +71,13 @@
"argSelect2": [
1
],
"opId": "Join",
"opId": 7,
"opType": "SymmetricHashJoin"
},
{
"argChild": "Join",
"argChild": 7,
"argOverwriteTable": true,
"connectionInfo": {
"database": "mrbenchmarks",
"dbms": "vertica",
"driverClass": "com.vertica.jdbc.Driver",
"host": "localhost",
"password": "mrbenchmarks",
"port": "15433",
"username": "dbadmin"
},
"opId": "InsertResult",
"opId": 8,
"opType": "DbInsert",
"relationKey": {
"programName": "broadcastjoin",
Expand Down

0 comments on commit d2d62c7

Please sign in to comment.