Author: mahadev
Date: Sat Jan 26 04:47:04 2013
New Revision: 1438846
URL: http://svn.apache.org/viewvc?rev=1438846&view=rev
Log:
AMBARI-1267. Store example Hive Queries somewhere in Ambari that's easily
accessible for demo/test purposes. (mahadev)
Added:
incubator/ambari/trunk/ambari-agent/src/examples/
incubator/ambari/trunk/ambari-agent/src/examples/query_with3jobs.txt
incubator/ambari/trunk/ambari-agent/src/examples/query_with6jobs.txt
incubator/ambari/trunk/ambari-agent/src/examples/tpcds_ss_tables.sql
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-agent/pom.xml
incubator/ambari/trunk/pom.xml
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1438846&r1=1438845&r2=1438846&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Sat Jan 26 04:47:04 2013
@@ -29,6 +29,9 @@ Trunk (unreleased changes):
AMBARI-1255. Make the agent hostname determination scriptable.
(mahadev)
+ AMBARI-1267. Store example Hive Queries somewhere in Ambari that's easily
+ accessible for demo/test purposes. (mahadev)
+
IMPROVEMENTS
AMBARI-1254. Modify App Browser to use server-side paging/sorting/filtering.
Modified: incubator/ambari/trunk/ambari-agent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/pom.xml?rev=1438846&r1=1438845&r2=1438846&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/pom.xml (original)
+++ incubator/ambari/trunk/ambari-agent/pom.xml Sat Jan 26 04:47:04 2013
@@ -173,6 +173,17 @@
</source>
</sources>
</mapping>
+ <mapping>
+ <directory>${lib.dir}/examples</directory>
+ <filemode>755</filemode>
+ <username>root</username>
+ <groupname>root</groupname>
+ <sources>
+ <source>
+ <location>src/examples</location>
+ </source>
+ </sources>
+ </mapping>
<mapping>
<directory>/var/lib/${project.artifactId}/puppet</directory>
<filemode>755</filemode>
@@ -186,6 +197,7 @@
</mapping>
<mapping>
<directory>${package.conf.dir}</directory>
+ <configuration>true</configuration>
<filemode>755</filemode>
<username>root</username>
<groupname>root</groupname>
@@ -289,6 +301,7 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
+ <exclude>src/examples/*</exclude>
<exclude>src/test/python/dummy*.txt</exclude>
<exclude>src/main/puppet/modules/stdlib/**</exclude>
<exclude>**/*.erb</exclude>
Added: incubator/ambari/trunk/ambari-agent/src/examples/query_with3jobs.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/examples/query_with3jobs.txt?rev=1438846&view=auto
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/examples/query_with3jobs.txt (added)
+++ incubator/ambari/trunk/ambari-agent/src/examples/query_with3jobs.txt Sat
Jan 26 04:47:04 2013
@@ -0,0 +1,36 @@
+SELECT
+ i_item_id,
+ s_state,
+ avg(ss_quantity) agg1,
+ avg(ss_list_price) agg2,
+ avg(ss_coupon_amt) agg3,
+ avg(ss_sales_price) agg4
+FROM
+ (SELECT /*+ MAPJOIN(item) */ i_item_id, s_state, ss_quantity,
ss_list_price, ss_coupon_amt, ss_sales_price
+ FROM item
+ JOIN
+ (SELECT /*+ MAPJOIN(customer_demographics) */ s_state, ss_quantity,
ss_list_price, ss_coupon_amt, ss_sales_price, ss_item_sk
+ FROM customer_demographics
+ JOIN
+ (SELECT /*+ MAPJOIN(store) */ s_state, ss_quantity, ss_list_price,
ss_coupon_amt, ss_sales_price, ss_item_sk, ss_cdemo_sk
+ FROM store
+ JOIN
+ (SELECT /*+ MAPJOIN(date_dim) */ ss_quantity, ss_list_price,
ss_coupon_amt, ss_sales_price, ss_item_sk, ss_cdemo_sk, ss_store_sk
+ FROM date_dim
+ JOIN store_sales
+ ON (store_sales.ss_sold_date_sk = date_dim.d_date_sk) WHERE d_year
= 2002) a
+ ON (a.ss_store_sk = store.s_store_sk)
+ WHERE s_state in ('TN', 'SD')) b
+ ON (b.ss_cdemo_sk = customer_demographics.cd_demo_sk)
+ WHERE
+ cd_gender = 'M' and
+ cd_marital_status = 'S' and
+ cd_education_status = 'College') c
+ ON (c.ss_item_sk = item.i_item_sk)) d
+GROUP BY
+ i_item_id,
+ s_state
+ORDER BY
+ i_item_id,
+ s_state
+LIMIT 100;
\ No newline at end of file
Added: incubator/ambari/trunk/ambari-agent/src/examples/query_with6jobs.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/examples/query_with6jobs.txt?rev=1438846&view=auto
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/examples/query_with6jobs.txt (added)
+++ incubator/ambari/trunk/ambari-agent/src/examples/query_with6jobs.txt Sat
Jan 26 04:47:04 2013
@@ -0,0 +1,35 @@
+SELECT
+ i_item_id,
+ s_state,
+ avg(ss_quantity) agg1,
+ avg(ss_list_price) agg2,
+ avg(ss_coupon_amt) agg3,
+ avg(ss_sales_price) agg4
+FROM
+ (SELECT i_item_id, s_state, ss_quantity, ss_list_price, ss_coupon_amt,
ss_sales_price
+ FROM item
+ JOIN
+ (SELECT s_state, ss_quantity, ss_list_price, ss_coupon_amt,
ss_sales_price, ss_item_sk
+ FROM customer_demographics
+ JOIN
+ (SELECT s_state, ss_quantity, ss_list_price, ss_coupon_amt,
ss_sales_price, ss_item_sk, ss_cdemo_sk
+ FROM store
+ JOIN
+ (SELECT ss_quantity, ss_list_price, ss_coupon_amt,
ss_sales_price, ss_item_sk, ss_cdemo_sk, ss_store_sk
+ FROM date_dim
+ JOIN store_sales ON (store_sales.ss_sold_date_sk =
date_dim.d_date_sk) WHERE d_year = 2002) a
+ ON (a.ss_store_sk = store.s_store_sk)
+ WHERE s_state in ('TN', 'SD')) b
+ ON (b.ss_cdemo_sk = customer_demographics.cd_demo_sk)
+ WHERE
+ cd_gender = 'M' and
+ cd_marital_status = 'S' and
+ cd_education_status = 'College') c
+ ON (c.ss_item_sk = item.i_item_sk)) d
+GROUP BY
+ i_item_id,
+ s_state
+ORDER BY
+ i_item_id,
+ s_state
+LIMIT 100;
\ No newline at end of file
Added: incubator/ambari/trunk/ambari-agent/src/examples/tpcds_ss_tables.sql
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/examples/tpcds_ss_tables.sql?rev=1438846&view=auto
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/examples/tpcds_ss_tables.sql (added)
+++ incubator/ambari/trunk/ambari-agent/src/examples/tpcds_ss_tables.sql Sat
Jan 26 04:47:04 2013
@@ -0,0 +1,226 @@
+create table store_sales
+(
+ ss_sold_date_sk int,
+ ss_sold_time_sk int,
+ ss_item_sk int,
+ ss_customer_sk int,
+ ss_cdemo_sk int,
+ ss_hdemo_sk int,
+ ss_addr_sk int,
+ ss_store_sk int,
+ ss_promo_sk int,
+ ss_ticket_number int,
+ ss_quantity int,
+ ss_wholesale_cost float,
+ ss_list_price float,
+ ss_sales_price float,
+ ss_ext_discount_amt float,
+ ss_ext_sales_price float,
+ ss_ext_wholesale_cost float,
+ ss_ext_list_price float,
+ ss_ext_tax float,
+ ss_coupon_amt float,
+ ss_net_paid float,
+ ss_net_paid_inc_tax float,
+ ss_net_profit float
+)
+row format delimited fields terminated by '|' ;
+
+create table customer_demographics
+(
+ cd_demo_sk int,
+ cd_gender string,
+ cd_marital_status string,
+ cd_education_status string,
+ cd_purchase_estimate int,
+ cd_credit_rating string,
+ cd_dep_count int,
+ cd_dep_employed_count int,
+ cd_dep_college_count int
+)
+row format delimited fields terminated by '|' ;
+
+create table date_dim
+(
+ d_date_sk int,
+ d_date_id string,
+ d_date timestamp,
+ d_month_seq int,
+ d_week_seq int,
+ d_quarter_seq int,
+ d_year int,
+ d_dow int,
+ d_moy int,
+ d_dom int,
+ d_qoy int,
+ d_fy_year int,
+ d_fy_quarter_seq int,
+ d_fy_week_seq int,
+ d_day_name string,
+ d_quarter_name string,
+ d_holiday string,
+ d_weekend string,
+ d_following_holiday string,
+ d_first_dom int,
+ d_last_dom int,
+ d_same_day_ly int,
+ d_same_day_lq int,
+ d_current_day string,
+ d_current_week string,
+ d_current_month string,
+ d_current_quarter string,
+ d_current_year string
+)
+row format delimited fields terminated by '|' ;
+
+create table time_dim
+(
+ t_time_sk int,
+ t_time_id string,
+ t_time int,
+ t_hour int,
+ t_minute int,
+ t_second int,
+ t_am_pm string,
+ t_shift string,
+ t_sub_shift string,
+ t_meal_time string
+)
+row format delimited fields terminated by '|' ;
+
+create table item
+(
+ i_item_sk int,
+ i_item_id string,
+ i_rec_start_date timestamp,
+ i_rec_end_date timestamp,
+ i_item_desc string,
+ i_current_price float,
+ i_wholesale_cost float,
+ i_brand_id int,
+ i_brand string,
+ i_class_id int,
+ i_class string,
+ i_category_id int,
+ i_category string,
+ i_manufact_id int,
+ i_manufact string,
+ i_size string,
+ i_formulation string,
+ i_color string,
+ i_units string,
+ i_container string,
+ i_manager_id int,
+ i_product_name string
+)
+row format delimited fields terminated by '|' ;
+
+create table store
+(
+ s_store_sk int,
+ s_store_id string,
+ s_rec_start_date timestamp,
+ s_rec_end_date timestamp,
+ s_closed_date_sk int,
+ s_store_name string,
+ s_number_employees int,
+ s_floor_space int,
+ s_hours string,
+ s_manager string,
+ s_market_id int,
+ s_geography_class string,
+ s_market_desc string,
+ s_market_manager string,
+ s_division_id int,
+ s_division_name string,
+ s_company_id int,
+ s_company_name string,
+ s_street_number string,
+ s_street_name string,
+ s_street_type string,
+ s_suite_number string,
+ s_city string,
+ s_county string,
+ s_state string,
+ s_zip string,
+ s_country string,
+ s_gmt_offset float,
+ s_tax_precentage float
+)
+row format delimited fields terminated by '|' ;
+
+create table customer
+(
+ c_customer_sk int,
+ c_customer_id string,
+ c_current_cdemo_sk int,
+ c_current_hdemo_sk int,
+ c_current_addr_sk int,
+ c_first_shipto_date_sk int,
+ c_first_sales_date_sk int,
+ c_salutation string,
+ c_first_name string,
+ c_last_name string,
+ c_preferred_cust_flag string,
+ c_birth_day int,
+ c_birth_month int,
+ c_birth_year int,
+ c_birth_country string,
+ c_login string,
+ c_email_address string,
+ c_last_review_date string
+)
+row format delimited fields terminated by '|' ;
+
+create table promotion
+(
+ p_promo_sk int,
+ p_promo_id string,
+ p_start_date_sk int,
+ p_end_date_sk int,
+ p_item_sk int,
+ p_cost float,
+ p_response_target int,
+ p_promo_name string,
+ p_channel_dmail string,
+ p_channel_email string,
+ p_channel_catalog string,
+ p_channel_tv string,
+ p_channel_radio string,
+ p_channel_press string,
+ p_channel_event string,
+ p_channel_demo string,
+ p_channel_details string,
+ p_purpose string,
+ p_discount_active string
+)
+row format delimited fields terminated by '|' ;
+
+create table household_demographics
+(
+ hd_demo_sk int,
+ hd_income_band_sk int,
+ hd_buy_potential string,
+ hd_dep_count int,
+ hd_vehicle_count int
+)
+row format delimited fields terminated by '|' ;
+
+create table customer_address
+(
+ ca_address_sk int,
+ ca_address_id string,
+ ca_street_number string,
+ ca_street_name string,
+ ca_street_type string,
+ ca_suite_number string,
+ ca_city string,
+ ca_county string,
+ ca_state string,
+ ca_zip string,
+ ca_country string,
+ ca_gmt_offset float,
+ ca_location_type string
+)
+row format delimited fields terminated by '|' ;
+
Modified: incubator/ambari/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/pom.xml?rev=1438846&r1=1438845&r2=1438846&view=diff
==============================================================================
--- incubator/ambari/trunk/pom.xml (original)
+++ incubator/ambari/trunk/pom.xml Sat Jan 26 04:47:04 2013
@@ -124,7 +124,6 @@
<exclude>.git/</exclude>
<exclude>**/.gitignore</exclude>
<exclude>**/.gitattributes</exclude>
-
<!--gitignore content-->
<exclude>.DS_Store</exclude>
<exclude>.iml/</exclude>