incubator-hcatalog-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tof...@apache.org
Subject svn commit: r1294329 - in /incubator/hcatalog/trunk: ./ src/java/org/apache/hcatalog/security/ src/java/org/apache/hcatalog/storagehandler/
Date Mon, 27 Feb 2012 21:13:22 GMT
Author: toffer
Date: Mon Feb 27 21:13:22 2012
New Revision: 1294329

URL: http://svn.apache.org/viewvc?rev=1294329&view=rev
Log:
HCATALOG-265 remove deprecated HCatStorageHandler (toffer)

Removed:
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/storagehandler/HCatStorageHandler.java
Modified:
    incubator/hcatalog/trunk/CHANGES.txt
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/security/StorageDelegationAuthorizationProvider.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/storagehandler/HCatStorageHandlerImpl.java

Modified: incubator/hcatalog/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1294329&r1=1294328&r2=1294329&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Mon Feb 27 21:13:22 2012
@@ -21,6 +21,8 @@ Apache HCatalog Change Log
 Trunk (unreleased changes)
 
   INCOMPATIBLE CHANGES
+  HCAT-265 remove deprecated HCatStorageHandler (toffer)
+
   HCAT-239. Changes to HCatInputFormat to make it use SerDes instead of StorageDrivers (vikram.dixit
via gates)
 
   HCAT-245. StorageHandler authorization providers (enis via hashutosh) 

Modified: incubator/hcatalog/trunk/src/java/org/apache/hcatalog/security/StorageDelegationAuthorizationProvider.java
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/java/org/apache/hcatalog/security/StorageDelegationAuthorizationProvider.java?rev=1294329&r1=1294328&r2=1294329&view=diff
==============================================================================
--- incubator/hcatalog/trunk/src/java/org/apache/hcatalog/security/StorageDelegationAuthorizationProvider.java
(original)
+++ incubator/hcatalog/trunk/src/java/org/apache/hcatalog/security/StorageDelegationAuthorizationProvider.java
Mon Feb 27 21:13:22 2012
@@ -34,7 +34,7 @@ import org.apache.hadoop.hive.ql.securit
 import org.apache.hadoop.hive.ql.security.authorization.HiveAuthorizationProviderBase;
 import org.apache.hadoop.hive.ql.security.authorization.Privilege;
 import org.apache.hadoop.util.ReflectionUtils;
-import org.apache.hcatalog.storagehandler.HCatStorageHandler;
+import org.apache.hcatalog.mapreduce.HCatStorageHandler;
 
 /**
  * A HiveAuthorizationProvider which delegates the authorization requests to 

Modified: incubator/hcatalog/trunk/src/java/org/apache/hcatalog/storagehandler/HCatStorageHandlerImpl.java
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/java/org/apache/hcatalog/storagehandler/HCatStorageHandlerImpl.java?rev=1294329&r1=1294328&r2=1294329&view=diff
==============================================================================
--- incubator/hcatalog/trunk/src/java/org/apache/hcatalog/storagehandler/HCatStorageHandlerImpl.java
(original)
+++ incubator/hcatalog/trunk/src/java/org/apache/hcatalog/storagehandler/HCatStorageHandlerImpl.java
Mon Feb 27 21:13:22 2012
@@ -30,111 +30,94 @@ import org.apache.hcatalog.mapred.HCatMa
 import org.apache.hcatalog.mapred.HCatMapredOutputFormat;
 import org.apache.hcatalog.mapreduce.HCatInputStorageDriver;
 import org.apache.hcatalog.mapreduce.HCatOutputStorageDriver;
+import org.apache.hcatalog.mapreduce.HCatStorageHandler;
 import org.apache.hcatalog.mapreduce.OutputJobInfo;
-import org.apache.hcatalog.storagehandler.HCatStorageHandler.DummyInputFormat;
-import org.apache.hcatalog.storagehandler.HCatStorageHandler.DummyOutputFormat;
 
+/**
+ * This  is a broken class and should be removed as
+ * part of HCATALOG-237
+ */
+@Deprecated
 public class HCatStorageHandlerImpl extends HCatStorageHandler {
 
   Class isd;
   Class osd;
 
   Log LOG = LogFactory.getLog(HCatStorageHandlerImpl.class);
-  
-  @Override
+
   public Class<? extends HCatInputStorageDriver> getInputStorageDriver() {
     return isd;
   }
 
-  @Override
   public Class<? extends HCatOutputStorageDriver> getOutputStorageDriver() {
     return osd;
   }
 
-  @Override
+    @Override
+    public void configureInputJobProperties(TableDesc tableDesc, Map<String, String>
jobProperties) {
+    }
+
+    @Override
+    public void configureOutputJobProperties(TableDesc tableDesc, Map<String, String>
jobProperties) {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    @Override
   public HiveAuthorizationProvider getAuthorizationProvider()
       throws HiveException {
     return new DummyHCatAuthProvider();
   }
 
-  @Override
   public void commitCreateTable(Table table) throws MetaException {
   }
 
   @Override
-  public void commitDropTable(Table table, boolean deleteData)
-      throws MetaException {
-    // do nothing special
-  }
-
-  @Override
-  public void preCreateTable(Table table) throws MetaException {
-    // do nothing special
-  }
-
-  @Override
-  public void preDropTable(Table table) throws MetaException {
-    // do nothing special
-  }
-
-  @Override
-  public void rollbackCreateTable(Table table) throws MetaException {
-    // do nothing special
-  }
-
-  @Override
-  public void rollbackDropTable(Table table) throws MetaException {
-    // do nothing special
-  }
-
-  @Override
   public HiveMetaHook getMetaHook() {
-    return this;
+    return null;
   }
 
-  @Override
-  public void configureTableJobProperties(TableDesc tableDesc,
-      Map<String, String> jobProperties) {
-    // Information about the table and the job to be performed
-    // We pass them on into the mepredif / mapredof
-
-    Properties tprops = tableDesc.getProperties();
-
-    if(LOG.isDebugEnabled()){
-      LOG.debug("HCatStorageHandlerImpl configureTableJobProperties:");
-      HCatUtil.logStackTrace(LOG);
-      HCatUtil.logMap(LOG, "jobProperties", jobProperties);
-      if (tprops!= null){
-        HCatUtil.logEntrySet(LOG, "tableprops", tprops.entrySet());
-      }
-      LOG.debug("tablename : "+tableDesc.getTableName());
-    }
-    
-    // copy existing table props first
-    for (Entry e : tprops.entrySet()){
-      jobProperties.put((String)e.getKey(), (String)e.getValue());
-    }
-    
-    // try to set input format related properties
-    try {
-      HCatMapredInputFormat.setTableDesc(tableDesc,jobProperties);
-    } catch (IOException ioe){
-      // ok, things are probably not going to work, but we
-      // can't throw out exceptions per interface. So, we log.
-      LOG.error("HCatInputFormat init fail " + ioe.getMessage());
-      LOG.error(ioe.getStackTrace());
-    }
-
-    // try to set output format related properties
-    try {
-      HCatMapredOutputFormat.setTableDesc(tableDesc,jobProperties);
-    } catch (IOException ioe){
-      // ok, things are probably not going to work, but we
-      // can't throw out exceptions per interface. So, we log.
-      LOG.error("HCatOutputFormat init fail " + ioe.getMessage());
-      LOG.error(ioe.getStackTrace());
-    }
-  }
+//  public void configureTableJobProperties(TableDesc tableDesc,
+//      Map<String, String> jobProperties) {
+//    // Information about the table and the job to be performed
+//    // We pass them on into the mepredif / mapredof
+//
+//    Properties tprops = tableDesc.getProperties();
+//
+//    if(LOG.isDebugEnabled()){
+//      LOG.debug("HCatStorageHandlerImpl configureTableJobProperties:");
+//      HCatUtil.logStackTrace(LOG);
+//      HCatUtil.logMap(LOG, "jobProperties", jobProperties);
+//      if (tprops!= null){
+//        HCatUtil.logEntrySet(LOG, "tableprops", tprops.entrySet());
+//      }
+//      LOG.debug("tablename : "+tableDesc.getTableName());
+//    }
+//
+//    // copy existing table props first
+//    for (Entry e : tprops.entrySet()){
+//      jobProperties.put((String)e.getKey(), (String)e.getValue());
+//    }
+//
+//    // try to set input format related properties
+//    try {
+//      HCatMapredInputFormat.setTableDesc(tableDesc,jobProperties);
+//    } catch (IOException ioe){
+//      // ok, things are probably not going to work, but we
+//      // can't throw out exceptions per interface. So, we log.
+//      LOG.error("HCatInputFormat init fail " + ioe.getMessage());
+//      LOG.error(ioe.getStackTrace());
+//    }
+//
+//    // try to set output format related properties
+//    try {
+//      HCatMapredOutputFormat.setTableDesc(tableDesc,jobProperties);
+//    } catch (IOException ioe){
+//      // ok, things are probably not going to work, but we
+//      // can't throw out exceptions per interface. So, we log.
+//      LOG.error("HCatOutputFormat init fail " + ioe.getMessage());
+//      LOG.error(ioe.getStackTrace());
+//    }
+//  }
 
   @Override
   public Configuration getConf() {



Mime
View raw message