This is an automated email from the ASF dual-hosted git repository. vjasani 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 8208adeb6a PHOENIX-6974 Move PBaseColumn to test (#1620) 8208adeb6a is described below commit 8208adeb6a80099da704b84fd114bba91ece35fb Author: Jing Yu <y...@salesforce.com> AuthorDate: Tue Jun 13 23:10:11 2023 -0400 PHOENIX-6974 Move PBaseColumn to test (#1620) --- .../org/apache/phoenix/schema/PDateColumn.java | 28 ---------------- .../org/apache/phoenix/schema/PIntegerColumn.java | 35 -------------------- .../org/apache/phoenix/schema/PStringColumn.java | 37 ---------------------- .../org/apache/phoenix/schema/PBaseColumn.java | 4 +-- .../org/apache/phoenix/schema/PLongColumn.java | 3 -- 5 files changed, 1 insertion(+), 106 deletions(-) diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/PDateColumn.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/PDateColumn.java deleted file mode 100644 index 339c9b4c3b..0000000000 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/PDateColumn.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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.phoenix.schema; - -import org.apache.phoenix.schema.types.PDataType; -import org.apache.phoenix.schema.types.PDate; - -abstract public class PDateColumn extends PBaseColumn { - @Override - public PDataType getDataType() { - return PDate.INSTANCE; - } -} diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/PIntegerColumn.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/PIntegerColumn.java deleted file mode 100644 index 7a8ab2fb83..0000000000 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/PIntegerColumn.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * 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.phoenix.schema; - -import org.apache.phoenix.schema.types.PDataType; -import org.apache.phoenix.schema.types.PInteger; - -/** - * - * Base class for PColumn implementors of type Integer. - * - * - * @since 0.1 - */ -public abstract class PIntegerColumn extends PBaseColumn { - @Override - public final PDataType getDataType() { - return PInteger.INSTANCE; - } -} diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/PStringColumn.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/PStringColumn.java deleted file mode 100644 index 8901aa2284..0000000000 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/PStringColumn.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * 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.phoenix.schema; - -import org.apache.phoenix.schema.types.PDataType; -import org.apache.phoenix.schema.types.PVarchar; - -/** - * - * Abstract class for columns of type {@link org.apache.phoenix.schema.types.PVarchar} - * - * - * @since 0.1 - */ -public abstract class PStringColumn extends PBaseColumn { - - @Override - public PDataType getDataType() { - return PVarchar.INSTANCE; - } - -} diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/PBaseColumn.java b/phoenix-core/src/test/java/org/apache/phoenix/schema/PBaseColumn.java similarity index 99% rename from phoenix-core/src/main/java/org/apache/phoenix/schema/PBaseColumn.java rename to phoenix-core/src/test/java/org/apache/phoenix/schema/PBaseColumn.java index 26107398fe..59c3ccbb4f 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/PBaseColumn.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/schema/PBaseColumn.java @@ -21,11 +21,9 @@ import org.apache.phoenix.util.SizedUtil; /** - * * Base class for PColumn implementors that provides * some reasonable default implementations. * - * * @since 0.1 */ public abstract class PBaseColumn implements PColumn { @@ -44,7 +42,7 @@ public abstract class PBaseColumn implements PColumn { public boolean isNullable() { return false; } - + @Override public int getEstimatedSize() { return SizedUtil.OBJECT_SIZE; // Not really interested in sized of these diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/PLongColumn.java b/phoenix-core/src/test/java/org/apache/phoenix/schema/PLongColumn.java similarity index 99% rename from phoenix-core/src/main/java/org/apache/phoenix/schema/PLongColumn.java rename to phoenix-core/src/test/java/org/apache/phoenix/schema/PLongColumn.java index ff3578f0ae..67c919071d 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/PLongColumn.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/schema/PLongColumn.java @@ -21,10 +21,7 @@ import org.apache.phoenix.schema.types.PDataType; import org.apache.phoenix.schema.types.PLong; /** - * * Base class for PColumn implementors of type Long. - * - * * @since 0.1 */ public abstract class PLongColumn extends PBaseColumn {