You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ga...@apache.org on 2009/10/15 22:38:13 UTC
svn commit: r825641 [3/3] - in /hadoop/pig/trunk: ./ contrib/zebra/
contrib/zebra/src/java/org/apache/hadoop/zebra/io/
contrib/zebra/src/java/org/apache/hadoop/zebra/mapred/
contrib/zebra/src/java/org/apache/hadoop/zebra/pig/
contrib/zebra/src/java/org...
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageCollection.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageCollection.java?rev=825641&r1=825640&r2=825641&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageCollection.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageCollection.java Thu Oct 15 20:38:08 2009
@@ -25,12 +25,12 @@
import junit.framework.Assert;
import org.apache.hadoop.zebra.types.CGSchema;
-import org.apache.hadoop.zebra.types.ColumnType;
-import org.apache.hadoop.zebra.types.ParseException;
+import org.apache.hadoop.zebra.schema.ColumnType;
+import org.apache.hadoop.zebra.parser.ParseException;
import org.apache.hadoop.zebra.types.Partition;
-import org.apache.hadoop.zebra.types.Schema;
-import org.apache.hadoop.zebra.types.TableSchemaParser;
-import org.apache.hadoop.zebra.types.Schema.ColumnSchema;
+import org.apache.hadoop.zebra.schema.Schema;
+import org.apache.hadoop.zebra.parser.TableSchemaParser;
+import org.apache.hadoop.zebra.schema.Schema.ColumnSchema;
import org.junit.Before;
import org.junit.Test;
@@ -64,11 +64,11 @@
CGSchema cgs2 = cgschemas[1];
ColumnSchema f11 = cgs1.getSchema().getColumn(0);
- Assert.assertEquals("c1", f11.name);
- Assert.assertEquals(ColumnType.COLLECTION, f11.type);
+ Assert.assertEquals("c1", f11.getName());
+ Assert.assertEquals(ColumnType.COLLECTION, f11.getType());
ColumnSchema f21 = cgs2.getSchema().getColumn(0);
- Assert.assertEquals("c2", f21.name);
- Assert.assertEquals(ColumnType.COLLECTION, f21.type);
+ Assert.assertEquals("c2", f21.getName());
+ Assert.assertEquals(ColumnType.COLLECTION, f21.getType());
System.out.println("*********** Column Map **********");
Map<String, HashSet<Partition.PartitionInfo.ColumnMappingEntry>> colmap = p
@@ -125,14 +125,14 @@
CGSchema cgs2 = cgschemas[1];
ColumnSchema f11 = cgs1.getSchema().getColumn(0);
- Assert.assertEquals("c1.f1", f11.name);
- Assert.assertEquals(ColumnType.INT, f11.type);
+ Assert.assertEquals("c1.f1", f11.getName());
+ Assert.assertEquals(ColumnType.INT, f11.getType());
ColumnSchema f21 = cgs2.getSchema().getColumn(0);
- Assert.assertEquals("c1.f2", f21.name);
- Assert.assertEquals(ColumnType.INT, f21.type);
+ Assert.assertEquals("c1.f2", f21.getName());
+ Assert.assertEquals(ColumnType.INT, f21.getType());
ColumnSchema f22 = cgs2.getSchema().getColumn(1);
- Assert.assertEquals("c2", f22.name);
- Assert.assertEquals(ColumnType.COLLECTION, f22.type);
+ Assert.assertEquals("c2", f22.getName());
+ Assert.assertEquals(ColumnType.COLLECTION, f22.getType());
System.out.println("*********** Column Map **********");
Map<String, HashSet<Partition.PartitionInfo.ColumnMappingEntry>> colmap = p
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageMap.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageMap.java?rev=825641&r1=825640&r2=825641&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageMap.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageMap.java Thu Oct 15 20:38:08 2009
@@ -26,12 +26,12 @@
import junit.framework.Assert;
import org.apache.hadoop.zebra.types.CGSchema;
-import org.apache.hadoop.zebra.types.ColumnType;
-import org.apache.hadoop.zebra.types.ParseException;
+import org.apache.hadoop.zebra.schema.ColumnType;
+import org.apache.hadoop.zebra.parser.ParseException;
import org.apache.hadoop.zebra.types.Partition;
-import org.apache.hadoop.zebra.types.Schema;
-import org.apache.hadoop.zebra.types.TableSchemaParser;
-import org.apache.hadoop.zebra.types.Schema.ColumnSchema;
+import org.apache.hadoop.zebra.schema.Schema;
+import org.apache.hadoop.zebra.parser.TableSchemaParser;
+import org.apache.hadoop.zebra.schema.Schema.ColumnSchema;
import org.junit.Before;
import org.junit.Test;
@@ -67,23 +67,23 @@
CGSchema cgs3 = cgschemas[2];
ColumnSchema f11 = cgs1.getSchema().getColumn(0);
- Assert.assertEquals(f11.name, "m1");
- Assert.assertEquals(ColumnType.MAP, f11.type);
+ Assert.assertEquals(f11.getName(), "m1");
+ Assert.assertEquals(ColumnType.MAP, f11.getType());
ColumnSchema f21 = cgs2.getSchema().getColumn(0);
- Assert.assertEquals(f21.name, "m2");
+ Assert.assertEquals(f21.getName(), "m2");
// TODO: type should be MAP!
- Assert.assertEquals(ColumnType.MAP, f21.type);
+ Assert.assertEquals(ColumnType.MAP, f21.getType());
ColumnSchema f22 = cgs2.getSchema().getColumn(1);
- Assert.assertEquals(f22.name, "f3");
- Assert.assertEquals(ColumnType.INT, f22.type);
+ Assert.assertEquals(f22.getName(), "f3");
+ Assert.assertEquals(ColumnType.INT, f22.getType());
ColumnSchema f31 = cgs3.getSchema().getColumn(0);
- Assert.assertEquals(f31.name, "m1");
- Assert.assertEquals(ColumnType.MAP, f31.type);
+ Assert.assertEquals(f31.getName(), "m1");
+ Assert.assertEquals(ColumnType.MAP, f31.getType());
ColumnSchema f32 = cgs3.getSchema().getColumn(1);
- Assert.assertEquals(f32.name, "m2");
- Assert.assertEquals(ColumnType.MAP, f32.type);
+ Assert.assertEquals(f32.getName(), "m2");
+ Assert.assertEquals(ColumnType.MAP, f32.getType());
System.out.println("*********** Column Map **********");
Map<String, HashSet<Partition.PartitionInfo.ColumnMappingEntry>> colmap = p
@@ -154,20 +154,20 @@
CGSchema cgs3 = cgschemas[2];
ColumnSchema f11 = cgs1.getSchema().getColumn(0);
- Assert.assertEquals(f11.name, "m1");
- Assert.assertEquals(ColumnType.MAP, f11.type);
+ Assert.assertEquals(f11.getName(), "m1");
+ Assert.assertEquals(ColumnType.MAP, f11.getType());
ColumnSchema f21 = cgs2.getSchema().getColumn(0);
- Assert.assertEquals(f21.name, "m1");
- Assert.assertEquals(ColumnType.MAP, f21.type);
+ Assert.assertEquals(f21.getName(), "m1");
+ Assert.assertEquals(ColumnType.MAP, f21.getType());
ColumnSchema f22 = cgs2.getSchema().getColumn(1);
- Assert.assertEquals(f22.name, "f3");
- Assert.assertEquals(ColumnType.INT, f22.type);
+ Assert.assertEquals(f22.getName(), "f3");
+ Assert.assertEquals(ColumnType.INT, f22.getType());
ColumnSchema f31 = cgs3.getSchema().getColumn(0);
- Assert.assertEquals(f31.name, "m1");
- Assert.assertEquals(ColumnType.MAP, f31.type);
+ Assert.assertEquals(f31.getName(), "m1");
+ Assert.assertEquals(ColumnType.MAP, f31.getType());
ColumnSchema f32 = cgs3.getSchema().getColumn(1);
- Assert.assertEquals(f32.name, "m2");
- Assert.assertEquals(ColumnType.MAP, f32.type);
+ Assert.assertEquals(f32.getName(), "m2");
+ Assert.assertEquals(ColumnType.MAP, f32.getType());
System.out.println("*********** Column Map **********");
Map<String, HashSet<Partition.PartitionInfo.ColumnMappingEntry>> colmap = p
@@ -268,4 +268,4 @@
Assert.assertEquals(errMsg.startsWith(str), true);
}
}
-}
\ No newline at end of file
+}
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageMisc1.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageMisc1.java?rev=825641&r1=825640&r2=825641&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageMisc1.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageMisc1.java Thu Oct 15 20:38:08 2009
@@ -25,12 +25,12 @@
import junit.framework.Assert;
import org.apache.hadoop.zebra.types.CGSchema;
-import org.apache.hadoop.zebra.types.ColumnType;
-import org.apache.hadoop.zebra.types.ParseException;
+import org.apache.hadoop.zebra.schema.ColumnType;
+import org.apache.hadoop.zebra.parser.ParseException;
import org.apache.hadoop.zebra.types.Partition;
-import org.apache.hadoop.zebra.types.Schema;
-import org.apache.hadoop.zebra.types.TableSchemaParser;
-import org.apache.hadoop.zebra.types.Schema.ColumnSchema;
+import org.apache.hadoop.zebra.schema.Schema;
+import org.apache.hadoop.zebra.parser.TableSchemaParser;
+import org.apache.hadoop.zebra.schema.Schema.ColumnSchema;
import org.junit.Before;
import org.junit.Test;
@@ -51,43 +51,43 @@
// test 1st level schema;
ColumnSchema f1 = schema.getColumn(0);
- Assert.assertEquals("r", f1.name);
- Assert.assertEquals(ColumnType.RECORD, f1.type);
+ Assert.assertEquals("r", f1.getName());
+ Assert.assertEquals(ColumnType.RECORD, f1.getType());
// test 2nd level schema;
- Schema f1Schema = f1.schema;
+ Schema f1Schema = f1.getSchema();
ColumnSchema f11 = f1Schema.getColumn(0);
- Assert.assertEquals("r", f11.name);
- Assert.assertEquals(ColumnType.RECORD, f11.type);
+ Assert.assertEquals("r", f11.getName());
+ Assert.assertEquals(ColumnType.RECORD, f11.getType());
ColumnSchema f12 = f1Schema.getColumn(1);
- Assert.assertEquals("f2", f12.name);
- Assert.assertEquals(ColumnType.MAP, f12.type);
+ Assert.assertEquals("f2", f12.getName());
+ Assert.assertEquals(ColumnType.MAP, f12.getType());
// test 3rd level schema;
- Schema f11Schema = f11.schema;
+ Schema f11Schema = f11.getSchema();
ColumnSchema f111 = f11Schema.getColumn(0);
- Assert.assertEquals("f1", f111.name);
- Assert.assertEquals(ColumnType.INT, f111.type);
+ Assert.assertEquals("f1", f111.getName());
+ Assert.assertEquals(ColumnType.INT, f111.getType());
ColumnSchema f112 = f11Schema.getColumn(1);
- Assert.assertEquals("f2", f112.name);
- Assert.assertEquals(ColumnType.INT, f112.type);
+ Assert.assertEquals("f2", f112.getName());
+ Assert.assertEquals(ColumnType.INT, f112.getType());
- Schema f12Schema = f12.schema;
+ Schema f12Schema = f12.getSchema();
ColumnSchema f121 = f12Schema.getColumn(0);
- // Assert.assertEquals("", f121.name);
- Assert.assertEquals(ColumnType.BYTES, f121.type);
+ // Assert.assertEquals("", f121.getName());
+ Assert.assertEquals(ColumnType.BYTES, f121.getType());
}
@Test
public void testStorageValid1() {
try {
- String strStorage = "[r.r.f1,r.f2#{k1}] COMPRESS BY gz SECURE BY user:gaurav; [r.r.f2, r.f2#{k2}] COMPRESS BY lzo SERIALIZE BY avro";
-// String strStorage = "[r.r.f1,r.f2#{k1}] COMPRESS BY gzip SECURE BY user:gaurav; [r.r.f2, r.f2#{k2}] COMPRESS BY lzo SERIALIZE BY avro";
-// String strStorage = "[r.r.f1,r.f2#{k1}] COMPRESS BY gzip SECURE BY user:gaurav group:data perm:0766; [r.r.f2, r.f2#{k2}] COMPRESS BY lzo SERIALIZE BY avro";
-// String strStorage = "[r.r.f1,r.f2#{k1}] COMPRESS BY gzip SECURE BY user:gaurav group:data perm:966; [r.r.f2, r.f2#{k2}] COMPRESS BY lzo SERIALIZE BY avro";
+ String strStorage = "[r.r.f1,r.f2#{k1}] COMPRESS BY gz SECURE BY user:root; [r.r.f2, r.f2#{k2}] COMPRESS BY lzo SERIALIZE BY avro";
+// String strStorage = "[r.r.f1,r.f2#{k1}] COMPRESS BY gzip SECURE BY user:root; [r.r.f2, r.f2#{k2}] COMPRESS BY lzo SERIALIZE BY avro";
+// String strStorage = "[r.r.f1,r.f2#{k1}] COMPRESS BY gzip SECURE BY user:root group:data perm:0766; [r.r.f2, r.f2#{k2}] COMPRESS BY lzo SERIALIZE BY avro";
+// String strStorage = "[r.r.f1,r.f2#{k1}] COMPRESS BY gzip SECURE BY user:root group:data perm:966; [r.r.f2, r.f2#{k2}] COMPRESS BY lzo SERIALIZE BY avro";
// String strStorage = "[r.r.f1,r.f2#{k1}] COMPRESS BY gzip SECURE BY; [r.r.f2, r.f2#{k2}] COMPRESS BY lzo SERIALIZE BY avro";
// String strStorage = "[r.r.f1,r.f2#{k1}] COMPRESS BY gzip SECURE BY user:ggg SECURE BY group:fff; [r.r.f2, r.f2#{k2}] COMPRESS BY lzo SERIALIZE BY avro";
-// String strStorage = "[r.r.f1,r.f2#{k1}] COMPRESS BY gzip SECURE BY user:gauravj user:gauravj; [r.r.f2, r.f2#{k2}] COMPRESS BY lzo SERIALIZE BY avro";
+// String strStorage = "[r.r.f1,r.f2#{k1}] COMPRESS BY gzip SECURE BY user:root user:root; [r.r.f2, r.f2#{k2}] COMPRESS BY lzo SERIALIZE BY avro";
Partition p = new Partition(schema.toString(), strStorage);
CGSchema[] cgschemas = p.getCGSchemas();
@@ -105,22 +105,22 @@
CGSchema cgs3 = cgschemas[2];
ColumnSchema f11 = cgs1.getSchema().getColumn(0);
- Assert.assertEquals("r.r.f1", f11.name);
- Assert.assertEquals(ColumnType.INT, f11.type);
+ Assert.assertEquals("r.r.f1", f11.getName());
+ Assert.assertEquals(ColumnType.INT, f11.getType());
ColumnSchema f12 = cgs1.getSchema().getColumn(1);
- Assert.assertEquals("r.f2", f12.name);
- Assert.assertEquals(ColumnType.MAP, f12.type);
+ Assert.assertEquals("r.f2", f12.getName());
+ Assert.assertEquals(ColumnType.MAP, f12.getType());
ColumnSchema f21 = cgs2.getSchema().getColumn(0);
- Assert.assertEquals("r.r.f2", f21.name);
- Assert.assertEquals(ColumnType.INT, f21.type);
+ Assert.assertEquals("r.r.f2", f21.getName());
+ Assert.assertEquals(ColumnType.INT, f21.getType());
ColumnSchema f22 = cgs2.getSchema().getColumn(1);
- Assert.assertEquals("r.f2", f22.name);
- Assert.assertEquals(ColumnType.MAP, f22.type);
+ Assert.assertEquals("r.f2", f22.getName());
+ Assert.assertEquals(ColumnType.MAP, f22.getType());
ColumnSchema f31 = cgs3.getSchema().getColumn(0);
- Assert.assertEquals("r.f2", f31.name);
- Assert.assertEquals(ColumnType.MAP, f31.type);
+ Assert.assertEquals("r.f2", f31.getName());
+ Assert.assertEquals(ColumnType.MAP, f31.getType());
System.out.println("*********** Column Map **********");
Map<String, HashSet<Partition.PartitionInfo.ColumnMappingEntry>> colmap = p
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageMisc2.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageMisc2.java?rev=825641&r1=825640&r2=825641&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageMisc2.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageMisc2.java Thu Oct 15 20:38:08 2009
@@ -25,12 +25,12 @@
import junit.framework.Assert;
import org.apache.hadoop.zebra.types.CGSchema;
-import org.apache.hadoop.zebra.types.ColumnType;
-import org.apache.hadoop.zebra.types.ParseException;
+import org.apache.hadoop.zebra.schema.ColumnType;
+import org.apache.hadoop.zebra.parser.ParseException;
import org.apache.hadoop.zebra.types.Partition;
-import org.apache.hadoop.zebra.types.Schema;
-import org.apache.hadoop.zebra.types.TableSchemaParser;
-import org.apache.hadoop.zebra.types.Schema.ColumnSchema;
+import org.apache.hadoop.zebra.schema.Schema;
+import org.apache.hadoop.zebra.parser.TableSchemaParser;
+import org.apache.hadoop.zebra.schema.Schema.ColumnSchema;
import org.junit.Before;
import org.junit.Test;
@@ -51,45 +51,45 @@
// test 1st level schema;
ColumnSchema f1 = schema.getColumn(0);
- Assert.assertEquals("c", f1.name);
- Assert.assertEquals(ColumnType.COLLECTION, f1.type);
+ Assert.assertEquals("c", f1.getName());
+ Assert.assertEquals(ColumnType.COLLECTION, f1.getType());
ColumnSchema f2 = schema.getColumn(1);
- Assert.assertEquals("m1", f2.name);
- Assert.assertEquals(ColumnType.MAP, f2.type);
+ Assert.assertEquals("m1", f2.getName());
+ Assert.assertEquals(ColumnType.MAP, f2.getType());
// test 2nd level schema;
- Schema f1Schema = f1.schema;
+ Schema f1Schema = f1.getSchema();
ColumnSchema f11 = f1Schema.getColumn(0);
- Assert.assertEquals("r", f11.name);
- Assert.assertEquals(ColumnType.RECORD, f11.type);
+ Assert.assertEquals("r", f11.getName());
+ Assert.assertEquals(ColumnType.RECORD, f11.getType());
- Schema f2Schema = f2.schema;
+ Schema f2Schema = f2.getSchema();
ColumnSchema f21 = f2Schema.getColumn(0);
- // Assert.assertEquals("", f21.name);
- Assert.assertEquals(ColumnType.INT, f21.type);
+ // Assert.assertEquals("", f21.getName());
+ Assert.assertEquals(ColumnType.INT, f21.getType());
// test 3rd level schema;
- Schema f11Schema = f11.schema;
+ Schema f11Schema = f11.getSchema();
ColumnSchema f111 = f11Schema.getColumn(0);
- Assert.assertEquals("r", f111.name);
- Assert.assertEquals(ColumnType.RECORD, f111.type);
+ Assert.assertEquals("r", f111.getName());
+ Assert.assertEquals(ColumnType.RECORD, f111.getType());
ColumnSchema f112 = f11Schema.getColumn(1);
- Assert.assertEquals("f2", f112.name);
- Assert.assertEquals(ColumnType.MAP, f112.type);
+ Assert.assertEquals("f2", f112.getName());
+ Assert.assertEquals(ColumnType.MAP, f112.getType());
// test 4th level schema;
- Schema f111Schema = f111.schema;
+ Schema f111Schema = f111.getSchema();
ColumnSchema f1111 = f111Schema.getColumn(0);
- Assert.assertEquals("f1", f1111.name);
- Assert.assertEquals(ColumnType.INT, f1111.type);
+ Assert.assertEquals("f1", f1111.getName());
+ Assert.assertEquals(ColumnType.INT, f1111.getType());
ColumnSchema f1112 = f111Schema.getColumn(1);
- Assert.assertEquals("f2", f1112.name);
- Assert.assertEquals(ColumnType.INT, f1112.type);
+ Assert.assertEquals("f2", f1112.getName());
+ Assert.assertEquals(ColumnType.INT, f1112.getType());
- Schema f112Schema = f112.schema;
+ Schema f112Schema = f112.getSchema();
ColumnSchema f1121 = f112Schema.getColumn(0);
- // Assert.assertEquals("", f1121.name);
- Assert.assertEquals(ColumnType.BYTES, f1121.type);
+ // Assert.assertEquals("", f1121.getName());
+ Assert.assertEquals(ColumnType.BYTES, f1121.getType());
}
@Test
@@ -111,12 +111,12 @@
CGSchema cgs2 = cgschemas[1];
ColumnSchema f11 = cgs1.getSchema().getColumn(0);
- Assert.assertEquals("c", f11.name);
- Assert.assertEquals(ColumnType.COLLECTION, f11.type);
+ Assert.assertEquals("c", f11.getName());
+ Assert.assertEquals(ColumnType.COLLECTION, f11.getType());
ColumnSchema f21 = cgs2.getSchema().getColumn(0);
- Assert.assertEquals("m1", f21.name);
- Assert.assertEquals(ColumnType.MAP, f21.type);
+ Assert.assertEquals("m1", f21.getName());
+ Assert.assertEquals(ColumnType.MAP, f21.getType());
Assert.assertEquals(cgs1.getCompressor(), "gz");
Assert.assertEquals(cgs2.getSerializer(), "avro");
@@ -176,16 +176,16 @@
CGSchema cgs3 = cgschemas[2];
ColumnSchema f11 = cgs1.getSchema().getColumn(0);
- Assert.assertEquals("c", f11.name);
- Assert.assertEquals(ColumnType.COLLECTION, f11.type);
+ Assert.assertEquals("c", f11.getName());
+ Assert.assertEquals(ColumnType.COLLECTION, f11.getType());
ColumnSchema f21 = cgs2.getSchema().getColumn(0);
- Assert.assertEquals("m1", f21.name);
- Assert.assertEquals(ColumnType.MAP, f21.type);
+ Assert.assertEquals("m1", f21.getName());
+ Assert.assertEquals(ColumnType.MAP, f21.getType());
ColumnSchema f31 = cgs3.getSchema().getColumn(0);
- Assert.assertEquals("m1", f31.name);
- Assert.assertEquals(ColumnType.MAP, f31.type);
+ Assert.assertEquals("m1", f31.getName());
+ Assert.assertEquals(ColumnType.MAP, f31.getType());
System.out.println("*********** Column Map **********");
Map<String, HashSet<Partition.PartitionInfo.ColumnMappingEntry>> colmap = p
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageMisc3.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageMisc3.java?rev=825641&r1=825640&r2=825641&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageMisc3.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageMisc3.java Thu Oct 15 20:38:08 2009
@@ -25,12 +25,12 @@
import junit.framework.Assert;
import org.apache.hadoop.zebra.types.CGSchema;
-import org.apache.hadoop.zebra.types.ColumnType;
-import org.apache.hadoop.zebra.types.ParseException;
+import org.apache.hadoop.zebra.schema.ColumnType;
+import org.apache.hadoop.zebra.parser.ParseException;
import org.apache.hadoop.zebra.types.Partition;
-import org.apache.hadoop.zebra.types.Schema;
-import org.apache.hadoop.zebra.types.TableSchemaParser;
-import org.apache.hadoop.zebra.types.Schema.ColumnSchema;
+import org.apache.hadoop.zebra.schema.Schema;
+import org.apache.hadoop.zebra.parser.TableSchemaParser;
+import org.apache.hadoop.zebra.schema.Schema.ColumnSchema;
import org.junit.Before;
import org.junit.Test;
@@ -64,12 +64,12 @@
CGSchema cgs2 = cgschemas[1];
ColumnSchema f11 = cgs1.getSchema().getColumn(0);
- Assert.assertEquals("c", f11.name);
- Assert.assertEquals(ColumnType.COLLECTION, f11.type);
+ Assert.assertEquals("c", f11.getName());
+ Assert.assertEquals(ColumnType.COLLECTION, f11.getType());
ColumnSchema f21 = cgs2.getSchema().getColumn(0);
- Assert.assertEquals("m1", f21.name);
- Assert.assertEquals(ColumnType.MAP, f21.type);
+ Assert.assertEquals("m1", f21.getName());
+ Assert.assertEquals(ColumnType.MAP, f21.getType());
Assert.assertEquals(cgs1.getCompressor(), "gz");
Assert.assertEquals(cgs2.getSerializer(), "avro");
@@ -129,12 +129,12 @@
CGSchema cgs2 = cgschemas[1];
ColumnSchema f11 = cgs1.getSchema().getColumn(0);
- Assert.assertEquals("c.r", f11.name);
- Assert.assertEquals(ColumnType.RECORD, f11.type);
+ Assert.assertEquals("c.r", f11.getName());
+ Assert.assertEquals(ColumnType.RECORD, f11.getType());
ColumnSchema f21 = cgs2.getSchema().getColumn(0);
- Assert.assertEquals("m1", f21.name);
- Assert.assertEquals(ColumnType.MAP, f21.type);
+ Assert.assertEquals("m1", f21.getName());
+ Assert.assertEquals(ColumnType.MAP, f21.getType());
Assert.assertEquals(cgs1.getCompressor(), "gz");
Assert.assertEquals(cgs2.getSerializer(), "avro");
@@ -194,16 +194,16 @@
CGSchema cgs3 = cgschemas[2];
ColumnSchema f11 = cgs1.getSchema().getColumn(0);
- Assert.assertEquals("c.r.f1", f11.name);
- Assert.assertEquals(ColumnType.INT, f11.type);
+ Assert.assertEquals("c.r.f1", f11.getName());
+ Assert.assertEquals(ColumnType.INT, f11.getType());
ColumnSchema f21 = cgs2.getSchema().getColumn(0);
- Assert.assertEquals("m1", f21.name);
- Assert.assertEquals(ColumnType.MAP, f21.type);
+ Assert.assertEquals("m1", f21.getName());
+ Assert.assertEquals(ColumnType.MAP, f21.getType());
ColumnSchema f31 = cgs3.getSchema().getColumn(0);
- Assert.assertEquals("c.r.f2", f31.name);
- Assert.assertEquals(ColumnType.INT, f31.type);
+ Assert.assertEquals("c.r.f2", f31.getName());
+ Assert.assertEquals(ColumnType.INT, f31.getType());
Assert.assertEquals(cgs1.getCompressor(), "gz");
Assert.assertEquals(cgs1.getSerializer(), "pig");
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageRecord.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageRecord.java?rev=825641&r1=825640&r2=825641&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageRecord.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorageRecord.java Thu Oct 15 20:38:08 2009
@@ -25,12 +25,12 @@
import junit.framework.Assert;
import org.apache.hadoop.zebra.types.CGSchema;
-import org.apache.hadoop.zebra.types.ColumnType;
-import org.apache.hadoop.zebra.types.ParseException;
+import org.apache.hadoop.zebra.schema.ColumnType;
+import org.apache.hadoop.zebra.parser.ParseException;
import org.apache.hadoop.zebra.types.Partition;
-import org.apache.hadoop.zebra.types.Schema;
-import org.apache.hadoop.zebra.types.TableSchemaParser;
-import org.apache.hadoop.zebra.types.Schema.ColumnSchema;
+import org.apache.hadoop.zebra.schema.Schema;
+import org.apache.hadoop.zebra.parser.TableSchemaParser;
+import org.apache.hadoop.zebra.schema.Schema.ColumnSchema;
import org.junit.Before;
import org.junit.Test;
@@ -64,18 +64,18 @@
CGSchema cgs2 = cgschemas[1];
ColumnSchema f11 = cgs1.getSchema().getColumn(0);
- Assert.assertEquals("r1.f1", f11.name);
- Assert.assertEquals(ColumnType.INT, f11.type);
+ Assert.assertEquals("r1.f1", f11.getName());
+ Assert.assertEquals(ColumnType.INT, f11.getType());
ColumnSchema f12 = cgs1.getSchema().getColumn(1);
- Assert.assertEquals("r2.r3.f3", f12.name);
- Assert.assertEquals(ColumnType.FLOAT, f12.type);
+ Assert.assertEquals("r2.r3.f3", f12.getName());
+ Assert.assertEquals(ColumnType.FLOAT, f12.getType());
ColumnSchema f21 = cgs2.getSchema().getColumn(0);
- Assert.assertEquals("r1.f2", f21.name);
- Assert.assertEquals(ColumnType.INT, f21.type);
+ Assert.assertEquals("r1.f2", f21.getName());
+ Assert.assertEquals(ColumnType.INT, f21.getType());
ColumnSchema f22 = cgs2.getSchema().getColumn(1);
- Assert.assertEquals("r2.r3.f4", f22.name);
- Assert.assertEquals(ColumnType.BYTES, f22.type);
+ Assert.assertEquals("r2.r3.f4", f22.getName());
+ Assert.assertEquals(ColumnType.BYTES, f22.getType());
System.out.println("*********** Column Map **********");
Map<String, HashSet<Partition.PartitionInfo.ColumnMappingEntry>> colmap = p
Modified: hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorePrimitive.java
URL: http://svn.apache.org/viewvc/hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorePrimitive.java?rev=825641&r1=825640&r2=825641&view=diff
==============================================================================
--- hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorePrimitive.java (original)
+++ hadoop/pig/trunk/contrib/zebra/src/test/org/apache/hadoop/zebra/types/TestStorePrimitive.java Thu Oct 15 20:38:08 2009
@@ -25,12 +25,12 @@
import junit.framework.Assert;
import org.apache.hadoop.zebra.types.CGSchema;
-import org.apache.hadoop.zebra.types.ColumnType;
-import org.apache.hadoop.zebra.types.ParseException;
+import org.apache.hadoop.zebra.schema.ColumnType;
+import org.apache.hadoop.zebra.parser.ParseException;
import org.apache.hadoop.zebra.types.Partition;
-import org.apache.hadoop.zebra.types.Schema;
-import org.apache.hadoop.zebra.types.TableSchemaParser;
-import org.apache.hadoop.zebra.types.Schema.ColumnSchema;
+import org.apache.hadoop.zebra.schema.Schema;
+import org.apache.hadoop.zebra.parser.TableSchemaParser;
+import org.apache.hadoop.zebra.schema.Schema.ColumnSchema;
import org.junit.Before;
import org.junit.Test;
@@ -48,23 +48,23 @@
@Test
public void testSchema() throws ParseException {
ColumnSchema f1 = schema.getColumn(0);
- Assert.assertEquals("f1", f1.name);
- Assert.assertEquals(ColumnType.INT, f1.type);
+ Assert.assertEquals("f1", f1.getName());
+ Assert.assertEquals(ColumnType.INT, f1.getType());
ColumnSchema f2 = schema.getColumn(1);
- Assert.assertEquals("f2", f2.name);
- Assert.assertEquals(ColumnType.LONG, f2.type);
+ Assert.assertEquals("f2", f2.getName());
+ Assert.assertEquals(ColumnType.LONG, f2.getType());
ColumnSchema f3 = schema.getColumn(2);
- Assert.assertEquals("f3", f3.name);
- Assert.assertEquals(ColumnType.FLOAT, f3.type);
+ Assert.assertEquals("f3", f3.getName());
+ Assert.assertEquals(ColumnType.FLOAT, f3.getType());
ColumnSchema f4 = schema.getColumn(3);
- Assert.assertEquals("f4", f4.name);
- Assert.assertEquals(ColumnType.BOOL, f4.type);
+ Assert.assertEquals("f4", f4.getName());
+ Assert.assertEquals(ColumnType.BOOL, f4.getType());
ColumnSchema f5 = schema.getColumn(4);
- Assert.assertEquals("f5", f5.name);
- Assert.assertEquals(ColumnType.STRING, f5.type);
+ Assert.assertEquals("f5", f5.getName());
+ Assert.assertEquals(ColumnType.STRING, f5.getType());
ColumnSchema f6 = schema.getColumn(5);
- Assert.assertEquals("f6", f6.name);
- Assert.assertEquals(ColumnType.BYTES, f6.type);
+ Assert.assertEquals("f6", f6.getName());
+ Assert.assertEquals(ColumnType.BYTES, f6.getType());
System.out.println(schema.toString());
}
@@ -89,23 +89,23 @@
CGSchema cgs3 = cgschemas[2];
ColumnSchema f11 = cgs1.getSchema().getColumn(0);
- Assert.assertEquals("f1", f11.name);
- Assert.assertEquals(ColumnType.INT, f11.type);
+ Assert.assertEquals("f1", f11.getName());
+ Assert.assertEquals(ColumnType.INT, f11.getType());
ColumnSchema f12 = cgs1.getSchema().getColumn(1);
- Assert.assertEquals("f2", f12.name);
- Assert.assertEquals(ColumnType.LONG, f12.type);
+ Assert.assertEquals("f2", f12.getName());
+ Assert.assertEquals(ColumnType.LONG, f12.getType());
ColumnSchema f21 = cgs2.getSchema().getColumn(0);
- Assert.assertEquals("f3", f21.name);
- Assert.assertEquals(ColumnType.FLOAT, f21.type);
+ Assert.assertEquals("f3", f21.getName());
+ Assert.assertEquals(ColumnType.FLOAT, f21.getType());
ColumnSchema f22 = cgs2.getSchema().getColumn(1);
- Assert.assertEquals("f4", f22.name);
- Assert.assertEquals(ColumnType.BOOL, f22.type);
+ Assert.assertEquals("f4", f22.getName());
+ Assert.assertEquals(ColumnType.BOOL, f22.getType());
ColumnSchema f31 = cgs3.getSchema().getColumn(0);
- Assert.assertEquals("f5", f31.name);
- Assert.assertEquals(ColumnType.STRING, f31.type);
+ Assert.assertEquals("f5", f31.getName());
+ Assert.assertEquals(ColumnType.STRING, f31.getType());
ColumnSchema f32 = cgs3.getSchema().getColumn(1);
- Assert.assertEquals("f6", f32.name);
- Assert.assertEquals(ColumnType.BYTES, f32.type);
+ Assert.assertEquals("f6", f32.getName());
+ Assert.assertEquals(ColumnType.BYTES, f32.getType());
Assert.assertEquals(cgs1.getCompressor(), "gz");
Assert.assertEquals(cgs1.getSerializer(), "pig");