Trafodion

Clone Tools
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge "Enable Phoenix T2 to work in local_hadoop environment"

Fix install_local_hadoop to find maven, run phoenix T2

Use the MAVEN variable set in sqenvcom.sh, rather than relying on it being

in the PATH.

Change exit code of DCS failure, since it is not required to run

trafodion instance.

Add in the option to run phoenix tests with jdbc T2 driver, now that

Alice Chen has enhanced the test script to work in local_hadoop environment.

Change-Id: I3ebc5fe194d1c28b98a777ad276fbdcd036f857a

    • -14
    • +14
    /sqf/sql/scripts/install_local_hadoop
modify some log trace level

Change-Id: If8e73cbc6f6cf64b936b0959f28e5dd97519e2eb

Node Up (re-integration) updates. Squashed commit of the following:

commit a1cc0bad793a00d3ae3436783e1a0b29cc5286ad

Merge: 6f8f67a b4d797a

Author: Gonzalo Correa <gonzalo.correa@hp.com>

Date: Fri Dec 12 14:49:33 2014 -0800

Merge remote branch 'gerrit/master' into traf/recovery_node_up

commit 6f8f67a2128a0b3d431a45f9a60c0b85f1071aba

Author: Gonzalo Correa <gonzalo.correa@hp.com>

Date: Fri Dec 12 14:47:38 2014 -0800

Restore mainline merge change.

Change-Id: I3f941e4db7ab68a7a5190af3e7c0ce9b8c83f810

commit 967255b2c7453aac0e2125fcea0dc421524bd1af

Merge: 2616982 f0f508a

Author: Gonzalo Correa <gonzalo.correa@hp.com>

Date: Fri Dec 12 10:00:54 2014 -0800

Merge branch 'master' of https://github.com/trafodion/core into traf/opensrc

commit 2616982f1eab099a1eaeafacc5fb17036feb989d

Merge: a329762 2977953

Author: Gonzalo Correa <gonzalo.correa@hp.com>

Date: Fri Dec 12 10:00:42 2014 -0800

Merge branch 'master' into traf/opensrc

commit 297795384d235f5b3e31b40878d68cc8ff08eee8

Author: Gonzalo Correa <gonzalo.correa@hp.com>

Date: Thu Dec 11 15:46:37 2014 -0800

Node up (re-integration) fixes, code cleanup, etc.

commit 52f713738b62d4dccd6d6e7b054210b946311af7

Merge: 882e800 5b93d74

Author: Gonzalo Correa <gonzalo.correa@hp.com>

Date: Tue Dec 9 13:00:19 2014 -0800

Merge branch 'master' of https://github.com/fuentead/recovery

Conflicts:

sqf/sql/scripts/sqgen

commit 882e8004d5927cdfad8a357537bbffee7f9dc5ce

Author: Gonzalo Correa <gonzalo.correa@hp.com>

Date: Tue Dec 9 12:46:33 2014 -0800

Preliminary node up (reintegration) changes.

commit 5b93d740f8c07fe57f19b0ff20cbd34c338c5e51

Author: adriana.fuentes@hp.com <adriana.fuentes@hp.com>

Date: Tue Dec 9 20:20:41 2014 +0000

Resolving conflicts

Change-Id: Idc42d06ae9ac1a27760439a24dabd2c7ff2e513f

commit befb8398207173f597eed371556eb28976389e48

Merge: 65f20fe 2334c66

Author: adriana.fuentes@hp.com <adriana.fuentes@hp.com>

Date: Tue Dec 9 20:11:39 2014 +0000

Merge remote branch 'gerrit/master'

Conflicts:

sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java

sqf/src/seatrans/tm/hbasetmlib2/HBaseTxClient.java

sqf/src/tm/tmrecov.cpp

Change-Id: Iac5aa6dd06ff6d9076c89c556882af213b81397f

commit 65f20fee9410003e27fe06baea5bf3cacbdacf5d

Author: Shang-Sheng Tung <shang-sheng.tung@hp.com>

Date: Wed Dec 3 20:47:37 2014 +0000

add node down code

commit 380796d38e51b9601af7f68b37b865e34ad595a0

Author: Shang-Sheng Tung <shang-sheng.tung@hp.com>

Date: Tue Nov 25 23:30:45 2014 +0000

test by adding a space

commit ac490047192d179abf70f3369529bec792f54e17

Author: oliverbucaojit <oliver.bucaojit@gmail.com>

Date: Tue Nov 25 23:22:45 2014 +0000

Moving Trace line

commit 1225a6caca2b4d9124f00ae187cee1c0b584267f

Author: Oliver Bucaojit <oliver.bucaojit@hp.com>

Date: Tue Nov 25 22:32:48 2014 +0000

Recovery thread changes, nodeDown and nodeUp addition, full try/catch and retry logic added to RecoveryThread

commit b5e26f283ef6b02e7073bc1b809aa27a40ed397c

Author: adriana.fuentes@hp.com <adriana.fuentes@hp.com>

Date: Tue Nov 25 01:39:20 2014 +0000

TM changes for sending NID on node down and up

TM changes to send node id on a node down and a node up.

JNI changes on C++ and java side.

Change-Id: I1f7166d97e7113d6c17a35dffd1c9a7e6a67c901

    • -7
    • +26
    /sqf/export/include/common/evl_sqlog_eventnum.h
    • -156
    • +1089
    /sqf/monitor/linux/cluster.cxx
    • -126
    • +176
    /sqf/monitor/linux/commaccept.cxx
  1. … 19 more files in changeset.
Merge "Region auditing change"

Various changes, details listed below.

-- fixed error msg 1429 text

-- added code to set objectUID & owner for metadata, histogram and

sequence tables during creation of metadata structs for these objects.

-- removed previously added code in binder that computed objectUID

for sequence.

-- Updated method lookupObjectUid to call an existing method

to get objectuid.

-- removed obsolete code for reorg, replicate and load

Change-Id: I60d161cfa72bcc674dc6c64e3a07237c7522ee6c

    • -313
    • +0
    /sql/generator/GenRelExeUtil.cpp
  1. … 14 more files in changeset.
Merge "Node down support; refactor prepareCommit"

Merge "Misc fixes related to LOB code"

Region auditing change

Change-Id: I912bed13e6562e4bdae8d2f5f14e01f4a2cb3ade

Node down support; refactor prepareCommit

Change-Id: Iafd976015b34ff9bed1e655bf0db05317d3574c4

Merge "Possible fix for RS crash"

Fix for bug 1401012

The first CLI call initializes the cli_globals global structure.

There was a loop hole that can cause this structure to be accessed

from another thread while it is being initialized and this was

causing core files in multi-threaded testing using T2 driver.

Change-Id: I13651ed241d9a4dd5973d8ab260af5de65757efc

Merge "Reverting a change causing issues on a cluster"

Reverting a change causing issues on a cluster

Change-Id: Ib8bd62b8e95fdc9ffa7c05b4aed8b764bb9480dd

Improved error handling during transaction hasConflict checking

Change-Id: I990460d321bfd89c71cdfd76783b2b6c0768dbf0

Misc fixes related to LOB code

Fix to generator that accidentally removed a whole method earlier.

Fix to executor/TEST130 to cleanup and execute a delete

Fixing version info for mxlobsrvr process

Change-Id: Ifb724543299172c4f8d01a7040a74144f8e9e397

    • -0
    • +48
    /sql/bin/vprocmxlobsrvr.cpp
    • -27
    • +19
    /sql/regress/executor/EXPECTED130
Merge "Add support for DCS and phoenix_tests to local_hadoop"

Possible fix for RS crash

Turning off block cache for regular full table scan and the coprocessor

count operation. This avoid these operations to add new block cache entries

in RS and evict the useful entries.

Ed atomic Testing has shown improvments in java memory usage in RS and in

throughput for large table full scans.

Change-Id: Ief1b9bb60c500100d3e63650b13cebfd99c2d041

Remove duplicates in PATH and CLASSPATH to fix bug 1401216

In sqf/sqenvcom.sh :

1. Removed duplicates from environment variables $CLASSPATH and $PATH,

so sqenv.sh can be invoked repeatedly without them growing.

2. Removed test for JAVA_HOME containing exactly "1.7.0_67", which should

help fix bug 1387238.

3. To reduce the places the recommended jdk version "1.7.0_67" appears,

set this variable earlier:

REQ_JDK_VER="1.7.0_67"

This is used only in setting JAVA_HOME if it does not exist.

4. Removed jdk 1.6 lines since we stopped using that when directory

sql/hbaseExtensions was removed about the end of September.

5. Made indentation more consistent.

6. Made formatting of "if" and "do" more consistent.

7. Used double-brackets in conditionals, which is safer as

documented in http://mywiki.wooledge.org/BashFAQ/031

8. Use $(..) for subshells instead of less readable backticks.

In sqf/tools/sqtools.sh, added function remove_duplicates_in_path which

removes second and later appearances of the same value.

Change-Id: Iec48874b14d08ca8155006ab6a6a3f41c1714ca8

Merge "Fixes and removal of obsolete code."

    • -126
    • +76
    /sql/optimizer/BindRelExpr.cpp
Miscellaneous minor changes

1) Revert a part of previous change to ComTdbHbaseAccess::displayRowId() for

SHOWPLAN. Each valid row id should have 2 bytes of length followed by the

value of id, if it is not missing or null. We need to treat the id as

binary value so we'll print each id byte as 2-digit hex value up to 20

bytes.

2) Remove the part of comments in sql/sqlcomp/DefineConstants.h that

requires not to delete and reuse existing constants. This is no longer

mandatory in Trafodion.

3) Enable NA memory overflow checking when running executor and qat

suites in debug flavor. This would increase the run time for these two

suites by about 10%.

Rework according to review comments. Explanations above changed too.

Change-Id: I854ec776fa5fb815c39677d469f8f46f18d51402

    • -20
    • +11
    /sql/comexe/ComTdbHbaseAccess.cpp
    • -0
    • +5
    /sql/regress/tools/runregr_executor.ksh
Merge "Lookup object UID for Sequence generator"

Merge "Changes to first review comments from Ruo-Yu"

Lookup object UID for Sequence generator

The NATable object representing a Sequence generator sometimes has

an object UID of 0 at the time privileges are checked, resulting

in failure to locate the object and denial of access. This change

looks up the UID if the corresponding NATable member variable is 0.

Change-Id: I889d2d823b8c0faca5318572250b45e07134b6cf

Merge "Fix for bug 1400963"

Merge "Changes to delay region split if txn present"

Merge "Give warning, not error, when Hadoop not found"

Updated Phoenix tests to cope with ANSI schemas

Updated Phoenix tests to do 'create schema' and 'drop schema' before and after

each test to cope with the new behavior with ANSI schemas. Up to now, schemas

in Trafodion do not need to be created or dropped, but the ANSI schema support

will change that. This update for Phoenix tests need to go in first before

the implement of ANSI schemas can go in, to ensure a smooth transition for

Jenkins builds. Since 'create schema' and 'drop schema' are just no-op right

now, Phoenix tests will continue to work for the existing builds even with this

update.

Change-Id: Ifa6902a122c78bdb899516cf8121295092cad0a9

Enable Phoenix T2 to work in local_hadoop environment

This will enable Phoenix T2 to work in developer's local_hadoop

environment. It makes the assumption that HBase/Hive lib

directory is at the same level as the HBase/Hive directory.

Change-Id: If2a2c84dca1d7cd8fc17da0ad56485c8bfdb9e74

Merge "TMUDF C++ compiler interface, part of log-reading TMUDF"

    • -0
    • +331
    /sql/optimizer/OptPhysRelExpr.cpp