updated od4h samples

Author: martygubar

samples/od4h_samples/Readme_OTA4H_Demo.txt renamed to samples/od4h_samples/Readme_OD4H_Demo.txt

@@ -2,8 +2,8 @@
 INTRODUCTION
 =============
 
-The demo illustrates a simple use case of Oracle Table Access for Hadoop and 
-Spark. It creates Hive external tables with different table properties to query 
+The demo illustrates a simple use case of Oracle Datasource for Apache Hadoop. 
+It creates Hive external tables with different table properties to query 
 Oracle Tables. We use simple and partition based splitters issue queries that 
 do predicate pushdown while executing.
 
@@ -18,7 +18,7 @@ System Requirements
 HOW TO RUN
 ==========
 
-1. Extract ota4h_demo.zip to any location. Bash scripts to create tables and 
+1. Extract od4h_samples.zip to any location. Bash scripts to create tables and 
 run queries are located under shell directory.
 
 2. Execute createOracleTables.sh to create staging Oracle tables. You may have 
@@ -31,3 +31,6 @@ table for a PDB user.
 
 5. Use Apache/Cloudera tools to set logging levels and check out the queries 
 generated by Oracle Storage Handler for querying Oracle tables.
+
+6. Movieplex demo contains scripts under shell directory to use OutputFormat 
+to write the result of a join query to a hive external table.

samples/od4h_samples/od4h_basic_demos/data/EmployeeData.log

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 #
-# $Header: hadoop/demo/osh/shell/createHiveTables.sh /main/1 2015/03/20 13:52:02 ratiwary Exp $
+# $Header: hadoop/demo/od4h_samples/od4h_basic_demos/shell/createHiveTables.sh ratiwary_od4h_demos/2 2018/01/19 05:07:14 ratiwary Exp $
 #
 # createHiveTables.sh
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
 #
 #    NAME
 #      createHiveTables.sh
@@ -42,4 +42,6 @@ SHELL_DIR=`dirname "$0"`
 DEMO_DIR=`cd "../"; pwd`
 cd ${DEMO_DIR}/sql
 
+# Storing password in plain text is not recommended. OD4H recommends using
+# strong password authentication like Kerberos
 hive -i hive_init.hql -f CreateEmployeeDataHive.hql -hiveconf connection_string="$conn_string" -hiveconf oracle_user=$username -hiveconf oracle_pwd=$password

samples/od4h_samples/od4h_basic_demos/shell/createHiveTables.sh

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 #
-# $Header: hadoop/demo/osh/shell/createOracleTable.sh /main/1 2015/03/20 13:52:02 ratiwary Exp $
+# $Header: hadoop/demo/od4h_samples/od4h_basic_demos/shell/createOracleTable.sh ratiwary_od4h_demos/2 2018/01/19 05:07:14 ratiwary Exp $
 #
 # createOracleTable.sh
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
 #
 #    NAME
 #      createOracleTable.sh
@@ -30,6 +30,7 @@ SHELL_DIR=`dirname "$0"`
 DEMO_DIR=`cd "../"; pwd`
 cd ${DEMO_DIR}/sql
 
+export TWO_TASK=orcl
 echo "Enter password for the User"
 sqlplus -S $username/ @CreateEmployeeData.sql;
 

samples/od4h_samples/od4h_basic_demos/shell/createOracleTable.sh

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 #
-# $Header: hadoop/demo/osh/shell/joinQuery.sh ratiwary_osh_newsplitters_outputformat/2 2016/03/05 06:41:50 ratiwary Exp $
+# $Header: hadoop/demo/od4h_samples/od4h_basic_demos/shell/joinQuery.sh ratiwary_od4h_demos/1 2018/01/11 01:40:05 ratiwary Exp $
 #
 # joinQueryHive.sh
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
 #
 #    NAME
 #      joinQueryHive.sh

samples/od4h_samples/od4h_basic_demos/shell/joinQuery.sh

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 #
-# $Header: hadoop/demo/osh/shell/partitionPruningQuery.sh ratiwary_osh_newsplitters_outputformat/1 2016/03/05 06:41:51 ratiwary Exp $
+# $Header: hadoop/demo/od4h_samples/od4h_basic_demos/shell/partitionPruningQuery.sh ratiwary_od4h_demos/2 2018/01/11 01:45:07 ratiwary Exp $
 #
 # partitionPruningQueryHive.sh
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
 #
 #    NAME
 #      partitionPruningQueryHive.sh
@@ -38,7 +38,7 @@ if [ $choice -eq 1 ]; then
   hive -i hive_init.hql -e "${QUERY}"
 elif [ $choice -eq 2 ]; then
   echo "sqlContext.sql(\""${QUERY}"\").show();System.exit(0);" > query.scala
-  spark-shell --jars /opt/oracle/od4h/jlib/osh.jar,/opt/oracle/od4h/jlib/ojdbc7.jar,/opt/oracle/od4h/jlib/ucp.jar -i query.scala
+  spark-shell --jars /opt/oracle/od4h/jlib/osh.jar,/opt/oracle/od4h/jlib/ojdbc8.jar,/opt/oracle/od4h/jlib/ucp.jar -i query.scala
   rm query.scala
 else
   echo "Invalid input"

samples/od4h_samples/od4h_basic_demos/shell/partitionPruningQuery.sh

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 #
-# $Header: hadoop/demo/osh/shell/partitionQuery.sh ratiwary_osh_newsplitters_outputformat/1 2016/03/05 06:41:50 ratiwary Exp $
+# $Header: hadoop/demo/od4h_samples/od4h_basic_demos/shell/partitionQuery.sh ratiwary_od4h_demos/2 2018/01/11 01:45:07 ratiwary Exp $
 #
 # partitionQueryHive.sh
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
 #
 #    NAME
 #      partitionQueryHive.sh
@@ -38,7 +38,7 @@ if [ $choice -eq 1 ]; then
   hive -i hive_init.hql -e "${QUERY}"
 elif [ $choice -eq 2 ]; then
   echo "sqlContext.sql(\""${QUERY}"\").show();System.exit(0);" > query.scala
-  spark-shell --jars /opt/oracle/od4h/jlib/osh.jar,/opt/oracle/od4h/jlib/ojdbc7.jar,/opt/oracle/od4h/jlib/ucp.jar -i query.scala
+  spark-shell --jars /opt/oracle/od4h/jlib/osh.jar,/opt/oracle/od4h/jlib/ojdbc8.jar,/opt/oracle/od4h/jlib/ucp.jar -i query.scala
   rm query.scala
 else
   echo "Invalid Input"

samples/od4h_samples/od4h_basic_demos/shell/partitionQuery.sh

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 #
-# $Header: hadoop/demo/osh/shell/simpleQuery.sh ratiwary_osh_newsplitters_outputformat/1 2016/03/05 06:41:50 ratiwary Exp $
+# $Header: hadoop/demo/od4h_samples/od4h_basic_demos/shell/simpleQuery.sh ratiwary_od4h_demos/3 2018/01/19 05:07:14 ratiwary Exp $
 #
 # simpleQueryHive.sh
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
 #
 #    NAME
 #      simpleQueryHive.sh
@@ -33,10 +33,10 @@ cd ${DEMO_DIR}/sql
 
 QUERY="select First_Name, Last_Name from EmployeeDataSimple where Emp_ID=39332"
 if [ $choice -eq 1 ]; then
-  hive -i hive_init.hql -e "${QUERY}"
+hive -i hive_init.hql -e "${QUERY}"
 elif [ $choice -eq 2 ]; then
   echo "sqlContext.sql(\""${QUERY}"\").show();System.exit(0);" > query.scala
-  spark-shell --jars /opt/oracle/od4h/jlib/osh.jar,/opt/oracle/od4h/jlib/ojdbc7.jar,/opt/oracle/od4h/jlib/ucp.jar -i query.scala
+  spark-shell --jars /opt/oracle/od4h/jlib/osh.jar,/opt/oracle/od4h/jlib/ojdbc8.jar,/opt/oracle/od4h/jlib/ucp.jar -i query.scala
   rm query.scala
 else
   echo "Invalid Input"

samples/od4h_samples/od4h_basic_demos/shell/simpleQuery.sh

@@ -1,9 +1,9 @@
 Rem
-Rem $Header: hadoop/demo/osh/sql/CreateEmployeeData.sql ratiwary_osh_newsplitters_outputformat/1 2016/01/19 05:23:49 ratiwary Exp $
+Rem $Header: hadoop/demo/od4h_samples/od4h_basic_demos/sql/CreateEmployeeData.sql ratiwary_od4h_demos/1 2018/01/11 01:40:05 ratiwary Exp $
 Rem
 Rem CreateEmployeeData.sql
 Rem
-Rem Copyright (c) 2015, 2016, Oracle and/or its affiliates. 
+Rem Copyright (c) 2015, 2018, Oracle and/or its affiliates. 
 Rem All rights reserved.
 Rem
 Rem    NAME

samples/od4h_samples/od4h_basic_demos/sql/CreateEmployeeData.sql

@@ -1,9 +1,9 @@
 --
--- $Header: hadoop/demo/osh/sql/CreateEmployeeDataHive.hql ratiwary_osh_newsplitters_outputformat/2 2016/01/19 05:57:36 ratiwary Exp $
+-- $Header: hadoop/demo/od4h_samples/od4h_basic_demos/sql/CreateEmployeeDataHive.hql ratiwary_od4h_demos/1 2018/01/11 01:40:05 ratiwary Exp $
 --
 -- CreateEmployeeDataHive.hql
 --
--- Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
 --
 --    NAME
 --      CreateEmployeeDataHive.hql

samples/od4h_samples/od4h_basic_demos/sql/CreateEmployeeDataHive.hql

@@ -1,9 +1,9 @@
 --
--- $Header: hadoop/demo/osh/sql/hive_init.hql ratiwary_osh_newsplitters_outputformat/1 2016/02/08 05:53:41 ratiwary Exp $
+-- $Header: hadoop/demo/od4h_samples/od4h_basic_demos/sql/hive_init.hql ratiwary_od4h_demos/2 2018/01/11 01:45:07 ratiwary Exp $
 --
 -- hive_init.hql
 --
--- Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
 --
 --    NAME
 --      hive_init.hql
@@ -17,5 +17,5 @@
 --
 
 add jar /opt/oracle/od4h/jlib/osh.jar;
-add jar /opt/oracle/od4h/jlib/ojdbc7.jar;
+add jar /opt/oracle/od4h/jlib/ojdbc8.jar;
 add jar /opt/oracle/od4h/jlib/ucp.jar;

samples/od4h_samples/od4h_basic_demos/sql/hive_init.hql

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 #
-# $Header: hadoop/demo/osh/shell/createHiveTables.sh /main/1 2015/03/20 13:52:02 ratiwary Exp $
+# $Header: hadoop/demo/od4h_samples/od4h_movieplex_demo/shell/createHiveTable.sh ratiwary_od4h_demos/1 2018/01/11 01:40:05 ratiwary Exp $
 #
 # createHiveTables.sh
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
 #
 #    NAME
 #      createHiveTables.sh

samples/od4h_samples/od4h_movieplex_demo/shell/createHiveTable.sh

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 #
-# $Header: hadoop/demo/osh/shell/createOracleTable.sh /main/1 2015/03/20 13:52:02 ratiwary Exp $
+# $Header: hadoop/demo/od4h_samples/od4h_movieplex_demo/shell/createOracleTable.sh ratiwary_od4h_demos/2 2018/01/19 05:07:14 ratiwary Exp $
 #
 # createOracleTable.sh
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
 #
 #    NAME
 #      createOracleTable.sh
@@ -30,5 +30,6 @@ SHELL_DIR=`dirname "$0"`
 DEMO_DIR=`cd "../"; pwd`
 cd ${DEMO_DIR}/sql
 
+export TWO_TASK=orcl
 echo "Enter password for the User"
 sqlplus -S $username/ @CreateMovieData.sql;

samples/od4h_samples/od4h_movieplex_demo/shell/createOracleTable.sh

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 #
-# $Header: hadoop/demo/osh/shell/joinQuery.sh ratiwary_osh_newsplitters_outputformat/2 2016/03/05 06:41:50 ratiwary Exp $
+# $Header: hadoop/demo/od4h_samples/od4h_movieplex_demo/shell/insertQuery.sh ratiwary_od4h_demos/1 2018/01/11 01:40:05 ratiwary Exp $
 #
 # joinQueryHive.sh
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
 #
 #    NAME
 #      joinQueryHive.sh

samples/od4h_samples/od4h_movieplex_demo/shell/insertQuery.sh

@@ -1,9 +1,9 @@
 Rem
-Rem $Header: hadoop/demo/osh/sql/CreateMovieData.sql ratiwary_osh_newsplitters_outputformat/1 2016/01/19 05:23:49 ratiwary Exp $
+Rem $Header: hadoop/demo/od4h_samples/od4h_movieplex_demo/sql/CreateMovieData.sql ratiwary_od4h_demos/1 2018/01/11 01:40:05 ratiwary Exp $
 Rem
 Rem CreateMovieData.sql
 Rem
-Rem Copyright (c) 2015, 2016, Oracle and/or its affiliates. 
+Rem Copyright (c) 2015, 2018, Oracle and/or its affiliates. 
 Rem All rights reserved.
 Rem
 Rem    NAME

samples/od4h_samples/od4h_movieplex_demo/sql/CreateMovieData.sql

@@ -1,9 +1,9 @@
 --
--- $Header: hadoop/demo/osh/sql/CreateMovieDataHive.hql ratiwary_osh_newsplitters_outputformat/2 2016/01/19 05:57:36 ratiwary Exp $
+-- $Header: hadoop/demo/od4h_samples/od4h_movieplex_demo/sql/CreateMovieDataHive.hql ratiwary_od4h_demos/1 2018/01/11 01:40:05 ratiwary Exp $
 --
 -- CreateMovieDataHive.hql
 --
--- Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
 --
 --    NAME
 --      CreateMovieDataHive.hql

samples/od4h_samples/od4h_movieplex_demo/sql/CreateMovieDataHive.hql

@@ -1,9 +1,9 @@
 --
--- $Header: hadoop/demo/osh/sql/hive_init.hql ratiwary_osh_newsplitters_outputformat/1 2016/02/08 05:53:41 ratiwary Exp $
+-- $Header: hadoop/demo/od4h_samples/od4h_movieplex_demo/sql/hive_init.hql ratiwary_od4h_demos/2 2018/01/11 01:45:07 ratiwary Exp $
 --
 -- hive_init.hql
 --
--- Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
 --
 --    NAME
 --      hive_init.hql
@@ -17,5 +17,5 @@
 --
 
 add jar /opt/oracle/od4h/jlib/osh.jar;
-add jar /opt/oracle/od4h/jlib/ojdbc7.jar;
+add jar /opt/oracle/od4h/jlib/ojdbc8.jar;
 add jar /opt/oracle/od4h/jlib/ucp.jar;