3870 Jan Wedvik 2012-03-30
This commit is a refactoring. NdbQueryBuilderImpl::m_id, NdbQueryBuilderImpl::m_ix are
renamed to m_opNo and m_internalOpNo. Associated methods are renamed in the same way.
modified:
sql/ha_ndbcluster.cc
storage/ndb/src/ndbapi/NdbQueryBuilder.cpp
storage/ndb/src/ndbapi/NdbQueryBuilder.hpp
storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp
storage/ndb/src/ndbapi/NdbQueryOperation.cpp
storage/ndb/src/ndbapi/NdbQueryOperationImpl.hpp
3869 Pekka Nousiainen 2012-03-30 [merge]
merge
added:
extra/yassl/certs/ca-key.pem
extra/yassl/certs/client-keyEnc.pem
extra/yassl/certs/client-keyEnc3.pem
extra/yassl/certs/server-keyEnc.pem
extra/yassl/taocrypt/certs/
extra/yassl/taocrypt/certs/client-cert.der
extra/yassl/taocrypt/certs/client-key.der
extra/yassl/taocrypt/certs/dh1024.dat
extra/yassl/taocrypt/certs/dsa512.der
extra/yassl/taocrypt/include/hc128.hpp
extra/yassl/taocrypt/include/rabbit.hpp
extra/yassl/taocrypt/src/hc128.cpp
extra/yassl/taocrypt/src/rabbit.cpp
mysql-test/include/libdaemon_example.ini
mysql-test/r/bug13633383.result
mysql-test/suite/innodb/r/innodb-blob.result
mysql-test/suite/innodb/r/innodb_bug11754376.result
mysql-test/suite/innodb/r/innodb_bug12400341.result
mysql-test/suite/innodb/r/innodb_bug13510739.result
mysql-test/suite/innodb/t/innodb-blob.test
mysql-test/suite/innodb/t/innodb_bug11754376.test
mysql-test/suite/innodb/t/innodb_bug12400341-master.opt
mysql-test/suite/innodb/t/innodb_bug12400341.test
mysql-test/suite/innodb/t/innodb_bug13510739.test
mysql-test/suite/ndb_binlog/r/ndb_binlog_index.result
mysql-test/suite/ndb_binlog/t/ndb_binlog_check_binlog_index.inc
mysql-test/suite/ndb_binlog/t/ndb_binlog_index.test
mysql-test/suite/ndb_binlog/t/ndb_binlog_index_test_schema_independent.inc
mysql-test/suite/rpl/r/rpl_skip_ddl_errors_cli.result
mysql-test/suite/rpl/r/rpl_start_stop_slave.result
mysql-test/suite/rpl/t/rpl_skip_ddl_errors_cli-slave.opt
mysql-test/suite/rpl/t/rpl_skip_ddl_errors_cli.test
mysql-test/suite/rpl/t/rpl_start_stop_slave.test
mysql-test/suite/sys_vars/r/innodb_change_buffering_debug_basic.result
mysql-test/suite/sys_vars/r/innodb_trx_rseg_n_slots_debug_basic.result
mysql-test/suite/sys_vars/r/stored_program_cache_basic.result
mysql-test/suite/sys_vars/t/innodb_change_buffering_debug_basic.test
mysql-test/suite/sys_vars/t/innodb_trx_rseg_n_slots_debug_basic.test
mysql-test/suite/sys_vars/t/stored_program_cache_basic.test
mysql-test/t/bug13633383.test
modified:
CMakeLists.txt
README
VERSION
client/CMakeLists.txt
client/mysql_plugin.c
client/mysql_upgrade.c
client/mysqldump.c
client/sql_string.cc
cmake/build_configurations/mysql_release.cmake
cmake/install_macros.cmake
extra/yassl/INSTALL
extra/yassl/README
extra/yassl/certs/ca-cert.pem
extra/yassl/certs/client-cert.der
extra/yassl/certs/client-cert.pem
extra/yassl/certs/client-key.der
extra/yassl/certs/client-key.pem
extra/yassl/certs/dsa-cert.pem
extra/yassl/certs/dsa512.der
extra/yassl/certs/server-cert.pem
extra/yassl/certs/server-key.pem
extra/yassl/certs/taoCert.txt
extra/yassl/examples/client/client.cpp
extra/yassl/examples/echoclient/echoclient.cpp
extra/yassl/examples/echoserver/echoserver.cpp
extra/yassl/examples/server/server.cpp
extra/yassl/include/buffer.hpp
extra/yassl/include/openssl/ssl.h
extra/yassl/include/socket_wrapper.hpp
extra/yassl/include/yassl_int.hpp
extra/yassl/include/yassl_types.hpp
extra/yassl/src/buffer.cpp
extra/yassl/src/cert_wrapper.cpp
extra/yassl/src/crypto_wrapper.cpp
extra/yassl/src/handshake.cpp
extra/yassl/src/make.bat*
extra/yassl/src/socket_wrapper.cpp
extra/yassl/src/ssl.cpp
extra/yassl/src/yassl.cpp
extra/yassl/src/yassl_error.cpp
extra/yassl/src/yassl_imp.cpp
extra/yassl/src/yassl_int.cpp
extra/yassl/taocrypt/CMakeLists.txt
extra/yassl/taocrypt/README
extra/yassl/taocrypt/benchmark/benchmark.cpp
extra/yassl/taocrypt/benchmark/benchmark.dsp
extra/yassl/taocrypt/benchmark/dh1024.der
extra/yassl/taocrypt/benchmark/dsa1024.der
extra/yassl/taocrypt/benchmark/make.bat*
extra/yassl/taocrypt/benchmark/rsa1024.der
extra/yassl/taocrypt/include/asn.hpp
extra/yassl/taocrypt/include/block.hpp
extra/yassl/taocrypt/include/blowfish.hpp
extra/yassl/taocrypt/include/des.hpp
extra/yassl/taocrypt/include/file.hpp
extra/yassl/taocrypt/include/hash.hpp
extra/yassl/taocrypt/include/integer.hpp
extra/yassl/taocrypt/include/kernelc.hpp
extra/yassl/taocrypt/include/misc.hpp
extra/yassl/taocrypt/include/modes.hpp
extra/yassl/taocrypt/include/pwdbased.hpp
extra/yassl/taocrypt/include/rsa.hpp
extra/yassl/taocrypt/include/runtime.hpp
extra/yassl/taocrypt/include/types.hpp
extra/yassl/taocrypt/mySTL/stdexcept.hpp
extra/yassl/taocrypt/mySTL/vector.hpp
extra/yassl/taocrypt/src/aes.cpp
extra/yassl/taocrypt/src/aestables.cpp
extra/yassl/taocrypt/src/algebra.cpp
extra/yassl/taocrypt/src/arc4.cpp
extra/yassl/taocrypt/src/asn.cpp
extra/yassl/taocrypt/src/blowfish.cpp
extra/yassl/taocrypt/src/coding.cpp
extra/yassl/taocrypt/src/dsa.cpp
extra/yassl/taocrypt/src/hash.cpp
extra/yassl/taocrypt/src/integer.cpp
extra/yassl/taocrypt/src/make.bat*
extra/yassl/taocrypt/src/md4.cpp
extra/yassl/taocrypt/src/md5.cpp
extra/yassl/taocrypt/src/misc.cpp
extra/yassl/taocrypt/src/random.cpp
extra/yassl/taocrypt/src/ripemd.cpp
extra/yassl/taocrypt/src/rsa.cpp
extra/yassl/taocrypt/src/sha.cpp
extra/yassl/taocrypt/src/template_instnt.cpp
extra/yassl/taocrypt/src/twofish.cpp
extra/yassl/taocrypt/taocrypt.dsp
extra/yassl/taocrypt/test/make.bat*
extra/yassl/taocrypt/test/memory.cpp
extra/yassl/taocrypt/test/test.cpp
extra/yassl/testsuite/make.bat*
extra/yassl/testsuite/test.hpp
extra/yassl/testsuite/testsuite.cpp
include/m_ctype.h
include/m_string.h
include/my_global.h
include/myisam.h
include/mysql/plugin.h
include/welcome_copyright_notice.h
libmysql/CMakeLists.txt
libmysqld/CMakeLists.txt
libmysqld/examples/CMakeLists.txt
mysql-test/CMakeLists.txt
mysql-test/collections/default.experimental
mysql-test/extra/rpl_tests/rpl_extra_col_master.test
mysql-test/extra/rpl_tests/rpl_insert_id_pk.test
mysql-test/extra/rpl_tests/rpl_multi_update.test
mysql-test/extra/rpl_tests/rpl_multi_update2.test
mysql-test/extra/rpl_tests/rpl_multi_update3.test
mysql-test/extra/rpl_tests/rpl_start_stop_slave.test
mysql-test/include/have_32bit.inc
mysql-test/include/have_example_plugin.inc
mysql-test/include/have_semisync_plugin.inc
mysql-test/include/have_simple_parser.inc
mysql-test/include/have_udf.inc
mysql-test/include/mtr_check.sql
mysql-test/include/show_slave_status.inc
mysql-test/include/wait_for_slave_io_error.inc
mysql-test/mysql-stress-test.pl
mysql-test/mysql-test-run.pl
mysql-test/r/bigint.result
mysql-test/r/ctype_utf8.result
mysql-test/r/func_in.result
mysql-test/r/func_str.result
mysql-test/r/func_time.result
mysql-test/r/init_connect.result
mysql-test/r/join_outer.result
mysql-test/r/multi_update.result
mysql-test/r/myisam.result
mysql-test/r/mysql_plugin.result
mysql-test/r/mysqld--help-notwin.result
mysql-test/r/mysqld--help-win.result
mysql-test/r/mysqldump.result
mysql-test/r/partition.result
mysql-test/r/partition_binlog_stmt.result
mysql-test/r/partition_error.result
mysql-test/r/ps.result
mysql-test/r/range.result
mysql-test/r/sp-bugs.result
mysql-test/r/sp.result
mysql-test/r/xa.result
mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result
mysql-test/suite/binlog/r/binlog_unsafe.result
mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test
mysql-test/suite/binlog/t/binlog_unsafe.test
mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result
mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result
mysql-test/suite/funcs_1/r/is_columns_mysql.result
mysql-test/suite/innodb/r/innodb-index.result
mysql-test/suite/innodb/t/innodb-index.test
mysql-test/suite/innodb/t/innodb_bug34300.test
mysql-test/suite/innodb/t/innodb_bug53756.test
mysql-test/suite/ndb/include/ndb_share_check_shares.inc
mysql-test/suite/ndb/r/ndb_basic.result
mysql-test/suite/ndb/r/ndb_ddl_open_trans.result
mysql-test/suite/ndb/r/ndb_index_stat_restart.result
mysql-test/suite/ndb/r/ndb_share.result
mysql-test/suite/ndb/t/ndb_basic.test
mysql-test/suite/ndb/t/ndb_ddl_open_trans.test
mysql-test/suite/ndb/t/ndb_index_stat_restart.test
mysql-test/suite/ndb_binlog/r/ndb_binlog_ignore_db.result
mysql-test/suite/ndb_binlog/t/ndb_binlog_ignore_db.test
mysql-test/suite/ndb_rpl/r/ndb_rpl_ddl_open_trans.result
mysql-test/suite/ndb_rpl/r/ndb_rpl_idempotent.result
mysql-test/suite/ndb_rpl/r/ndb_rpl_sync.result
mysql-test/suite/ndb_rpl/t/ndb_rpl_idempotent.test
mysql-test/suite/rpl/r/rpl_auto_increment_11932.result
mysql-test/suite/rpl/r/rpl_cant_read_event_incident.result
mysql-test/suite/rpl/r/rpl_heartbeat_basic.result
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
mysql-test/suite/rpl/r/rpl_insert_id_pk.result
mysql-test/suite/rpl/r/rpl_known_bugs_detection.result
mysql-test/suite/rpl/r/rpl_log_pos.result
mysql-test/suite/rpl/r/rpl_manual_change_index_file.result
mysql-test/suite/rpl/r/rpl_multi_update.result
mysql-test/suite/rpl/r/rpl_multi_update2.result
mysql-test/suite/rpl/r/rpl_multi_update3.result
mysql-test/suite/rpl/r/rpl_packet.result
mysql-test/suite/rpl/r/rpl_rotate_logs.result
mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result
mysql-test/suite/rpl/t/rpl_auto_increment_11932.test
mysql-test/suite/rpl/t/rpl_cant_read_event_incident.test
mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
mysql-test/suite/rpl/t/rpl_known_bugs_detection.test
mysql-test/suite/rpl/t/rpl_log_pos.test
mysql-test/suite/rpl/t/rpl_manual_change_index_file.test
mysql-test/suite/rpl/t/rpl_multi_update2.test
mysql-test/suite/rpl/t/rpl_multi_update3.test
mysql-test/suite/rpl/t/rpl_optimize.test
mysql-test/suite/rpl/t/rpl_packet.test
mysql-test/suite/rpl/t/rpl_rotate_logs.test
mysql-test/suite/rpl/t/rpl_semi_sync_event.test
mysql-test/suite/rpl/t/rpl_stm_start_stop_slave.test
mysql-test/suite/rpl/t/rpl_timezone.test
mysql-test/suite/sys_vars/r/all_vars.result
mysql-test/suite/sys_vars/r/character_sets_dir_basic.result
mysql-test/suite/sys_vars/r/plugin_dir_basic.result
mysql-test/suite/sys_vars/t/all_vars.test
mysql-test/suite/sys_vars/t/character_sets_dir_basic.test
mysql-test/suite/sys_vars/t/disabled.def
mysql-test/t/bigint.test
mysql-test/t/ctype_utf8.test
mysql-test/t/events_restart.test
mysql-test/t/func_str.test
mysql-test/t/func_time.test
mysql-test/t/init_connect.test
mysql-test/t/join_outer.test
mysql-test/t/multi_update.test
mysql-test/t/myisam.test
mysql-test/t/mysql_plugin.test
mysql-test/t/mysqldump.test
mysql-test/t/partition.test
mysql-test/t/partition_binlog_stmt.test
mysql-test/t/partition_error.test
mysql-test/t/ps.test
mysql-test/t/range.test
mysql-test/t/sp-bugs.test
mysql-test/t/sp.test
mysql-test/t/udf_skip_grants-master.opt
mysql-test/t/xa.test
mysql-test/valgrind.supp
mysys/charset-def.c
mysys/my_init.c
mysys/my_symlink.c
packaging/WiX/custom_ui.wxs
plugin/auth/dialog.c
plugin/auth/qa_auth_interface.c
plugin/auth/qa_auth_server.c
plugin/daemon_example/CMakeLists.txt
plugin/daemon_example/daemon_example.cc
scripts/mysql_install_db.pl.in
scripts/mysql_install_db.sh
scripts/mysql_system_tables.sql
scripts/mysql_system_tables_fix.sql
scripts/mysqld_safe.sh
sql-common/my_time.c
sql/filesort.cc
sql/ha_ndbcluster.cc
sql/ha_ndbcluster_binlog.cc
sql/ha_partition.cc
sql/item.cc
sql/item_cmpfunc.cc
sql/item_cmpfunc.h
sql/item_timefunc.cc
sql/item_xmlfunc.cc
sql/log.cc
sql/log.h
sql/log_event.h
sql/mysqld.cc
sql/mysqld.h
sql/rpl_handler.h
sql/rpl_injector.cc
sql/rpl_injector.h
sql/rpl_mi.cc
sql/rpl_mi.h
sql/rpl_rli.cc
sql/rpl_rli.h
sql/set_var.h
sql/share/errmsg-utf8.txt
sql/slave.cc
sql/slave.h
sql/sp_cache.cc
sql/sp_cache.h
sql/sp_head.cc
sql/sp_head.h
sql/sql_admin.cc
sql/sql_base.cc
sql/sql_cache.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_connect.cc
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_parse.cc
sql/sql_partition.cc
sql/sql_partition.h
sql/sql_plugin.cc
sql/sql_prepare.cc
sql/sql_profile.cc
sql/sql_repl.cc
sql/sql_select.cc
sql/sql_show.cc
sql/sql_table.cc
sql/sql_udf.cc
sql/sql_yacc.yy
sql/sys_vars.cc
sql/sys_vars.h
sql/table.h
storage/archive/ha_archive.cc
storage/blackhole/ha_blackhole.cc
storage/csv/ha_tina.cc
storage/example/ha_example.cc
storage/federated/ha_federated.cc
storage/heap/hp_info.c
storage/innobase/btr/btr0btr.c
storage/innobase/btr/btr0cur.c
storage/innobase/btr/btr0pcur.c
storage/innobase/btr/btr0sea.c
storage/innobase/buf/buf0buf.c
storage/innobase/buf/buf0flu.c
storage/innobase/dict/dict0load.c
storage/innobase/fil/fil0fil.c
storage/innobase/fsp/fsp0fsp.c
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innobase/handler/handler0alter.cc
storage/innobase/ibuf/ibuf0ibuf.c
storage/innobase/include/btr0btr.h
storage/innobase/include/btr0btr.ic
storage/innobase/include/btr0cur.h
storage/innobase/include/btr0cur.ic
storage/innobase/include/btr0pcur.h
storage/innobase/include/buf0buf.h
storage/innobase/include/buf0buf.ic
storage/innobase/include/data0data.h
storage/innobase/include/data0data.ic
storage/innobase/include/fsp0fsp.h
storage/innobase/include/log0log.h
storage/innobase/include/mem0mem.ic
storage/innobase/include/mtr0log.ic
storage/innobase/include/mtr0mtr.h
storage/innobase/include/mtr0mtr.ic
storage/innobase/include/page0page.h
storage/innobase/include/page0page.ic
storage/innobase/include/row0mysql.h
storage/innobase/include/row0sel.h
storage/innobase/include/sync0sync.h
storage/innobase/include/trx0rec.ic
storage/innobase/include/trx0rseg.ic
storage/innobase/include/trx0sys.h
storage/innobase/include/trx0undo.h
storage/innobase/include/univ.i
storage/innobase/include/ut0mem.h
storage/innobase/include/ut0rnd.ic
storage/innobase/lock/lock0lock.c
storage/innobase/log/log0log.c
storage/innobase/mem/mem0pool.c
storage/innobase/mtr/mtr0mtr.c
storage/innobase/os/os0file.c
storage/innobase/os/os0proc.c
storage/innobase/page/page0cur.c
storage/innobase/page/page0page.c
storage/innobase/pars/pars0pars.c
storage/innobase/row/row0ins.c
storage/innobase/row/row0merge.c
storage/innobase/row/row0mysql.c
storage/innobase/row/row0row.c
storage/innobase/row/row0sel.c
storage/innobase/row/row0umod.c
storage/innobase/row/row0upd.c
storage/innobase/srv/srv0srv.c
storage/innobase/srv/srv0start.c
storage/innobase/sync/sync0rw.c
storage/innobase/sync/sync0sync.c
storage/innobase/trx/trx0purge.c
storage/innobase/trx/trx0rec.c
storage/innobase/trx/trx0sys.c
storage/innobase/trx/trx0trx.c
storage/innobase/trx/trx0undo.c
storage/innobase/ut/ut0mem.c
storage/myisam/ft_boolean_search.c
storage/myisam/ft_nlq_search.c
storage/myisam/ha_myisam.cc
storage/myisam/ha_myisam.h
storage/myisam/mi_check.c
storage/myisam/mi_packrec.c
storage/myisam/mi_preload.c
storage/myisam/myisamchk.c
storage/myisam/myisamdef.h
storage/myisam/sort.c
storage/ndb/clusterj/clusterj-api/pom.xml
storage/ndb/clusterj/clusterj-bindings/pom.xml
storage/ndb/clusterj/clusterj-core/pom.xml
storage/ndb/clusterj/clusterj-jdbc/pom.xml
storage/ndb/clusterj/clusterj-jpatest/pom.xml
storage/ndb/clusterj/clusterj-openjpa/pom.xml
storage/ndb/clusterj/clusterj-test/pom.xml
storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/VarcharStringLengthTest.java
storage/ndb/clusterj/clusterj-tie/pom.xml
storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/OperationImpl.java
storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/Utility.java
storage/ndb/clusterj/clusterj-tie/src/main/resources/com/mysql/clusterj/tie/Bundle.properties
storage/ndb/clusterj/pom.xml
storage/ndb/src/mgmsrv/ConfigManager.cpp
storage/ndb/test/ndbapi/testMgmd.cpp
storage/perfschema/ha_perfschema.cc
storage/perfschema/pfs.cc
storage/perfschema/table_ews_global_by_event_name.cc
storage/perfschema/table_ews_global_by_event_name.h
strings/ctype-uca.c
strings/ctype-ucs2.c
strings/ctype-utf8.c
strings/dtoa.c
support-files/compiler_warnings.supp
unittest/mysys/bitmap-t.c
unittest/mysys/my_atomic-t.c
unittest/strings/strings-t.c
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc 2012-03-28 15:09:33 +0000
+++ b/sql/ha_ndbcluster.cc 2012-03-30 12:25:43 +0000
@@ -14679,7 +14679,7 @@ ha_ndbcluster::parent_of_pushed_join() c
uint parent_ix= m_pushed_join_member
->get_query_def().getQueryOperation(m_pushed_join_operation)
->getParentOperation(0)
- ->getQueryOperationIx();
+ ->getOpNo();
return m_pushed_join_member->get_table(parent_ix);
}
return NULL;
=== modified file 'storage/ndb/src/ndbapi/NdbQueryBuilder.cpp'
--- a/storage/ndb/src/ndbapi/NdbQueryBuilder.cpp 2012-02-23 15:41:31 +0000
+++ b/storage/ndb/src/ndbapi/NdbQueryBuilder.cpp 2012-03-30 12:25:43 +0000
@@ -181,8 +181,8 @@ protected:
const NdbQueryOperand* const keys[],
const NdbQueryOptionsImpl& options,
const char* ident,
- Uint32 ix,
- Uint32 id,
+ Uint32 opNo,
+ Uint32 internalOpNo,
int& error);
virtual const NdbQueryLookupOperationDef& getInterface() const
@@ -214,10 +214,11 @@ private:
const NdbQueryOperand* const keys[],
const NdbQueryOptionsImpl& options,
const char* ident,
- Uint32 ix,
- Uint32 id,
+ Uint32 opNo,
+ Uint32 internalOpNo,
int& error)
- : NdbQueryLookupOperationDefImpl(table,keys,options,ident,ix,id,error)
+ : NdbQueryLookupOperationDefImpl(table, keys, options, ident, opNo,
+ internalOpNo, error)
{}
virtual NdbQueryOperationDef::Type getType() const
@@ -244,11 +245,12 @@ private:
const NdbQueryOperand* const keys[],
const NdbQueryOptionsImpl& options,
const char* ident,
- Uint32 ix,
- Uint32 id,
+ Uint32 opNo,
+ Uint32 internalOpNo,
int& error)
// Add 1 to 'id' since index lookup is serialized as two operations.
- : NdbQueryLookupOperationDefImpl(table,keys,options,ident,ix,id+1,error),
+ : NdbQueryLookupOperationDefImpl(table, keys, options, ident, opNo,
+ internalOpNo+1, error),
m_index(index)
{}
@@ -280,10 +282,11 @@ private:
const NdbTableImpl& table,
const NdbQueryOptionsImpl& options,
const char* ident,
- Uint32 ix,
- Uint32 id,
+ Uint32 opNo,
+ Uint32 internalOpNo,
int& error)
- : NdbQueryScanOperationDefImpl(table,options,ident,ix,id,error),
+ : NdbQueryScanOperationDefImpl(table, options, ident, opNo,
+ internalOpNo, error),
m_interface(*this)
{}
@@ -626,9 +629,9 @@ NdbQueryIndexScanOperationDefImpl& getIm
Uint32
-NdbQueryOperationDef::getQueryOperationIx() const
+NdbQueryOperationDef::getOpNo() const
{
- return ::getImpl(*this).getQueryOperationIx();
+ return ::getImpl(*this).getOpNo();
}
Uint32
@@ -884,7 +887,7 @@ NdbQueryBuilder::readTuple(const NdbDict
options ? options->getImpl() : defaultOptions,
ident,
m_impl.m_operations.size(),
- m_impl.getNextId(),
+ m_impl.getNextInternalOpNo(),
error);
returnErrIf(m_impl.takeOwnership(op)!=0, Err_MemoryAlloc);
@@ -958,7 +961,7 @@ NdbQueryBuilder::readTuple(const NdbDict
options ? options->getImpl() : defaultOptions,
ident,
m_impl.m_operations.size(),
- m_impl.getNextId(),
+ m_impl.getNextInternalOpNo(),
error);
returnErrIf(m_impl.takeOwnership(op)!=0, Err_MemoryAlloc);
@@ -999,7 +1002,7 @@ NdbQueryBuilder::scanTable(const NdbDict
options ? options->getImpl() : defaultOptions,
ident,
m_impl.m_operations.size(),
- m_impl.getNextId(),
+ m_impl.getNextInternalOpNo(),
error);
returnErrIf(m_impl.takeOwnership(op)!=0, Err_MemoryAlloc);
@@ -1072,7 +1075,7 @@ NdbQueryBuilder::scanIndex(const NdbDict
options ? options->getImpl() : defaultOptions,
ident,
m_impl.m_operations.size(),
- m_impl.getNextId(),
+ m_impl.getNextInternalOpNo(),
error);
returnErrIf(m_impl.takeOwnership(op)!=0, Err_MemoryAlloc);
@@ -1271,7 +1274,7 @@ NdbQueryDefImpl(const Vector<NdbQueryOpe
// Set length and number of nodes in tree.
Uint32 cntLen;
QueryTree::setCntLen(cntLen,
- m_operations[m_operations.size()-1]->getQueryOperationId()+1,
+ m_operations[m_operations.size()-1]->getInternalOpNo()+1,
m_serializedDef.getSize());
m_serializedDef.put(0,cntLen);
@@ -1636,10 +1639,11 @@ NdbQueryLookupOperationDefImpl::NdbQuery
const NdbQueryOperand* const keys[],
const NdbQueryOptionsImpl& options,
const char* ident,
- Uint32 ix,
- Uint32 id,
+ Uint32 opNo,
+ Uint32 internalOpNo,
int& error)
- : NdbQueryOperationDefImpl(table,options,ident,ix,id,error),
+ : NdbQueryOperationDefImpl(table, options, ident, opNo,
+ internalOpNo, error),
m_interface(*this)
{
int i;
@@ -1659,10 +1663,11 @@ NdbQueryIndexScanOperationDefImpl::NdbQu
const NdbQueryIndexBound* bound,
const NdbQueryOptionsImpl& options,
const char* ident,
- Uint32 ix,
- Uint32 id,
+ Uint32 opNo,
+ Uint32 internalOpNo,
int& error)
- : NdbQueryScanOperationDefImpl(table,options,ident,ix,id,error),
+ : NdbQueryScanOperationDefImpl(table, options, ident, opNo, internalOpNo,
+ error),
m_interface(*this),
m_index(index),
m_paramInPruneKey(false)
@@ -1901,14 +1906,14 @@ NdbQueryOperationDefImpl::NdbQueryOperat
const NdbTableImpl& table,
const NdbQueryOptionsImpl& options,
const char* ident,
- Uint32 ix,
- Uint32 id,
+ Uint32 opNo,
+ Uint32 internalOpNo,
int& error)
:m_isPrepared(false),
m_diskInChildProjection(false),
m_table(table),
m_ident(ident),
- m_ix(ix), m_id(id),
+ m_opNo(opNo), m_internalOpNo(internalOpNo),
m_options(options),
m_parent(NULL),
m_children(),
@@ -1921,7 +1926,7 @@ NdbQueryOperationDefImpl::NdbQueryOperat
error = Err_MemoryAlloc;
return;
}
- if (unlikely(m_id >= NDB_SPJ_MAX_TREE_NODES))
+ if (unlikely(m_internalOpNo >= NDB_SPJ_MAX_TREE_NODES))
{
error = QRY_DEFINITION_TOO_LARGE;
return;
@@ -2127,8 +2132,8 @@ NdbQueryOperationDefImpl::appendParentLi
if (getParentOperation() != NULL)
{
Uint16Sequence parentSeq(serializedDef, 1);
- assert (getParentOperation()->getQueryOperationId() < getQueryOperationId());
- parentSeq.append(getParentOperation()->getQueryOperationId());
+ assert (getParentOperation()->getInternalOpNo() < getInternalOpNo());
+ parentSeq.append(getParentOperation()->getInternalOpNo());
parentSeq.finish();
return DABits::NI_HAS_PARENT;
}
@@ -2212,7 +2217,7 @@ NdbQueryOperationDefImpl::printTree(Uint
ndbout << NdbQueryOperationDef::getTypeName(getType()) << endl;
printMargin(depth, hasMoreSiblingsMask, false);
// Print attributes.
- ndbout << " opNo: " << getQueryOperationIx() << endl;
+ ndbout << " opNo: " << getOpNo() << endl;
printMargin(depth, hasMoreSiblingsMask, false);
ndbout << " table: " << getTable().getName() << endl;
if (getIndex() != NULL)
@@ -2251,7 +2256,7 @@ NdbQueryLookupOperationDefImpl::appendKe
* Key value for root operation is constructed when query is instantiated with
* NdbQueryOperationImpl::prepareIndexKeyInfo()
*/
- if (getQueryOperationIx() == 0)
+ if (getOpNo() == 0)
return 0;
if (m_keys[0]!=NULL)
@@ -2328,7 +2333,7 @@ NdbQueryIndexScanOperationDefImpl::appen
* Bound value for root operation is constructed when query is instantiated with
* NdbQueryOperationImpl::prepareIndexKeyInfo()
*/
- if (getQueryOperationIx() == 0)
+ if (getOpNo() == 0)
return 0;
if (m_bound.lowKeys>0 || m_bound.highKeys>0)
@@ -2512,7 +2517,7 @@ NdbQueryIndexScanOperationDefImpl::appen
* Bound value for root operation is constructed when query is instantiated with
* NdbQueryOperationImpl::prepareIndexKeyInfo()
*/
- if (getQueryOperationIx() == 0)
+ if (getOpNo() == 0)
return 0;
if (m_bound.lowKeys>0 || m_bound.highKeys>0)
@@ -2621,7 +2626,7 @@ NdbQueryPKLookupOperationDefImpl
}
#ifdef __TRACE_SERIALIZATION
- ndbout << "Serialized node " << getQueryOperationId() << " : ";
+ ndbout << "Serialized node " << getInternalOpNo() << " : ";
for (Uint32 i = startPos; i < serializedDef.getSize(); i++) {
char buf[12];
sprintf(buf, "%.8x", serializedDef.get(i));
@@ -2654,7 +2659,7 @@ NdbQueryIndexOperationDefImpl
Uint32 requestInfo = QN_LookupNode::L_UNIQUE_INDEX;
// Optional part1: Make list of parent nodes.
- assert (getQueryOperationId() > 0);
+ assert (getInternalOpNo() > 0);
requestInfo |= appendParentList (serializedDef);
// Part2: m_keys[] are the keys to be used for index
@@ -2686,7 +2691,7 @@ NdbQueryIndexOperationDefImpl
}
#ifdef __TRACE_SERIALIZATION
- ndbout << "Serialized index " << getQueryOperationId()-1 << " : ";
+ ndbout << "Serialized index " << getInternalOpNo()-1 << " : ";
for (Uint32 i = startPos; i < serializedDef.getSize(); i++){
char buf[12];
sprintf(buf, "%.8x", serializedDef.get(i));
@@ -2712,7 +2717,7 @@ NdbQueryIndexOperationDefImpl
// Optional part1: Append index as (single) parent op..
{ requestInfo |= DABits::NI_HAS_PARENT;
Uint16Sequence parentSeq(serializedDef,1);
- parentSeq.append(getQueryOperationId()-1);
+ parentSeq.append(getInternalOpNo()-1);
parentSeq.finish();
}
@@ -2742,7 +2747,7 @@ NdbQueryIndexOperationDefImpl
}
#ifdef __TRACE_SERIALIZATION
- ndbout << "Serialized node " << getQueryOperationId() << " : ";
+ ndbout << "Serialized node " << getInternalOpNo() << " : ";
for (Uint32 i = startPos; i < serializedDef.getSize(); i++) {
char buf[12];
sprintf(buf, "%.8x", serializedDef.get(i));
@@ -2759,17 +2764,17 @@ NdbQueryScanOperationDefImpl::NdbQuerySc
const NdbTableImpl& table,
const NdbQueryOptionsImpl& options,
const char* ident,
- Uint32 ix,
- Uint32 id,
+ Uint32 opNo,
+ Uint32 internalOpNo,
int& error)
- : NdbQueryOperationDefImpl(table,options,ident,ix,id,error)
+ : NdbQueryOperationDefImpl(table, options, ident, opNo, internalOpNo, error)
{}
int
NdbQueryScanOperationDefImpl::serialize(Uint32Buffer& serializedDef,
const NdbTableImpl& tableOrIndex)
{
- bool isRoot = (getQueryOperationIx()==0);
+ bool isRoot = (getOpNo()==0);
// This method should only be invoked once.
assert (!m_isPrepared);
@@ -2824,7 +2829,7 @@ NdbQueryScanOperationDefImpl::serialize(
}
#ifdef __TRACE_SERIALIZATION
- ndbout << "Serialized node " << getQueryOperationId() << " : ";
+ ndbout << "Serialized node " << getInternalOpNo() << " : ";
for(Uint32 i = startPos; i < serializedDef.getSize(); i++){
char buf[12];
sprintf(buf, "%.8x", serializedDef.get(i));
=== modified file 'storage/ndb/src/ndbapi/NdbQueryBuilder.hpp'
--- a/storage/ndb/src/ndbapi/NdbQueryBuilder.hpp 2011-09-29 09:23:04 +0000
+++ b/storage/ndb/src/ndbapi/NdbQueryBuilder.hpp 2012-03-30 12:25:43 +0000
@@ -225,7 +225,7 @@ public:
/**
* Get the ordinal position of this operation within the QueryDef.
*/
- Uint32 getQueryOperationIx() const;
+ Uint32 getOpNo() const;
Uint32 getNoOfParentOperations() const;
const NdbQueryOperationDef* getParentOperation(Uint32 i) const;
=== modified file 'storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp'
--- a/storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp 2011-10-20 19:52:11 +0000
+++ b/storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp 2012-03-30 12:25:43 +0000
@@ -423,17 +423,17 @@ protected:
explicit NdbQueryOperationDefImpl (const NdbTableImpl& table,
const NdbQueryOptionsImpl& options,
const char* ident,
- Uint32 ix,
- Uint32 id,
+ Uint32 opNo,
+ Uint32 internalOpNo,
int& error);
public:
// Get the ordinal position of this operation within the query def.
- Uint32 getQueryOperationIx() const
- { return m_ix; }
+ Uint32 getOpNo() const
+ { return m_opNo; }
// Get id of node as known inside queryTree
- Uint32 getQueryOperationId() const
- { return m_id; }
+ Uint32 getInternalOpNo() const
+ { return m_internalOpNo; }
// Get type of query operation
virtual NdbQueryOperationDef::Type getType() const = 0;
@@ -487,9 +487,9 @@ private:
private:
const NdbTableImpl& m_table;
const char* const m_ident; // Optional name specified by aplication
- const Uint32 m_ix; // Index of this operation within operation array
- const Uint32 m_id; // Operation id when materialized into queryTree.
- // If op has index, index id is 'm_id-1'.
+ const Uint32 m_opNo; // Index of this operation within operation array
+ const Uint32 m_internalOpNo;// Operation id when materialized into queryTree.
+ // If op has index, index opNo is 'm_internalOpNo-1'.
// Optional (or default) options specified when building query:
// - Scan order which may specify ascending or descending scan order
@@ -517,8 +517,8 @@ public:
const NdbTableImpl& table,
const NdbQueryOptionsImpl& options,
const char* ident,
- Uint32 ix,
- Uint32 id,
+ Uint32 opNo,
+ Uint32 internalOpNo,
int& error);
virtual bool isScanOperation() const
@@ -581,8 +581,8 @@ private:
const NdbQueryIndexBound* bound,
const NdbQueryOptionsImpl& options,
const char* ident,
- Uint32 ix,
- Uint32 id,
+ Uint32 opNo,
+ Uint32 internalOpNo,
int& error);
// Append pattern for creating a single bound value to serialized code
@@ -693,10 +693,10 @@ private:
bool contains(const NdbQueryOperationDefImpl*);
// Get interal operation number of the next operation.
- Uint32 getNextId() const
+ Uint32 getNextInternalOpNo() const
{
return m_operations.size() == 0 ? 0 :
- m_operations[m_operations.size()-1]->getQueryOperationId()+1;
+ m_operations[m_operations.size()-1]->getInternalOpNo()+1;
}
NdbQueryBuilder m_interface;
=== modified file 'storage/ndb/src/ndbapi/NdbQueryOperation.cpp'
--- a/storage/ndb/src/ndbapi/NdbQueryOperation.cpp 2012-02-23 15:41:31 +0000
+++ b/storage/ndb/src/ndbapi/NdbQueryOperation.cpp 2012-03-30 12:25:43 +0000
@@ -273,7 +273,7 @@ public:
NdbResultStream& getResultStream(Uint32 operationNo) const;
NdbResultStream& getResultStream(const NdbQueryOperationImpl& op) const
- { return getResultStream(op.getQueryOperationDef().getQueryOperationIx()); }
+ { return getResultStream(op.getQueryOperationDef().getOpNo()); }
Uint32 getReceiverId() const;
Uint32 getReceiverTcPtrI() const;
@@ -508,7 +508,7 @@ public:
* operation will have two distincts nodes in the tree used by the
* SPJ block, this number may be different from 'opNo'.
*/
- const Uint32 internalOpNo = m_operation.getQueryOperationDef().getQueryOperationId();
+ const Uint32 internalOpNo = m_operation.getInternalOpNo();
const bool complete = !((remainingScans >> internalOpNo) & 1);
return complete;
@@ -1004,7 +1004,7 @@ NdbResultStream::prepareResultSet(Uint32
NdbResultStream& childStream = m_rootFrag.getResultStream(child);
const bool allSubScansComplete = childStream.prepareResultSet(remainingScans);
- Uint32 childId = child.getQueryOperationDef().getQueryOperationIx();
+ Uint32 childId = child.getQueryOperationDef().getOpNo();
/* Condition 1) & 2) calc'ed outside loop, see comments further below: */
const bool skipNonMatches = !allSubScansComplete || // 1)
@@ -3788,7 +3788,7 @@ NdbQueryOperationImpl::NdbQueryOperation
m_ordering(NdbQueryOptions::ScanOrdering_unordered),
m_interpretedCode(NULL),
m_diskInUserProjection(false),
- m_parallelism(def.getQueryOperationIx() == 0
+ m_parallelism(def.getOpNo() == 0
? Parallelism_max : Parallelism_adaptive),
m_rowSize(0xffffffff)
{
@@ -3802,7 +3802,7 @@ NdbQueryOperationImpl::NdbQueryOperation
const NdbQueryOperationDefImpl* parent = def.getParentOperation();
if (parent != NULL)
{
- const Uint32 ix = parent->getQueryOperationIx();
+ const Uint32 ix = parent->getOpNo();
assert (ix < m_queryImpl.getNoOfOperations());
m_parent = &m_queryImpl.getQueryOperation(ix);
const int res = m_parent->m_children.push_back(this);
@@ -4475,7 +4475,7 @@ NdbQueryOperationImpl::prepareAttrInfo(U
#ifdef __TRACE_SERIALIZATION
ndbout << "Serialized params for index node "
- << m_operationDef.getQueryOperationId()-1 << " : ";
+ << getInternalOpNo()-1 << " : ";
for(Uint32 i = startPos; i < attrInfo.getSize(); i++){
char buf[12];
sprintf(buf, "%.8x", attrInfo.get(i));
@@ -4489,7 +4489,7 @@ NdbQueryOperationImpl::prepareAttrInfo(U
// 'length' and 'requestInfo' has been calculated.
Uint32 startPos = attrInfo.getSize();
Uint32 requestInfo = 0;
- bool isRoot = (def.getQueryOperationIx()==0);
+ bool isRoot = (def.getOpNo()==0);
QueryNodeParameters::OpType paramType =
!def.isScanOperation() ? QueryNodeParameters::QN_LOOKUP
@@ -4609,7 +4609,7 @@ NdbQueryOperationImpl::prepareAttrInfo(U
#ifdef __TRACE_SERIALIZATION
ndbout << "Serialized params for node "
- << m_operationDef.getQueryOperationId() << " : ";
+ << getInternalOpNo() << " : ";
for(Uint32 i = startPos; i < attrInfo.getSize(); i++){
char buf[12];
sprintf(buf, "%.8x", attrInfo.get(i));
@@ -4935,7 +4935,7 @@ NdbQueryOperationImpl::execTRANSID_AI(co
if (traceSignals) {
ndbout << "NdbQueryOperationImpl::execTRANSID_AI()"
<< ", fragment no: " << rootFrag->getFragNo()
- << ", operation no: " << getQueryOperationDef().getQueryOperationIx()
+ << ", operation no: " << getQueryOperationDef().getOpNo()
<< endl;
}
@@ -5182,7 +5182,7 @@ int NdbQueryOperationImpl::setParallelis
getQuery().setErrorCode(QRY_SEQUENTIAL_SCAN_SORTED);
return -1;
}
- else if (getQueryOperationDef().getQueryOperationIx() > 0)
+ else if (getQueryOperationDef().getOpNo() > 0)
{
getQuery().setErrorCode(Err_FunctionNotImplemented);
return -1;
@@ -5212,7 +5212,7 @@ int NdbQueryOperationImpl::setAdaptivePa
getQuery().setErrorCode(QRY_WRONG_OPERATION_TYPE);
return -1;
}
- else if (getQueryOperationDef().getQueryOperationIx() == 0)
+ else if (getQueryOperationDef().getOpNo() == 0)
{
getQuery().setErrorCode(Err_FunctionNotImplemented);
return -1;
@@ -5296,8 +5296,8 @@ Uint32 NdbQueryOperationImpl::getRowSize
NdbOut& operator<<(NdbOut& out, const NdbQueryOperationImpl& op){
out << "[ this: " << &op
<< " m_magic: " << op.m_magic;
- out << " op.operationDef.getQueryOperationIx()"
- << op.m_operationDef.getQueryOperationIx();
+ out << " op.operationDef.getOpNo()"
+ << op.m_operationDef.getOpNo();
if (op.getParentOperation()){
out << " m_parent: " << op.getParentOperation();
}
=== modified file 'storage/ndb/src/ndbapi/NdbQueryOperationImpl.hpp'
--- a/storage/ndb/src/ndbapi/NdbQueryOperationImpl.hpp 2011-09-13 13:40:30 +0000
+++ b/storage/ndb/src/ndbapi/NdbQueryOperationImpl.hpp 2012-03-30 12:25:43 +0000
@@ -603,6 +603,12 @@ public:
NdbQueryOperationImpl& getRoot() const
{ return m_queryImpl.getRoot(); }
+ // A shorthand method.
+ Uint32 getInternalOpNo() const
+ {
+ return m_operationDef.getInternalOpNo();
+ }
+
const NdbQueryDefImpl& getQueryDef() const
{ return m_queryImpl.getQueryDef(); }
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.5-cluster-7.2 branch (jan.wedvik:3869 to 3870) | Jan Wedvik | 31 Mar |
