You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by ar...@apache.org on 2015/10/08 02:15:26 UTC
[1/2] incubator-trafodion git commit: [TRAFODION-1511] Phoenix tests
when using T2 driver fails with Index out of range error
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 87b28274e -> 0618e6ec5
[TRAFODION-1511] Phoenix tests when using T2 driver fails with Index out of range error
Updated the license file for Linux driver
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/5e17dfe9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/5e17dfe9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/5e17dfe9
Branch: refs/heads/master
Commit: 5e17dfe957f6350cd163c0a4938418d1159de99b
Parents: bd0f69c
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Wed Oct 7 20:50:19 2015 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Wed Oct 7 20:50:19 2015 +0000
----------------------------------------------------------------------
.../odbc/odbcclient/unixcli/package/license.txt | 47 ++++++--------------
dcs/conf/dcs-site.xml | 3 +-
tests/phx/phoenix_test.py | 12 -----
tests/phx/pom.xml.template | 42 ++++++++++++++---
4 files changed, 52 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5e17dfe9/core/conn/unixodbc/odbc/odbcclient/unixcli/package/license.txt
----------------------------------------------------------------------
diff --git a/core/conn/unixodbc/odbc/odbcclient/unixcli/package/license.txt b/core/conn/unixodbc/odbc/odbcclient/unixcli/package/license.txt
index b26eb25..fd52331 100644
--- a/core/conn/unixodbc/odbc/odbcclient/unixcli/package/license.txt
+++ b/core/conn/unixodbc/odbc/odbcclient/unixcli/package/license.txt
@@ -1,37 +1,18 @@
-Trafodion ODBC LICENSE AGREEMENT
-This agreement (�Agreement�) is entered into by and between Hewlett-Packard Company (�HP�) and the customer (�You�) as of the date Your authorized representative accepts this Agreement on Your behalf (�Effective Date�). The terms and conditions of this Agreement apply to Your evaluation of the Trafodion software (�Product�) provided to You by HP under this Agreement.
+ 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
-1. Products/Materials: Subject to the terms and conditions of this Agreement, HP shall provide to You at no charge (a) a version of the Trafodion software product (�Product�)Product, and (b) materials related to the Product, including documentation, presentations or other media (collectively, the �Materials�).
+ http://www.apache.org/licenses/LICENSE-2.0
-2. Term and Termination: This term of this Agreement (�Term�) will begin on the Effective Date and will terminate either as provided in this Agreement or180 days after the Effective Date, whichever occurs first. Your rights under this Agreement terminate if You fail to comply with it. HP may terminate this Agreement immediately at any time in its sole discretion. Sections 2, 5, and 7-17 shall survive expiration or termination of this Agreement.
+ 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.
-3. Installation: You shall comply with any installation requirements provided by HP.
-
-4. Product Use: Subject to the terms and conditions of this Agreement, HP grants to You a personal, non-transferable, non-sublicenseable, limited, revocable, non-exclusive royalty free license to internally use and test the Product and Materials during the Term for non-production testing and evaluation purposes only. Except where the terms of an open source license governing open source code which may be included in the Product and Materials specifically provides that the open source code cannot be licensed under other terms, the terms of this Agreement shall govern with regard to that open source code; otherwise, Your use of the Product and Materials is further subject to any third party license terms found in or accompanying the Product and Materials.
-
-5. Restrictions on Use: You shall not use the Product or Materials in any manner to produce, market, or support Your own products or business. You acknowledge that the Product and Materials may contain bugs or defects. Your right to use the Product or Materials is specifically limited to the rights as described in this Agreement. Except as permitted by law, You shall not reverse engineer, disassemble, decompile, copy, distribute, or modify the Products and Materials or provide access to the Products and Materials to a third party.
-
-6. Technical Support: HP is not required to provide You with technical support. Any technical support HP does provide to You shall be at HP�s sole discretion and is provided �As Is�.
-
-7. Title: All right, title, and interest to all intellectual property and related intellectual property rights with respect to the Product and Materials, including that which may be or become protectable by patent, copyright, trademark, trade secret, or similar laws, shall remain exclusively with HP or its suppliers. This Agreement confers no title or ownership and is not a sale of any rights in any current or future HP products or services.
-
-8. Return of Products: At the expiration or termination of this Agreement, You shall promptly return to HP or destroy all copies of the Product and/or Materials in Your possession. HP may ask You to certify in writing that You have complied with this section within ten business days of such request from HP.
-
-9. Disclaimer of Warranties: The Product and Materials are provided �As Is.� YOU ACKNOWLEDGE THAT THE PRODUCT AND MATERIALS HAVE NOT COMPLETED HP'S FULL QUALITY ASSURANCE PROGRAM AND MAY HAVE ERRORS OR DEFECTS. HP MAKES NO EXPRESS OR IMPLIED WARRANTY OF ANY KIND WITH RESPECT TO THE PRODUCTS AND MATERIALS, AND SPECIFICALLY DISCLAIMS THE IMPLIED WARRANTIES OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-
-10. Future Availability: HP may at any time and without notice choose not to release a final Product or Materials or, even if released, to alter prices, features, specifications, capabilities, functions, release dates, general availability, or other characteristics of the Product or Materials.
-
-11. Limitation of Liability: TO THE FULLEST EXTENT PERMITTED UNDER LAW, HP WILL HAVE NO OBLIGATION OR LIABILITY (WHETHER ARISING IN CONTRACT, WARRANTY, TORT, NEGLIGENCE, PRODUCT LIABILITY, OR OTHERWISE) FOR ANY DIRECT, INCIDENTAL, INDIRECT, PUNITIVE, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LIABILITIES (INCLUDING LOST PROFITS, LOSS OF INCOME, REVENUE, GOODWILL, REPUTATION OR SAVINGS, LOSS OR UNAVAILABILITY OF OR DAMAGE TO DATA OR SOFTWARE RESTORATION), EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES OR LIABILITIES, ARISING UNDER THIS AGREEMENT.
-
-12. Intellectual Property Rights: No rights in copyright, patents, trademarks, trade secrets, or other intellectual property rights are granted by either party to the other except as expressly provided under this Agreement. You agree that HP shall have, and You shall assign to HP, all right, title and interest in and to any feedback, Product test results or suggestions regarding the Product or Materials (�Feedback�). HP at its discretion may choose not to use or implement any Feedback in the Product or Materials. You shall not register or use any mark or internet domain name that contains HP�s trademarks.
-
-13. Confidentiality of Information: You acknowledge and agree that all information pertaining to the terms and conditions of this Agreement and the Product and Materials are HP�s proprietary and confidential information. As such, You shall protect the confidentiality of such information until such information is made public by HP, using the same degree of care, but no less than a reasonable degree of care, to prevent the unauthorized use, dissemination, or publication of such information as parties use to protect their own confidential information of a like nature. You shall not make public any information, reports or test results obtained pursuant to this Agreement.
-
-14. Assignment: You may not assign this Agreement without prior written consent of HP. Authorized assignments will terminate Your license. You must first obtain the assignee�s agreement in writing to comply with this Agreement.
-
-15. Governing Law: This Agreement will be governed by the laws of the state of California, U.S.A., excluding rules as to choice and conflicts of law. You and HP agree that the United Nations Convention on Contracts for the International Sale of Goods will not apply.
-
-16. Global Trade Compliance: You agree to comply with the trade-related laws and regulations of the U.S. and other national governments. You agree You will not export, import or otherwise transfer the Product and Materials provided under this Agreement except as authorized by this Agreement and that, You will be responsible for obtaining any required export or import authorizations. You confirm that You are not located in a country that is subject to trade control sanctions (currently Cuba, Iran, N. Korea, N. Sudan, and Syria) and further agree that You will not retransfer the Product and Materials to any such country. HP may suspend its performance under this Agreement to the extent required by laws applicable to either party.
-
-17. Entire Agreement: This Agreement represents the entire understanding with respect to the Product and Materials and supersedes any previous communication or agreements that may exist. Modifications to the Agreement will be made only through a written amendment signed by both parties. If HP doesn�t exercise its rights under this Agreement, such delay is not a waiver of its rights. In the event any provision of this Agreement is held invalid or unenforceable, the remainder of the Agreement will remain enforceable and unaffected thereby.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5e17dfe9/dcs/conf/dcs-site.xml
----------------------------------------------------------------------
diff --git a/dcs/conf/dcs-site.xml b/dcs/conf/dcs-site.xml
index b5e7782..4442258 100644
--- a/dcs/conf/dcs-site.xml
+++ b/dcs/conf/dcs-site.xml
@@ -21,7 +21,8 @@
* specific language governing permissions and limitations
* under the License.
*
-* @@@ END COPYRIGHT @@@ -->
+* @@@ END COPYRIGHT @@@
+-->
<configuration>
</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5e17dfe9/tests/phx/phoenix_test.py
----------------------------------------------------------------------
diff --git a/tests/phx/phoenix_test.py b/tests/phx/phoenix_test.py
index 6589529..13a891c 100755
--- a/tests/phx/phoenix_test.py
+++ b/tests/phx/phoenix_test.py
@@ -271,7 +271,6 @@ def generate_pom_xml(targettype, jdbc_groupid, jdbc_artid, jdbc_path, hadoop_dis
'MY_ZOOKEEPER_VERSION': get_hadoop_component_ver(hadoop_distro, "zookeeper"),
# cdh sub-string added at 1.1
'TRAF_HBASE_TRX_REGEX': re.compile("^hbase-trx-(cdh[\d_]*-)?[\d\.]{3,}jar"),
- 'TRAF_HBASE_ACS_REGEX': re.compile("^trafodion-HBaseAccess-[\d\.]{3,}jar"),
'MVN_DEPS': [('org.apache.hbase', 'hbase-client', '${hbase_version}', 'EDEP'),
('org.apache.hbase', 'hbase-common', '${hbase_version}', 'EDEP'),
('org.apache.hbase', 'hbase-server', '${hbase_version}', 'EDEP'),
@@ -299,7 +298,6 @@ def generate_pom_xml(targettype, jdbc_groupid, jdbc_artid, jdbc_path, hadoop_dis
'MY_HIVE_VERSION': get_hadoop_component_ver(hadoop_distro, "hive"),
'MY_ZOOKEEPER_VERSION': get_hadoop_component_ver(hadoop_distro, "zookeeper"),
'TRAF_HBASE_TRX_REGEX': re.compile("^hbase-trx-hdp[\d_]*-[\d\.]{3,}jar"),
- 'TRAF_HBASE_ACS_REGEX': re.compile("^trafodion-HBaseAccess-[\d\.]{3,}jar"),
'MVN_DEPS': [('org.apache.hbase', 'hbase-client', '${hbase_version}', 'EDEP'),
('org.apache.hbase', 'hbase-common', '${hbase_version}', 'EDEP'),
('org.apache.hbase', 'hbase-server', '${hbase_version}', 'EDEP'),
@@ -366,16 +364,6 @@ def generate_pom_xml(targettype, jdbc_groupid, jdbc_artid, jdbc_path, hadoop_dis
if m][0]
template_text = re.sub('TRAF_HBASE_TRX_FILE', traf_hbase_trx_file, template_text)
- traf_hbase_access_file = [m.group(0) for l in traf_lib_file_list for m in
- [hadoop_dict[hadoop_distro]['TRAF_HBASE_ACS_REGEX'].search(l)]
- if m][0]
- template_text = re.sub('TRAF_HBASE_ACS_FILE', traf_hbase_access_file, template_text)
-
- # find the Trafodion HBase version being used
- hbaseVerRegex = re.compile("^hbase-trx(-[a-z0-9_]+)?-([\d\.]{3,})jar")
- traf_hbase_version = hbaseVerRegex.match(traf_hbase_trx_file).group(2)[:-1]
- template_text = re.sub('MY_TRAF_HBASE_VERSION', traf_hbase_version, template_text)
-
# fix up T2 Hadoop properties
for hprop in ['MY_HADOOP_DISTRO', 'MY_HADOOP_VERSION', 'MY_MVN_URL', 'MY_HBASE_VERSION',
'MY_HIVE_VERSION', 'MY_ZOOKEEPER_VERSION']:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5e17dfe9/tests/phx/pom.xml.template
----------------------------------------------------------------------
diff --git a/tests/phx/pom.xml.template b/tests/phx/pom.xml.template
index c107688..ab83732 100644
--- a/tests/phx/pom.xml.template
+++ b/tests/phx/pom.xml.template
@@ -1,5 +1,28 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+<!--
+* @@@ START COPYRIGHT @@@
+*
+* 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.
+*
+* @@@ END COPYRIGHT @@@
+-->
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
@@ -20,6 +43,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jdbc_path>MYJDBC_PATH</jdbc_path>
+
<!-- START_FOR_T2_ONLY -->
<hadoop_distro>MY_HADOOP_DISTRO</hadoop_distro>
<hadoop_version>MY_HADOOP_VERSION</hadoop_version>
@@ -27,8 +51,8 @@
<hbase_version>MY_HBASE_VERSION</hbase_version>
<hive_version>MY_HIVE_VERSION</hive_version>
<zookeeper_version>MY_ZOOKEEPER_VERSION</zookeeper_version>
- <traf_hbase_version>MY_TRAF_HBASE_VERSION</traf_hbase_version>
<!-- END_FOR_T2_ONLY -->
+
</properties>
<!-- START_FOR_T2_ONLY -->
@@ -168,22 +192,27 @@
<version>1.7.5</version>
<scope>test</scope>
</dependency>
+
<!-- Trafodion specific test dependencies -->
+
<dependency>
<groupId>hbase-trx</groupId>
<artifactId>hbase-trx</artifactId>
- <version>${traf_hbase_version}</version>
+ <version>${env.TRAFODION_VER}</version>
<scope>system</scope>
<systemPath>${env.MY_SQROOT}/export/lib/TRAF_HBASE_TRX_FILE</systemPath>
</dependency>
+
<dependency>
<groupId>org.trafodion.sql</groupId>
- <artifactId>HBaseAccess</artifactId>
- <version>${traf_hbase_version}</version>
+ <artifactId>trafodion-sql</artifactId>
+ <version>${env.TRAFODION_VER}</version>
<scope>system</scope>
- <systemPath>${env.MY_SQROOT}/export/lib/TRAF_HBASE_ACS_FILE</systemPath>
- </dependency>
+ <systemPath>${env.MY_SQROOT}/export/lib/trafodion-sql-${env.TRAFODION_VER}.jar</systemPath>
+ </dependency>
+
<!-- END_FOR_T2_ONLY -->
+
<dependency>
<groupId>MYJDBC_GROUP_ID</groupId>
<artifactId>MYJDBC_ART_ID</artifactId>
@@ -191,6 +220,7 @@
<scope>system</scope>
<systemPath>${jdbc_path}</systemPath>
</dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
[2/2] incubator-trafodion git commit: Merge [TRAFODION 1511] Phoenix
tests when using T2 driver fails with Index out of range error
Posted by ar...@apache.org.
Merge [TRAFODION 1511] Phoenix tests when using T2 driver fails with Index out of range error
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/0618e6ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/0618e6ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/0618e6ec
Branch: refs/heads/master
Commit: 0618e6ec53e5c96d030bcf190116937e1dc13625
Parents: 87b2827 5e17dfe
Author: Arvind Narain <ar...@apache.org>
Authored: Thu Oct 8 00:13:48 2015 +0000
Committer: Arvind Narain <ar...@apache.org>
Committed: Thu Oct 8 00:13:48 2015 +0000
----------------------------------------------------------------------
.../odbc/odbcclient/unixcli/package/license.txt | 47 ++++++--------------
dcs/conf/dcs-site.xml | 3 +-
tests/phx/phoenix_test.py | 12 -----
tests/phx/pom.xml.template | 42 ++++++++++++++---
4 files changed, 52 insertions(+), 52 deletions(-)
----------------------------------------------------------------------