Github user kavinderd commented on a diff in the pull request:
https://github.com/apache/incubator-hawq/pull/1076#discussion_r98277093
--- Diff:
pxf/pxf-hive/src/main/java/org/apache/hawq/pxf/plugins/hive/utilities/HiveUtilities.java
---
@@ -432,32 +447,144 @@ public static String
serializePartitionKeys(HiveTablePartition partData) throws
@SuppressWarnings("unchecked")
public static byte[] makeUserData(String fragmenterClassName,
HiveTablePartition partData, boolean filterInFragmenter) throws Exception {
- String userData = null;
+ HiveUserData hiveUserData = null;
if (fragmenterClassName == null) {
throw new IllegalArgumentException("No fragmenter provided.");
}
Class fragmenterClass = Class.forName(fragmenterClassName);
+ String inputFormatName = partData.storageDesc.getInputFormat();
+ String serdeClassName =
partData.storageDesc.getSerdeInfo().getSerializationLib();
+ String propertiesString = serializeProperties(partData.properties);
+ String partitionKeys = serializePartitionKeys(partData);
+ String delimiter =
getDelimiterCode(partData.storageDesc).toString();
+
if
(HiveInputFormatFragmenter.class.isAssignableFrom(fragmenterClass)) {
- String inputFormatName = partData.storageDesc.getInputFormat();
- String serdeName =
partData.storageDesc.getSerdeInfo().getSerializationLib();
- String partitionKeys = serializePartitionKeys(partData);
assertFileType(inputFormatName, partData);
- userData = assertSerde(serdeName, partData) +
HiveDataFragmenter.HIVE_UD_DELIM
- + partitionKeys + HiveDataFragmenter.HIVE_UD_DELIM +
filterInFragmenter;
- } else if
(HiveDataFragmenter.class.isAssignableFrom(fragmenterClass)){
- String inputFormatName = partData.storageDesc.getInputFormat();
- String serdeName =
partData.storageDesc.getSerdeInfo().getSerializationLib();
- String propertiesString =
serializeProperties(partData.properties);
- String partitionKeys = serializePartitionKeys(partData);
- userData = inputFormatName + HiveDataFragmenter.HIVE_UD_DELIM
+ serdeName
- + HiveDataFragmenter.HIVE_UD_DELIM + propertiesString
+ HiveDataFragmenter.HIVE_UD_DELIM
- + partitionKeys + HiveDataFragmenter.HIVE_UD_DELIM +
filterInFragmenter;
+ }
+
+ hiveUserData = new HiveUserData(inputFormatName, serdeClassName,
propertiesString, partitionKeys, filterInFragmenter, delimiter);
+
+ return hiveUserData.toString().getBytes();
+ }
+
+ public static HiveUserData parseHiveUserData(InputData input,
PXF_HIVE_SERDES... supportedSerdes) throws UserDataException{
+ String userData = new String(input.getFragmentUserData());
+ String[] toks = userData.split(HiveUserData.HIVE_UD_DELIM,
EXPECTED_NUM_OF_TOKS);
+
+ if (toks.length != (EXPECTED_NUM_OF_TOKS)) {
+ throw new UserDataException("HiveInputFormatFragmenter
expected "
+ + EXPECTED_NUM_OF_TOKS + " tokens, but got " +
toks.length);
+ }
+
+ HiveUserData hiveUserData = new HiveUserData(toks[0], toks[1],
toks[2], toks[3], Boolean.valueOf(toks[4]), toks[5]);
+
+ if (supportedSerdes.length > 0) {
--- End diff --
Indentation
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
