Author: kamrul
Date: Fri Nov 30 01:52:37 2012
New Revision: 1415476
URL: http://svn.apache.org/viewvc?rev=1415476&view=rev
Log:
OOZIE-1105 Resolve issues found during integration
Modified:
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionInputCheckXCommand.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionUpdatePushMissingDependency.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/hcat/MetaDataClientWrapper.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/jms/HCatMessageHandler.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/jms/MessageReceiver.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/service/MetaDataAccessorService.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/service/PartitionDependencyManagerService.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/util/HCatURI.java
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/util/PartitionWrapper.java
oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/service/TestPartitionDependencyManagerService.java
oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/util/TestHCatURI.java
oozie/branches/hcat-intre/release-log.txt
Modified:
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionInputCheckXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionInputCheckXCommand.java?rev=1415476&r1=1415475&r2=1415476&view=diff
==============================================================================
---
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionInputCheckXCommand.java
(original)
+++
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionInputCheckXCommand.java
Fri Nov 30 01:52:37 2012
@@ -135,7 +135,8 @@ public class CoordActionInputCheckXComma
nonExistList.append(CoordCommandUtils.RESOLVED_UNRESOLVED_SEPARATOR).append(nonResolvedList);
}
coordAction.setMissingDependencies(nonExistList.toString());
- if (status == true) {
+ String pushDeps = coordAction.getPushMissingDependencies();
+ if (status == true && (pushDeps == null || pushDeps.length() ==
0)) {
coordAction.setStatus(CoordinatorAction.Status.READY);
// pass jobID to the CoordActionReadyXCommand
queue(new CoordActionReadyXCommand(coordAction.getJobId()),
100);
Modified:
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionUpdatePushMissingDependency.java
URL:
http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionUpdatePushMissingDependency.java?rev=1415476&r1=1415475&r2=1415476&view=diff
==============================================================================
---
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionUpdatePushMissingDependency.java
(original)
+++
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordActionUpdatePushMissingDependency.java
Fri Nov 30 01:52:37 2012
@@ -2,13 +2,9 @@ package org.apache.oozie.command.coord;
import java.net.URISyntaxException;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Date;
-import java.util.LinkedList;
import java.util.List;
-import java.util.ListIterator;
-import org.apache.hadoop.util.StringUtils;
import org.apache.oozie.CoordinatorActionBean;
import org.apache.oozie.ErrorCode;
import org.apache.oozie.XException;
@@ -16,14 +12,12 @@ import org.apache.oozie.client.Coordinat
import org.apache.oozie.command.CommandException;
import org.apache.oozie.command.PreconditionException;
import org.apache.oozie.coord.CoordELFunctions;
-import org.apache.oozie.executor.jpa.CoordActionGetForCheckJPAExecutor;
import org.apache.oozie.executor.jpa.CoordActionGetForInputCheckJPAExecutor;
import
org.apache.oozie.executor.jpa.CoordActionUpdatePushInputCheckJPAExecutor;
import org.apache.oozie.executor.jpa.JPAExecutorException;
import org.apache.oozie.service.JPAService;
import org.apache.oozie.service.PartitionDependencyManagerService;
import org.apache.oozie.service.Services;
-import org.apache.oozie.util.HCatURI;
import org.apache.oozie.util.LogUtils;
import org.apache.oozie.util.PartitionWrapper;
@@ -40,7 +34,8 @@ public class CoordActionUpdatePushMissin
@Override
protected Void execute() throws CommandException {
- // TODO: Get the list of action from Available map
+ LOG.info("STARTED for Action id [{0}]", actionId);
+ // TODO: Get the list of action from Available map
PartitionDependencyManagerService pdms =
Services.get().get(PartitionDependencyManagerService.class);
if (pdms == null) {
throw new CommandException(ErrorCode.E1024,
"PartitionDependencyManagerService");
@@ -85,6 +80,7 @@ public class CoordActionUpdatePushMissin
}
}
}
+ LOG.info("ENDED for Action id [{0}]", actionId);
return null;
}
Modified:
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java?rev=1415476&r1=1415475&r2=1415476&view=diff
==============================================================================
---
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java
(original)
+++
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java
Fri Nov 30 01:52:37 2012
@@ -330,6 +330,7 @@ public class CoordMaterializeTransitionX
if (!dryrun) {
storeToDB(actionBean, action); // Storing to table
CoordCommandUtils.registerPartition(actionBean); // Register
partition to PDMS
+ queue(new
CoordPushDependencyCheckXCommand(actionBean.getId()));
}
else {
actionStrings.append("action for new instance");
Modified:
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java
URL:
http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java?rev=1415476&r1=1415475&r2=1415476&view=diff
==============================================================================
---
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java
(original)
+++
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java
Fri Nov 30 01:52:37 2012
@@ -392,7 +392,7 @@ public class CoordELFunctions {
public static String ph3_coord_metaServer(String dataInName) {
HCatURI hcatURI = getURI(dataInName);
if (hcatURI != null) {
- return hcatURI.getServer();
+ return hcatURI.getServerEndPoint();
}
else {
return "";
Modified:
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/hcat/MetaDataClientWrapper.java
URL:
http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/hcat/MetaDataClientWrapper.java?rev=1415476&r1=1415475&r2=1415476&view=diff
==============================================================================
---
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/hcat/MetaDataClientWrapper.java
(original)
+++
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/hcat/MetaDataClientWrapper.java
Fri Nov 30 01:52:37 2012
@@ -61,6 +61,7 @@ public class MetaDataClientWrapper {
HCatClient client = mdac.getHCatClient(server, user);
HCatPartition hPartition;
try {
+ LOG.debug("Calling for db [{0}] table [{1}] partition [{2}]", db,
table, partition);
hPartition = client.getPartition(db, table, partition);
}
catch (Exception e) {
@@ -85,7 +86,7 @@ public class MetaDataClientWrapper {
catch (URISyntaxException e) {
throw new MetaDataAccessorException(ErrorCode.E1504, e);
}
- return getOnePartition(uri.getServer(), uri.getDb(), uri.getTable(),
uri.getPartitionMap(), user);
+ return getOnePartition(uri.getServerEndPoint(), uri.getDb(),
uri.getTable(), uri.getPartitionMap(), user);
}
/**
@@ -130,7 +131,7 @@ public class MetaDataClientWrapper {
catch (URISyntaxException e) {
throw new MetaDataAccessorException(ErrorCode.E1504, e);
}
- return getPartitionsByFilter(uri.getServer(), uri.getDb(),
uri.getTable(), filter, user);
+ return getPartitionsByFilter(uri.getServerEndPoint(), uri.getDb(),
uri.getTable(), filter, user);
}
/**
@@ -173,7 +174,7 @@ public class MetaDataClientWrapper {
catch (Exception e) {
throw new MetaDataAccessorException(ErrorCode.E1504, e);
}
- dropOnePartition(uri.getServer(), uri.getDb(), uri.getTable(),
uri.getPartitionMap(), ifExists, user);
+ dropOnePartition(uri.getServerEndPoint(), uri.getDb(), uri.getTable(),
uri.getPartitionMap(), ifExists, user);
return;
}
Modified:
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/jms/HCatMessageHandler.java
URL:
http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/jms/HCatMessageHandler.java?rev=1415476&r1=1415475&r2=1415476&view=diff
==============================================================================
---
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/jms/HCatMessageHandler.java
(original)
+++
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/jms/HCatMessageHandler.java
Fri Nov 30 01:52:37 2012
@@ -37,7 +37,7 @@ public class HCatMessageHandler implemen
private PartitionWrapper msgPartition;
private static XLog log;
- HCatMessageHandler() {
+ public HCatMessageHandler() {
log = XLog.getLog(getClass());
}
@@ -49,6 +49,7 @@ public class HCatMessageHandler implemen
*/
@Override
public void process(Message msg) throws MetadataServiceException {
+ log.debug("About to process the JMS message ");
try {
HCatEventMessage hcatMsg = MessagingUtils.getMessage(msg);
if
(hcatMsg.getEventType().equals(HCatEventMessage.EventType.ADD_PARTITION)) {
@@ -57,6 +58,7 @@ public class HCatMessageHandler implemen
String server = partMsg.getServer();
String db = partMsg.getDB();
String table = partMsg.getTable();
+ log.info("ADD event type db [{0}] table [{1}] partitions
[{3}]", db, table, partMsg.getPartitions());
PartitionDependencyManagerService pdms =
Services.get().get(PartitionDependencyManagerService.class);
if (pdms != null) {
// message is batched. therefore iterate through partitions
@@ -84,6 +86,9 @@ public class HCatMessageHandler implemen
else if
(hcatMsg.getEventType().equals(HCatEventMessage.EventType.DROP_TABLE)) {
log.info("Message is of type [{0}]",
HCatEventMessage.EventType.DROP_TABLE.toString());
}
+ else {
+ log.info("Unknown event type [{0}] ", hcatMsg.getEventType());
+ }
}
catch (IllegalArgumentException iae) {
throw new MetadataServiceException(ErrorCode.E1505, iae);
Modified:
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/jms/MessageReceiver.java
URL:
http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/jms/MessageReceiver.java?rev=1415476&r1=1415475&r2=1415476&view=diff
==============================================================================
---
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/jms/MessageReceiver.java
(original)
+++
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/jms/MessageReceiver.java
Fri Nov 30 01:52:37 2012
@@ -93,6 +93,7 @@ public class MessageReceiver implements
*/
@Override
public synchronized void onMessage(Message msg) {
+ LOG.trace("Received a JMS message ");
if (msgHandler != null) {
try {
msgHandler.process(msg);
Modified:
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/service/MetaDataAccessorService.java
URL:
http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/service/MetaDataAccessorService.java?rev=1415476&r1=1415475&r2=1415476&view=diff
==============================================================================
---
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/service/MetaDataAccessorService.java
(original)
+++
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/service/MetaDataAccessorService.java
Fri Nov 30 01:52:37 2012
@@ -57,7 +57,7 @@ public class MetaDataAccessorService imp
HCatClient client = null;
try {
UserGroupInformation ugi =
UserGroupInformation.createProxyUser(user, UserGroupInformation.getLoginUser());
- log.info("Create HCatClient for user [{0}] login_user [{1}] and
server [{1}] ", user,
+ log.info("Create HCatClient for user [{0}] login_user [{1}] and
server [{2}] ", user,
UserGroupInformation.getLoginUser(), server);
client = ugi.doAs(new PrivilegedExceptionAction<HCatClient>() {
public HCatClient run() throws Exception {
Modified:
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/service/PartitionDependencyManagerService.java
URL:
http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/service/PartitionDependencyManagerService.java?rev=1415476&r1=1415475&r2=1415476&view=diff
==============================================================================
---
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/service/PartitionDependencyManagerService.java
(original)
+++
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/service/PartitionDependencyManagerService.java
Fri Nov 30 01:52:37 2012
@@ -24,10 +24,15 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
+
import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
import org.apache.hadoop.conf.Configuration;
import org.apache.oozie.ErrorCode;
+import org.apache.oozie.command.CommandException;
+import org.apache.oozie.command.coord.CoordActionUpdatePushMissingDependency;
+import org.apache.oozie.jms.HCatMessageHandler;
+import org.apache.oozie.jms.MessageReceiver;
import org.apache.oozie.service.Service;
import org.apache.oozie.service.ServiceException;
import org.apache.oozie.service.Services;
@@ -75,6 +80,7 @@ public class PartitionDependencyManagerS
availMap = new ConcurrentHashMap<String, List<PartitionWrapper>>();
maxCapacity = conf.getInt(MAP_MAX_WEIGHTED_CAPACITY,
DEFAULT_MAP_MAX_WEIGHTED_CAPACITY);
log = XLog.getLog(getClass());
+ log.debug("PartitionDependencyManagerService initialized");
}
@Override
@@ -142,7 +148,7 @@ public class PartitionDependencyManagerS
catch (URISyntaxException e) {
throw new MetadataServiceException(ErrorCode.E1503,
e.getMessage());
}
- PartitionWrapper partition = new PartitionWrapper(uri.getServer(),
uri.getDb(), uri.getTable(),
+ PartitionWrapper partition = new
PartitionWrapper(uri.getServerEndPoint(), uri.getDb(), uri.getTable(),
uri.getPartitionMap());
List<String> actions = _getActionsForPartition(partition);
if (actions != null && actions.size() != 0) {
@@ -179,6 +185,7 @@ public class PartitionDependencyManagerS
else { // new partition from different hcat server/db
_addNewEntry(hcatInstanceMap, prefix, tableName, partition,
actionId);
}
+ _registerMessageReceiver(_getTopic(partition));
}
catch (ClassCastException e) {
throw new MetadataServiceException(ErrorCode.E1501, e.getCause());
@@ -189,6 +196,22 @@ public class PartitionDependencyManagerS
catch (IllegalArgumentException e) {
throw new MetadataServiceException(ErrorCode.E1501, e.getCause());
}
+ catch (Exception e) {
+ throw new MetadataServiceException(ErrorCode.E1501, e.getCause());
+ }
+ }
+
+ private void _registerMessageReceiver(String topic) throws Exception {
+ MessageReceiver recvr = new MessageReceiver(new HCatMessageHandler());
+ log.debug("Registering topic :" + topic);
+ recvr.registerTopic(topic);
+ }
+
+ private String _getTopic(PartitionWrapper partition) {
+ // TODO: Get it from HCAT directly. HCat doesn't support it yet
+ StringBuilder topic = new StringBuilder();
+
topic.append("hcat.").append(partition.getDbName()).append(".").append(partition.getTableName());
+ return topic.toString();
}
/**
@@ -206,7 +229,7 @@ public class PartitionDependencyManagerS
catch (URISyntaxException e) {
throw new MetadataServiceException(ErrorCode.E1503,
e.getMessage());
}
- PartitionWrapper partition = new PartitionWrapper(uri.getServer(),
uri.getDb(), uri.getTable(),
+ PartitionWrapper partition = new
PartitionWrapper(uri.getServerEndPoint(), uri.getDb(), uri.getTable(),
uri.getPartitionMap());
addMissingPartition(partition, actionId);
}
@@ -228,6 +251,7 @@ public class PartitionDependencyManagerS
* @return true if partition was successfully removed false otherwise
*/
public boolean removePartition(PartitionWrapper partition, boolean
cascade) {
+ log.debug("Removing partition " + partition + " with cascade :" +
cascade);
String prefix = PartitionWrapper.makePrefix(partition.getServerName(),
partition.getDbName());
if (hcatInstanceMap.containsKey(prefix)) {
Map<String, PartitionsGroup> tableMap =
hcatInstanceMap.get(prefix);
@@ -278,7 +302,7 @@ public class PartitionDependencyManagerS
catch (URISyntaxException e) {
throw new MetadataServiceException(ErrorCode.E1503,
e.getMessage());
}
- PartitionWrapper partition = new PartitionWrapper(uri.getServer(),
uri.getDb(), uri.getTable(),
+ PartitionWrapper partition = new
PartitionWrapper(uri.getServerEndPoint(), uri.getDb(), uri.getTable(),
uri.getPartitionMap());
return removePartition(partition, cascade);
}
@@ -299,7 +323,7 @@ public class PartitionDependencyManagerS
catch (URISyntaxException e) {
throw new MetadataServiceException(ErrorCode.E1503,
e.getMessage());
}
- PartitionWrapper partition = new PartitionWrapper(uri.getServer(),
uri.getDb(), uri.getTable(),
+ PartitionWrapper partition = new
PartitionWrapper(uri.getServerEndPoint(), uri.getDb(), uri.getTable(),
uri.getPartitionMap());
return removePartition(partition, true);
}
@@ -313,9 +337,10 @@ public class PartitionDependencyManagerS
* otherwise
*/
public boolean partitionAvailable(PartitionWrapper partition) {
-
+ log.debug("Making partition [{0}] available ", partition);
List<String> actionsList = _getActionsForPartition(partition);
if (actionsList != null) {
+ log.debug("List of actions to be updated: " + actionsList);
Iterator<String> it = actionsList.iterator();
while (it.hasNext()) { // add actions into separate entries
String actionId = it.next();
@@ -326,6 +351,13 @@ public class PartitionDependencyManagerS
else { // new entry
availMap.put(actionId, new
CopyOnWriteArrayList<PartitionWrapper>(Arrays.asList((partition))));
}
+ // TODO : queue() implement like in Recover Service
+ try {
+ new
CoordActionUpdatePushMissingDependency(actionId).call();
+ }
+ catch (CommandException e) {
+ log.error(e.getMessage(), e);
+ }
}
removePartition(partition, true);
return true;
@@ -354,7 +386,7 @@ public class PartitionDependencyManagerS
catch (URISyntaxException e) {
throw new MetadataServiceException(ErrorCode.E1503,
e.getMessage());
}
- PartitionWrapper partition = new PartitionWrapper(uri.getServer(),
uri.getDb(), uri.getTable(),
+ PartitionWrapper partition = new
PartitionWrapper(uri.getServerEndPoint(), uri.getDb(), uri.getTable(),
uri.getPartitionMap());
return partitionAvailable(partition);
}
@@ -430,6 +462,7 @@ public class PartitionDependencyManagerS
private void _addNewEntry(Map<String, Map<String, PartitionsGroup>>
instanceMap, String prefix, String tableName,
PartitionWrapper partition, String actionId) {
+ log.debug("Adding a New Entry for [{0}] with partition [{1}] Action
Id [{2}]", prefix, partition, actionId);
Map<String, PartitionsGroup> tableMap = new ConcurrentHashMap<String,
PartitionsGroup>();
instanceMap.put(prefix, tableMap);
_createPartitionMapForTable(tableMap, tableName, partition, actionId);
Modified:
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/util/HCatURI.java
URL:
http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/util/HCatURI.java?rev=1415476&r1=1415475&r2=1415476&view=diff
==============================================================================
---
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/util/HCatURI.java
(original)
+++
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/util/HCatURI.java
Fri Nov 30 01:52:37 2012
@@ -40,6 +40,8 @@ public class HCatURI {
public static final String PATH_SEPARATOR = "/";
public static final String PARTITION_PREFIX = "?";
public static final String PARTITION_VALUE_QUOTE = "'";
+ // TODO: Over writable through oozie-site
+ public static final String DEFAULT_PROTOCOL = "thrift://";
private URI uri;
private String server;
@@ -49,6 +51,7 @@ public class HCatURI {
/**
* Constructor using given configuration
+ *
* @param s HCat URI String
* @param conf Configuration
* @throws URISyntaxException
@@ -59,6 +62,7 @@ public class HCatURI {
/**
* Constructor using default configuration
+ *
* @param s HCat URI String
* @throws URISyntaxException
*/
@@ -126,7 +130,14 @@ public class HCatURI {
}
/**
- * @return server name
+ * @return fully qualified server address
+ */
+ public String getServerEndPoint() {
+ return DEFAULT_PROTOCOL + server;
+ }
+
+ /**
+ * @return server host:port
*/
public String getServer() {
return server;
@@ -260,6 +271,7 @@ public class HCatURI {
HCatURI uri = (HCatURI) obj;
boolean equals = true;
HashMap<String, String> p = this.getPartitionMap();
+
if (this.server.equals(uri.getServer()) && this.db.equals(uri.getDb())
&& this.table.equals(uri.getTable())
&& p.size() == uri.getPartitionMap().size()) {
Iterator<Map.Entry<String, String>> it1 =
uri.getPartitionMap().entrySet().iterator();
Modified:
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/util/PartitionWrapper.java
URL:
http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/util/PartitionWrapper.java?rev=1415476&r1=1415475&r2=1415476&view=diff
==============================================================================
---
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/util/PartitionWrapper.java
(original)
+++
oozie/branches/hcat-intre/core/src/main/java/org/apache/oozie/util/PartitionWrapper.java
Fri Nov 30 01:52:37 2012
@@ -45,7 +45,7 @@ public class PartitionWrapper {
}
public PartitionWrapper(HCatURI hcatUri) {
- this(hcatUri.getServer(), hcatUri.getDb(), hcatUri.getTable(),
hcatUri.getPartitionMap());
+ this(hcatUri.getServerEndPoint(), hcatUri.getDb(), hcatUri.getTable(),
hcatUri.getPartitionMap());
}
public PartitionWrapper(String partURI) throws URISyntaxException {
Modified:
oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/service/TestPartitionDependencyManagerService.java
URL:
http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/service/TestPartitionDependencyManagerService.java?rev=1415476&r1=1415475&r2=1415476&view=diff
==============================================================================
---
oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/service/TestPartitionDependencyManagerService.java
(original)
+++
oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/service/TestPartitionDependencyManagerService.java
Fri Nov 30 01:52:37 2012
@@ -83,7 +83,7 @@ public class TestPartitionDependencyMana
pdms.addMissingPartition(newHCatDependency, actionId);
HCatURI hcatUri = new HCatURI(newHCatDependency);
- Map<String, PartitionsGroup> tablePartitionsMap =
pdms.getHCatMap().get(hcatUri.getServer() + "#" +
+ Map<String, PartitionsGroup> tablePartitionsMap =
pdms.getHCatMap().get(hcatUri.getServerEndPoint() + "#" +
hcatUri.getDb()); // clicks
assertNotNull(tablePartitionsMap);
assertTrue(tablePartitionsMap.containsKey("clicks"));
@@ -112,7 +112,7 @@ public class TestPartitionDependencyMana
pdms.addMissingPartition(newHCatDependency, actionId);
HCatURI hcatUri = new HCatURI(newHCatDependency);
- Map<String, PartitionsGroup> tablePartitionsMap =
pdms.getHCatMap().get(hcatUri.getServer() + "#" +
+ Map<String, PartitionsGroup> tablePartitionsMap =
pdms.getHCatMap().get(hcatUri.getServerEndPoint() + "#" +
hcatUri.getDb()); // clicks
assertNotNull(tablePartitionsMap);
assertTrue(tablePartitionsMap.containsKey("clicks"));
@@ -146,7 +146,7 @@ public class TestPartitionDependencyMana
pdms.addMissingPartition(newHCatDependency, actionId);
HCatURI hcatUri = new HCatURI(newHCatDependency);
- Map<String, PartitionsGroup> tablePartitionsMap =
pdms.getHCatMap().get(hcatUri.getServer() + "#" +
+ Map<String, PartitionsGroup> tablePartitionsMap =
pdms.getHCatMap().get(hcatUri.getServerEndPoint() + "#" +
hcatUri.getDb()); // clicks
assertNotNull(tablePartitionsMap);
assertTrue(tablePartitionsMap.containsKey("clicks"));
@@ -182,7 +182,7 @@ public class TestPartitionDependencyMana
pdms.removeActionFromMissingPartitions(newHCatDependency2, actionId2);
HCatURI hcatUri = new HCatURI(newHCatDependency1);
- String prefix = PartitionWrapper.makePrefix(hcatUri.getServer(),
hcatUri.getDb());
+ String prefix =
PartitionWrapper.makePrefix(hcatUri.getServerEndPoint(), hcatUri.getDb());
Map<String, PartitionsGroup> tablePartitionsMap =
pdms.getHCatMap().get(prefix);
PartitionsGroup missingPartitions =
tablePartitionsMap.get(hcatUri.getTable());
assertNotNull(missingPartitions);
Modified:
oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/util/TestHCatURI.java
URL:
http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/util/TestHCatURI.java?rev=1415476&r1=1415475&r2=1415476&view=diff
==============================================================================
---
oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/util/TestHCatURI.java
(original)
+++
oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/util/TestHCatURI.java
Fri Nov 30 01:52:37 2012
@@ -38,7 +38,7 @@ public class TestHCatURI {
catch (Exception ex) {
System.err.print(ex.getMessage());
}
- assertEquals(uri.getServer(), "hcat.yahoo.com:5080");
+ assertEquals(uri.getServerEndPoint(), HCatURI.DEFAULT_PROTOCOL +
"hcat.yahoo.com:5080");
assertEquals(uri.getDb(), "mydb");
assertEquals(uri.getTable(), "clicks");
assertEquals(uri.getPartitionValue("datastamp"), "12");
@@ -62,7 +62,7 @@ public class TestHCatURI {
catch (Exception ex) {
System.err.println(ex.getMessage());
}
- assertEquals(uri.getServer(), "hcat.yahoo.com:5080");
+ assertEquals(uri.getServerEndPoint(), HCatURI.DEFAULT_PROTOCOL +
"hcat.yahoo.com:5080");
assertEquals(uri.getDb(), "mydb");
assertEquals(uri.getTable(), "clicks");
assertEquals(uri.getPartitionValue("datastamp"), "12");
@@ -85,7 +85,7 @@ public class TestHCatURI {
catch (Exception ex) {
System.err.println(ex.getMessage());
}
- assertEquals(uri.getServer(), "hcat.yahoo.com:5080");
+ assertEquals(uri.getServerEndPoint(), HCatURI.DEFAULT_PROTOCOL +
"hcat.yahoo.com:5080");
assertEquals(uri.getDb(), "mydb");
assertEquals(uri.getTable(), "clicks");
assertEquals(uri.getPartitionValue("datastamp"), "12");
@@ -108,7 +108,7 @@ public class TestHCatURI {
catch (Exception ex) {
System.err.println(ex.getMessage());
}
- assertEquals(uri.getServer(), "hcat.yahoo.com:5080");
+ assertEquals(uri.getServerEndPoint(), HCatURI.DEFAULT_PROTOCOL +
"hcat.yahoo.com:5080");
assertEquals(uri.getDb(), "mydb");
assertEquals(uri.getTable(), "clicks");
assertEquals(uri.getPartitionValue("datastamp"), "12");
@@ -131,7 +131,7 @@ public class TestHCatURI {
catch (Exception ex) {
System.err.println(ex.getMessage());
}
- assertEquals(uri.getServer(), "hcat.yahoo.com:5080");
+ assertEquals(uri.getServerEndPoint(), HCatURI.DEFAULT_PROTOCOL +
"hcat.yahoo.com:5080");
assertEquals(uri.getDb(), "mydb");
assertEquals(uri.getTable(), "clicks");
assertEquals(uri.getPartitionValue("datastamp"), "12");
Modified: oozie/branches/hcat-intre/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/branches/hcat-intre/release-log.txt?rev=1415476&r1=1415475&r2=1415476&view=diff
==============================================================================
--- oozie/branches/hcat-intre/release-log.txt (original)
+++ oozie/branches/hcat-intre/release-log.txt Fri Nov 30 01:52:37 2012
@@ -1,5 +1,6 @@
-- Oozie 3.4.0 release (trunk - unreleased)
+OOZIE-1105 Resolve issues found during integration(mohammad)
OOZIE-1096 Update wfgen README.txt to have the TLP mailing list (jun aoki via
rkanter)
OOZIE-1015 HadoopAccessorService jobtracker validation should not have
hardcoded conf key (mona)
OOZIE-1078 Help -> Documentation and Help -> Online Help should link to
oozie.apache.org/ (jun via mohammad)
