Merge lp:~tenbrae/drizzle/connectionid-plugin into lp:~drizzle-trunk/drizzle/development

[aeva black]

[Stewart Smith (stewart)]

review: Approve

[Jay Pipes (jaypipes)]

Approved.

review: Approve

[lp:~tenbrae/drizzle/connectionid-plugin]

1088. By aeva black on 2009-07-09

formatting cleanup

=== modified file 'drizzled/Makefile.am'
--- drizzled/Makefile.am	2009-06-26 06:25:57 +0000
+++ drizzled/Makefile.am	2009-07-05 16:50:29 +0000
@@ -76,7 +76,6 @@
 		function/benchmark.h \
 		function/char_length.h \
 		function/coercibility.h \
-		function/connection_id.h \
 		function/create.h \
 		function/field.h \
 		function/find_in_set.h \
@@ -409,7 +408,6 @@
 		function/benchmark.cc \
 		function/char_length.cc \
 		function/check_reserved_words.cc \
-		function/connection_id.cc \
 		function/coercibility.cc \
 		function/field.cc \
 		function/find_in_set.cc \
 
=== removed file 'drizzled/function/connection_id.cc'
--- drizzled/function/connection_id.cc	2009-05-15 07:39:56 +0000
+++ drizzled/function/connection_id.cc	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
- *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- *  Copyright (C) 2008 Sun Microsystems
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <drizzled/server_includes.h>
-#include CSTDINT_H
-#include <drizzled/function/connection_id.h>
-#include <drizzled/session.h>
-
-void Item_func_connection_id::fix_length_and_dec()
-{
-  Item_int_func::fix_length_and_dec();
-  max_length= 10;
-}
-
-
-bool Item_func_connection_id::fix_fields(Session *session, Item **ref)
-{
-  if (Item_int_func::fix_fields(session, ref))
-    return true;
-
-  value= session->variables.pseudo_thread_id;
-
-  return false;
-}
-
 
=== removed file 'drizzled/function/connection_id.h'
--- drizzled/function/connection_id.h	2009-05-15 01:47:27 +0000
+++ drizzled/function/connection_id.h	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
- *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- *  Copyright (C) 2008 Sun Microsystems
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef DRIZZLED_FUNCTION_CONNECTION_ID_H
-#define DRIZZLED_FUNCTION_CONNECTION_ID_H
-
-#include <drizzled/function/math/int.h>
-#include <drizzled/function/func.h>
-
-class Item_func_connection_id :public Item_int_func
-{
-  int64_t value;
-
-public:
-  Item_func_connection_id() {}
-  const char *func_name() const { return "connection_id"; }
-  void fix_length_and_dec();
-  bool fix_fields(Session *session, Item **ref);
-  int64_t val_int() { assert(fixed == 1); return value; }
-};
-
-#endif /* DRIZZLED_FUNCTION_CONNECTION_ID_H */
 
=== modified file 'drizzled/item/create.cc'
--- drizzled/item/create.cc	2009-06-30 18:09:07 +0000
+++ drizzled/item/create.cc	2009-07-05 16:50:29 +0000
@@ -73,7 +73,6 @@
 #include <drizzled/function/math/ceiling.h>
 #include <drizzled/function/char_length.h>
 #include <drizzled/function/coercibility.h>
-#include <drizzled/function/connection_id.h>
 #include <drizzled/function/math/cos.h>
 #include <drizzled/function/math/dec.h>
 #include <drizzled/function/math/decimal_typecast.h>
@@ -424,21 +423,6 @@
 };
 
 
-class Create_func_connection_id : public Create_func_arg0
-{
-public:
-  using Create_func_arg0::create;
-
-  virtual Item *create(Session *session);
-
-  static Create_func_connection_id s_singleton;
-
-protected:
-  Create_func_connection_id() {}
-  virtual ~Create_func_connection_id() {}
-};
-
-
 class Create_func_conv : public Create_func_arg3
 {
 public:
@@ -1838,15 +1822,6 @@
 }
 
 
-Create_func_connection_id Create_func_connection_id::s_singleton;
-
-Item*
-Create_func_connection_id::create(Session *session)
-{
-  return new (session->mem_root) Item_func_connection_id();
-}
-
-
 Create_func_conv Create_func_conv::s_singleton;
 
 Item*
@@ -2837,7 +2812,6 @@
   { { C_STRING_WITH_LEN("COERCIBILITY") }, BUILDER(Create_func_coercibility)},
   { { C_STRING_WITH_LEN("CONCAT") }, BUILDER(Create_func_concat)},
   { { C_STRING_WITH_LEN("CONCAT_WS") }, BUILDER(Create_func_concat_ws)},
-  { { C_STRING_WITH_LEN("CONNECTION_ID") }, BUILDER(Create_func_connection_id)},
   { { C_STRING_WITH_LEN("CONV") }, BUILDER(Create_func_conv)},
   { { C_STRING_WITH_LEN("COS") }, BUILDER(Create_func_cos)},
   { { C_STRING_WITH_LEN("COT") }, BUILDER(Create_func_cot)},
 
=== added directory 'plugin/connection_id'
=== added file 'plugin/connection_id/connection_id.cc'
--- plugin/connection_id/connection_id.cc	1970-01-01 00:00:00 +0000
+++ plugin/connection_id/connection_id.cc	2009-07-05 20:42:38 +0000
@@ -0,0 +1,94 @@
+/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
+ *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ *  Copyright (C) 2008 Sun Microsystems
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <drizzled/server_includes.h>
+#include <drizzled/function/math/int.h>
+#include <drizzled/function/create.h>
+#include <drizzled/session.h>
+
+using namespace std;
+
+class ConnectionIdFunction :public Item_int_func
+{
+  int64_t value;
+public:
+  ConnectionIdFunction() :Item_int_func() {}
+  
+  int64_t val_int() 
+  {
+    assert(fixed==1);
+    return value;
+  }
+  
+  const char *func_name() const 
+  { 
+    return "connection_id"; 
+  }
+
+  void fix_length_and_dec() 
+  {
+    Item_int_func::fix_length_and_dec();
+    max_length= 10;
+  }
+
+  bool fix_fields(Session *session, Item **ref)
+  {
+    if (Item_int_func::fix_fields(session, ref))
+      return true;
+
+    value= session->variables.pseudo_thread_id;
+
+    return false;
+  }
+
+  bool check_argument_count(int n)
+  {
+    return (n==0);
+  }
+};
+
+
+Create_function<ConnectionIdFunction> connection_idudf(string("connection_id"));
+
+static int initialize(PluginRegistry &registry)
+{
+  registry.add(&connection_idudf);
+  return 0;
+}
+
+static int finalize(PluginRegistry &registry)
+{
+   registry.remove(&connection_idudf);
+   return 0;
+}
+
+drizzle_declare_plugin(connection_id)
+{
+  "connection_id",
+  "1.0",
+  "Devananda van der Veen",
+  "Return the current connection_id",
+  PLUGIN_LICENSE_GPL,
+  initialize, /* Plugin Init */
+  finalize,   /* Plugin Deinit */
+  NULL,   /* status variables */
+  NULL,   /* system variables */
+  NULL    /* config options */
+}
+drizzle_declare_plugin_end;
 
=== added file 'plugin/connection_id/plugin.ini'
--- plugin/connection_id/plugin.ini	1970-01-01 00:00:00 +0000
+++ plugin/connection_id/plugin.ini	2009-07-05 20:42:38 +0000
@@ -0,0 +1,6 @@
+[plugin]
+name=connection_id
+title=Connection ID UDF
+description=UDF Plugin for connection_id function
+load_by_default=yes
+sources=connection_id.cc