You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2015/05/06 04:02:05 UTC
cassandra git commit: fix merge issue with ColumnInfo name change
Repository: cassandra
Updated Branches:
refs/heads/trunk f698cc228 -> 8f4c43db0
fix merge issue with ColumnInfo name change
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8f4c43db
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8f4c43db
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8f4c43db
Branch: refs/heads/trunk
Commit: 8f4c43db021c75a8d790f0fa2f93282952fffb71
Parents: f698cc2
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Tue May 5 22:01:15 2015 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue May 5 22:01:15 2015 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f4c43db/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java b/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
index 91cdd02..0b833b7 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
@@ -499,8 +499,8 @@ public class CqlNativeStorage extends LoadFunc implements StoreFuncInterface, Lo
for (ColumnInfo cdef : cfInfo.getColumns())
{
ResourceFieldSchema valSchema = new ResourceFieldSchema();
- AbstractType validator = validators.get(cdef.getName());
- valSchema.setName(new String(cdef.getName()));
+ AbstractType<?> validator = validators.get(ByteBufferUtil.bytes(cdef.getName()));
+ valSchema.setName(cdef.getName());
valSchema.setType(StorageHelper.getPigType(validator));
allSchemaFields.add(valSchema);
}
@@ -901,7 +901,7 @@ public class CqlNativeStorage extends LoadFunc implements StoreFuncInterface, Lo
String[] partitionKeys = new String[tableMetadata.getPartitionKey().size()];
for (int i = 0; i < tableMetadata.getPartitionKey().size(); i++)
{
- partitionKeys[i] = new String(tableMetadata.getPartitionKey().get(i).getName());
+ partitionKeys[i] = tableMetadata.getPartitionKey().get(i).getName();
}
return partitionKeys;
}