8000 Merge branch 'next' into sam_std_bind · jchjava/rethinkdb@e161519 · GitHub
[go: up one dir, main page]
Skip to content

Commit e161519

Browse files
srhsrh
committed
Merge branch 'next' into sam_std_bind
2 parents 501a410 + f399fb7 commit e161519

File tree

8 files changed

+31
-23
lines changed

8 files changed

+31
-23
lines changed

‎admin/static/coffee/dataexplorer.coffee

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3467,6 +3467,8 @@ module 'DataExplorerView', ->
34673467
for task in profile
34683468
if task['duration(ms)']?
34693469
total_duration += task['duration(ms)']
3470+
else if task['mean_duration(ms)']?
3471+
total_duration += task['mean_duration(ms)']
34703472

34713473
total_duration
34723474

‎admin/static/handlebars/namespaces/database.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ <h2 class="title">Tables in this database</h2>
4949
<ul class="tables">
5050
{{#each tables}}
5151
<li class="table">
52-
<p class="name"><a href="/#tables/{{id}}">{{name}}</a></p>
52+
<p class="name"><a href="#tables/{{id}}">{{name}}</a></p>
5353
<p class="info"><span class 8000 ="highlight">{{nshards}}</span> {{pluralize_noun "shard" nshards}}, <span class="highlight">{{nreplicas}}</span> {{pluralize_noun "replica" nreplicas}}</p>
5454
<p class="status">{{humanize_namespace_reachability reachability}}</p>
5555
</li>

‎drivers/javascript/ast.coffee

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,17 @@ funcWrap = (val) ->
3232

3333
return val
3434

35+
hasImplicit = (args) ->
36+
# args is an array of (strings and arrays)
37+
# We recurse to look for `r.row` which is an implicit var
38+
if Array.isArray(args)
39+
for arg in args
40+
if hasImplicit(arg) is true
41+
return true
42+
else if args is 'r.row'
43+
return true
44+
return false
45+
3546
# AST classes
3647

3748
class TermBase
@@ -791,7 +802,10 @@ class Func extends RDBOp
791802
return super(optargs, argsArr, body)
792803

793804
compose: (args) ->
794-
['function(', (Var::compose(arg) for arg in args[0][1...-1]), ') { return ', args[1], '; }']
805+
if hasImplicit(args[1]) is true
806+
[args[1]]
807+
else
808+
['function(', (Var::compose(arg) for arg in args[0][1...-1]), ') { return ', args[1], '; }']
795809

796810
class Asc extends RDBOp
797811
tt: "ASC"

‎drivers/python/rethinkdb/net.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def reconnect(self, noreply_wait=True):
9898
try:
9999
self.socket = socket.create_connection((self.host, self.port), self.timeout)
100100
except Exception as err:
101-
raise RqlDriverError("Could not connect to %s:%s." % (self.host, self.port))
101+
raise RqlDriverError("Could not connect to %s:%s. Error: %s" % (self.host, self.port, err))
102102

103103
self._sock_sendall(struct.pack("<L", p.VersionDummy.V0_2))
104104
self._sock_sendall(struct.pack("<L", len(self.auth_key)) + str.encode(self.auth_key, 'ascii'))

‎src/rdb_protocol/terms/db_table.cc

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,15 @@ namespace ql {
1515
durability_requirement_t parse_durability_optarg(counted_t<val_t> arg,
1616
pb_rcheckable_t *target);
1717

18-
name_string_t get_name(counted_t<val_t> val, const term_t *caller) {
18+
name_string_t get_name(counted_t<val_t> val, const term_t *caller,
19+
const char *type_str) {
1920
r_sanity_check(val.has());
2021
std::string raw_name = val->as_str();
2122
name_string_t name;
2223
bool assignment_successful = name.assign_value(raw_name);
2324
rcheck_target(caller, base_exc_t::GENERIC, assignment_successful,
24-
strprintf("Database name `%s` invalid (%s).",
25-
raw_name.c_str(), name_string_t::valid_char_msg));
25+
strprintf("%s name `%s` invalid (%s).",
26+
type_str, raw_name.c_str(), name_string_t::valid_char_msg));
2627
return name;
2728
}
2829

@@ -90,7 +91,7 @@ class db_term_t : public meta_op_term_t {
9091
db_term_t(compile_env_t *env, const protob_t<const Term> &term) : meta_op_term_t(env, term, argspec_t(1)) { }
9192
private:
9293
virtual counted_t<val_t> eval_impl(scope_env_t *env, UNUSED eval_flags_t flags) {
93-
name_string_t db_name = get_name(arg(env, 0), this);
94+
name_string_t db_name = get_name(arg(env, 0), this, "Database");
9495
uuid_u uuid;
9596
{
9697
rethreading_metadata_accessor_t meta(env);
@@ -109,7 +110,7 @@ class db_create_term_t : public meta_write_op_t {
109110
meta_write_op_t(env, term, argspec_t(1)) { }
110111
private:
111112
virtual std::string write_eval_impl(scope_env_t *env, UNUSED eval_flags_t flags) {
112-
name_string_t db_name = get_name(arg(env, 0), this);
113+
name_string_t db_name = get_name(arg(env, 0), this, "Database");
113114

114115
rethreading_metadata_accessor_t meta(env);
115116

@@ -162,7 +163,7 @@ class table_create_term_t : public meta_write_op_t {
162163
virtual std::string write_eval_impl(scope_env_t *env, UNUSED eval_flags_t flags) {
163164
uuid_u dc_id = nil_uuid();
164165
if (counted_t<val_t> v = optarg(env, "datacenter")) {
165-
name_string_t name = get_name(v, this);
166+
name_string_t name = get_name(v, this, "Table");
166167
{
167168
rethreading_metadata_accessor_t meta(env);
168169
dc_id = meta_get_uuid(&meta.dc_searcher, name,
@@ -191,10 +192,10 @@ class table_create_term_t : public meta_write_op_t {
191192
counted_t<val_t> dbv = optarg(env, "db");
192193
r_sanity_check(dbv);
193194
db_id = dbv->as_db()->id;
194-
tbl_name = get_name(arg(env, 0), this);
195+
tbl_name = get_name(arg(env, 0), this, "Table");
195196
} else {
196197
db_id = arg(env, 0)->as_db()->id;
197-
tbl_name = get_name(arg(env, 1), this);
198+
tbl_name = get_name(arg(env, 1), this, "Table");
198199
}
199200

200201
// Ensure table doesn't already exist.
@@ -259,7 +260,7 @@ class db_drop_term_t : public meta_write_op_t {
259260
meta_write_op_t(env, term, argspec_t(1)) { }
260261
private:
261262
virtual std::string write_eval_impl(scope_env_t *env, UNUSED eval_flags_t flags) {
262-
name_string_t db_name = get_name(arg(env, 0), this);
263+
name_string_t db_name = get_name(arg(env, 0), this, "Database");
263264

264265
rethreading_metadata_accessor_t meta(env);
265266

@@ -312,10 +313,10 @@ class table_drop_term_t : public meta_write_op_t {
312313
counted_t<val_t> dbv = optarg(env, "db");
313314
r_sanity_check(dbv);
314315
db_id = dbv->as_db()->id;
315-
tbl_name = get_name(arg(env, 0), this);
316+
tbl_name = get_name(arg(env, 0), this, "Table");
316317
} else {
317318
db_id = arg(env, 0)->as_db()->id;
318-
tbl_name = get_name(arg(env, 1), this);
319+
tbl_name = get_name(arg(env, 1), this, "Table");
319320
}
320321

321322
rethreading_metadata_accessor_t meta(env);

‎src/serializer/log/data_block_manager.cc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -724,8 +724,6 @@ data_block_manager_t::many_writes(const std::vector<buf_write_info_t> &writes,
724724
}
725725
}
726726

727-
stats->pm_serializer_data_blocks_written += writes.size();
728-
729727
struct intermediate_cb_t : public iocallback_t {
730728
virtual void on_io_complete() {
731729
--ops_remaining;
@@ -795,7 +793,6 @@ data_block_manager_t::many_writes(const std::vector<buf_write_info_t> &writes,
795793

796794
void data_block_manager_t::destroy_entry(gc_entry_t *entry) {
797795
rassert(entry != NULL);
798-
++stats->pm_serializer_data_extents_reclaimed;
799796
entry->destroy();
800797
}
801798

‎src/serializer/log/log_serializer.cc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,7 @@ log_serializer_stats_t::log_serializer_stats_t(perfmon_collection_t *parent)
123123
pm_serializer_lba_extents(),
124124
pm_serializer_data_extents(),
125125
pm_serializer_data_extents_allocated(),
126-
pm_serializer_data_extents_reclaimed(),
127126
pm_serializer_data_extents_gced(),
128-
pm_serializer_data_blocks_written(),
129127
pm_serializer_old_garbage_block_bytes(),
130128
pm_serializer_old_total_block_bytes(),
131129
pm_serializer_lba_gcs(),
@@ -141,9 +139,7 @@ log_serializer_stats_t::log_serializer_stats_t(perfmon_collection_t *parent)
141139
&pm_serializer_lba_extents, "serializer_lba_extents",
142140
&pm_serializer_data_extents, "serializer_data_extents",
143141
&pm_serializer_data_extents_allocated, "serializer_data_extents_allocated",
144-
&pm_serializer_data_extents_reclaimed, "serializer_data_extents_reclaimed",
145142
&pm_serializer_data_extents_gced, "serializer_data_extents_gced",
146-
&pm_serializer_data_blocks_written, "serializer_data_blocks_written",
147143
&pm_serializer_old_garbage_block_bytes, "serializer_old_garbage_block_bytes",
148144
&pm_serializer_old_total_block_bytes, "serializer_old_total_block_bytes",
149145
&pm_serializer_lba_gcs, "serializer_lba_gcs",

‎src/serializer/log/stats.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ struct log_serializer_stats_t {
2424
/* used in serializer/log/data_block_manager.cc */
2525
perfmon_counter_t pm_serializer_data_extents;
2626
perfmon_counter_t pm_serializer_data_extents_allocated;
27-
perfmon_counter_t pm_serializer_data_extents_reclaimed;
2827
perfmon_counter_t pm_serializer_data_extents_gced;
29-
perfmon_counter_t pm_serializer_data_blocks_written;
3028
perfmon_counter_t pm_serializer_old_garbage_block_bytes;
3129
perfmon_counter_t pm_serializer_old_total_block_bytes;
3230

0 commit comments

Comments
 (0)
0