- MRR + Block Indexing

modified:
  storage/connect/array.h
  storage/connect/catalog.h
  storage/connect/colblk.cpp
  storage/connect/colblk.h
  storage/connect/connect.cc
  storage/connect/connect.h
  storage/connect/domdoc.h
  storage/connect/filamap.cpp
  storage/connect/filamap.h
  storage/connect/filamdbf.h
  storage/connect/filamfix.cpp
  storage/connect/filamfix.h
  storage/connect/filamtxt.cpp
  storage/connect/filamtxt.h
  storage/connect/filamvct.cpp
  storage/connect/filamvct.h
  storage/connect/filamzip.cpp
  storage/connect/filamzip.h
  storage/connect/filter.cpp
  storage/connect/filter.h
  storage/connect/global.h
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h
  storage/connect/myconn.h
  storage/connect/plgcnx.h
  storage/connect/plgdbsem.h
  storage/connect/plgdbutl.cpp
  storage/connect/plugutil.c
  storage/connect/preparse.h
  storage/connect/reldef.cpp
  storage/connect/reldef.h
  storage/connect/tabcol.h
  storage/connect/tabdos.cpp
  storage/connect/tabdos.h
  storage/connect/tabfix.cpp
  storage/connect/tabfmt.cpp
  storage/connect/tabfmt.h
  storage/connect/table.cpp
  storage/connect/tabmysql.cpp
  storage/connect/tabmysql.h
  storage/connect/taboccur.h
  storage/connect/tabodbc.h
  storage/connect/tabsys.h
  storage/connect/tabtbl.h
  storage/connect/tabutil.h
  storage/connect/tabvct.cpp
  storage/connect/tabvct.h
  storage/connect/tabwmi.h
  storage/connect/tabxml.h
  storage/connect/user_connect.cc
  storage/connect/user_connect.h
  storage/connect/valblk.cpp
  storage/connect/valblk.h
  storage/connect/value.cpp
  storage/connect/value.h
  storage/connect/xindex.cpp
  storage/connect/xindex.h
  storage/connect/xobject.cpp
  storage/connect/xobject.h
  storage/connect/xtable.h

1 files changed, 186 insertions, 188 deletions

diff --git a/storage/connect/xobject.cpp b/storage/connect/xobject.cpp
index 4050fd520fa..cdc2ef9bf62 100644
--- a/storage/connect/xobject.cpp
+++ b/storage/connect/xobject.cpp
@@ -1,188 +1,186 @@
-/************ Xobject C++ Functions Source Code File (.CPP) ************/
-/*  Name: XOBJECT.CPP  Version 2.2                                     */
-/*                                                                     */
-/*  (C) Copyright to the author Olivier BERTRAND          1998-2012    */
-/*                                                                     */
-/*  This file contains base XOBJECT class functions.                   */
-/*  Also here is the implementation of the CONSTANT class.             */
-/***********************************************************************/
-
-/***********************************************************************/
-/*  Include mariaDB header file.                                       */
-/***********************************************************************/
-#include "my_global.h"
-
-/***********************************************************************/
-/*  Include required application header files                          */
-/*  global.h    is header containing all global Plug declarations.     */
-/*  plgdbsem.h  is header containing the DB applic. declarations.      */
-/***********************************************************************/
-#include "global.h"
-#include "plgdbsem.h"
-#include "xobject.h"
-
-/***********************************************************************/
-/*  Macro definitions.                                                 */
-/***********************************************************************/
-#if defined(_DEBUG) || defined(DEBTRACE)
-#define ASSERT(B)      assert(B);
-#else
-#define ASSERT(B)
-#endif
-
-/***********************************************************************/
-/*  The one and only needed void object.                               */
-/***********************************************************************/
-XVOID Xvoid;
-PXOB const pXVOID = &Xvoid;       // Pointer used by other classes
-
-/* ------------------------- Class XOBJECT --------------------------- */
-
-/***********************************************************************/
-/*  GetCharValue: returns the Result value as a char string.           */
-/*  Using GetCharValue provides no conversion from numeric types.      */
-/***********************************************************************/
-PSZ XOBJECT::GetCharValue(void)
-  {
-  ASSERT(Value)
-  return Value->GetCharValue();
-  } // end of GetCharValue()
-
-/***********************************************************************/
-/*  GetShortValue: returns the Result value as a short integer.        */
-/***********************************************************************/
-short XOBJECT::GetShortValue(void)
-  {
-  ASSERT(Value)
-  return Value->GetShortValue();
-  } // end of GetShortValue
-
-/***********************************************************************/
-/*  GetIntValue: returns the Result value as a int integer.            */
-/***********************************************************************/
-int XOBJECT::GetIntValue(void)
-  {
-  ASSERT(Value)
-  return Value->GetIntValue();
-  } // end of GetIntValue
-
-/***********************************************************************/
-/*  GetFloatValue: returns the Result value as a double float.         */
-/***********************************************************************/
-double XOBJECT::GetFloatValue(void)
-  {
-  ASSERT(Value)
-  return Value->GetFloatValue();
-  } // end of GetFloatValue
-
-/* ------------------------- Class CONSTANT -------------------------- */
-
-/***********************************************************************/
-/*  CONSTANT public constructor.                                       */
-/***********************************************************************/
-CONSTANT::CONSTANT(PGLOBAL g, void *value, short type)
-  {
-  if (!(Value = AllocateValue(g, value, (int)type)))
-    longjmp(g->jumper[g->jump_level], TYPE_CONST);
-
-  Constant = true;
-  } // end of CONSTANT constructor
-
-/***********************************************************************/
-/*  CONSTANT public constructor.                                       */
-/***********************************************************************/
-CONSTANT::CONSTANT(PGLOBAL g, int n)
-  {
-  if (!(Value = AllocateValue(g, &n, TYPE_INT)))
-    longjmp(g->jumper[g->jump_level], TYPE_CONST);
-
-  Constant = true;
-  } // end of CONSTANT constructor
-
-/***********************************************************************/
-/*  GetLengthEx: returns an evaluation of the constant string length.  */
-/*  Note: When converting from token to string, length has to be       */
-/*    specified but we need the domain length, not the value length.   */
-/***********************************************************************/
-int CONSTANT::GetLengthEx(void)
-  {
-  return Value->GetValLen();
-  } // end of GetLengthEx
-
-#if defined(BLK_INDX)
-/***********************************************************************/
-/*  Convert a constant to the given type.                              */
-/***********************************************************************/
-void CONSTANT::Convert(PGLOBAL g, int newtype)
-  {
-  if (Value->GetType() != newtype)
-    if (!(Value = AllocateValue(g, Value, newtype)))
-      longjmp(g->jumper[g->jump_level], TYPE_CONST);
-
-  } // end of Convert
-#endif   // BLK_INDX
-
-/***********************************************************************/
-/*  Compare: returns true if this object is equivalent to xp.          */
-/***********************************************************************/
-bool CONSTANT::Compare(PXOB xp)
-  {
-  if (this == xp)
-    return true;
-  else if (xp->GetType() != TYPE_CONST)
-    return false;
-  else
-    return Value->IsEqual(xp->GetValue(), true);
-
-  } // end of Compare
-
-#if 0
-/***********************************************************************/
-/*  Rephrase: temporary implementation used by PlugRephraseSQL.        */
-/***********************************************************************/
-bool CONSTANT::Rephrase(PGLOBAL g, PSZ work)
-  {
-  switch (Value->GetType()) {
-    case TYPE_STRING:
-      sprintf(work + strlen(work), "'%s'", Value->GetCharValue());
-      break;
-    case TYPE_SHORT:
-      sprintf(work + strlen(work), "%hd", Value->GetShortValue());
-      break;
-    case TYPE_INT:
-    case TYPE_DATE:
-      sprintf(work + strlen(work), "%d", Value->GetIntValue());
-      break;
-    case TYPE_DOUBLE:
-      sprintf(work + strlen(work), "%lf", Value->GetFloatValue());
-      break;
-    case TYPE_BIGINT:
-      sprintf(work + strlen(work), "%lld", Value->GetBigintValue());
-      break;
-    case TYPE_TINY:
-      sprintf(work + strlen(work), "%d", Value->GetTinyValue());
-      break;
-    default:
-      sprintf(g->Message, MSG(BAD_CONST_TYPE), Value->GetType());
-      return false;
-    } // endswitch
-
-  return false;
-  } // end of Rephrase
-#endif // 0
-
-/***********************************************************************/
-/*  Make file output of a constant object.                             */
-/***********************************************************************/
-void CONSTANT::Print(PGLOBAL g, FILE *f, uint n)
-  {
-  Value->Print(g, f, n);
-  } /* end of Print */
-
-/***********************************************************************/
-/*  Make string output of a constant object.                           */
-/***********************************************************************/
-void CONSTANT::Print(PGLOBAL g, char *ps, uint z)
-  {
-  Value->Print(g, ps, z);
-  } /* end of Print */
+/************ Xobject C++ Functions Source Code File (.CPP) ************/

+/*  Name: XOBJECT.CPP  Version 2.3                                     */

+/*                                                                     */

+/*  (C) Copyright to the author Olivier BERTRAND          1998-2014    */

+/*                                                                     */

+/*  This file contains base XOBJECT class functions.                   */

+/*  Also here is the implementation of the CONSTANT class.             */

+/***********************************************************************/

+

+/***********************************************************************/

+/*  Include mariaDB header file.                                       */

+/***********************************************************************/

+#include "my_global.h"

+

+/***********************************************************************/

+/*  Include required application header files                          */

+/*  global.h    is header containing all global Plug declarations.     */

+/*  plgdbsem.h  is header containing the DB applic. declarations.      */

+/***********************************************************************/

+#include "global.h"

+#include "plgdbsem.h"

+#include "xobject.h"

+

+/***********************************************************************/

+/*  Macro definitions.                                                 */

+/***********************************************************************/

+#if defined(_DEBUG) || defined(DEBTRACE)

+#define ASSERT(B)      assert(B);

+#else

+#define ASSERT(B)

+#endif

+

+/***********************************************************************/

+/*  The one and only needed void object.                               */

+/***********************************************************************/

+XVOID Xvoid;

+PXOB const pXVOID = &Xvoid;       // Pointer used by other classes

+

+/* ------------------------- Class XOBJECT --------------------------- */

+

+/***********************************************************************/

+/*  GetCharValue: returns the Result value as a char string.           */

+/*  Using GetCharValue provides no conversion from numeric types.      */

+/***********************************************************************/

+PSZ XOBJECT::GetCharValue(void)

+  {

+  ASSERT(Value)

+  return Value->GetCharValue();

+  } // end of GetCharValue()

+

+/***********************************************************************/

+/*  GetShortValue: returns the Result value as a short integer.        */

+/***********************************************************************/

+short XOBJECT::GetShortValue(void)

+  {

+  ASSERT(Value)

+  return Value->GetShortValue();

+  } // end of GetShortValue

+

+/***********************************************************************/

+/*  GetIntValue: returns the Result value as a int integer.            */

+/***********************************************************************/

+int XOBJECT::GetIntValue(void)

+  {

+  ASSERT(Value)

+  return Value->GetIntValue();

+  } // end of GetIntValue

+

+/***********************************************************************/

+/*  GetFloatValue: returns the Result value as a double float.         */

+/***********************************************************************/

+double XOBJECT::GetFloatValue(void)

+  {

+  ASSERT(Value)

+  return Value->GetFloatValue();

+  } // end of GetFloatValue

+

+/* ------------------------- Class CONSTANT -------------------------- */

+

+/***********************************************************************/

+/*  CONSTANT public constructor.                                       */

+/***********************************************************************/

+CONSTANT::CONSTANT(PGLOBAL g, void *value, short type)

+  {

+  if (!(Value = AllocateValue(g, value, (int)type)))

+    longjmp(g->jumper[g->jump_level], TYPE_CONST);

+

+  Constant = true;

+  } // end of CONSTANT constructor

+

+/***********************************************************************/

+/*  CONSTANT public constructor.                                       */

+/***********************************************************************/

+CONSTANT::CONSTANT(PGLOBAL g, int n)

+  {

+  if (!(Value = AllocateValue(g, &n, TYPE_INT)))

+    longjmp(g->jumper[g->jump_level], TYPE_CONST);

+

+  Constant = true;

+  } // end of CONSTANT constructor

+

+/***********************************************************************/

+/*  GetLengthEx: returns an evaluation of the constant string length.  */

+/*  Note: When converting from token to string, length has to be       */

+/*    specified but we need the domain length, not the value length.   */

+/***********************************************************************/

+int CONSTANT::GetLengthEx(void)

+  {

+  return Value->GetValLen();

+  } // end of GetLengthEx

+

+/***********************************************************************/

+/*  Convert a constant to the given type.                              */

+/***********************************************************************/

+void CONSTANT::Convert(PGLOBAL g, int newtype)

+  {

+  if (Value->GetType() != newtype)

+    if (!(Value = AllocateValue(g, Value, newtype)))

+      longjmp(g->jumper[g->jump_level], TYPE_CONST);

+

+  } // end of Convert

+

+/***********************************************************************/

+/*  Compare: returns true if this object is equivalent to xp.          */

+/***********************************************************************/

+bool CONSTANT::Compare(PXOB xp)

+  {

+  if (this == xp)

+    return true;

+  else if (xp->GetType() != TYPE_CONST)

+    return false;

+  else

+    return Value->IsEqual(xp->GetValue(), true);

+

+  } // end of Compare

+

+#if 0

+/***********************************************************************/

+/*  Rephrase: temporary implementation used by PlugRephraseSQL.        */

+/***********************************************************************/

+bool CONSTANT::Rephrase(PGLOBAL g, PSZ work)

+  {

+  switch (Value->GetType()) {

+    case TYPE_STRING:

+      sprintf(work + strlen(work), "'%s'", Value->GetCharValue());

+      break;

+    case TYPE_SHORT:

+      sprintf(work + strlen(work), "%hd", Value->GetShortValue());

+      break;

+    case TYPE_INT:

+    case TYPE_DATE:

+      sprintf(work + strlen(work), "%d", Value->GetIntValue());

+      break;

+    case TYPE_DOUBLE:

+      sprintf(work + strlen(work), "%lf", Value->GetFloatValue());

+      break;

+    case TYPE_BIGINT:

+      sprintf(work + strlen(work), "%lld", Value->GetBigintValue());

+      break;

+    case TYPE_TINY:

+      sprintf(work + strlen(work), "%d", Value->GetTinyValue());

+      break;

+    default:

+      sprintf(g->Message, MSG(BAD_CONST_TYPE), Value->GetType());

+      return false;

+    } // endswitch

+

+  return false;

+  } // end of Rephrase

+#endif // 0

+

+/***********************************************************************/

+/*  Make file output of a constant object.                             */

+/***********************************************************************/

+void CONSTANT::Print(PGLOBAL g, FILE *f, uint n)

+  {

+  Value->Print(g, f, n);

+  } /* end of Print */

+

+/***********************************************************************/

+/*  Make string output of a constant object.                           */

+/***********************************************************************/

+void CONSTANT::Print(PGLOBAL g, char *ps, uint z)

+  {

+  Value->Print(g, ps, z);

+  } /* end of Print */