phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maryann...@apache.org
Subject phoenix git commit: PHOENIX-2819 Remove problematic method ValueSchemaBuilder.addField(Field)
Date Sun, 03 Apr 2016 17:34:35 GMT
Repository: phoenix
Updated Branches:
  refs/heads/calcite 4e32e29a5 -> c9f117e5b


PHOENIX-2819 Remove problematic method ValueSchemaBuilder.addField(Field)


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/c9f117e5
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/c9f117e5
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/c9f117e5

Branch: refs/heads/calcite
Commit: c9f117e5b5cc45b27255f4ebb1e23e282e10470f
Parents: 4e32e29
Author: maryannxue <maryann.xue@gmail.com>
Authored: Sun Apr 3 13:34:26 2016 -0400
Committer: maryannxue <maryann.xue@gmail.com>
Committed: Sun Apr 3 13:34:26 2016 -0400

----------------------------------------------------------------------
 .../src/main/java/org/apache/phoenix/index/IndexMaintainer.java | 3 ++-
 .../src/main/java/org/apache/phoenix/schema/ValueSchema.java    | 5 -----
 2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/c9f117e5/phoenix-core/src/main/java/org/apache/phoenix/index/IndexMaintainer.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/index/IndexMaintainer.java b/phoenix-core/src/main/java/org/apache/phoenix/index/IndexMaintainer.java
index 13ad7e5..57616cb 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/index/IndexMaintainer.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/index/IndexMaintainer.java
@@ -705,7 +705,8 @@ public class IndexMaintainer implements Writable, Iterable<ColumnReference>
{
         }
         int dataPosOffset = isDataTableSalted ? 1 : 0 ;
         if (isMultiTenant) {
-            builder.addField(dataRowKeySchema.getField(dataPosOffset++));
+            Field field = dataRowKeySchema.getField(dataPosOffset++);
+            builder.addField(field, field.isNullable(), field.getSortOrder());
             nIndexedColumns--;
         }
         if (viewIndexId != null) {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c9f117e5/phoenix-core/src/main/java/org/apache/phoenix/schema/ValueSchema.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/ValueSchema.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/ValueSchema.java
index a4b40f3..5c8c4f9 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/ValueSchema.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/ValueSchema.java
@@ -318,11 +318,6 @@ public abstract class ValueSchema implements Writable {
             fields.add(new Field(datum, isNullable, 1, sortOrder));
             return this;
         }
-
-        public ValueSchemaBuilder addField(Field field) {
-            fields.add(field);
-            return this;
-        }
     }
     
     public int getEstimatedByteSize() {


Mime
View raw message