Update to c2hadoop

Author: martygubar

samples/c2hadoop/c2h.ohsh

@@ -1,16 +1,16 @@
-# copy the table movie_sessions_tab in Oracle Database schema MOVIEDEMO
-# to Hive schema MOVIEDEMO
-
-create hive table hive_moviedemo:movie_sessions_tab from oracle table moviedemo:movie_sessions_tab using stage;
-
-# Verify the results of the load by comparing with the number of rows
-# in the database table
-%sql select count(*) from movie_sessions_tab;
-%hive_moviedemo select count(*) from movie_sessions_tab;
-
-# Append additional rows to the table
-load hive table hive_moviedemo:movie_sessions_tab from oracle table moviedemo:movie_sessions_tab using stage where "(cust_id = 1446522)";
-
-# Verify the results again - you will have four more rows
-%hive_moviedemo select count(*) from movie_sessions_tab;
-
+# copy the table movie_sessions_tab in Oracle Database schema MOVIEDEMO
+# to Hive schema MOVIEDEMO
+
+create hive table hive_moviedemo:movie_sessions_tab from oracle table moviedemo:movie_sessions_tab;
+
+# Verify the results of the load by comparing with the number of rows
+# in the database table
+%sql select count(*) from movie_sessions_tab;
+%hive_moviedemo select count(*) from movie_sessions_tab;
+
+# Append additional rows to the table
+load hive table hive_moviedemo:movie_sessions_tab from oracle table moviedemo:movie_sessions_tab where "(cust_id = 1446522)";
+
+# Verify the results again - you will have four more rows
+%hive_moviedemo select count(*) from movie_sessions_tab;
+

samples/c2hadoop/setresources.ohsh renamed to samples/c2hadoop/c2h_setresources.ohsh

@@ -1,29 +1,27 @@
-# Create a hive resource for hive database MOVIEDEMO
-create hive resource hive_moviedemo database="MOVIEDEMO"
-
-# Create a SQL resource for Oracle Database user MOVIEDEMO
-create sqlplus resource sql user="MOVIEDEMO" \
-connectid="bigdatalite.localdomain:1521/orcl"
-
-# Create a JDBC resource to connect to Oracle Database
-create oracle jdbc resource moviedemo user="MOVIEDEMO" \
-connectid="bigdatalite.localdomain:1521/orcl"
-
-# Create directories for staging data pump files and log files
-# Ignore the error if the directory already exists
-%bash0 mkdir /home/oracle/src/samples/c2hadoop/dmpfiles
-%bash0 mkdir /home/oracle/src/samples/c2hadoop/logs
-
-# Create database directories for these directories
-
-# Temporary database directory for staging data pump files
-%sql create or replace directory C2H_DP_DIR as \
-'/home/oracle/src/samples/c2hadoop/dmpfiles';
-
-# Database directory for log files
-%sql create or replace directory C2H_DP_DIR as \
-'/home/oracle/src/samples/c2hadoop/dmpfiles';
-
-# set OHSH resources for database directories
-set locationdirectory C2H_DP_DIR
-set defaultdirectory C2H_LOG_DIR
+# Create a hive resource for hive database MOVIEDEMO
+create hive resource hive_moviedemo connectionurl="jdbc:hive2:///moviedemo";
+
+# Create a SQL resource for Oracle Database user MOVIEDEMO
+create sqlplus resource sql connectid="bigdatalite.localdomain:1521/orcl";
+
+# Create a JDBC resource to connect to Oracle Database
+create oracle jdbc resource moviedemo connectid="bigdatalite.localdomain:1521/orcl";
+
+# Create directories for staging data pump files and log files 
+# Ignore the error if the directory already exists
+%bash0 mkdir /home/oracle/src/samples/c2hadoop/dmpfiles
+%bash0 mkdir /home/oracle/src/samples/c2hadoop/logs
+
+# Create database directories for these directories
+
+# Temporary database directory for staging data pump files
+%sql create or replace directory C2H_DP_DIR as \
+'/home/oracle/src/samples/c2hadoop/dmpfiles';
+
+# Database directory for log files
+%sql create or replace directory C2H_LOG_DIR as \
+'/home/oracle/src/samples/c2hadoop/logs';
+
+# set OHSH resources for database directories
+set locationdirectory C2H_DP_DIR
+set defaultdirectory C2H_LOG_DIR