(phoenix) branch master updated: PHOENIX-7141 Use relocate by default for phoenix-server shading

2024-02-08 Thread stoty
This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new d0ed96f2aa PHOENIX-7141 Use relocate by default for phoenix-server 
shading
d0ed96f2aa is described below

commit d0ed96f2aa23c487f60207062835183e35cabfb4
Author: Istvan Toth 
AuthorDate: Fri Jan 5 08:28:36 2024 +0100

PHOENIX-7141 Use relocate by default for phoenix-server shading
---
 phoenix-server/pom.xml | 672 +++--
 1 file changed, 429 insertions(+), 243 deletions(-)

diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index e61af7d963..6c48589fad 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -39,294 +39,470 @@
   
 
   
+
+  
+
+  org.apache.maven.plugins
+  maven-site-plugin
+  
+true
+  
+
+
+  
+  org.apache.rat
+  apache-rat-plugin
+  
+true
+  
+
+
+  org.apache.maven.plugins
+  maven-jar-plugin
+
+
+  org.apache.maven.plugins
+  maven-dependency-plugin
+  
+
+  *
+
+   
+
+
+  org.apache.maven.plugins
+  maven-shade-plugin
+  
+
+  
+*:*
+
+  META-INF/*.SF
+  META-INF/*.DSA
+  META-INF/*.RSA
+  META-INF/license/*
+  META-INF/NOTICE
+  LICENSE.*
+  NOTICE.*
+  NOTICE
+  README*
+
+  
+ 
+org.apache.hadoop:hadoop-yarn-common
+
+  
org/apache/hadoop/yarn/factories/package-info.class
+  
org/apache/hadoop/yarn/util/package-info.class
+  
org/apache/hadoop/yarn/factory/providers/package-info.class
+  
org/apache/hadoop/yarn/client/api/impl/package-info.class
+  
org/apache/hadoop/yarn/client/api/package-info.class
+  webapps/**
+
+  
+  
+  
+org.apache.commons:commons-math3
+
+  assets/**
+
+  
+  
+org.apache.hbase:hbase-server
+
+  hbase-webapps/**
+
+  
+  
+org.apache.hbase.thirdparty:*
+
+  /**
+  webapps/**
+
+  
+  
+
+
+  
+  
+csv-bulk-load-config.properties
+
+  ${project.basedir}/../config/csv-bulk-load-config.properties
+
+  
+  
+README.md
+${project.basedir}/../README.md
+  
+  
+LICENSE.txt
+${project.basedir}/../LICENSE
+  
+  
+NOTICE
+${project.basedir}/../NOTICE
+  
+
+
+  
+org/
+${shaded.package}.org.
+
+  org/apache/hadoop/**
+  
+  org/apache/htrace/**
+  org/slf4j/**
+  org/apache/commons/logging/**
+  org/apache/log4j/**
+  org/apache/logging/log4j/**
+  
+  org/ietf/jgss/**
+  org/omg/**
+  org/w3c/dom/**
+  org/xml/sax/**
+  
+  org/eclipse/jetty/**
+  
+  
+  org/apache/hbase/**
+  
+  org/apache/phoenix/**
+  
+  org/apache/omid/**
+  
+org/apache/commons/configuration2/**
+
+  
+  
+  
+com/
+${shaded.package}.com.
+
+  
+  com/sun/tools/**
+  com/sun/javadoc/**
+  com/sun/security/**
+  com/sun/jndi/**
+  com/sun/management/**
+  com/sun/management/**
+  
+  com/google/protobuf/**
+
+  
+  
+io/
+${shaded.package}.io.
+
+  
+  io/compression/**
+  io/mapfile/**
+  

(phoenix) branch 5.1 updated: PHOENIX-7188 Remove Omid TTable.getTableDescriptor() calls

2024-02-08 Thread stoty
This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
 new 105876a501 PHOENIX-7188 Remove Omid TTable.getTableDescriptor() calls
105876a501 is described below

commit 105876a501e0d3fe74938e0bcb3579f5ba1f
Author: Istvan Toth 
AuthorDate: Thu Feb 8 08:30:10 2024 +0100

PHOENIX-7188 Remove Omid TTable.getTableDescriptor() calls
---
 .../org/apache/phoenix/transaction/OmidTransactionTable.java |  7 ++-
 .../phoenix/compat/hbase/CompatOmidTransactionTable.java | 12 
 .../phoenix/compat/hbase/CompatOmidTransactionTable.java | 12 
 .../phoenix/compat/hbase/CompatOmidTransactionTable.java | 12 
 .../phoenix/compat/hbase/CompatOmidTransactionTable.java | 12 
 .../phoenix/compat/hbase/CompatOmidTransactionTable.java | 12 
 .../phoenix/compat/hbase/CompatOmidTransactionTable.java | 12 
 .../phoenix/compat/hbase/CompatOmidTransactionTable.java | 12 
 8 files changed, 86 insertions(+), 5 deletions(-)

diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java
index cdd8349987..335489f16c 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java
@@ -65,6 +65,7 @@ public class OmidTransactionTable extends 
CompatOmidTransactionTable implements
 private final boolean addShadowCells;
 
 public OmidTransactionTable() throws SQLException {
+super(null);
 this.tTable = null;
 this.tx = null;
 this.addShadowCells = false;
@@ -79,6 +80,7 @@ public class OmidTransactionTable extends 
CompatOmidTransactionTable implements
 }
 
 public OmidTransactionTable(PhoenixTransactionContext ctx, Table hTable, 
boolean isConflictFree, boolean addShadowCells) throws SQLException  {
+super(hTable);
 assert(ctx instanceof OmidTransactionContext);
 
 OmidTransactionContext omidTransactionContext = 
(OmidTransactionContext) ctx;
@@ -121,11 +123,6 @@ public class OmidTransactionTable extends 
CompatOmidTransactionTable implements
 return tTable.getConfiguration();
 }
 
-@Override
-public HTableDescriptor getTableDescriptor() throws IOException {
-return tTable.getTableDescriptor();
-}
-
 @Override
 public boolean exists(Get get) throws IOException {
return tTable.exists(tx, get);
diff --git 
a/phoenix-hbase-compat-2.1.6/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
 
b/phoenix-hbase-compat-2.1.6/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
index 573196e59b..d5c893abc2 100644
--- 
a/phoenix-hbase-compat-2.1.6/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
+++ 
b/phoenix-hbase-compat-2.1.6/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
@@ -19,11 +19,23 @@ package org.apache.phoenix.compat.hbase;
 
 import java.io.IOException;
 
+import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.client.RowMutations;
 import org.apache.hadoop.hbase.client.Table;
 
 public abstract class CompatOmidTransactionTable implements Table {
 
+protected Table hTable;
+
+public CompatOmidTransactionTable(Table hTable) {
+this.hTable = hTable;
+}
+
+@Override
+public HTableDescriptor getTableDescriptor() throws IOException {
+return hTable.getTableDescriptor();
+}
+
 @Override
 public void mutateRow(RowMutations rm) throws IOException {
 throw new UnsupportedOperationException();
diff --git 
a/phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
 
b/phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
index 573196e59b..d5c893abc2 100644
--- 
a/phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
+++ 
b/phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
@@ -19,11 +19,23 @@ package org.apache.phoenix.compat.hbase;
 
 import java.io.IOException;
 
+import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.client.RowMutations;
 import org.apache.hadoop.hbase.client.Table;
 
 public abstract class CompatOmidTransactionTable implements Table {
 
+protected Table hTable;
+
+public CompatOmidTransactionTable(Table hTable) {
+this.hTable = hTable;
+}
+
+@Override
+public HTableDescriptor getTableDescriptor() throws IOException {
+return 

(phoenix) branch master updated: PHOENIX-7188 Remove Omid TTable.getTableDescriptor() calls

2024-02-08 Thread stoty
This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new 4ba8a33a03 PHOENIX-7188 Remove Omid TTable.getTableDescriptor() calls
4ba8a33a03 is described below

commit 4ba8a33a03429af0214a2cbd1e1abf81aa4604ba
Author: Istvan Toth 
AuthorDate: Thu Feb 8 08:30:10 2024 +0100

PHOENIX-7188 Remove Omid TTable.getTableDescriptor() calls
---
 .../org/apache/phoenix/transaction/OmidTransactionTable.java |  7 ++-
 .../phoenix/compat/hbase/CompatOmidTransactionTable.java | 12 
 .../phoenix/compat/hbase/CompatOmidTransactionTable.java | 12 
 .../phoenix/compat/hbase/CompatOmidTransactionTable.java | 12 
 .../phoenix/compat/hbase/CompatOmidTransactionTable.java | 12 
 5 files changed, 50 insertions(+), 5 deletions(-)

diff --git 
a/phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java
 
b/phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java
index 7d4d7bdf77..0e9ddb41a5 100644
--- 
a/phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java
+++ 
b/phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java
@@ -66,6 +66,7 @@ public class OmidTransactionTable extends 
CompatOmidTransactionTable implements
 private final boolean addShadowCells;
 
 public OmidTransactionTable() throws SQLException {
+super(null);
 this.tTable = null;
 this.tx = null;
 this.addShadowCells = false;
@@ -80,6 +81,7 @@ public class OmidTransactionTable extends 
CompatOmidTransactionTable implements
 }
 
 public OmidTransactionTable(PhoenixTransactionContext ctx, Table hTable, 
boolean isConflictFree, boolean addShadowCells) throws SQLException  {
+super(hTable);
 assert(ctx instanceof OmidTransactionContext);
 
 OmidTransactionContext omidTransactionContext = 
(OmidTransactionContext) ctx;
@@ -122,11 +124,6 @@ public class OmidTransactionTable extends 
CompatOmidTransactionTable implements
 return tTable.getConfiguration();
 }
 
-@Override
-public HTableDescriptor getTableDescriptor() throws IOException {
-return tTable.getTableDescriptor();
-}
-
 @Override
 public boolean exists(Get get) throws IOException {
return tTable.exists(tx, get);
diff --git 
a/phoenix-hbase-compat-2.4.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
 
b/phoenix-hbase-compat-2.4.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
index bddc7a57ec..b2997a86a1 100644
--- 
a/phoenix-hbase-compat-2.4.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
+++ 
b/phoenix-hbase-compat-2.4.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
@@ -19,12 +19,24 @@ package org.apache.phoenix.compat.hbase;
 
 import java.io.IOException;
 
+import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.RowMutations;
 import org.apache.hadoop.hbase.client.Table;
 
 public abstract class CompatOmidTransactionTable implements Table {
 
+protected Table hTable;
+
+public CompatOmidTransactionTable(Table hTable) {
+this.hTable = hTable;
+}
+
+@Override
+public HTableDescriptor getTableDescriptor() throws IOException {
+return hTable.getTableDescriptor();
+}
+
 @Override
 public Result mutateRow(RowMutations rm) throws IOException {
 throw new UnsupportedOperationException();
diff --git 
a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
 
b/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
index bddc7a57ec..b2997a86a1 100644
--- 
a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
+++ 
b/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
@@ -19,12 +19,24 @@ package org.apache.phoenix.compat.hbase;
 
 import java.io.IOException;
 
+import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.RowMutations;
 import org.apache.hadoop.hbase.client.Table;
 
 public abstract class CompatOmidTransactionTable implements Table {
 
+protected Table hTable;
+
+public CompatOmidTransactionTable(Table hTable) {
+this.hTable = hTable;
+}
+
+@Override
+public HTableDescriptor getTableDescriptor() throws IOException {
+return hTable.getTableDescriptor();
+}
+
 @Override
 public Result mutateRow(RowMutations rm) throws 

(phoenix) branch master updated: PHOENIX-6769 Align mockito version with Hadoop and HBase

2024-02-08 Thread stoty
This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new 06f5abc5b9 PHOENIX-6769 Align mockito version with Hadoop and HBase
06f5abc5b9 is described below

commit 06f5abc5b94a94a0187c1655bfda2b1440a5a4c2
Author: Istvan Toth 
AuthorDate: Thu Feb 1 16:56:19 2024 +0100

PHOENIX-6769 Align mockito version with Hadoop and HBase

* Update mockito to 4.11.0, same as HBase branch-3
* Remove org.hamcrest usage and direct dependency
---
 phoenix-core/pom.xml   |  5 
 .../apache/phoenix/end2end/AppendOnlySchemaIT.java | 27 +++---
 .../end2end/OrderByWithServerMemoryLimitIT.java|  5 ++--
 .../end2end/ParameterizedIndexUpgradeToolIT.java   |  2 +-
 .../end2end/RebuildIndexConnectionPropsIT.java | 21 -
 .../org/apache/phoenix/end2end/SumFunctionIT.java  | 13 ++-
 .../apache/phoenix/end2end/UpsertWithSCNIT.java| 25 ++--
 .../end2end/join/SortMergeJoinNoSpoolingIT.java|  5 ++--
 .../phoenix/jdbc/HighAvailabilityGroupTestIT.java  | 10 
 .../monitoring/PhoenixMetricsDisabledIT.java   |  5 ++--
 .../phoenix/monitoring/PhoenixMetricsIT.java   | 23 +++---
 .../rpc/UpdateCacheConnectionLevelPropIT.java  |  4 ++--
 .../java/org/apache/phoenix/rpc/UpdateCacheIT.java |  6 ++---
 .../coprocessor/TaskMetaDataEndpointTest.java  |  8 +++
 .../phoenix/hbase/index/write/TestIndexWriter.java |  2 +-
 .../hbase/index/write/TestParalleIndexWriter.java  |  2 +-
 .../write/TestParalleWriterIndexCommitter.java |  2 +-
 .../org/apache/phoenix/index/ShouldVerifyTest.java |  8 +++
 .../phoenix/index/VerifySingleIndexRowTest.java| 22 +-
 .../jdbc/ClusterRoleRecordGeneratorToolTest.java   |  2 +-
 .../jdbc/FailoverPhoenixConnectionTest.java|  2 +-
 .../phoenix/jdbc/ParallelPhoenixResultSetTest.java |  2 +-
 .../phoenix/jdbc/ParallelPhoenixUtilTest.java  |  2 +-
 .../phoenix/jdbc/PhoenixHAAdminToolTest.java   |  8 ---
 .../apache/phoenix/jdbc/PhoenixStatementTest.java  | 24 +++
 .../apache/phoenix/monitoring/MetricUtilTest.java  |  2 +-
 .../query/ConnectionQueryServicesImplTest.java |  7 +++---
 .../schema/stats/StatisticsScannerTest.java| 12 +-
 .../phoenix/util/AbstractUpsertExecutorTest.java   |  4 ++--
 .../java/org/apache/phoenix/util/LogUtilTest.java  |  2 +-
 phoenix-pherf/pom.xml  |  5 
 .../org/apache/phoenix/pherf/ResourceTest.java | 16 -
 pom.xml| 14 ---
 33 files changed, 152 insertions(+), 145 deletions(-)

diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 9a78ada110..6b0738e365 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -451,11 +451,6 @@
 mockito-core
 test
 
-
-org.hamcrest
-hamcrest-core
-test
-
 
 
 
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AppendOnlySchemaIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AppendOnlySchemaIT.java
index 82a8e8e40f..3d25c1a932 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AppendOnlySchemaIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AppendOnlySchemaIT.java
@@ -22,14 +22,13 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyList;
-import static org.mockito.Matchers.anyListOf;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.anyMap;
-import static org.mockito.Matchers.anySetOf;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.ArgumentMatchers.anySet;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.times;
@@ -112,14 +111,14 @@ public class AppendOnlySchemaIT extends 
ParallelStatsDisabledIT {
 fail("Create Table should not fail");
 }
 }
-
+
 // verify getTable rpcs
 verify(connectionQueryServices, never())
 .getTable((PName) isNull(), AdditionalMatchers.aryEq(new 
byte[0]),
-   

(phoenix) branch PHOENIX-6883-feature updated: PHOENIX-7190 : Store LAST_DDL_TIMESTAMP of all ancestors in a View's PTable (#1807)

2024-02-08 Thread shahrs87
This is an automated email from the ASF dual-hosted git repository.

shahrs87 pushed a commit to branch PHOENIX-6883-feature
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/PHOENIX-6883-feature by this 
push:
 new 39d7e94885 PHOENIX-7190 : Store LAST_DDL_TIMESTAMP of all ancestors in 
a View's PTable (#1807)
39d7e94885 is described below

commit 39d7e94885cb5fc0e86e1d090d4398ade6a071fe
Author: palash 
AuthorDate: Thu Feb 8 14:43:51 2024 -0800

PHOENIX-7190 : Store LAST_DDL_TIMESTAMP of all ancestors in a View's PTable 
(#1807)
---
 .../org/apache/phoenix/schema/DelegateTable.java   |   5 +
 .../org/apache/phoenix/schema/MetaDataClient.java  |  72 +--
 .../java/org/apache/phoenix/schema/PTable.java |   4 +
 .../java/org/apache/phoenix/schema/PTableImpl.java |  15 ++-
 .../java/org/apache/phoenix/schema/PTableKey.java  |  13 ++
 .../phoenix/util/ValidateLastDDLTimestampUtil.java |  60 -
 .../org/apache/phoenix/end2end/ViewMetadataIT.java | 117 ++
 .../java/org/apache/phoenix/rpc/UpdateCacheIT.java |   2 +-
 .../phoenix/cache/ServerMetadataCacheTest.java | 134 +
 9 files changed, 371 insertions(+), 51 deletions(-)

diff --git 
a/phoenix-core-client/src/main/java/org/apache/phoenix/schema/DelegateTable.java
 
b/phoenix-core-client/src/main/java/org/apache/phoenix/schema/DelegateTable.java
index 1a5d83e728..453a7663d1 100644
--- 
a/phoenix-core-client/src/main/java/org/apache/phoenix/schema/DelegateTable.java
+++ 
b/phoenix-core-client/src/main/java/org/apache/phoenix/schema/DelegateTable.java
@@ -413,6 +413,11 @@ public class DelegateTable implements PTable {
 return delegate.getIndexWhere();
 }
 
+@Override
+public Map getAncestorLastDDLTimestampMap() {
+return delegate.getAncestorLastDDLTimestampMap();
+}
+
 @Override
 public Expression getIndexWhereExpression(PhoenixConnection connection)
 throws SQLException {
diff --git 
a/phoenix-core-client/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
 
b/phoenix-core-client/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
index 4878cb5cf4..0d63f089f5 100644
--- 
a/phoenix-core-client/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
+++ 
b/phoenix-core-client/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
@@ -716,8 +716,9 @@ public class MetaDataClient {
 // In this case, we update the parent table which 
may in turn pull
 // in indexes to add to this table.
 long resolvedTime = 
TransactionUtil.getResolvedTime(connection, result);
-if (addColumnsAndIndexesFromAncestors(result, 
resolvedTimestamp,
-true, false)) {
+if 
(addColumnsIndexesAndLastDDLTimestampsFromAncestors(result,
+resolvedTimestamp, true, false)) {
+updateIndexesWithAncestorMap(result);
 connection.addTable(result.getTable(), 
resolvedTime);
 } else {
 // if we aren't adding the table, we still 
need to update the
@@ -898,14 +899,14 @@ public class MetaDataClient {
  * @return true if the PTable contained by result was modified and false 
otherwise
  * @throws SQLException if the physical table cannot be found
  */
-private boolean addColumnsAndIndexesFromAncestors(MetaDataMutationResult 
result, Long resolvedTimestamp,
-  boolean 
alwaysAddAncestorColumnsAndIndexes,
-  boolean 
alwaysHitServerForAncestors)
+private boolean addColumnsIndexesAndLastDDLTimestampsFromAncestors(
+MetaDataMutationResult result, 
Long resolvedTimestamp,
+boolean 
alwaysAddAncestorColumnsAndIndexes,
+boolean 
alwaysHitServerForAncestors)
 throws SQLException {
 PTable table = result.getTable();
 boolean hasIndexId = table.getViewIndexId() != null;
-// only need to inherit columns and indexes for view indexes and views
-if ((table.getType()==PTableType.INDEX && hasIndexId)
+if (table.getType() == PTableType.INDEX
 || (table.getType() == PTableType.VIEW && table.getViewType() 
!= ViewType.MAPPED)) {
 String tableName = null;
 try {
@@ -940,8 +941,18 @@ public class MetaDataClient {
 if (!alwaysAddAncestorColumnsAndIndexes && 
!result.wasUpdated() && !parentResult.wasUpdated()) {
 return false;
 }
-result.setTable(ViewUtil.addDerivedColumnsAndIndexesFromParent(
- 

svn commit: r1915664 - in /phoenix/site: publish/download.html publish/language/datatypes.html publish/language/functions.html publish/language/index.html source/src/site/markdown/download.md

2024-02-08 Thread rajeshbabu
Author: rajeshbabu
Date: Thu Feb  8 19:05:37 2024
New Revision: 1915664

URL: http://svn.apache.org/viewvc?rev=1915664=rev
Log:
Add Omid Release 1.1.1

Modified:
phoenix/site/publish/download.html
phoenix/site/publish/language/datatypes.html
phoenix/site/publish/language/functions.html
phoenix/site/publish/language/index.html
phoenix/site/source/src/site/markdown/download.md

Modified: phoenix/site/publish/download.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/download.html?rev=1915664=1915663=1915664=diff
==
--- phoenix/site/publish/download.html (original)
+++ phoenix/site/publish/download.html Thu Feb  8 19:05:37 2024
@@ -1,7 +1,7 @@
 
 
 
 
@@ -258,6 +258,7 @@ addRelease2('4.16.1', '21/may/2021', '1.
 addPhoenixdbRelease('1.2.1','25/oct/2022');
 addPhoenixThirdpartyRelease('2.1.0','20/dec/2023');
 addPhoenixThirdpartyRelease('2.0.0','19/apr/2022');
+addPhoenixOmidRelease('1.1.1','08/feb/2024');
 addPhoenixOmidRelease('1.1.0','17/oct/2022');
 addPhoenixTephraRelease('0.16.1','13/may/2021');
 addPhoenixQueryServerRelease('6.0.0','03/aug/2021');
@@ -517,7 +518,7 @@ addPhoenixQueryServerRelease('6.0.0','03


Back to 
top
-   Copyright 2023 http://www.apache.org;>Apache Software Foundation. All Rights 
Reserved.
+   Copyright 2024 http://www.apache.org;>Apache Software Foundation. All Rights 
Reserved.




Modified: phoenix/site/publish/language/datatypes.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/language/datatypes.html?rev=1915664=1915663=1915664=diff
==
--- phoenix/site/publish/language/datatypes.html (original)
+++ phoenix/site/publish/language/datatypes.html Thu Feb  8 19:05:37 2024
@@ -1,7 +1,7 @@
 
 
 
 
@@ -995,7 +995,7 @@ syntax-end -->


Back to 
top
-   Copyright 2023 http://www.apache.org;>Apache Software Foundation. All Rights 
Reserved.
+   Copyright 2024 http://www.apache.org;>Apache Software Foundation. All Rights 
Reserved.




Modified: phoenix/site/publish/language/functions.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/language/functions.html?rev=1915664=1915663=1915664=diff
==
--- phoenix/site/publish/language/functions.html (original)
+++ phoenix/site/publish/language/functions.html Thu Feb  8 19:05:37 2024
@@ -1,7 +1,7 @@
 
 
 
 
@@ -2324,7 +2324,7 @@ syntax-end -->


Back to 
top
-   Copyright 2023 http://www.apache.org;>Apache Software Foundation. All Rights 
Reserved.
+   Copyright 2024 http://www.apache.org;>Apache Software Foundation. All Rights 
Reserved.




Modified: phoenix/site/publish/language/index.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/language/index.html?rev=1915664=1915663=1915664=diff
==
--- phoenix/site/publish/language/index.html (original)
+++ phoenix/site/publish/language/index.html Thu Feb  8 19:05:37 2024
@@ -1,7 +1,7 @@
 
 
 
 
@@ -2094,7 +2094,7 @@ syntax-end -->


Back to 
top
-   Copyright 2023 http://www.apache.org;>Apache Software Foundation. All Rights 
Reserved.
+   Copyright 2024 http://www.apache.org;>Apache Software Foundation. All Rights 
Reserved.




Modified: phoenix/site/source/src/site/markdown/download.md
URL: 
http://svn.apache.org/viewvc/phoenix/site/source/src/site/markdown/download.md?rev=1915664=1915663=1915664=diff
==
--- phoenix/site/source/src/site/markdown/download.md (original)
+++ phoenix/site/source/src/site/markdown/download.md Thu Feb  8 19:05:37 2024
@@ -80,6 +80,7 @@ addRelease2('4.16.1', '21/may/2021', '1.
 addPhoenixdbRelease('1.2.1','25/oct/2022');
 addPhoenixThirdpartyRelease('2.1.0','20/dec/2023');
 addPhoenixThirdpartyRelease('2.0.0','19/apr/2022');
+addPhoenixOmidRelease('1.1.1','08/feb/2024');
 addPhoenixOmidRelease('1.1.0','17/oct/2022');
 addPhoenixTephraRelease('0.16.1','13/may/2021');
 addPhoenixQueryServerRelease('6.0.0','03/aug/2021');