You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ya...@apache.org on 2010/04/16 21:09:00 UTC
svn commit: r935046 [2/2] - in /hadoop/pig/trunk/contrib/zebra: ./
src/java/org/apache/hadoop/zebra/io/
src/java/org/apache/hadoop/zebra/mapreduce/
src/java/org/apache/hadoop/zebra/pig/
src/java/org/apache/hadoop/zebra/types/ src/test/org/apache/hadoop...
Added: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/mapreduce/TestTypeCheck.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/mapreduce/TestTypeCheck.java?rev=935046&view=auto
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/mapreduce/TestTypeCheck.java (added)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/mapreduce/TestTypeCheck.java Fri Apr 16 19:08:58 2010
@@ -0,0 +1,232 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.zebra.mapreduce;
+
+import java.io.IOException;
+
+import junit.framework.Assert;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.io.BytesWritable;
+import org.apache.hadoop.mapreduce.Job;
+import org.apache.hadoop.mapreduce.Mapper;
+import org.apache.hadoop.util.Tool;
+import org.apache.hadoop.util.ToolRunner;
+import org.apache.hadoop.zebra.BaseTestCase;
+import org.apache.hadoop.zebra.io.BasicTable;
+import org.apache.hadoop.zebra.io.TableInserter;
+import org.apache.hadoop.zebra.mapreduce.BasicTableOutputFormat;
+import org.apache.hadoop.zebra.parser.ParseException;
+import org.apache.hadoop.zebra.schema.Schema;
+import org.apache.hadoop.zebra.types.TypesUtils;
+import org.apache.hadoop.zebra.types.ZebraTuple;
+import org.apache.pig.backend.executionengine.ExecException;
+import org.apache.pig.data.Tuple;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * This is to test type checking at M/R level;
+ *
+ */
+public class TestTypeCheck extends BaseTestCase implements Tool {
+ static String inputPath;
+
+ final static String STR_SCHEMA1 = "a:string,b:string";
+ final static String STR_STORAGE1 = "[a];[b]";
+ final static String STR_SCHEMA2 = "a:string,c:string";
+ final static String STR_STORAGE2 = "[a];[c]";
+
+ static Path path1, path2, path3;
+
+ @BeforeClass
+ public static void setUpOnce() throws Exception {
+ init();
+
+ path1 = getTableFullPath("t1");
+ path2 = getTableFullPath("t2");
+ path3 = getTableFullPath("t3");
+ removeDir(path1);
+ removeDir(path2);
+ removeDir(path3);
+
+ /*
+ * create 1st basic table;
+ */
+ BasicTable.Writer writer = new BasicTable.Writer(path1, STR_SCHEMA1, STR_STORAGE1, conf);
+ Schema schema = writer.getSchema();
+ Tuple tuple = TypesUtils.createTuple(schema);
+
+ final int numsBatch = 10;
+ final int numsInserters = 1;
+ TableInserter[] inserters = new TableInserter[numsInserters];
+ for (int i = 0; i < numsInserters; i++) {
+ inserters[i] = writer.getInserter("ins" + i, false);
+ }
+
+ for (int b = 0; b < numsBatch; b++) {
+ for (int i = 0; i < numsInserters; i++) {
+ TypesUtils.resetTuple(tuple);
+ for (int k = 0; k < tuple.size(); ++k) {
+ try {
+ tuple.set(k, b + "_" + i + "" + k);
+ } catch (ExecException e) {
+
+ }
+ }// k
+ inserters[i].insert(new BytesWritable(("key1" + i).getBytes()), tuple);
+ }// i
+ }// b
+ for (int i = 0; i < numsInserters; i++) {
+ inserters[i].close();
+ }
+ writer.close();
+
+ /*
+ * create 2nd basic table;
+ */
+ writer = new BasicTable.Writer(path2, STR_SCHEMA2, STR_STORAGE2, conf);
+ schema = writer.getSchema();
+ tuple = TypesUtils.createTuple(schema);
+
+ inserters = new TableInserter[numsInserters];
+ for (int i = 0; i < numsInserters; i++) {
+ inserters[i] = writer.getInserter("ins" + i, false);
+ }
+
+ for (int b = 0; b < numsBatch; b++) {
+ for (int i = 0; i < numsInserters; i++) {
+ TypesUtils.resetTuple(tuple);
+ for (int k = 0; k < tuple.size(); ++k) {
+ try {
+ tuple.set(k, b + "_" + i + "" + k);
+ } catch (ExecException e) {
+
+ }
+ }
+ inserters[i].insert(new BytesWritable(("key2" + i).getBytes()), tuple);
+ }
+ }
+ for (int i = 0; i < numsInserters; i++) {
+ inserters[i].close();
+ }
+ writer.close();
+ }
+
+ @AfterClass
+ public static void tearDown() throws Exception {
+ removeDir(path1);
+ removeDir(path2);
+ removeDir(path3);
+ }
+
+ static class MapClass extends Mapper<BytesWritable, Tuple, BytesWritable, Tuple> {
+ @Override
+ public void map(BytesWritable key, Tuple value, Context context) throws IOException, InterruptedException {
+ System.out.println("key = " + key);
+ System.out.println("value = " + value);
+
+ context.write(key, value);
+ }
+
+ @Override
+ public void setup(Context context) throws IOException {
+ }
+ }
+
+ @Test
+ public void test1() throws ParseException, IOException,
+ org.apache.hadoop.zebra.parser.ParseException, Exception {
+ Job job = new Job(conf);
+ job.setJobName("Test1");
+ job.setJarByClass(TestTypeCheck.class);
+
+ // input settings
+ job.setInputFormatClass(TableInputFormat.class);
+ job.setMapperClass(MapClass.class);
+ job.setMapOutputKeyClass(BytesWritable.class);
+ job.setMapOutputValueClass(ZebraTuple.class);
+ job.setOutputFormatClass(BasicTableOutputFormat.class);
+
+ TableInputFormat.setInputPaths(job, path1, path2);
+ TableInputFormat.setProjection(job, "a,b,c");
+ BasicTableOutputFormat.setOutputPath(job, path3);
+ removeDir(path3);
+
+ BasicTableOutputFormat.setSchema(job, "a:string, b:string, c:string");
+ BasicTableOutputFormat.setStorageHint(job, "[a,b,c]");
+
+ job.submit();
+ job.waitForCompletion( true );
+ Assert.assertTrue(job.isSuccessful());
+
+ BasicTableOutputFormat.close(job);
+ }
+
+ @Test
+ public void testNegative1() throws ParseException, IOException, InterruptedException, ClassNotFoundException {
+ Job job = new Job(conf);
+ job.setJobName("Test1");
+ job.setJarByClass(TestTypeCheck.class);
+
+ // input settings
+ job.setInputFormatClass(TableInputFormat.class);
+ job.setMapperClass(MapClass.class);
+ job.setMapOutputKeyClass(BytesWritable.class);
+ job.setMapOutputValueClass(ZebraTuple.class);
+ job.setOutputFormatClass(BasicTableOutputFormat.class);
+
+ TableInputFormat.setInputPaths(job, path1, path2);
+ TableInputFormat.setProjection(job, "a,b,c");
+ BasicTableOutputFormat.setOutputPath(job, path3);
+ removeDir(path3);
+
+ BasicTableOutputFormat.setSchema(job, "a:int, b:string, c:string");
+ BasicTableOutputFormat.setStorageHint(job, "[a,b,c]");
+
+ job.submit();
+ job.waitForCompletion( true );
+ Assert.assertFalse(job.isSuccessful());
+
+ BasicTableOutputFormat.close(job);
+ }
+
+ @Override
+ public int run(String[] args) throws Exception {
+ TestTypeCheck test = new TestTypeCheck();
+ TestTypeCheck.setUpOnce();
+ System.out.println("after setup");
+
+ test.test1();
+ test.testNegative1();
+
+ return 0;
+ }
+
+
+ public static void main(String[] args) throws Exception {
+ conf = new Configuration();
+
+ int res = ToolRunner.run(conf, new TestTypeCheck(), args);
+ System.out.println("PASS");
+ System.exit(res);
+ }
+}
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestBasicTableSourceTableIndex.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestBasicTableSourceTableIndex.java?rev=935046&r1=935045&r2=935046&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestBasicTableSourceTableIndex.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestBasicTableSourceTableIndex.java Fri Apr 16 19:08:58 2010
@@ -54,7 +54,7 @@ public class TestBasicTableSourceTableIn
*/
BasicTable.Writer writer = new BasicTable.Writer(pathTable1,
- "a:string,b,c:string", "[a,b];[c]", conf);
+ "a:string,b:string,c:string", "[a,b];[c]", conf);
Schema schema = writer.getSchema();
Tuple tuple = TypesUtils.createTuple(schema);
@@ -87,7 +87,7 @@ public class TestBasicTableSourceTableIn
* create 2nd basic table;
*/
- writer = new BasicTable.Writer(pathTable2, "a:string,b,d:string",
+ writer = new BasicTable.Writer(pathTable2, "a:string,b:string,d:string",
"[a,b];[d]", conf);
schema = writer.getSchema();
tuple = TypesUtils.createTuple(schema);
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestBasicTableUnionLoader.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestBasicTableUnionLoader.java?rev=935046&r1=935045&r2=935046&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestBasicTableUnionLoader.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestBasicTableUnionLoader.java Fri Apr 16 19:08:58 2010
@@ -52,7 +52,7 @@ public class TestBasicTableUnionLoader e
*/
BasicTable.Writer writer = new BasicTable.Writer(pathTable1,
- "a:string,b,c:string", "[a,b];[c]", conf);
+ "a:string,b:string,c:string", "[a,b];[c]", conf);
Schema schema = writer.getSchema();
Tuple tuple = TypesUtils.createTuple(schema);
@@ -85,7 +85,7 @@ public class TestBasicTableUnionLoader e
* create 2nd basic table;
*/
- writer = new BasicTable.Writer(pathTable2, "a:string,b,d:string",
+ writer = new BasicTable.Writer(pathTable2, "a:string,b:string,d:string",
"[a,b];[d]", conf);
schema = writer.getSchema();
tuple = TypesUtils.createTuple(schema);
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestBasicUnion.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestBasicUnion.java?rev=935046&r1=935045&r2=935046&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestBasicUnion.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestBasicUnion.java Fri Apr 16 19:08:58 2010
@@ -38,6 +38,7 @@ import org.apache.hadoop.zebra.types.Typ
import org.apache.pig.ExecType;
import org.apache.pig.PigServer;
import org.apache.pig.backend.executionengine.ExecException;
+import org.apache.pig.data.DataByteArray;
import org.apache.pig.data.Tuple;
import org.apache.pig.test.MiniCluster;
import org.junit.AfterClass;
@@ -103,7 +104,11 @@ public class TestBasicUnion extends Base
TypesUtils.resetTuple(tuple);
for (int k = 0; k < tuple.size(); ++k) {
try {
- tuple.set(k, b + "_" + i + "" + k);
+ if (k == 1 || k == 3 || k == 4) { // bytes type
+ tuple.set(k, new DataByteArray(new String(b + "_" + i + "" + k).toString()));
+ } else {
+ tuple.set(k, b + "_" + i + "" + k);
+ }
} catch (ExecException e) {
}
@@ -115,10 +120,10 @@ public class TestBasicUnion extends Base
inserters[i].close();
}
writer.close();
+
/*
* create 2nd basic table;
*/
-
writer = new BasicTable.Writer(path2, STR_SCHEMA2, STR_STORAGE2, conf);
schema = writer.getSchema();
tuple = TypesUtils.createTuple(schema);
@@ -133,7 +138,11 @@ public class TestBasicUnion extends Base
TypesUtils.resetTuple(tuple);
for (int k = 0; k < tuple.size(); ++k) {
try {
- tuple.set(k, b + "_" + i + "" + k);
+ if (k == 1 || k == 3 || k == 4) {
+ tuple.set(k, new DataByteArray(new String(b + "_" + i + "" + k).toString()));
+ } else {
+ tuple.set(k, b + "_" + i + "" + k);
+ }
} catch (ExecException e) {
}
@@ -145,10 +154,11 @@ public class TestBasicUnion extends Base
inserters[i].close();
}
writer.close();
+
/*
* create 3rd basic table;
*/
-
+
writer = new BasicTable.Writer(path3, STR_SCHEMA3, STR_STORAGE3, conf);
schema = writer.getSchema();
tuple = TypesUtils.createTuple(schema);
@@ -163,7 +173,7 @@ public class TestBasicUnion extends Base
TypesUtils.resetTuple(tuple);
for (int k = 0; k < tuple.size(); ++k) {
try {
- tuple.set(k, b + "_" + i + "" + k);
+ tuple.set(k, new DataByteArray(new String(b + "_" + i + "" + k).toString()));
} catch (ExecException e) {
}
@@ -174,7 +184,8 @@ public class TestBasicUnion extends Base
for (int i = 0; i < numsInserters; i++) {
inserters[i].close();
}
- writer.close();
+ writer.close();
+
/*
* create 4th basic table;
*/
@@ -193,7 +204,11 @@ public class TestBasicUnion extends Base
TypesUtils.resetTuple(tuple);
for (int k = 0; k < tuple.size(); ++k) {
try {
- tuple.set(k, b + "_" + i + "" + k);
+ if (k == 1) {
+ tuple.set(k, new DataByteArray(new String(b + "_" + i + "" + k).toString()));
+ } else {
+ tuple.set(k, b + "_" + i + "" + k);
+ }
} catch (ExecException e) {
}
@@ -204,7 +219,8 @@ public class TestBasicUnion extends Base
for (int i = 0; i < numsInserters; i++) {
inserters[i].close();
}
- writer.close();
+ writer.close();
+
/*
* create 5th basic table;
*/
@@ -223,7 +239,11 @@ public class TestBasicUnion extends Base
TypesUtils.resetTuple(tuple);
for (int k = 0; k < tuple.size(); ++k) {
try {
- tuple.set(k, b + "_" + i + "" + k);
+ if (k == 0) {
+ tuple.set(k, new DataByteArray(new String(b + "_" + i + "" + k).toString()));
+ } else {
+ tuple.set(k, b + "_" + i + "" + k);
+ }
} catch (ExecException e) {
}
@@ -234,7 +254,7 @@ public class TestBasicUnion extends Base
for (int i = 0; i < numsInserters; i++) {
inserters[i].close();
}
- writer.close();
+ writer.close();
}
@AfterClass
@@ -267,7 +287,7 @@ public class TestBasicUnion extends Base
if (i <= 9) {
System.out.println("first table first part: " + cur.toString());
Assert.assertEquals(i + "_00", cur.get(0));
- Assert.assertEquals(i + "_01", cur.get(1));
+ Assert.assertEquals(i + "_01", cur.get(1).toString());
Assert.assertTrue(((cur.get(2) == null) || (cur.get(2)
.equals(i + "_02"))));
Assert.assertTrue(((cur.get(3) == null) || (cur.get(3)
@@ -279,7 +299,7 @@ public class TestBasicUnion extends Base
if (k <= 9 && k >= 0) {
System.out.println("first table second part: : " + cur.toString());
Assert.assertEquals(k + "_10", cur.get(0));
- Assert.assertEquals(k + "_11", cur.get(1));
+ Assert.assertEquals(k + "_11", cur.get(1).toString());
Assert.assertTrue(((cur.get(2) == null) || (cur.get(2)
.equals(k + "_12"))));
Assert.assertTrue(((cur.get(3) == null) || (cur.get(3)
@@ -294,7 +314,7 @@ public class TestBasicUnion extends Base
if (t <= 9 && t >= 0) {
System.out.println("second table first part: " + cur.toString());
Assert.assertEquals(t + "_00", cur.get(0));
- Assert.assertEquals(t + "_01", cur.get(1));
+ Assert.assertEquals(t + "_01", cur.get(1).toString());
Assert.assertTrue(((cur.get(2) == null) || (cur.get(2)
.equals(t + "_02"))));
Assert.assertTrue(((cur.get(3) == null) || (cur.get(3)
@@ -306,7 +326,7 @@ public class TestBasicUnion extends Base
if (j <= 9 && j >= 0) {
System.out.println("second table first part: " + cur.toString());
Assert.assertEquals(j + "_10", cur.get(0));
- Assert.assertEquals(j + "_11", cur.get(1));
+ Assert.assertEquals(j + "_11", cur.get(1).toString());
Assert.assertTrue(((cur.get(2) == null) || (cur.get(2)
.equals(j + "_12"))));
Assert.assertTrue(((cur.get(3) == null) || (cur.get(3)
@@ -338,7 +358,7 @@ public class TestBasicUnion extends Base
scanner.getValue(RowValue);
System.out.println("read record or record:" + RowValue.toString());
Assert.assertEquals(i + "_00", RowValue.get(0));
- Assert.assertEquals(i + "_01", RowValue.get(1));
+ Assert.assertEquals(i + "_01", RowValue.get(1).toString());
Assert.assertEquals(i + "_02", RowValue.get(2));
scanner.advance();
}
@@ -346,7 +366,7 @@ public class TestBasicUnion extends Base
scanner.getValue(RowValue);
System.out.println("read record or record:" + RowValue.toString());
Assert.assertEquals(i + "_10", RowValue.get(0));
- Assert.assertEquals(i + "_11", RowValue.get(1));
+ Assert.assertEquals(i + "_11", RowValue.get(1).toString());
Assert.assertEquals(i + "_12", RowValue.get(2));
scanner.advance();
}
@@ -537,7 +557,7 @@ public class TestBasicUnion extends Base
if (i <= 9) {
System.out.println("first table first part: " + cur.toString());
Assert.assertEquals(i + "_00", cur.get(0));
- Assert.assertEquals(i + "_01", cur.get(1));
+ Assert.assertEquals(i + "_01", cur.get(1).toString());
try {
cur.get(2);
Assert.fail("should throw index out of bound exception");
@@ -552,7 +572,7 @@ public class TestBasicUnion extends Base
if (k <= 9 && k >= 0) {
System.out.println("first table second part: : " + cur.toString());
Assert.assertEquals(k + "_10", cur.get(0));
- Assert.assertEquals(k + "_11", cur.get(1));
+ Assert.assertEquals(k + "_11", cur.get(1).toString());
try {
cur.get(2);
Assert.fail("should throw index out of bound exception");
@@ -568,7 +588,7 @@ public class TestBasicUnion extends Base
if (t <= 9 && t >= 0) {
System.out.println("second table first part: " + cur.toString());
Assert.assertEquals(t + "_00", cur.get(0));
- Assert.assertEquals(t + "_01", cur.get(1));
+ Assert.assertEquals(t + "_01", cur.get(1).toString());
try {
cur.get(2);
Assert.fail("should throw index out of bound exception");
@@ -582,7 +602,7 @@ public class TestBasicUnion extends Base
if (j <= 9 && j >= 0) {
System.out.println("second table first part: " + cur.toString());
Assert.assertEquals(j + "_10", cur.get(0));
- Assert.assertEquals(j + "_11", cur.get(1));
+ Assert.assertEquals(j + "_11", cur.get(1).toString());
try {
cur.get(2);
Assert.fail("should throw index out of bound exception");
@@ -615,10 +635,10 @@ public class TestBasicUnion extends Base
// first table
if (i <= 9) {
System.out.println("first table first part: " + cur.toString());
- Assert.assertTrue(((cur.get(0)).equals(i + "_03") || (cur.get(0)
+ Assert.assertTrue(((cur.get(0)).toString().equals(i + "_03") || (cur.get(0).toString()
.equals(i + "_04"))));
System.out.println("get1: " + cur.get(1));
- Assert.assertTrue(((cur.get(1)).equals(i + "_03") || (cur.get(1)
+ Assert.assertTrue(((cur.get(1)).toString().equals(i + "_03") || (cur.get(1).toString()
.equals(i + "_04"))));
try {
cur.get(2);
@@ -632,9 +652,9 @@ public class TestBasicUnion extends Base
}
if (k <= 9 && k >= 0) {
System.out.println("first table second part: : " + cur.toString());
- Assert.assertTrue(((cur.get(0).equals(k + "_13")) || (cur.get(0)
+ Assert.assertTrue(((cur.get(0).toString().equals(k + "_13")) || (cur.get(0).toString()
.equals(k + "_14"))));
- Assert.assertTrue(((cur.get(1).equals(k + "_13")) || (cur.get(1)
+ Assert.assertTrue(((cur.get(1).toString().equals(k + "_13")) || (cur.get(1).toString()
.equals(k + "_14"))));
}
@@ -645,9 +665,9 @@ public class TestBasicUnion extends Base
}
if (t <= 9 && t >= 0) {
System.out.println("second table first part: " + cur.toString());
- Assert.assertTrue(((cur.get(0).equals(t + "_03")) || (cur.get(0)
+ Assert.assertTrue(((cur.get(0).toString().equals(t + "_03")) || (cur.get(0).toString()
.equals(t + "_04"))));
- Assert.assertTrue(((cur.get(1).equals(t + "_03")) || (cur.get(1)
+ Assert.assertTrue(((cur.get(1).toString().equals(t + "_03")) || (cur.get(1).toString()
.equals(t + "_04"))));
}
@@ -656,9 +676,9 @@ public class TestBasicUnion extends Base
}
if (j <= 9 && j >= 0) {
System.out.println("second table first part: " + cur.toString());
- Assert.assertTrue(((cur.get(0).equals(j + "_13")) || (cur.get(0)
+ Assert.assertTrue(((cur.get(0).toString().equals(j + "_13")) || (cur.get(0).toString()
.equals(j + "_14"))));
- Assert.assertTrue(((cur.get(1).equals(j + "_13")) || (cur.get(1)
+ Assert.assertTrue(((cur.get(1).toString().equals(j + "_13")) || (cur.get(1).toString()
.equals(j + "_14"))));
}
@@ -691,7 +711,8 @@ public class TestBasicUnion extends Base
} catch (Exception e) {
}
- String b = (String)cur.get(0);
+ //String b = (String)cur.get(0);
+ String b = cur.get(0).toString();
String a = (String)cur.get(1);
Assert.assertTrue( b.equals(exp1[i]) || b.equals(exp2[i]) );
Assert.assertTrue( a.equals(exp2[i]) || a.equals(exp1[i]) );
@@ -726,7 +747,7 @@ public class TestBasicUnion extends Base
}
if (cnt == 22) {
Assert.assertEquals("1_00", cur.get(0));
- Assert.assertEquals("1_01", cur.get(1));
+ Assert.assertEquals("1_01", cur.get(1).toString());
Assert
.assertTrue(((cur.get(2) == null) || (cur.get(2).equals("1_02"))));
Assert
@@ -757,7 +778,7 @@ public class TestBasicUnion extends Base
Assert.assertEquals("1_00", cur.get(0));
System.out.println("neg2, cnt ==1: " +cur.get(1));
Assert
- .assertTrue(((cur.get(1) == null) || (cur.get(1).equals("1_03"))||(cur.get(1).equals("1_04"))));
+ .assertTrue(((cur.get(1) == null) || (cur.get(1).toString().equals("1_03"))||(cur.get(1).toString().equals("1_04"))));
Assert.assertEquals(null, cur.get(2));
try {
@@ -772,7 +793,7 @@ public class TestBasicUnion extends Base
System.out.println("neg2, cnt ==22: " +cur.get(1));
Assert
- .assertTrue(((cur.get(1) == null) || (cur.get(1).equals("1_04"))||(cur.get(1).equals("1_03"))));
+ .assertTrue(((cur.get(1) == null) || (cur.get(1).toString().equals("1_04"))||(cur.get(1).toString().equals("1_03"))));
Assert.assertEquals(null, cur.get(2));
try {
cur.get(3);
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestCogroup.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestCogroup.java?rev=935046&r1=935045&r2=935046&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestCogroup.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestCogroup.java Fri Apr 16 19:08:58 2010
@@ -71,7 +71,7 @@ public class TestCogroup extends BaseTes
removeDir(pathTable);
BasicTable.Writer writer = new BasicTable.Writer(pathTable,
- "SF_a:string,SF_b:string,SF_c,SF_d,SF_e,SF_f,SF_g",
+ "SF_a:string,SF_b:string,SF_c:string,SF_d:string,SF_e:string,SF_f:string,SF_g:string",
"[SF_a, SF_b, SF_c]; [SF_e, SF_f, SF_g]", conf);
Schema schema = writer.getSchema();
Tuple tuple = TypesUtils.createTuple(schema);
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestCollection.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestCollection.java?rev=935046&r1=935045&r2=935046&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestCollection.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestCollection.java Fri Apr 16 19:08:58 2010
@@ -53,7 +53,7 @@ import org.junit.Test;
*/
public class TestCollection extends BaseTestCase
{
- final static String STR_SCHEMA = "c:collection(record(a:double, b:float, c:bytes))";
+ final static String STR_SCHEMA = "c:collection(record(a:double, b:double, c:bytes))";
final static String STR_STORAGE = "[c]";
private static Path path;
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestCollectionTableLoader.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestCollectionTableLoader.java?rev=935046&r1=935045&r2=935046&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestCollectionTableLoader.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestCollectionTableLoader.java Fri Apr 16 19:08:58 2010
@@ -49,7 +49,7 @@ public class TestCollectionTableLoader e
removeDir(path);
BasicTable.Writer writer = new BasicTable.Writer(path,
- "c:collection(record(a:double, b:float, c:bytes))", "[c]", conf);
+ "c:collection(record(a:double, b:double, c:bytes))", "[c]", conf);
Schema schema = writer.getSchema();
Tuple tuple = TypesUtils.createTuple(schema);
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestCollectionTableStorer.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestCollectionTableStorer.java?rev=935046&r1=935045&r2=935046&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestCollectionTableStorer.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestCollectionTableStorer.java Fri Apr 16 19:08:58 2010
@@ -49,7 +49,7 @@ public class TestCollectionTableStorer e
removeDir(pathTable);
BasicTable.Writer writer = new BasicTable.Writer(pathTable,
- "c:collection(record(a:double, b:float, c:bytes))", "[c]", conf);
+ "c:collection(record(a:double, b:double, c:bytes))", "[c]", conf);
Schema schema = writer.getSchema();
Tuple tuple = TypesUtils.createTuple(schema);
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestMixedType1.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestMixedType1.java?rev=935046&r1=935045&r2=935046&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestMixedType1.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestMixedType1.java Fri Apr 16 19:08:58 2010
@@ -45,7 +45,7 @@ import org.junit.Test;
*
*/
public class TestMixedType1 extends BaseTestCase {
- final static String STR_SCHEMA = "s1:bool, s2:int, s3:long, s4:float, s5:string, s6:bytes, r1:record(f1:int, f2:long), r2:record(r3:record(f3:float, f4)), m1:map(string),m2:map(map(int)), c:collection(record(f13:double, f14:float, f15:bytes))";
+ final static String STR_SCHEMA = "s1:bool, s2:int, s3:long, s4:double, s5:string, s6:bytes, r1:record(f1:int, f2:long), r2:record(r3:record(f3:double, f4)), m1:map(string),m2:map(map(int)), c:collection(record(f13:double, f14:double, f15:bytes))";
final static String STR_STORAGE = "[s1, s2]; [m1#{a}]; [r1.f1]; [s3, s4, r2.r3.f3]; [s5, s6, m2#{x|y}]; [r1.f2, m1#{b}]; [r2.r3.f4, m2#{z}]";
private static Path path;
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestOrderPreserveUnion.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestOrderPreserveUnion.java?rev=935046&r1=935045&r2=935046&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestOrderPreserveUnion.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestOrderPreserveUnion.java Fri Apr 16 19:08:58 2010
@@ -56,7 +56,7 @@ public class TestOrderPreserveUnion exte
pathTable = getTableFullPath("TestOrderPreserveUnion");
removeDir(pathTable);
BasicTable.Writer writer = new BasicTable.Writer(pathTable,
- "SF_a:string,SF_b:string,SF_c,SF_d,SF_e,SF_f,SF_g",
+ "SF_a:string,SF_b:string,SF_c:string,SF_d:string,SF_e:string,SF_f:string,SF_g:string",
"[SF_a, SF_b, SF_c]; [SF_e, SF_f, SF_g]", conf);
Schema schema = writer.getSchema();
Tuple tuple = TypesUtils.createTuple(schema);
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestSimpleType.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestSimpleType.java?rev=935046&r1=935045&r2=935046&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestSimpleType.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestSimpleType.java Fri Apr 16 19:08:58 2010
@@ -47,7 +47,7 @@ import org.junit.Test;
*/
public class TestSimpleType extends BaseTestCase {
- final static String STR_SCHEMA = "s1:bool, s2:int, s3:long, s4:float, s5:string, s6:bytes";
+ final static String STR_SCHEMA = "s1:bool, s2:int, s3:long, s4:double, s5:string, s6:bytes";
final static String STR_STORAGE = "[s1, s2]; [s3, s4]; [s5, s6]";
private static Path path;
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestSortedTableUnion.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestSortedTableUnion.java?rev=935046&r1=935045&r2=935046&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestSortedTableUnion.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestSortedTableUnion.java Fri Apr 16 19:08:58 2010
@@ -59,7 +59,7 @@ public class TestSortedTableUnion extend
removeDir(pathTable);
BasicTable.Writer writer = new BasicTable.Writer(pathTable,
- "SF_a:string,SF_b:string,SF_c,SF_d,SF_e,SF_f,SF_g",
+ "SF_a:string,SF_b:string,SF_c:string,SF_d:string,SF_e:string,SF_f:string,SF_g:string",
"[SF_a, SF_b, SF_c]; [SF_e, SF_f, SF_g]", conf);
Schema schema = writer.getSchema();
Tuple tuple = TypesUtils.createTuple(schema);
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestSortedTableUnionMergeJoin.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestSortedTableUnionMergeJoin.java?rev=935046&r1=935045&r2=935046&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestSortedTableUnionMergeJoin.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestSortedTableUnionMergeJoin.java Fri Apr 16 19:08:58 2010
@@ -69,7 +69,7 @@ public class TestSortedTableUnionMergeJo
BasicTable.Writer writer = new BasicTable.Writer(pathTable,
- "SF_a:string,SF_b:string,SF_c,SF_d,SF_e,SF_f,SF_g",
+ "SF_a:string,SF_b:string,SF_c:string,SF_d:string,SF_e:string,SF_f:string,SF_g:string",
"[SF_a, SF_b, SF_c]; [SF_e, SF_f, SF_g]", conf);
Schema schema = writer.getSchema();
Tuple tuple = TypesUtils.createTuple(schema);
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestSortedTableUnionSourceTableProj.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestSortedTableUnionSourceTableProj.java?rev=935046&r1=935045&r2=935046&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestSortedTableUnionSourceTableProj.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestSortedTableUnionSourceTableProj.java Fri Apr 16 19:08:58 2010
@@ -69,7 +69,7 @@ public class TestSortedTableUnionSourceT
removeDir(pathTable);
BasicTable.Writer writer = new BasicTable.Writer(pathTable,
- "SF_a:string,SF_b:string,SF_c,SF_d,SF_e,SF_f,SF_g",
+ "SF_a:string,SF_b:string,SF_c:string,SF_d:string,SF_e:string,SF_f:string,SF_g:string",
"[SF_a, SF_b, SF_c]; [SF_e, SF_f, SF_g]", conf);
Schema schema = writer.getSchema();
Tuple tuple = TypesUtils.createTuple(schema);
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableLoader.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableLoader.java?rev=935046&r1=935045&r2=935046&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableLoader.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableLoader.java Fri Apr 16 19:08:58 2010
@@ -60,7 +60,7 @@ public class TestTableLoader extends Bas
removeDir(pathTable);
BasicTable.Writer writer = new BasicTable.Writer(pathTable,
- "a:string,b,c:string,d,e,f,g", "[a,b,c];[d,e,f,g]", conf);
+ "a:string,b:string,c:string,d:string,e:string,f:string,g:string", "[a,b,c];[d,e,f,g]", conf);
Schema schema = writer.getSchema();
Tuple tuple = TypesUtils.createTuple(schema);
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableLoaderPrune.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableLoaderPrune.java?rev=935046&r1=935045&r2=935046&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableLoaderPrune.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableLoaderPrune.java Fri Apr 16 19:08:58 2010
@@ -62,7 +62,7 @@ public class TestTableLoaderPrune extend
BasicTable.Writer writer = new BasicTable.Writer(pathTable,
- "a:string,b,c:string,d,e,f,g", "[a,b,c];[d,e,f,g]", conf);
+ "a:string,b:string,c:string,d:string,e:string,f:string,g:string", "[a,b,c];[d,e,f,g]", conf);
Schema schema = writer.getSchema();
Tuple tuple = TypesUtils.createTuple(schema);
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableMergeJoin.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableMergeJoin.java?rev=935046&r1=935045&r2=935046&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableMergeJoin.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableMergeJoin.java Fri Apr 16 19:08:58 2010
@@ -70,7 +70,7 @@ public class TestTableMergeJoin extends
removeDir(pathTable);
BasicTable.Writer writer = new BasicTable.Writer(pathTable,
- "SF_a:string,SF_b:string,SF_c,SF_d,SF_e,SF_f,SF_g",
+ "SF_a:string,SF_b:string,SF_c:string,SF_d:string,SF_e:string,SF_f:string,SF_g:string",
"[SF_a, SF_b, SF_c]; [SF_e, SF_f, SF_g]", conf);
Schema schema = writer.getSchema();
Tuple tuple = TypesUtils.createTuple(schema);
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableMergeJoinAfterFilter.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableMergeJoinAfterFilter.java?rev=935046&r1=935045&r2=935046&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableMergeJoinAfterFilter.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableMergeJoinAfterFilter.java Fri Apr 16 19:08:58 2010
@@ -70,7 +70,7 @@ public class TestTableMergeJoinAfterFilt
BasicTable.Writer writer = new BasicTable.Writer(pathTable,
- "SF_a:string,SF_b:string,SF_c,SF_d,SF_e,SF_f,SF_g",
+ "SF_a:string,SF_b:string,SF_c:string,SF_d:string,SF_e:string,SF_f:string,SF_g:string",
"[SF_a, SF_b, SF_c]; [SF_e, SF_f, SF_g]", conf);
Schema schema = writer.getSchema();
Tuple tuple = TypesUtils.createTuple(schema);
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableMergeJoinFloat.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableMergeJoinFloat.java?rev=935046&r1=935045&r2=935046&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableMergeJoinFloat.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableMergeJoinFloat.java Fri Apr 16 19:08:58 2010
@@ -69,7 +69,7 @@ public class TestTableMergeJoinFloat ext
removeDir(pathTable);
BasicTable.Writer writer = new BasicTable.Writer(pathTable,
- "SF_a:float,SF_b:string,SF_c,SF_d,SF_e,SF_f,SF_g",
+ "SF_a:float,SF_b:string,SF_c:string,SF_d:string,SF_e:string,SF_f:string,SF_g:string",
"[SF_a, SF_b, SF_c]; [SF_e, SF_f, SF_g]", conf);
Schema schema = writer.getSchema();
System.out.println("typeName" + schema.getColumn("SF_a").getType().pigDataType());
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableMergeJoinInteger.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableMergeJoinInteger.java?rev=935046&r1=935045&r2=935046&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableMergeJoinInteger.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableMergeJoinInteger.java Fri Apr 16 19:08:58 2010
@@ -70,7 +70,7 @@ public class TestTableMergeJoinInteger e
BasicTable.Writer writer = new BasicTable.Writer(pathTable,
- "SF_a:int,SF_b:string,SF_c,SF_d,SF_e,SF_f,SF_g",
+ "SF_a:int,SF_b:string,SF_c:string,SF_d:string,SF_e:string,SF_f:string,SF_g:string",
"[SF_a, SF_b, SF_c]; [SF_e, SF_f, SF_g]", conf);
Schema schema = writer.getSchema();
System.out.println("typeName" + schema.getColumn("SF_a").getType().pigDataType());
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableMergeJoinMultipleColsSort.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableMergeJoinMultipleColsSort.java?rev=935046&r1=935045&r2=935046&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableMergeJoinMultipleColsSort.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableMergeJoinMultipleColsSort.java Fri Apr 16 19:08:58 2010
@@ -71,7 +71,7 @@ public class TestTableMergeJoinMultipleC
BasicTable.Writer writer = new BasicTable.Writer(pathTable,
- "SF_a:int,SF_b:int,SF_c,SF_d,SF_e,SF_f,SF_g",
+ "SF_a:int,SF_b:int,SF_c:string,SF_d:string,SF_e:string,SF_f:string,SF_g:string",
"[SF_a, SF_b, SF_c]; [SF_e, SF_f, SF_g]", conf);
Schema schema = writer.getSchema();
System.out.println("typeName" + schema.getColumn("SF_a").getType().pigDataType());
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableSortStorer.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableSortStorer.java?rev=935046&r1=935045&r2=935046&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableSortStorer.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableSortStorer.java Fri Apr 16 19:08:58 2010
@@ -69,7 +69,7 @@ public class TestTableSortStorer extends
removeDir(pathTable);
BasicTable.Writer writer = new BasicTable.Writer(pathTable,
- "SF_a:string,SF_b,SF_c,SF_d,SF_e,SF_f,SF_g",
+ "SF_a:string,SF_b:string,SF_c:string,SF_d:string,SF_e:string,SF_f:string,SF_g:string",
"[SF_a, SF_b, SF_c]; [SF_e, SF_f, SF_g]", conf);
Schema schema = writer.getSchema();
Tuple tuple = TypesUtils.createTuple(schema);
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableSortStorerDesc.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableSortStorerDesc.java?rev=935046&r1=935045&r2=935046&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableSortStorerDesc.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableSortStorerDesc.java Fri Apr 16 19:08:58 2010
@@ -69,7 +69,7 @@ public class TestTableSortStorerDesc ext
removeDir(pathTable);
BasicTable.Writer writer = new BasicTable.Writer(pathTable,
- "SF_a:string,SF_b,SF_c,SF_d,SF_e,SF_f,SF_g",
+ "SF_a:string,SF_b:string,SF_c:string,SF_d:string,SF_e:string,SF_f:string,SF_g:string",
"[SF_a, SF_b, SF_c]; [SF_e, SF_f, SF_g]", conf);
Schema schema = writer.getSchema();
Tuple tuple = TypesUtils.createTuple(schema);
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableStorer.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableStorer.java?rev=935046&r1=935045&r2=935046&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableStorer.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestTableStorer.java Fri Apr 16 19:08:58 2010
@@ -67,7 +67,7 @@ public class TestTableStorer extends Bas
BasicTable.Writer writer = new BasicTable.Writer(pathTable,
- "SF_a,SF_b,SF_c,SF_d,SF_e,SF_f,SF_g",
+ "SF_a:string,SF_b:string,SF_c:string,SF_d:string,SF_e:string,SF_f:string,SF_g:string",
"[SF_a, SF_b, SF_c]; [SF_e, SF_f, SF_g]", conf);
Schema schema = writer.getSchema();
Tuple tuple = TypesUtils.createTuple(schema);
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestUnionMixedTypes.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestUnionMixedTypes.java?rev=935046&r1=935045&r2=935046&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestUnionMixedTypes.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/pig/TestUnionMixedTypes.java Fri Apr 16 19:08:58 2010
@@ -64,9 +64,9 @@ import org.apache.hadoop.zebra.BaseTestC
*/
public class TestUnionMixedTypes extends BaseTestCase {
private static Path pathWorking, pathTable1, pathTable2;
- final static String STR_SCHEMA1 = "a:collection(record(a:string, b:string)),b:map(string),c:record(f1:string, f2:string),d";
+ final static String STR_SCHEMA1 = "a:collection(record(a:string, b:string)),b:map(string),c:record(f1:string, f2:string),d:string";
final static String STR_STORAGE1 = "[a,d];[b#{k1|k2}];[c]";
- final static String STR_SCHEMA2 = "a:collection(record(a:string, b:string)),b:map(string),c:record(f1:string, f2:string),e";
+ final static String STR_SCHEMA2 = "a:collection(record(a:string, b:string)),b:map(string),c:record(f1:string, f2:string),e:string";
final static String STR_STORAGE2 = "[a,e];[b#{k1}];[c.f1]";
@BeforeClass
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestSchemaMap.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestSchemaMap.java?rev=935046&r1=935045&r2=935046&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestSchemaMap.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestSchemaMap.java Fri Apr 16 19:08:58 2010
@@ -47,6 +47,12 @@ public class TestSchemaMap {
ColumnSchema f2 = schema.getColumn(1);
Assert.assertEquals("m1", f2.getName());
Assert.assertEquals(ColumnType.MAP, f2.getType());
+
+ Schema temp = f2.getSchema();
+ System.out.println(temp.getNumColumns());
+ ColumnSchema cs = temp.getColumn(0);
+ System.out.println(cs.getType());
+
}
@Test
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageGrammar.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageGrammar.java?rev=935046&r1=935045&r2=935046&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageGrammar.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageGrammar.java Fri Apr 16 19:08:58 2010
@@ -52,7 +52,7 @@ import org.junit.Test;
*/
public class TestStorageGrammar {
- final static String STR_SCHEMA = "s1:bool, s2:int, s3:long, s4:float, s5:string, s6:bytes, r1:record(f1:int, f2:long), r2:record(r3:record(f3:float, f4)), m1:map(string),m2:map(map(int)), c:collection(record(f13:double, f14:float, f15:bytes)),s7:string, s8:string, s9:string, s10:string, s11:string, s12:string, s13:string, s14:string, s15:string, s16:string, s17:string, s18:string, s19:string, s20:string, s21:string, s22:string, s23:string";
+ final static String STR_SCHEMA = "s1:bool, s2:int, s3:long, s4:double, s5:string, s6:bytes, r1:record(f1:int, f2:long), r2:record(r3:record(f3:double, f4)), m1:map(string),m2:map(map(int)), c:collection(record(f13:double, f14:double, f15:bytes)),s7:string, s8:string, s9:string, s10:string, s11:string, s12:string, s13:string, s14:string, s15:string, s16:string, s17:string, s18:string, s19:string, s20:string, s21:string, s22:string, s23:string";
static String STR_STORAGE = null;
final private static Configuration conf = new Configuration();
private static Path path;
@@ -60,30 +60,29 @@ public class TestStorageGrammar {
private static String user;
private static String group;
private static String defaultUser;
-
- static{
- try{
- String command = "whoami";
- Process process = new ProcessBuilder(command).start();
- InputStream is = process.getInputStream();
- InputStreamReader isr = new InputStreamReader(is);
- BufferedReader br = new BufferedReader(isr);
- System.out.printf("Output of running %s is:",
- command);
- String line;
- while ((line = br.readLine()) != null) {
- System.out.println("default user0:" +line);
- defaultUser = line;
-
- }
- }catch(Exception e){
+
+ static {
+ try {
+ String command = "whoami";
+ Process process = new ProcessBuilder(command).start();
+ InputStream is = process.getInputStream();
+ InputStreamReader isr = new InputStreamReader(is);
+ BufferedReader br = new BufferedReader(isr);
+ System.out.printf("Output of running %s is:", command);
+ String line;
+ while ((line = br.readLine()) != null) {
+ System.out.println("default user0:" + line);
+ defaultUser = line;
+
+ }
+ } catch (Exception e) {
e.printStackTrace();
}
}
@BeforeClass
public static void setUpOnce() throws IOException, LoginException {
- if (System.getProperty("user") == null) {
+ if (System.getProperty("user") == null) {
System.setProperty("user", defaultUser);
}
user = System.getProperty("user");
@@ -319,12 +318,12 @@ public class TestStorageGrammar {
public static void tearDownOnce() throws IOException {
}
- //@Test
+ // @Test
/*
* group1 is user specific
*/
public void test1() throws IOException, ParseException {
-
+
String schema = "s1:string, s2:string";
String storage = "[s1, s2]COMPRESS BY gz SECURE BY uid:user1 gid:users perm:744 SERIALIZE BY pig";
RawLocalFileSystem rawLFS = new RawLocalFileSystem();
@@ -355,6 +354,7 @@ public class TestStorageGrammar {
Path path1 = new Path(path.toString() + "2");
BasicTable.Writer writer = null;
try {
+ BasicTable.drop(path1, conf);
writer = new BasicTable.Writer(path1, schema, storage, conf);
} catch (Exception e) {
e.printStackTrace();
@@ -379,6 +379,7 @@ public class TestStorageGrammar {
Path path1 = new Path(path.toString() + "3");
BasicTable.Writer writer = null;
try {
+ BasicTable.drop(path1, conf);
writer = new BasicTable.Writer(path1, schema, storage, conf);
} catch (Exception e) {
e.printStackTrace();
@@ -401,6 +402,7 @@ public class TestStorageGrammar {
Path path1 = new Path(path.toString() + "4");
BasicTable.Writer writer = null;
try {
+ BasicTable.drop(path1, conf);
writer = new BasicTable.Writer(path1, schema, storage, conf);
} catch (Exception e) {
e.printStackTrace();
@@ -423,6 +425,7 @@ public class TestStorageGrammar {
Path path1 = new Path(path.toString() + "5");
BasicTable.Writer writer = null;
try {
+ BasicTable.drop(path1, conf);
writer = new BasicTable.Writer(path1, schema, storage, conf);
} catch (Exception e) {
e.printStackTrace();
@@ -445,6 +448,7 @@ public class TestStorageGrammar {
Path path1 = new Path(path.toString() + "6");
BasicTable.Writer writer = null;
try {
+ BasicTable.drop(path1, conf);
writer = new BasicTable.Writer(path1, schema, storage, conf);
} catch (Exception e) {
e.printStackTrace();
@@ -467,6 +471,7 @@ public class TestStorageGrammar {
Path path1 = new Path(path.toString() + "7");
BasicTable.Writer writer = null;
try {
+ BasicTable.drop(path1, conf);
writer = new BasicTable.Writer(path1, schema, storage, conf);
} catch (Exception e) {
e.printStackTrace();
@@ -488,6 +493,7 @@ public class TestStorageGrammar {
Path path1 = new Path(path.toString() + "8");
BasicTable.Writer writer = null;
try {
+ BasicTable.drop(path1, conf);
writer = new BasicTable.Writer(path1, schema, storage, conf);
} catch (Exception e) {
e.printStackTrace();
@@ -510,6 +516,7 @@ public class TestStorageGrammar {
Path path1 = new Path(path.toString() + "9");
BasicTable.Writer writer = null;
+ BasicTable.drop(path1, conf);
writer = new BasicTable.Writer(path1, schema, storage, conf);
Assert.fail("should throw exception, none defined serializer");
writer.finish();
@@ -522,6 +529,7 @@ public class TestStorageGrammar {
Path path1 = new Path(path.toString() + "10");
BasicTable.Writer writer = null;
+ BasicTable.drop(path1, conf);
writer = new BasicTable.Writer(path1, schema, storage, conf);
Assert.fail("should throw exception, none defined serializer");
writer.finish();
@@ -534,6 +542,7 @@ public class TestStorageGrammar {
Path path1 = new Path(path.toString() + "11");
BasicTable.Writer writer = null;
+ BasicTable.drop(path1, conf);
writer = new BasicTable.Writer(path1, schema, storage, conf);
Assert.fail("should throw exception, none defined serializer");
writer.finish();
@@ -546,6 +555,7 @@ public class TestStorageGrammar {
Path path1 = new Path(path.toString() + "12");
BasicTable.Writer writer = null;
+ BasicTable.drop(path1, conf);
writer = new BasicTable.Writer(path1, schema, storage, conf);
Assert.fail("should throw exception, none defined serializer");
writer.finish();
@@ -558,6 +568,7 @@ public class TestStorageGrammar {
Path path1 = new Path(path.toString() + "13");
BasicTable.Writer writer = null;
+ BasicTable.drop(path1, conf);
writer = new BasicTable.Writer(path1, schema, storage, conf);
Assert.fail("should throw exception, none defined serializer");
writer.finish();
@@ -568,6 +579,8 @@ public class TestStorageGrammar {
String schema = "some1:string, some2:string";
String storage = "[some1,some2] COMPRESS BY gz SECURE BY usssser:user1 gid:users perm:760 SERIALIZE BY pig";
Path path1 = new Path(path.toString() + "14");
+
+ BasicTable.drop(path1, conf);
BasicTable.Writer writer = null;
writer = new BasicTable.Writer(path1, schema, storage, conf);
Assert.fail("should throw exception, none defined serializer");
@@ -580,6 +593,7 @@ public class TestStorageGrammar {
String storage = "[some1,some2] COMPRESS BY gz SECURE BY uid:user1 grouuuup:group1 perm:760 SERIALIZE BY pig";
Path path1 = new Path(path.toString() + "15");
BasicTable.Writer writer = null;
+ BasicTable.drop(path1, conf);
writer = new BasicTable.Writer(path1, schema, storage, conf);
Assert.fail("should throw exception, none defined serializer");
writer.finish();
@@ -591,6 +605,7 @@ public class TestStorageGrammar {
String storage = "[some1,some2] COMPRESS BY gz SECURE BY uid:user1 gid:users perrrrrm:760 SERIALIZE BY pig";
Path path1 = new Path(path.toString() + "16");
BasicTable.Writer writer = null;
+ BasicTable.drop(path1, conf);
writer = new BasicTable.Writer(path1, schema, storage, conf);
Assert.fail("should throw exception, none defined serializer");
writer.finish();
@@ -604,6 +619,7 @@ public class TestStorageGrammar {
Path path1 = new Path(path.toString() + "17");
Runtime.getRuntime().exec("rm -rf " + path1.toString());
fs = path.getFileSystem(conf);
+ BasicTable.drop(path1, conf);
BasicTable.Writer writer = new BasicTable.Writer(path1, schema, storage,
conf);
writer.close();
@@ -618,7 +634,7 @@ public class TestStorageGrammar {
"Schema : s9:string,s10:string"));
}
- //@Test
+ // @Test
public void test18() throws IOException, ParseException {
String schema = "s9:string, s10:string";
String storage = "[s9,s10] COMPRESS BY gZ";
@@ -626,6 +642,7 @@ public class TestStorageGrammar {
Path path1 = new Path(path.toString() + "18");
Runtime.getRuntime().exec("rm -rf " + path1.toString());
fs = path.getFileSystem(conf);
+ BasicTable.drop(path1, conf);
BasicTable.Writer writer = new BasicTable.Writer(path1, schema, storage,
conf);
writer.finish();
@@ -636,7 +653,7 @@ public class TestStorageGrammar {
System.out.println("bos: " + bos.toString());
Assert.assertEquals(true, bos.toString().contains("Serializer: pig"));
-
+
Assert.assertEquals(true, bos.toString().contains("Compressor: gz"));
Assert.assertEquals(true, bos.toString().contains(
"Schema : s9:string,s10:string"));
@@ -647,13 +664,14 @@ public class TestStorageGrammar {
String schema = "some1:string, some2:string";
String storage = "[some1,some2] COMPRESS BY something";
Path path1 = new Path(path.toString() + "19");
+ BasicTable.drop(path1, conf);
BasicTable.Writer writer = null;
writer = new BasicTable.Writer(path1, schema, storage, conf);
Assert.fail("should throw exception, none defined serializer");
writer.finish();
}
- //@Test
+ // @Test
/*
* group1 is user specific
*/
@@ -664,6 +682,7 @@ public class TestStorageGrammar {
Path path1 = new Path(path.toString() + "20");
Runtime.getRuntime().exec("rm -rf " + path1.toString());
fs = path.getFileSystem(conf);
+ BasicTable.drop(path1, conf);
BasicTable.Writer writer = new BasicTable.Writer(path1, schema, storage,
conf);
writer.finish();
@@ -684,6 +703,7 @@ public class TestStorageGrammar {
String schema = "s9:string, s10:string, s11:string";
String storage = "[s9,s10] COMPRESS BY gZ; secure by uid:user1 gid:users perm:755;secure by user:user1 gid:users perm:755";
Path path1 = new Path(path.toString() + "16");
+ BasicTable.drop(path1, conf);
BasicTable.Writer writer = null;
writer = new BasicTable.Writer(path1, schema, storage, conf);
Assert.fail("should throw exception, none defined serializer");
@@ -696,6 +716,7 @@ public class TestStorageGrammar {
String storage = "[s9,s10] secure by uid:user3";
Path path1 = new Path(path.toString() + "22");
+ BasicTable.drop(path1, conf);
Runtime.getRuntime().exec("rm -rf " + path1.toString());
fs = path.getFileSystem(conf);
BasicTable.Writer writer = new BasicTable.Writer(path1, schema, storage,
@@ -715,7 +736,7 @@ public class TestStorageGrammar {
Assert.assertEquals(true, bos.toString().contains("Perm: -1"));
}
- //@Test
+ // @Test
/*
* group1 is user specific
*/
@@ -724,6 +745,7 @@ public class TestStorageGrammar {
String storage = "[s9,s10] secure by gid:users";
Path path1 = new Path(path.toString() + "23");
+ BasicTable.drop(path1, conf);
Runtime.getRuntime().exec("rm -rf " + path1.toString());
fs = path.getFileSystem(conf);
BasicTable.Writer writer = new BasicTable.Writer(path1, schema, storage,
@@ -743,12 +765,13 @@ public class TestStorageGrammar {
Assert.assertEquals(true, bos.toString().contains("Perm: -1"));
}
- //@Test
+ // @Test
public void test24() throws IOException, ParseException {
String schema = "s9:string, s10:string";
String storage = "[s9,s10] secure by perm:755";
Path path1 = new Path(path.toString() + "24");
+ BasicTable.drop(path1, conf);
Runtime.getRuntime().exec("rm -rf " + path1.toString());
fs = path.getFileSystem(conf);
BasicTable.Writer writer = new BasicTable.Writer(path1, schema, storage,
@@ -768,7 +791,7 @@ public class TestStorageGrammar {
Assert.assertEquals(true, bos.toString().contains("Perm: 0755"));
}
- //@Test
+ // @Test
/*
* group1 is user specific
*/
@@ -777,6 +800,7 @@ public class TestStorageGrammar {
String storage = "[s9,s10] secure by uid:user1 gid:users";
Path path1 = new Path(path.toString() + "25");
+ BasicTable.drop(path1, conf);
Runtime.getRuntime().exec("rm -rf " + path1.toString());
fs = path.getFileSystem(conf);
BasicTable.Writer writer = new BasicTable.Writer(path1, schema, storage,
@@ -796,12 +820,13 @@ public class TestStorageGrammar {
Assert.assertEquals(true, bos.toString().contains("Perm: -1"));
}
- //@Test
+ // @Test
public void test26() throws IOException, ParseException {
String schema = "s9:string, s10:string";
String storage = "[s9,s10] secure by perm:755 gid:users";
Path path1 = new Path(path.toString() + "26");
+ BasicTable.drop(path1, conf);
Runtime.getRuntime().exec("rm -rf " + path1.toString());
fs = path.getFileSystem(conf);
BasicTable.Writer writer = new BasicTable.Writer(path1, schema, storage,
@@ -826,6 +851,7 @@ public class TestStorageGrammar {
String schema = "s9:string, s10:string";
String storage = "[s9,s10] COMPRESS BY gZ; secure by ";
Path path1 = new Path(path.toString() + "27");
+ BasicTable.drop(path1, conf);
BasicTable.Writer writer = null;
writer = new BasicTable.Writer(path1, schema, storage, conf);
Assert.fail("should throw exception, none defined serializer");
Added: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestTypeCheck.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestTypeCheck.java?rev=935046&view=auto
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestTypeCheck.java (added)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestTypeCheck.java Fri Apr 16 19:08:58 2010
@@ -0,0 +1,421 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.hadoop.zebra.types;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import junit.framework.Assert;
+
+import org.apache.hadoop.zebra.BaseTestCase;
+import org.apache.hadoop.zebra.parser.ParseException;
+import org.apache.hadoop.zebra.schema.Schema;
+import org.apache.hadoop.zebra.types.TypesUtils;
+import org.apache.pig.data.DataBag;
+import org.apache.pig.data.DataByteArray;
+import org.apache.pig.data.Tuple;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * This is to test type check for writes in Zebra.
+ */
+public class TestTypeCheck extends BaseTestCase {
+
+ @BeforeClass
+ public static void setUpOnce() throws Exception {
+ init();
+ }
+
+ @Test
+ public void testPositive1() throws ParseException, IOException {
+ String STR_SCHEMA = "s1:bool, s2:int, s3:long, s4:float, s5:double, s6:string, s7:bytes";
+ Schema schema = new Schema(STR_SCHEMA);
+
+ Tuple tuple = TypesUtils.createTuple(schema);
+ TypesUtils.resetTuple(tuple);
+
+ tuple.set(0, true);
+ tuple.set(1, 1);
+ tuple.set(2, 1001L);
+ tuple.set(3, 1.1f);
+ tuple.set(4, 2.2d);
+ tuple.set(5, "hello world 1");
+ tuple.set(6, new DataByteArray("hello byte 1"));
+
+ try {
+ TypesUtils.checkCompatible(tuple, schema);
+ } catch (Exception e) {
+ Assert.fail("Should not see this: " + e.getMessage());
+ }
+ }
+
+ @Test
+ public void testPositive2() throws ParseException, IOException {
+ String STR_SCHEMA = "f1:bool, r:record(f11:int, f12:long), m:map(string), c:collection(record(f13:double, f14:float, f15:bytes))";
+ Schema schema = new Schema(STR_SCHEMA);
+
+ Tuple tuple = TypesUtils.createTuple(schema);
+ TypesUtils.resetTuple(tuple);
+
+ tuple.set(0, true);
+
+ Tuple tupRecord;
+ try {
+ tupRecord = TypesUtils.createTuple(schema.getColumnSchema("r").getSchema());
+ } catch (ParseException e) {
+ e.printStackTrace();
+ throw new IOException(e);
+ }
+ tupRecord.set(0, 1);
+ tupRecord.set(1, 1001L);
+ tuple.set(1, tupRecord);
+
+ Map<String, String> map = new HashMap<String, String>();
+ map.put("a", "x");
+ map.put("b", "y");
+ map.put("c", "z");
+ tuple.set(2, map);
+
+ DataBag bagColl = TypesUtils.createBag();
+ Schema schColl = schema.getColumn(3).getSchema().getColumn(0).getSchema();
+ Tuple tupColl1 = TypesUtils.createTuple(schColl);
+ Tuple tupColl2 = TypesUtils.createTuple(schColl);
+ byte[] abs1 = new byte[3];
+ byte[] abs2 = new byte[4];
+ tupColl1.set(0, 3.1415926);
+ tupColl1.set(1, 1.6f);
+ abs1[0] = 11;
+ abs1[1] = 12;
+ abs1[2] = 13;
+ tupColl1.set(2, new DataByteArray(abs1));
+ bagColl.add(tupColl1);
+ tupColl2.set(0, 123.456789);
+ tupColl2.set(1, 100f);
+ abs2[0] = 21;
+ abs2[1] = 22;
+ abs2[2] = 23;
+ abs2[3] = 24;
+ tupColl2.set(2, new DataByteArray(abs2));
+ bagColl.add(tupColl2);
+ tuple.set(3, bagColl);
+
+ try {
+ TypesUtils.checkCompatible(tuple, schema);
+ } catch (Exception e) {
+ Assert.fail("Should not see this: " + e.getMessage());
+ }
+ }
+
+ @Test
+ public void testPositive3() throws IOException, ParseException {
+ String STR_SCHEMA = "m1:map(string),m2:map(map(int))";
+ Schema schema = new Schema(STR_SCHEMA);
+ Tuple tuple = TypesUtils.createTuple(schema);
+ TypesUtils.resetTuple(tuple);
+
+ // m1:map(string)
+ Map<String, String> m1 = new HashMap<String, String>();
+ m1.put("a", "A");
+ m1.put("b", "B");
+ m1.put("c", "C");
+ tuple.set(0, m1);
+
+ // m2:map(map(int))
+ HashMap<String, Map> m2 = new HashMap<String, Map>();
+ Map<String, Integer> m3 = new HashMap<String, Integer>();
+ m3.put("m311", 311);
+ m3.put("m321", 321);
+ m3.put("m331", 331);
+ Map<String, Integer> m4 = new HashMap<String, Integer>();
+ m4.put("m411", 411);
+ m4.put("m421", 421);
+ m4.put("m431", 431);
+ m2.put("x", m3);
+ m2.put("y", m4);
+ tuple.set(1, m2);
+
+ try {
+ TypesUtils.checkCompatible(tuple, schema);
+ } catch (Exception e) {
+ Assert.fail("Should not see this: " + e.getMessage());
+ }
+ }
+
+ @Test
+ public void testPositive4() throws ParseException, IOException {
+ String STR_SCHEMA = "s1:bool, s2:int, s3:long, s4:float, s5:double, s6:string, s7:bytes";
+ Schema schema = new Schema(STR_SCHEMA);
+
+ Tuple tuple = TypesUtils.createTuple(schema);
+ TypesUtils.resetTuple(tuple);
+
+ tuple.set(0, true);
+ tuple.set(1, 1);
+ tuple.set(2, 1001);
+ tuple.set(3, 1.1f);
+ tuple.set(4, 2.2f);
+ tuple.set(5, "hello world 1");
+ tuple.set(6, new DataByteArray("hello byte 1"));
+
+ try {
+ TypesUtils.checkCompatible(tuple, schema);
+ } catch (Exception e) {
+ Assert.fail("Should not see this: " + e.getMessage());
+ }
+ }
+
+ // null is ok
+ @Test
+ public void testPositive5() throws ParseException, IOException {
+ String STR_SCHEMA = "s1:bool, s2:int, s3:long, s4:float, s5:double, s6:string, s7:bytes";
+ Schema schema = new Schema(STR_SCHEMA);
+
+ Tuple tuple = TypesUtils.createTuple(schema);
+ TypesUtils.resetTuple(tuple);
+
+ tuple.set(0, null);
+ tuple.set(1, 1);
+ tuple.set(2, null);
+ tuple.set(3, 1.1f);
+ tuple.set(4, null);
+ tuple.set(5, "hello world 1");
+ tuple.set(6, new DataByteArray("hello byte 1"));
+
+ try {
+ TypesUtils.checkCompatible(tuple, schema);
+ } catch (Exception e) {
+ Assert.fail("Should not see this: " + e.getMessage());
+ }
+ }
+
+ @Test
+ public void testPositive6() throws ParseException, IOException {
+ String STR_SCHEMA = "f1:bool, r:record(f11:int, f12:long), m:map(string), c:collection(record(f13:double, f14:float, m:map(string)))";
+ Schema schema = new Schema(STR_SCHEMA);
+
+ Tuple tuple = TypesUtils.createTuple(schema);
+ TypesUtils.resetTuple(tuple);
+
+ tuple.set(0, true);
+
+ Tuple tupRecord;
+ try {
+ tupRecord = TypesUtils.createTuple(schema.getColumnSchema("r").getSchema());
+ } catch (ParseException e) {
+ e.printStackTrace();
+ throw new IOException(e);
+ }
+ tupRecord.set(0, 1);
+ tupRecord.set(1, 1001L);
+ tuple.set(1, tupRecord);
+
+ Map<String, String> map = new HashMap<String, String>();
+ map.put("a", "x");
+ map.put("b", "y");
+ map.put("c", "z");
+ tuple.set(2, map);
+
+ DataBag bagColl = TypesUtils.createBag();
+ Schema schColl = schema.getColumn(3).getSchema().getColumn(0).getSchema();
+ Tuple tupColl1 = TypesUtils.createTuple(schColl);
+ Tuple tupColl2 = TypesUtils.createTuple(schColl);
+ tupColl1.set(0, 3.1415926);
+ tupColl1.set(1, 1.6f);
+ tupColl1.set(2, map);
+ bagColl.add(tupColl1);
+ tupColl2.set(0, 123.456789);
+ tupColl2.set(1, 100f);
+ tupColl2.set(2, map);
+ bagColl.add(tupColl2);
+ tuple.set(3, bagColl);
+
+ try {
+ TypesUtils.checkCompatible(tuple, schema);
+ } catch (Exception e) {
+ Assert.fail("Should not see this: " + e.getMessage());
+ }
+ }
+
+
+ // sees an long for an integer column;
+ @Test (expected = IOException.class)
+ public void testNegative1() throws ParseException, IOException {
+ String STR_SCHEMA = "s1:bool, s2:int, s3:long, s4:float, s5:double, s6:string, s7:bytes";
+ Schema schema = new Schema(STR_SCHEMA);
+
+ Tuple tuple = TypesUtils.createTuple(schema);
+ TypesUtils.resetTuple(tuple);
+
+ tuple.set(0, true);
+ tuple.set(1, 1L);
+ tuple.set(2, 1001);
+ tuple.set(3, 1.1f);
+ tuple.set(4, 2.2f);
+ tuple.set(5, "hello world 1");
+ tuple.set(6, new DataByteArray("hello byte 1"));
+
+ TypesUtils.checkCompatible(tuple, schema);
+ }
+
+ // sees an float for an integer column;
+ @Test (expected = IOException.class)
+ public void testNegative2() throws ParseException, IOException {
+ String STR_SCHEMA = "s1:bool, s2:int, s3:long, s4:float, s5:double, s6:string, s7:bytes";
+ Schema schema = new Schema(STR_SCHEMA);
+
+ Tuple tuple = TypesUtils.createTuple(schema);
+ TypesUtils.resetTuple(tuple);
+
+ tuple.set(0, true);
+ tuple.set(1, 1.1f);
+ tuple.set(2, 1001);
+ tuple.set(3, 1.1f);
+ tuple.set(4, 2.2f);
+ tuple.set(5, "hello world 1");
+ tuple.set(6, new DataByteArray("hello byte 1"));
+
+ TypesUtils.checkCompatible(tuple, schema);
+ }
+
+ // sees a double for an integer column;
+ @Test (expected = IOException.class)
+ public void testNegative3() throws ParseException, IOException {
+ String STR_SCHEMA = "s1:bool, s2:int, s3:long, s4:float, s5:double, s6:string, s7:bytes";
+ Schema schema = new Schema(STR_SCHEMA);
+
+ Tuple tuple = TypesUtils.createTuple(schema);
+ TypesUtils.resetTuple(tuple);
+
+ tuple.set(0, true);
+ tuple.set(1, 1.1);
+ tuple.set(2, 1001);
+ tuple.set(3, 1.1f);
+ tuple.set(4, 2.2f);
+ tuple.set(5, "hello world 1");
+ tuple.set(6, new DataByteArray("hello byte 1"));
+
+ TypesUtils.checkCompatible(tuple, schema);
+ }
+
+ // sees an float for an long column;
+ @Test (expected = IOException.class)
+ public void testNegative4() throws ParseException, IOException {
+ String STR_SCHEMA = "s1:bool, s2:int, s3:long, s4:float, s5:double, s6:string, s7:bytes";
+ Schema schema = new Schema(STR_SCHEMA);
+
+ Tuple tuple = TypesUtils.createTuple(schema);
+ TypesUtils.resetTuple(tuple);
+
+ tuple.set(0, true);
+ tuple.set(1, 1);
+ tuple.set(2, 1.1f);
+ tuple.set(3, 1.1f);
+ tuple.set(4, 2.2f);
+ tuple.set(5, "hello world 1");
+ tuple.set(6, new DataByteArray("hello byte 1"));
+
+ TypesUtils.checkCompatible(tuple, schema);
+ }
+
+ // sees a double for an long column;
+ @Test (expected = IOException.class)
+ public void testNegative5() throws ParseException, IOException {
+ String STR_SCHEMA = "s1:bool, s2:int, s3:long, s4:float, s5:double, s6:string, s7:bytes";
+ Schema schema = new Schema(STR_SCHEMA);
+
+ Tuple tuple = TypesUtils.createTuple(schema);
+ TypesUtils.resetTuple(tuple);
+
+ tuple.set(0, true);
+ tuple.set(1, 1);
+ tuple.set(2, 1.1);
+ tuple.set(3, 1.1f);
+ tuple.set(4, 2.2f);
+ tuple.set(5, "hello world 1");
+ tuple.set(6, new DataByteArray("hello byte 1"));
+
+ TypesUtils.checkCompatible(tuple, schema);
+ }
+
+ // sees a double for an float column;
+ @Test (expected = IOException.class)
+ public void testNegative6() throws ParseException, IOException {
+ String STR_SCHEMA = "s1:bool, s2:int, s3:long, s4:float, s5:double, s6:string, s7:bytes";
+ Schema schema = new Schema(STR_SCHEMA);
+
+ Tuple tuple = TypesUtils.createTuple(schema);
+ TypesUtils.resetTuple(tuple);
+
+ tuple.set(0, true);
+ tuple.set(1, 1);
+ tuple.set(2, 1);
+ tuple.set(3, 1.1);
+ tuple.set(4, 2.2);
+ tuple.set(5, "hello world 1");
+ tuple.set(6, new DataByteArray("hello byte 1"));
+
+ TypesUtils.checkCompatible(tuple, schema);
+ }
+
+ // sees an float for a boolean column;
+ @Test (expected = IOException.class)
+ public void testNegative7() throws ParseException, IOException {
+ String STR_SCHEMA = "s1:bool, s2:int, s3:long, s4:float, s5:double, s6:string, s7:bytes";
+ Schema schema = new Schema(STR_SCHEMA);
+
+ Tuple tuple = TypesUtils.createTuple(schema);
+ TypesUtils.resetTuple(tuple);
+
+ tuple.set(0, 1.1f);
+ tuple.set(1, 1);
+ tuple.set(2, 1.1f);
+ tuple.set(3, 1.1f);
+ tuple.set(4, 2.2f);
+ tuple.set(5, "hello world 1");
+ tuple.set(6, new DataByteArray("hello byte 1"));
+
+ TypesUtils.checkCompatible(tuple, schema);
+ }
+
+ // no. of columns is wrong;
+ @Test (expected = IOException.class)
+ public void testNegative8() throws ParseException, IOException {
+ String STR_SCHEMA = "s1:bool, s2:int, s3:long, s4:float, s5:double, s6:string, s7:bytes";
+ String STR_SCHEMA1 = "s1:bool, s2:int, s3:long, s4:float, s5:double, s6:string";
+ Schema schema = new Schema(STR_SCHEMA);
+ Schema schema1 = new Schema(STR_SCHEMA1);
+
+ Tuple tuple = TypesUtils.createTuple(schema1);
+ TypesUtils.resetTuple(tuple);
+
+ tuple.set(0, true);
+ tuple.set(1, 1);
+ tuple.set(2, 1L);
+ tuple.set(3, 1.1f);
+ tuple.set(4, 2.2f);
+ tuple.set(5, "hello world 1");
+
+ TypesUtils.checkCompatible(tuple, schema);
+ }
+
+ @AfterClass
+ public static void tearDownOnce() throws IOException {
+
+ }
+}