Explorar o código

[pig] Example not showing up

Notice that the example can't be modify by other user but can be copied.
It will be improved later with the new document model.
Romain Rigaux %!s(int64=12) %!d(string=hai) anos
pai
achega
d47ac9c

+ 4 - 9
apps/beeswax/data/designs.json

@@ -5,7 +5,7 @@
       "type":"0",
       "data":{
          "query":{
-            "query":"SELECT sample_07.description, sample_07.salary\nFROM\n  sample_07\nWHERE\n( sample_07.salary > 100000)\nSORT BY sample_07.salary DESC",
+            "query":"SELECT sample_07.description, sample_07.salary\nFROM\n  sample_07\nWHERE\n( sample_07.salary > 100000)\nORDER BY sample_07.salary DESC\nLIMIT 1000",
             "type":null,
             "email_notify":null,
             "is_parameterized":null
@@ -22,7 +22,7 @@
       "type":"0",
       "data":{
          "query":{
-            "query":"SELECT s07.description, s07.salary, s08.salary,\n  s08.salary - s07.salary\nFROM\n  sample_07 s07 JOIN sample_08 s08\nON ( s07.code = s08.code)\nWHERE\n s07.salary < s08.salary\nSORT BY s08.salary-s07.salary DESC",
+            "query":"SELECT s07.description, s07.salary, s08.salary,\n  s08.salary - s07.salary\nFROM\n  sample_07 s07 JOIN sample_08 s08\nON ( s07.code = s08.code)\nWHERE\n s07.salary < s08.salary\nORDER BY s08.salary-s07.salary DESC\nLIMIT 1000",
             "type":null,
             "email_notify":null,
             "is_parameterized":null
@@ -30,12 +30,7 @@
          "functions":[ ],
          "VERSION":"0.4.0",
          "file_resources":[ ],
-         "settings":[
-            {
-               "value":"1",
-               "key":"hive.merge.mapredfiles"
-            }
-         ]
+         "settings":[ ]
       }
    },
    {
@@ -44,7 +39,7 @@
       "type":"0",
       "data":{
          "query":{
-            "query":"SELECT s07.description, s07.total_emp, s08.total_emp, s07.salary\nFROM\n  sample_07 s07 JOIN \n  sample_08 s08\nON ( s07.code = s08.code )\nWHERE\n( s07.total_emp > s08.total_emp\n AND s07.salary > 100000 )\nSORT BY s07.salary DESC",
+            "query":"SELECT s07.description, s07.total_emp, s08.total_emp, s07.salary\nFROM\n  sample_07 s07 JOIN \n  sample_08 s08\nON ( s07.code = s08.code )\nWHERE\n( s07.total_emp > s08.total_emp\n AND s07.salary > 100000 )\nORDER BY s07.salary DESC\nLIMIT 1000",
             "type":null,
             "email_notify":null,
             "is_parameterized":null

+ 2 - 2
apps/beeswax/src/beeswax/views.py

@@ -327,10 +327,10 @@ def list_query_history(request):
 
   querydict_query = request.GET.copy()
   if not share_queries:
-    querydict_query['user'] = request.user.username
+    querydict_query[prefix + 'user'] = request.user.username
 
   app_name= get_app_name(request)
-  querydict_query['type'] = app_name
+  querydict_query[prefix + 'type'] = app_name
 
   page, filter_params = _list_query_history(request.user, querydict_query, DEFAULT_PAGE_SIZE, prefix)
 

+ 13 - 8
apps/oozie/src/oozie/views/editor.py

@@ -867,15 +867,20 @@ def list_history_record(request, record_id):
 
 
 def install_examples(request):
+  result = {'status': -1, 'message': ''}
+
   if request.method != 'POST':
-    raise PopupException(_('A POST request is required.'))
-  try:
-    oozie_setup.Command().handle_noargs()
-    activate_translation(request.LANGUAGE_CODE)
-    request.info(_('Workspaces and examples installed.'))
-  except WebHdfsException, e:
-    raise PopupException(_('The app setup could complete.'), detail=e)
-  return redirect(reverse('oozie:list_workflows'))
+    result['message'] = _('A POST request is required.')
+  else:
+    try:
+      oozie_setup.Command().handle_noargs()
+      activate_translation(request.LANGUAGE_CODE)
+      result['status'] = 0
+    except Exception, e:
+      LOG.exception(e)
+      result['message'] = str(e)
+
+  return HttpResponse(json.dumps(result), mimetype="application/json")
 
 
 def jasmine(request):

+ 4 - 4
apps/pig/src/pig/fixtures/initial_pig_examples.json

@@ -1,17 +1,17 @@
 [
   {
-    "pk": 1,
+    "pk": 1100713,
     "model": "pig.document",
     "fields": {
       "owner": 1100713,
-      "is_design": false
+      "is_design": true
     }
   },
   {
-    "pk": 1,
+    "pk": 1100713,
     "model": "pig.pigscript",
     "fields": {
-      "data": "{\"job_id\": null, \"parameters\": [], \"script\": \"REGISTER piggybank.jar;\\n\\n\\ndata = LOAD '/user/hue/pig/examples/data/midsummer.txt' as (text:CHARARRAY);\\n\\nupper_case =  FOREACH data GENERATE org.apache.pig.piggybank.evaluation.string.UPPER(text);\\n\\n\\nSTORE upper_case INTO '$output' ;\\n\", \"properties\": [], \"resources\": [{\"type\": \"file\", \"value\": \"/user/hue/pig/examples/lib/piggybank.jar\"}], \"name\": \"UpperText\"}"
+      "data": "{\"job_id\": null, \"parameters\": [], \"script\": \"REGISTER piggybank.jar;\\n\\n\\ndata = LOAD '/user/hue/pig/examples/data/midsummer.txt' as (text:CHARARRAY);\\n\\nupper_case =  FOREACH data GENERATE org.apache.pig.piggybank.evaluation.string.UPPER(text);\\n\\n\\nSTORE upper_case INTO '$output' ;\\n\", \"properties\": [], \"resources\": [{\"type\": \"file\", \"value\": \"/user/hue/pig/examples/lib/piggybank.jar\"}], \"name\": \"UpperText (example)\"}"
     }
   }
 ]