phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tdsi...@apache.org
Subject [39/42] phoenix git commit: Refactor code to store and use column qualifiers in SYSTEM.CATALOG
Date Fri, 23 Dec 2016 01:28:13 GMT
http://git-wip-us.apache.org/repos/asf/phoenix/blob/a41074a9/phoenix-core/src/test/java/org/apache/phoenix/execute/LiteralResultIteratorPlanTest.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/execute/LiteralResultIteratorPlanTest.java
b/phoenix-core/src/test/java/org/apache/phoenix/execute/LiteralResultIteratorPlanTest.java
index 0cd22ef..e8e42a6 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/execute/LiteralResultIteratorPlanTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/execute/LiteralResultIteratorPlanTest.java
@@ -174,9 +174,10 @@ public class LiteralResultIteratorPlanTest {
         for (int i = 0; i < row.length; i++) {
             String name = ParseNodeFactory.createTempAlias();
             Expression expr = LiteralExpression.newConstant(row[i]);
+            PName colName = PNameFactory.newName(name);
             columns.add(new PColumnImpl(PNameFactory.newName(name),
                     PNameFactory.newName(VALUE_COLUMN_FAMILY), expr.getDataType(), expr.getMaxLength(),
-                    expr.getScale(), expr.isNullable(), i, expr.getSortOrder(), null, null,
false, name, false, false, null));
+                    expr.getScale(), expr.isNullable(), i, expr.getSortOrder(), null, null,
false, name, false, false, colName.getBytes()));
         }
         try {
             PTable pTable = PTableImpl.makePTable(null, PName.EMPTY_NAME, PName.EMPTY_NAME,
PTableType.SUBQUERY, null,

http://git-wip-us.apache.org/repos/asf/phoenix/blob/a41074a9/phoenix-core/src/test/java/org/apache/phoenix/execute/UnnestArrayPlanTest.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/execute/UnnestArrayPlanTest.java
b/phoenix-core/src/test/java/org/apache/phoenix/execute/UnnestArrayPlanTest.java
index ff62f63..195c2f0 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/execute/UnnestArrayPlanTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/execute/UnnestArrayPlanTest.java
@@ -48,6 +48,7 @@ import org.apache.phoenix.jdbc.PhoenixStatement;
 import org.apache.phoenix.parse.SelectStatement;
 import org.apache.phoenix.schema.PColumn;
 import org.apache.phoenix.schema.PColumnImpl;
+import org.apache.phoenix.schema.PName;
 import org.apache.phoenix.schema.PNameFactory;
 import org.apache.phoenix.schema.RowKeyValueAccessor;
 import org.apache.phoenix.schema.SortOrder;
@@ -118,8 +119,10 @@ public class UnnestArrayPlanTest {
         LiteralExpression dummy = LiteralExpression.newConstant(null, arrayType);
         RowKeyValueAccessor accessor = new RowKeyValueAccessor(Arrays.asList(dummy), 0);
         UnnestArrayPlan plan = new UnnestArrayPlan(subPlan, new RowKeyColumnExpression(dummy,
accessor), withOrdinality);
-        PColumn elemColumn = new PColumnImpl(PNameFactory.newName("ELEM"), PNameFactory.newName(VALUE_COLUMN_FAMILY),
baseType, null, null, true, 0, SortOrder.getDefault(), null, null, false, "", false, false,
null);
-        PColumn indexColumn = withOrdinality ? new PColumnImpl(PNameFactory.newName("IDX"),
PNameFactory.newName(VALUE_COLUMN_FAMILY), PInteger.INSTANCE, null, null, true, 0, SortOrder.getDefault(),
null, null, false, "", false, false, null) : null;
+        PName colName = PNameFactory.newName("ELEM");
+        PColumn elemColumn = new PColumnImpl(PNameFactory.newName("ELEM"), PNameFactory.newName(VALUE_COLUMN_FAMILY),
baseType, null, null, true, 0, SortOrder.getDefault(), null, null, false, "", false, false,
colName.getBytes());
+        colName = PNameFactory.newName("IDX");
+        PColumn indexColumn = withOrdinality ? new PColumnImpl(colName, PNameFactory.newName(VALUE_COLUMN_FAMILY),
PInteger.INSTANCE, null, null, true, 0, SortOrder.getDefault(), null, null, false, "", false,
false, colName.getBytes()) : null;
         List<PColumn> columns = withOrdinality ? Arrays.asList(elemColumn, indexColumn)
: Arrays.asList(elemColumn);
         ProjectedColumnExpression elemExpr = new ProjectedColumnExpression(elemColumn, columns,
0, elemColumn.getName().getString());
         ProjectedColumnExpression indexExpr = withOrdinality ? new ProjectedColumnExpression(indexColumn,
columns, 1, indexColumn.getName().getString()) : null;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/a41074a9/phoenix-core/src/test/java/org/apache/phoenix/expression/ColumnExpressionTest.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/expression/ColumnExpressionTest.java
b/phoenix-core/src/test/java/org/apache/phoenix/expression/ColumnExpressionTest.java
index 98c2495..2788235 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/expression/ColumnExpressionTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/expression/ColumnExpressionTest.java
@@ -25,13 +25,14 @@ import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 
-import org.apache.phoenix.schema.types.PBinary;
-import org.apache.phoenix.schema.types.PDecimal;
 import org.apache.phoenix.schema.PColumn;
 import org.apache.phoenix.schema.PColumnImpl;
+import org.apache.phoenix.schema.PName;
 import org.apache.phoenix.schema.PNameFactory;
-import org.apache.phoenix.schema.types.PVarchar;
 import org.apache.phoenix.schema.SortOrder;
+import org.apache.phoenix.schema.types.PBinary;
+import org.apache.phoenix.schema.types.PDecimal;
+import org.apache.phoenix.schema.types.PVarchar;
 import org.junit.Test;
 
 public class ColumnExpressionTest {
@@ -40,9 +41,10 @@ public class ColumnExpressionTest {
     public void testSerialization() throws Exception {
         int maxLen = 30;
         int scale = 5;
-        PColumn column = new PColumnImpl(PNameFactory.newName("c1"), PNameFactory.newName("f1"),
PDecimal.INSTANCE, maxLen, scale,
-                true, 20, SortOrder.getDefault(), 0, null, false, null, false, false, 0);
-        ColumnExpression colExp = new KeyValueColumnExpression(column, true);
+        PName colName = PNameFactory.newName("c1");
+        PColumn column = new PColumnImpl(colName, PNameFactory.newName("f1"), PDecimal.INSTANCE,
maxLen, scale,
+                true, 20, SortOrder.getDefault(), 0, null, false, null, false, false, colName.getBytes());
+        ColumnExpression colExp = new KeyValueColumnExpression(column);
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         DataOutputStream dOut = new DataOutputStream(baos);
         colExp.write(dOut);
@@ -60,9 +62,10 @@ public class ColumnExpressionTest {
     @Test
     public void testSerializationWithNullScale() throws Exception {
         int maxLen = 30;
-        PColumn column = new PColumnImpl(PNameFactory.newName("c1"), PNameFactory.newName("f1"),
PBinary.INSTANCE, maxLen, null,
-                true, 20, SortOrder.getDefault(), 0, null, false, null, false, false, 0);
-        ColumnExpression colExp = new KeyValueColumnExpression(column, true);
+        PName colName = PNameFactory.newName("c1");
+        PColumn column = new PColumnImpl(colName, PNameFactory.newName("f1"), PBinary.INSTANCE,
maxLen, null,
+                true, 20, SortOrder.getDefault(), 0, null, false, null, false, false, colName.getBytes());
+        ColumnExpression colExp = new KeyValueColumnExpression(column);
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         DataOutputStream dOut = new DataOutputStream(baos);
         colExp.write(dOut);
@@ -80,9 +83,10 @@ public class ColumnExpressionTest {
     @Test
     public void testSerializationWithNullMaxLength() throws Exception {
         int scale = 5;
-        PColumn column = new PColumnImpl(PNameFactory.newName("c1"), PNameFactory.newName("f1"),
PVarchar.INSTANCE, null, scale,
-                true, 20, SortOrder.getDefault(), 0, null, false, null, false, false, 0);
-        ColumnExpression colExp = new KeyValueColumnExpression(column, true);
+        PName colName = PNameFactory.newName("c1");
+        PColumn column = new PColumnImpl(colName, PNameFactory.newName("f1"), PVarchar.INSTANCE,
null, scale,
+                true, 20, SortOrder.getDefault(), 0, null, false, null, false, false, colName.getBytes());
+        ColumnExpression colExp = new KeyValueColumnExpression(column);
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         DataOutputStream dOut = new DataOutputStream(baos);
         colExp.write(dOut);
@@ -99,9 +103,10 @@ public class ColumnExpressionTest {
 
     @Test
     public void testSerializationWithNullScaleAndMaxLength() throws Exception {
-        PColumn column = new PColumnImpl(PNameFactory.newName("c1"), PNameFactory.newName("f1"),
PDecimal.INSTANCE, null, null, true,
-                20, SortOrder.getDefault(), 0, null, false, null, false, false, 0);
-        ColumnExpression colExp = new KeyValueColumnExpression(column, true);
+        PName colName = PNameFactory.newName("c1");
+        PColumn column = new PColumnImpl(colName, PNameFactory.newName("f1"), PDecimal.INSTANCE,
null, null, true,
+                20, SortOrder.getDefault(), 0, null, false, null, false, false, colName.getBytes());
+        ColumnExpression colExp = new KeyValueColumnExpression(column);
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         DataOutputStream dOut = new DataOutputStream(baos);
         colExp.write(dOut);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/a41074a9/phoenix-core/src/test/java/org/apache/phoenix/query/EncodedColumnQualifierCellsListTest.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/EncodedColumnQualifierCellsListTest.java
b/phoenix-core/src/test/java/org/apache/phoenix/query/EncodedColumnQualifierCellsListTest.java
index 564e75e..a25af78 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/query/EncodedColumnQualifierCellsListTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/query/EncodedColumnQualifierCellsListTest.java
@@ -17,7 +17,7 @@
  */
 package org.apache.phoenix.query;
 
-import static org.apache.phoenix.util.EncodedColumnsUtil.getEncodedColumnQualifier;
+import static org.apache.phoenix.schema.PTable.QualifierEncodingScheme.FOUR_BYTE_QUALIFIERS;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
@@ -46,7 +46,7 @@ public class EncodedColumnQualifierCellsListTest {
     
     @Test
     public void testIterator() {
-        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16);
+        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16,
FOUR_BYTE_QUALIFIERS);
         Cell[] cells = new Cell[7];
         int i = 0;
         populateListAndArray(list, cells);
@@ -80,7 +80,7 @@ public class EncodedColumnQualifierCellsListTest {
     
     @Test
     public void testSize() {
-        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16);
+        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16,
FOUR_BYTE_QUALIFIERS);
         assertEquals(0, list.size());
         
         populateList(list);
@@ -98,7 +98,7 @@ public class EncodedColumnQualifierCellsListTest {
     
     @Test
     public void testIsEmpty() throws Exception {
-        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16);
+        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16,
FOUR_BYTE_QUALIFIERS);
         assertTrue(list.isEmpty());
         populateList(list);
         assertFalse(list.isEmpty());
@@ -115,19 +115,19 @@ public class EncodedColumnQualifierCellsListTest {
     
     @Test
     public void testContains() throws Exception {
-        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16);
+        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16,
FOUR_BYTE_QUALIFIERS);
         Cell[] cells = new Cell[7];
         populateListAndArray(list, cells);
         
         for (Cell c : cells) {
             assertTrue(list.contains(c));
         }
-        assertFalse(list.contains(KeyValue.createFirstOnRow(row, cf, getEncodedColumnQualifier(13))));
+        assertFalse(list.contains(KeyValue.createFirstOnRow(row, cf, FOUR_BYTE_QUALIFIERS.getEncodedBytes(13))));
     }
     
     @Test
     public void testToArrayWithParam() throws Exception {
-        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16);
+        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16,
FOUR_BYTE_QUALIFIERS);
         Cell[] cells = new Cell[7];
         populateListAndArray(list, cells);
         Cell[] array = list.toArray(new Cell[0]);
@@ -136,7 +136,7 @@ public class EncodedColumnQualifierCellsListTest {
     
     @Test
     public void testToArrayWithoutParam() throws Exception {
-        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16);
+        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16,
FOUR_BYTE_QUALIFIERS);
         Cell[] cells = new Cell[7];
         populateListAndArray(list, cells);
         Object[] array = list.toArray();
@@ -145,7 +145,7 @@ public class EncodedColumnQualifierCellsListTest {
     
     @Test
     public void testRemove() throws Exception {
-        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16);
+        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16,
FOUR_BYTE_QUALIFIERS);
         Cell[] cells = new Cell[7];
         populateListAndArray(list, cells);
         assertTrue(list.remove(cells[0]));
@@ -154,21 +154,21 @@ public class EncodedColumnQualifierCellsListTest {
         assertEquals(5, list.size());
         assertTrue(list.remove(cells[3]));
         assertEquals(4, list.size());
-        assertFalse(list.remove(KeyValue.createFirstOnRow(row, cf, getEncodedColumnQualifier(13))));
+        assertFalse(list.remove(KeyValue.createFirstOnRow(row, cf, FOUR_BYTE_QUALIFIERS.getEncodedBytes(13))));
         assertEquals(4, list.size());
     }
     
     @Test
     public void testContainsAll() throws Exception {
-        EncodedColumnQualiferCellsList list1 = new EncodedColumnQualiferCellsList(11, 16);
+        EncodedColumnQualiferCellsList list1 = new EncodedColumnQualiferCellsList(11, 16,
FOUR_BYTE_QUALIFIERS);
         populateList(list1);
-        EncodedColumnQualiferCellsList list2 = new EncodedColumnQualiferCellsList(11, 16);
+        EncodedColumnQualiferCellsList list2 = new EncodedColumnQualiferCellsList(11, 16,
FOUR_BYTE_QUALIFIERS);
         populateList(list2);
         assertTrue(list1.containsAll(list2));
-        list2.remove(KeyValue.createFirstOnRow(row, cf, getEncodedColumnQualifier(11)));
+        list2.remove(KeyValue.createFirstOnRow(row, cf, FOUR_BYTE_QUALIFIERS.getEncodedBytes(11)));
         assertTrue(list1.containsAll(list2));
         assertFalse(list2.containsAll(list1));
-        list2.add(KeyValue.createFirstOnRow(row, cf, getEncodedColumnQualifier(13)));
+        list2.add(KeyValue.createFirstOnRow(row, cf, FOUR_BYTE_QUALIFIERS.getEncodedBytes(13)));
         assertFalse(list1.containsAll(list2));
         assertFalse(list2.containsAll(list1));
         List<Cell> arrayList = new ArrayList<>();
@@ -178,9 +178,9 @@ public class EncodedColumnQualifierCellsListTest {
     
     @Test
     public void testAddAll() throws Exception {
-        EncodedColumnQualiferCellsList list1 = new EncodedColumnQualiferCellsList(11, 16);
+        EncodedColumnQualiferCellsList list1 = new EncodedColumnQualiferCellsList(11, 16,
FOUR_BYTE_QUALIFIERS);
         populateList(list1);
-        EncodedColumnQualiferCellsList list2 = new EncodedColumnQualiferCellsList(11, 16);
+        EncodedColumnQualiferCellsList list2 = new EncodedColumnQualiferCellsList(11, 16,
FOUR_BYTE_QUALIFIERS);
         populateList(list2);
         /* 
          * Note that we don't care about equality of the element being added with the element
already
@@ -191,7 +191,7 @@ public class EncodedColumnQualifierCellsListTest {
     
     @Test
     public void testAddAllAtIndexFails() throws Exception {
-        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16);
+        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16,
FOUR_BYTE_QUALIFIERS);
         populateList(list);
         try {
             list.addAll(0, new ArrayList<Cell>());
@@ -201,7 +201,7 @@ public class EncodedColumnQualifierCellsListTest {
     
     @Test
     public void testRemoveAll() throws Exception {
-        EncodedColumnQualiferCellsList list1 = new EncodedColumnQualiferCellsList(11, 16);
+        EncodedColumnQualiferCellsList list1 = new EncodedColumnQualiferCellsList(11, 16,
FOUR_BYTE_QUALIFIERS);
         populateList(list1);
         ArrayList<Cell> list2 = new ArrayList<>();
         populateList(list2);
@@ -212,13 +212,13 @@ public class EncodedColumnQualifierCellsListTest {
     
     @Test
     public void testRetainAll() throws Exception {
-        EncodedColumnQualiferCellsList list1 = new EncodedColumnQualiferCellsList(11, 16);
+        EncodedColumnQualiferCellsList list1 = new EncodedColumnQualiferCellsList(11, 16,
FOUR_BYTE_QUALIFIERS);
         populateList(list1);
-        EncodedColumnQualiferCellsList list2 = new EncodedColumnQualiferCellsList(11, 16);
+        EncodedColumnQualiferCellsList list2 = new EncodedColumnQualiferCellsList(11, 16,
FOUR_BYTE_QUALIFIERS);
         populateList(list2);
         // retainAll won't be modifying the list1 since they both have the same elements
equality wise
         assertFalse(list1.retainAll(list2));
-        list2.remove(KeyValue.createFirstOnRow(row, cf, getEncodedColumnQualifier(12)));
+        list2.remove(KeyValue.createFirstOnRow(row, cf, FOUR_BYTE_QUALIFIERS.getEncodedBytes(12)));
         assertTrue(list1.retainAll(list2));
         assertEquals(list1.size(), list2.size());
         for (Cell c : list1) {
@@ -228,7 +228,7 @@ public class EncodedColumnQualifierCellsListTest {
     
     @Test
     public void testClear() throws Exception {
-        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16);
+        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16,
FOUR_BYTE_QUALIFIERS);
         populateList(list);
         list.clear();
         assertTrue(list.isEmpty());
@@ -237,7 +237,7 @@ public class EncodedColumnQualifierCellsListTest {
     
     @Test
     public void testGetIndex() throws Exception {
-        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16);
+        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16,
FOUR_BYTE_QUALIFIERS);
         Cell[] cells = new Cell[7];
         populateListAndArray(list, cells);
         for (int i = 0; i < cells.length; i++) {
@@ -247,7 +247,7 @@ public class EncodedColumnQualifierCellsListTest {
     
     @Test
     public void testIndexOf() throws Exception {
-        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16);
+        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16,
FOUR_BYTE_QUALIFIERS);
         Cell[] cells = new Cell[7];
         populateListAndArray(list, cells);
         for (int i = 0; i < cells.length; i++) {
@@ -257,7 +257,7 @@ public class EncodedColumnQualifierCellsListTest {
     
     @Test
     public void testLastIndexOf() throws Exception {
-        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16);
+        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16,
FOUR_BYTE_QUALIFIERS);
         Cell[] cells = new Cell[7];
         populateListAndArray(list, cells);
         for (int i = 0; i < cells.length; i++) {
@@ -267,7 +267,7 @@ public class EncodedColumnQualifierCellsListTest {
     
     @Test
     public void testListIterator() throws Exception {
-        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16);
+        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16,
FOUR_BYTE_QUALIFIERS);
         Cell[] cells = new Cell[7];
         int i = 0;
         populateListAndArray(list, cells);
@@ -302,7 +302,7 @@ public class EncodedColumnQualifierCellsListTest {
     
     @Test
     public void testListIteratorSet() {
-        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16);
+        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16,
FOUR_BYTE_QUALIFIERS);
         Cell[] array = new Cell[7];
         populateListAndArray(list, array);
         ListIterator<Cell> itr = list.listIterator();
@@ -346,7 +346,7 @@ public class EncodedColumnQualifierCellsListTest {
     
     @Test
     public void testListIteratorNextAndPrevious()  throws Exception {
-        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16);
+        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16,
FOUR_BYTE_QUALIFIERS);
         Cell[] array = new Cell[7];
         populateListAndArray(list, array);
         ListIterator<Cell> itr = list.listIterator();
@@ -389,7 +389,7 @@ public class EncodedColumnQualifierCellsListTest {
     
     @Test
     public void testSetNull() throws Exception {
-        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16);
+        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16,
FOUR_BYTE_QUALIFIERS);
         try {
             list.add(null);
             fail("Adding null elements to the list is not allowed");
@@ -400,7 +400,7 @@ public class EncodedColumnQualifierCellsListTest {
     
     @Test
     public void testFailFastIterator() throws Exception {
-        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16);
+        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16,
FOUR_BYTE_QUALIFIERS);
         populateList(list);
         int i = 0;
         Iterator<Cell> itr = list.iterator();
@@ -408,7 +408,7 @@ public class EncodedColumnQualifierCellsListTest {
             i++;
             try {
                 itr.next();
-                list.add(KeyValue.createFirstOnRow(row, cf, getEncodedColumnQualifier(0)));
+                list.add(KeyValue.createFirstOnRow(row, cf, FOUR_BYTE_QUALIFIERS.getEncodedBytes(0)));
                 if (i == 2) {
                     fail("ConcurrentModificationException should have been thrown as the
list is being modified while being iterated through");
                 }
@@ -422,25 +422,25 @@ public class EncodedColumnQualifierCellsListTest {
     
     @Test
     public void testFailFastListIterator() throws Exception {
-        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16);
+        EncodedColumnQualiferCellsList list = new EncodedColumnQualiferCellsList(11, 16,
FOUR_BYTE_QUALIFIERS);
         populateList(list);
         ListIterator<Cell> itr = list.listIterator();
         itr.next();
-        list.add(KeyValue.createFirstOnRow(row, cf, getEncodedColumnQualifier(0)));
+        list.add(KeyValue.createFirstOnRow(row, cf, FOUR_BYTE_QUALIFIERS.getEncodedBytes(0)));
         try {
             itr.next();
             fail("ConcurrentModificationException should have been thrown as the list was
modified without using iterator");
         } catch (ConcurrentModificationException expected) {
 
         }
-        list = new EncodedColumnQualiferCellsList(11, 16);
+        list = new EncodedColumnQualiferCellsList(11, 16, FOUR_BYTE_QUALIFIERS);
         populateList(list);
         itr = list.listIterator();
         itr.next();
         itr.next();
         itr.remove();
         itr.next();
-        list.remove(KeyValue.createFirstOnRow(row, cf, getEncodedColumnQualifier(0)));
+        list.remove(KeyValue.createFirstOnRow(row, cf, FOUR_BYTE_QUALIFIERS.getEncodedBytes(0)));
         try {
             itr.next();
             fail("ConcurrentModificationException should have been thrown as the list was
modified without using iterator");
@@ -451,28 +451,28 @@ public class EncodedColumnQualifierCellsListTest {
     
     private void populateListAndArray(List<Cell> list, Cell[] cells) {
         // add elements in reserved range
-        list.add(cells[0] = KeyValue.createFirstOnRow(row, cf, getEncodedColumnQualifier(0)));
-        list.add(cells[1] = KeyValue.createFirstOnRow(row, cf, getEncodedColumnQualifier(5)));
-        list.add(cells[2] = KeyValue.createFirstOnRow(row, cf, getEncodedColumnQualifier(10)));
+        list.add(cells[0] = KeyValue.createFirstOnRow(row, cf, FOUR_BYTE_QUALIFIERS.getEncodedBytes(0)));
+        list.add(cells[1] = KeyValue.createFirstOnRow(row, cf, FOUR_BYTE_QUALIFIERS.getEncodedBytes(5)));
+        list.add(cells[2] = KeyValue.createFirstOnRow(row, cf, FOUR_BYTE_QUALIFIERS.getEncodedBytes(10)));
 
         // add elements in qualifier range
-        list.add(cells[6] = KeyValue.createFirstOnRow(row, cf, getEncodedColumnQualifier(16)));
-        list.add(cells[4] = KeyValue.createFirstOnRow(row, cf, getEncodedColumnQualifier(12)));
-        list.add(cells[5] = KeyValue.createFirstOnRow(row, cf, getEncodedColumnQualifier(14)));
-        list.add(cells[3] = KeyValue.createFirstOnRow(row, cf, getEncodedColumnQualifier(11)));
+        list.add(cells[6] = KeyValue.createFirstOnRow(row, cf, FOUR_BYTE_QUALIFIERS.getEncodedBytes(16)));
+        list.add(cells[4] = KeyValue.createFirstOnRow(row, cf, FOUR_BYTE_QUALIFIERS.getEncodedBytes(12)));
+        list.add(cells[5] = KeyValue.createFirstOnRow(row, cf, FOUR_BYTE_QUALIFIERS.getEncodedBytes(14)));
+        list.add(cells[3] = KeyValue.createFirstOnRow(row, cf, FOUR_BYTE_QUALIFIERS.getEncodedBytes(11)));
     }
 
     private void populateList(List<Cell> list) {
         // add elements in reserved range
-        list.add(KeyValue.createFirstOnRow(row, cf, getEncodedColumnQualifier(0)));
-        list.add(KeyValue.createFirstOnRow(row, cf, getEncodedColumnQualifier(5)));
-        list.add(KeyValue.createFirstOnRow(row, cf, getEncodedColumnQualifier(10)));
+        list.add(KeyValue.createFirstOnRow(row, cf, FOUR_BYTE_QUALIFIERS.getEncodedBytes(0)));
+        list.add(KeyValue.createFirstOnRow(row, cf, FOUR_BYTE_QUALIFIERS.getEncodedBytes(5)));
+        list.add(KeyValue.createFirstOnRow(row, cf, FOUR_BYTE_QUALIFIERS.getEncodedBytes(10)));
 
         // add elements in qualifier range
-        list.add(KeyValue.createFirstOnRow(row, cf, getEncodedColumnQualifier(16)));
-        list.add(KeyValue.createFirstOnRow(row, cf, getEncodedColumnQualifier(12)));
-        list.add(KeyValue.createFirstOnRow(row, cf, getEncodedColumnQualifier(14)));
-        list.add(KeyValue.createFirstOnRow(row, cf, getEncodedColumnQualifier(11)));
+        list.add(KeyValue.createFirstOnRow(row, cf, FOUR_BYTE_QUALIFIERS.getEncodedBytes(16)));
+        list.add(KeyValue.createFirstOnRow(row, cf, FOUR_BYTE_QUALIFIERS.getEncodedBytes(12)));
+        list.add(KeyValue.createFirstOnRow(row, cf, FOUR_BYTE_QUALIFIERS.getEncodedBytes(14)));
+        list.add(KeyValue.createFirstOnRow(row, cf, FOUR_BYTE_QUALIFIERS.getEncodedBytes(11)));
     }
     
     private class DelegateCell implements Cell {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/a41074a9/phoenix-core/src/test/java/org/apache/phoenix/util/TestUtil.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/util/TestUtil.java b/phoenix-core/src/test/java/org/apache/phoenix/util/TestUtil.java
index 5409554..3c9a1bc 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/util/TestUtil.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/util/TestUtil.java
@@ -304,11 +304,11 @@ public class TestUtil {
     }
 
     public static Expression constantComparison(CompareOp op, PColumn c, Object o) {
-        return  new ComparisonExpression(Arrays.<Expression>asList(new KeyValueColumnExpression(c,
true), LiteralExpression.newConstant(o)), op);
+        return  new ComparisonExpression(Arrays.<Expression>asList(new KeyValueColumnExpression(c),
LiteralExpression.newConstant(o)), op);
     }
 
     public static Expression kvColumn(PColumn c) {
-        return new KeyValueColumnExpression(c, true);
+        return new KeyValueColumnExpression(c);
     }
 
     public static Expression pkColumn(PColumn c, List<PColumn> columns) {
@@ -725,10 +725,10 @@ public class TestUtil {
                     return false;
                 }
                 @Override
-                public Integer getEncodedColumnQualifier() {
-                    return null;
+                public byte[] getColumnQualifierBytes() {
+                    return SINGLE_COLUMN_NAME.getBytes();
                 }
-            }, false)), null);
+            })), null);
             aggregationManager.setAggregators(new ClientAggregators(Collections.<SingleAggregateFunction>singletonList(func),
1));
             ClientAggregators aggregators = aggregationManager.getAggregators();
             return aggregators;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/a41074a9/phoenix-protocol/src/main/PTable.proto
----------------------------------------------------------------------
diff --git a/phoenix-protocol/src/main/PTable.proto b/phoenix-protocol/src/main/PTable.proto
index 3eac63b..f2eb46c 100644
--- a/phoenix-protocol/src/main/PTable.proto
+++ b/phoenix-protocol/src/main/PTable.proto
@@ -47,7 +47,7 @@ message PColumn {
   optional string expression = 12;
   optional bool isRowTimestamp = 13;
   optional bool isDynamic = 14;
-  optional int32 encodedColumnQualifier = 15;
+  optional bytes columnQualifierBytes = 15;
 }
 
 message PTableStats {


Mime
View raw message