Joal has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/373341 )
Change subject: Correct host normalization udf
......................................................................
Correct host normalization udf
Version patched today adds a new field in a struct in the middle
of the struct and breaks some data reading. It seems that adding
the field a the end of the struct solves the issue.
Change-Id: Ic8c23c273645f1635760f59164f033d4ae01da09
---
M
refinery-hive/src/main/java/org/wikimedia/analytics/refinery/hive/GetHostPropertiesUDF.java
1 file changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery/source
refs/changes/41/373341/1
diff --git
a/refinery-hive/src/main/java/org/wikimedia/analytics/refinery/hive/GetHostPropertiesUDF.java
b/refinery-hive/src/main/java/org/wikimedia/analytics/refinery/hive/GetHostPropertiesUDF.java
index d52fdc3..e493d2e 100644
---
a/refinery-hive/src/main/java/org/wikimedia/analytics/refinery/hive/GetHostPropertiesUDF.java
+++
b/refinery-hive/src/main/java/org/wikimedia/analytics/refinery/hive/GetHostPropertiesUDF.java
@@ -113,10 +113,6 @@
fieldOIs.add(PrimitiveObjectInspectorFactory.javaStringObjectInspector);
IDX_PROJECT_CLASS=idx++;
- fieldNames.add("project_family");
-
fieldOIs.add(PrimitiveObjectInspectorFactory.javaStringObjectInspector);
- IDX_PROJECT_FAMILY=idx++;
-
fieldNames.add("project");
fieldOIs.add(PrimitiveObjectInspectorFactory.javaStringObjectInspector);
IDX_PROJECT=idx++;
@@ -129,6 +125,10 @@
fieldNames.add("tld");
fieldOIs.add(PrimitiveObjectInspectorFactory.javaStringObjectInspector);
IDX_TLD=idx++;
+
+ fieldNames.add("project_family");
+
fieldOIs.add(PrimitiveObjectInspectorFactory.javaStringObjectInspector);
+ IDX_PROJECT_FAMILY=idx++;
result = new Object[idx];
@@ -174,16 +174,16 @@
if (normHost == null) {
result[IDX_PROJECT_CLASS] =
NormalizedHostInfo.EMPTY_NORM_HOST_VALUE;
- result[IDX_PROJECT_FAMILY] =
NormalizedHostInfo.EMPTY_NORM_HOST_VALUE;
result[IDX_PROJECT] = NormalizedHostInfo.EMPTY_NORM_HOST_VALUE;
result[IDX_QUALIFIERS] = new ArrayList<String>();
result[IDX_TLD] = NormalizedHostInfo.EMPTY_NORM_HOST_VALUE;
+ result[IDX_PROJECT_FAMILY] =
NormalizedHostInfo.EMPTY_NORM_HOST_VALUE;
} else {
result[IDX_PROJECT_CLASS] = normHost.getProjectFamily();
- result[IDX_PROJECT_FAMILY] = normHost.getProjectFamily();
result[IDX_PROJECT] = normHost.getProject();
result[IDX_QUALIFIERS] = normHost.getQualifiers();
result[IDX_TLD] = normHost.getTld();
+ result[IDX_PROJECT_FAMILY] = normHost.getProjectFamily();
}
return result;
--
To view, visit https://gerrit.wikimedia.org/r/373341
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8c23c273645f1635760f59164f033d4ae01da09
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery/source
Gerrit-Branch: master
Gerrit-Owner: Joal <j...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
