Index: hcatalog-pig-adapter/src/test/java/org/apache/hcatalog/pig/TestHCatLoaderComplexSchema.java =================================================================== --- hcatalog-pig-adapter/src/test/java/org/apache/hcatalog/pig/TestHCatLoaderComplexSchema.java (revision 1458071) +++ hcatalog-pig-adapter/src/test/java/org/apache/hcatalog/pig/TestHCatLoaderComplexSchema.java (working copy) @@ -112,7 +112,6 @@ @Test public void testSyntheticComplexSchema() throws Exception { String pigSchema = - "(" + "a: " + "(" + "aa: chararray, " + @@ -124,8 +123,7 @@ ")," + "b: chararray, " + "c: long, " + - "d: { t: (da:long, db: ( dba: chararray, dbb: long), dc: { t: (dca: long) } ) } " + - ")"; + "d: { t: (da:long, db: ( dba: chararray, dbb: long), dc: { t: (dca: long) } ) } "; // with extra structs String tableSchema = @@ -191,7 +189,7 @@ createTable(tablename, tableSchema); PigServer server = new PigServer(ExecType.LOCAL); server.setBatchOn(); - server.registerQuery("A = load '" + tablename + "Input' using org.apache.hcatalog.pig.MockLoader() AS " + pigSchema + ";"); + server.registerQuery("A = load '" + tablename + "Input' using org.apache.hcatalog.pig.MockLoader() AS (" + pigSchema + ");"); Schema dumpedASchema = server.dumpSchema("A"); server.registerQuery("STORE A into '" + tablename + "' using org.apache.hcatalog.pig.HCatStorer(" + (provideSchemaToStorer ? "'', '" + pigSchema + "'" : "") @@ -255,7 +253,7 @@ */ @Test public void testTupleInBagInTupleInBag() throws Exception { - String pigSchema = "(a: { b : ( c: { d: (i : long) } ) })"; + String pigSchema = "a: { b : ( c: { d: (i : long) } ) }"; String tableSchema = "a array< array< bigint > >"; @@ -279,7 +277,7 @@ @Test public void testMapWithComplexData() throws Exception { - String pigSchema = "(a: long, b: map[])"; + String pigSchema = "a: long, b: map[]"; String tableSchema = "a bigint, b map>"; List data = new ArrayList(); Index: pom.xml =================================================================== --- pom.xml (revision 1458071) +++ pom.xml (working copy) @@ -35,7 +35,7 @@ 1.14 7.6.0.v20120127 1.1 - 0.8.0 + 0.10.1 1.6.1 1.4 3.4.3 Index: hcatalog-pig-adapter/src/test/java/org/apache/hcatalog/pig/TestPigHCatUtil.java =================================================================== --- hcatalog-pig-adapter/src/test/java/org/apache/hcatalog/pig/TestPigHCatUtil.java (revision 1458071) +++ hcatalog-pig-adapter/src/test/java/org/apache/hcatalog/pig/TestPigHCatUtil.java (working copy) @@ -65,7 +65,7 @@ // When updating our pig dependency this will need updated. System.setProperty(HCatConstants.HCAT_PIG_INNER_TUPLE_NAME, "t"); System.setProperty(HCatConstants.HCAT_PIG_INNER_FIELD_NAME, "FIELDNAME_tuple"); - UDFContext.getUDFContext().setClientSystemProps(); + UDFContext.getUDFContext().setClientSystemProps(System.getProperties()); // Define the expected schema. ResourceFieldSchema[] bagSubFieldSchemas = new ResourceFieldSchema[1];